blacklight 5.0.2 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39a6ce9d4e75308e52d555bfc2a9142e4a3e323c
-  data.tar.gz: 98fed869e782531d52fd52ba807411ad8c200f59
+  metadata.gz: 7dabf17ff15de58d015662a3f76b993373abddd2
+  data.tar.gz: 8a05023c77d84fae2f3221740157c887789c74b7
 SHA512:
-  metadata.gz: 8008cc989c982ebb220ae69d01e39070c7b07078ed18bccceb3b64af6c8963eafd7a7e5023cb8925c6cf9da4d8bd1f438fe5f12813835c2c2a56760bcdb16851
-  data.tar.gz: 05e632077c43895265057e9da360862554d69386f42f90d17faee1130877f63e939ee7db9e4fe4cf461dd2d9a5883b9e4b42c2727f5ad8ccaa8e528ec4b991b2
+  metadata.gz: 9f3c1b6f201964e4481be952d25d53c85960351dd304c83c884ca2a5000e517e160738f4f7763b6c118cf98f7bb8888cc9006ec14673261ba798afce20cf945a
+  data.tar.gz: e997713b7968192f908ee5c6d251f9e5a3f86f4789745bb9605cd9a747520920f1e3cacac84a87758b00bcaf0b3e23819c7039e16c2a14b51a46993857fb149b

data/.gitignore

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

data/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

data/Rakefile

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

data/VERSION

@@ -1 +1 @@
-5.0.2
+5.0.3

data/app/helpers/blacklight/url_helper_behavior.rb

@@ -205,4 +205,9 @@ module Blacklight::UrlHelperBehavior
     p
   end
 
-end
+  if ::Rails.version < "4.0"
+    def asset_url *args
+      "#{request.protocol}#{request.host_with_port}#{asset_path(*args)}"
+    end
+  end
+end

data/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

data/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"

data/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'

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -11,13 +11,8 @@ class TestAppGenerator < Rails::Generators::Base
     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

data/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.0.3
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -81,20 +81,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.6
-- !ruby/object:Gem::Dependency
-  name: sass-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -165,6 +151,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: poltergeist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
@@ -455,9 +469,7 @@ files:
 - spec/support/features.rb
 - spec/support/features/session_helpers.rb
 - spec/support/include_text.rb
-- spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
-- spec/test_app_templates/lib/tasks/blacklight_test_app.rake
 - spec/views/catalog/_constraints.html.erb_spec.rb
 - spec/views/catalog/_constraints_element.html.erb_spec.rb
 - spec/views/catalog/_document.html.erb_spec.rb
@@ -475,6 +487,7 @@ files:
 - spec/views/catalog/_view_type_group.html.erb_spec.rb
 - spec/views/catalog/index.atom.builder_spec.rb
 - spec/views/catalog/index.html.erb_spec.rb
+- spec/views/catalog/opensearch.xml.builder_spec.rb
 - spec/views/catalog/show.html.erb_spec.rb
 - tasks/blacklight.rake
 homepage: http://projectblacklight.org/
@@ -497,7 +510,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)
@@ -559,9 +572,7 @@ test_files:
 - spec/support/features.rb
 - spec/support/features/session_helpers.rb
 - spec/support/include_text.rb
-- spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
-- spec/test_app_templates/lib/tasks/blacklight_test_app.rake
 - spec/views/catalog/_constraints.html.erb_spec.rb
 - spec/views/catalog/_constraints_element.html.erb_spec.rb
 - spec/views/catalog/_document.html.erb_spec.rb
@@ -579,4 +590,5 @@ test_files:
 - spec/views/catalog/_view_type_group.html.erb_spec.rb
 - spec/views/catalog/index.atom.builder_spec.rb
 - spec/views/catalog/index.html.erb_spec.rb
+- spec/views/catalog/opensearch.xml.builder_spec.rb
 - spec/views/catalog/show.html.erb_spec.rb

data/spec/test_app_templates/Gemfile.extra

@@ -1,21 +0,0 @@
-platforms :jruby do
-  gem 'jdbc-sqlite3'
-  gem 'mediashelf-loggable', '>= 0.4.8'
-  gem 'therubyrhino'
-end
-
-platforms :ruby do
- gem 'sqlite3'
-end
-
-gem 'jquery-rails'
-
-group :test do
-  gem 'rspec-rails', '~> 2.13'
-  gem 'generator_spec'
-  gem 'poltergeist'
-  gem 'simplecov'
-end
-
-gem 'jettywrapper', '>= 1.2.0'
-

data/spec/test_app_templates/lib/tasks/blacklight_test_app.rake

@@ -1,14 +0,0 @@
-require 'rspec/core/rake_task'
-
-desc "run the blacklight gem spec"
-gem_home = File.expand_path('../../../../..', __FILE__)
-
-namespace :blacklight_test_app do
-
-  RSpec::Core::RakeTask.new(:spec) do |t|
-    t.pattern = gem_home + '/spec/**/*_spec.rb'
-    t.rspec_opts = "--colour"
-    t.ruby_opts = "-I#{gem_home}/spec"
-  end
-
-end