Merge pull request #825 from projectblacklight/5.1-backport

Backport #asset_url for 5.1

.gitignore

@@ -11,5 +11,5 @@ log/*
 solr_marc/solrmarc.log
 lib/solrmarc.log.*
 tmp/*
-spec/internal/
-pkg/*
+pkg/*
+spec/internal

Gemfile

@@ -1,21 +1,21 @@
 source 'https://rubygems.org'
 
 # Please see blacklight.gemspec for dependency information.
-gemspec
+gemspec path: File.expand_path('..', __FILE__)
 
 
 gem 'simplecov', require: false
 gem 'coveralls', require: false
 
+gem 'engine_cart', '~> 0.3.0'
+
 group :test do
-  gem 'devise'
-  gem 'devise-guests'
-  gem "bootstrap-sass"
-  gem 'turbolinks'
-  gem 'sass-rails'
-  gem 'blacklight-marc', :github => 'projectblacklight/blacklight_marc'
+  gem "blacklight-marc", "~> 5.0", github: "projectblacklight/blacklight_marc"
+  gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 end
 
-if File.exists?('spec/test_app_templates/Gemfile.extra')
-  eval File.read('spec/test_app_templates/Gemfile.extra'), nil, 'spec/test_app_templates/Gemfile.extra'
+file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path("../spec/internal", __FILE__))
+if File.exists?(file)
+  puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
+  instance_eval File.read(file)
 end

Rakefile

@@ -1,5 +1,6 @@
 # encoding: UTF-8
 require 'rubygems'
+require 'rails'
 begin
   require 'bundler/setup'
 rescue LoadError

app/helpers/blacklight/url_helper_behavior.rb

@@ -215,4 +215,9 @@ def remove_facet_params(field, item, source_params=params)
     p
   end
 
-end
+  if ::Rails.version < "4.0"
+    def asset_url *args
+      "#{request.protocol}#{request.host_with_port}#{asset_path(*args)}"
+    end
+  end
+end

blacklight.gemspec

@@ -17,18 +17,18 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  # PRODUCTION GEM REQUIREMENTS
-  # ---------------------------------------   
   s.add_dependency "rails",     ">= 3.2.6", "< 5"
   s.add_dependency "nokogiri",  "~>1.6"     # XML Parser
   s.add_dependency "kaminari", "~> 0.13"  # the pagination (page 1,2,3, etc..) of our search results
   s.add_dependency "rsolr",     "~> 1.0.6"  # Library for interacting with rSolr.
-  s.add_dependency "sass-rails"
   s.add_dependency "bootstrap-sass", "~> 3.0"
   s.add_dependency "deprecation"
+
   s.add_development_dependency "jettywrapper", ">= 1.5.2"
   s.add_development_dependency "blacklight-marc", "~> 5.0"
   s.add_development_dependency "rspec-rails"
+  s.add_development_dependency "capybara"
+  s.add_development_dependency "poltergeist"
   s.add_development_dependency 'engine_cart', ">= 0.1.0"
   s.add_development_dependency "equivalent-xml"
 end

gemfiles/rails3.gemfile

@@ -1,23 +1,9 @@
 source 'http://rubygems.org'
 
-# Please see blacklight.gemspec for dependency information.
-gemspec :path=>"../"
-
-gem 'rails', "~> 3.2"
-
-gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
-
-group :test do
-  gem 'simplecov', require: false
-  gem 'coveralls', require: false
-  gem 'devise'
-  gem 'devise-guests'
-  gem "bootstrap-sass"
-  gem 'turbolinks'
-  gem 'uglifier'
+file = File.expand_path("../../Gemfile", __FILE__)
+if File.exists?(file)
+  puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
+  instance_eval File.read(file)
 end
 
-f = File.expand_path(File.dirname(__FILE__) + '/../spec/test_app_templates/Gemfile.extra')
-if File.exists?(f)
-  eval File.read(f), nil, f
-end
+gem 'rails', "3.2.17"

gemfiles/rails4.gemfile

@@ -1,22 +1,10 @@
 source 'http://rubygems.org'
 
-# Please see blacklight.gemspec for dependency information.
-gemspec :path=>"../"
+file = File.expand_path("../../Gemfile", __FILE__)
 
-gem 'rails', '~> 4.0.0'
-
-gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
-
-group :test do
-  gem 'simplecov', require: false
-  gem 'coveralls', require: false
-  gem 'devise'
-  gem 'devise-guests'
-  gem "bootstrap-sass"
-  gem 'turbolinks'
+if File.exists?(file)
+  puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
+  instance_eval File.read(file)
 end
 
-f = File.expand_path(File.dirname(__FILE__) + '/../spec/test_app_templates/Gemfile.extra')
-if File.exists?(f)
-  eval File.read(f), nil, f
-end
+gem 'rails', '4.0.3'

spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -11,13 +11,8 @@ def fix_travis_rails_4
     end
   end
 
-  def copy_blacklight_test_app_rake_task
-    copy_file "lib/tasks/blacklight_test_app.rake"
-  end
-
   def remove_index 
     remove_file "public/index.html"
-    remove_file 'app/assets/images/rails.png'
   end
 
   def run_blacklight_generator

spec/views/catalog/opensearch.xml.builder_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe 'catalog/opensearch.xml.builder' do
+  it "should render an OpenSearch description document" do
+    render
+    doc = Nokogiri::XML.parse(rendered)
+    doc.remove_namespaces!
+    expect(doc.xpath('/OpenSearchDescription').length).to eq 1
+  end
+end