blacklight 5.1.0 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b2d38f9b220bd5f8964188bb0ee5789fb834a3c
-  data.tar.gz: a25ff32577292eada643a0b1410c48d9544b3cde
+  metadata.gz: 3a001b98201040df18b0c251d644db58d7b462cb
+  data.tar.gz: f193d5ea8bb6f8b106e525884982a34578c50cf1
 SHA512:
-  metadata.gz: 4130f90f31cbcc0bbe4650f508bc38b88ed7779ab8af2523311bac816a879f2790ebd39c079410f10070761291ed20e04678651a19aa11b81bfe079f7f28851e
-  data.tar.gz: 83af8dee407631644e94b28af90ad3b995584c0856071fcbfdb7c9440a02e099b3def65e11c162a045dab11cef9230c49ab0c06ff8fd803b8917c6441d83fb98
+  metadata.gz: 632d7373d5a5060a2459df1d57c57d26bfe5584bb7c7883e3382f9190f8b53eef02450bd971e282fb1e8912c9411ce1b665efab6bc2f6c81beb02c7cc00c720d
+  data.tar.gz: 991c52e5c79ececb1a29300ce97a8f457c8489cbb2447a6913374d6c24bfb8b9a7fc5802a9af279dfeaf0aaa95bb6b2089b7503377a98cc4c246c00016a2260f

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.1.0
+5.1.1

data/app/helpers/blacklight/url_helper_behavior.rb

@@ -215,4 +215,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.1.0
+  version: 5.1.1
 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
@@ -476,6 +488,7 @@ files:
 - spec/views/catalog/facet.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/
@@ -498,7 +511,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)
@@ -560,9 +573,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
@@ -581,4 +592,5 @@ test_files:
 - spec/views/catalog/facet.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