blacklight_range_limit 5.0.3 → 5.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfbd60cfa11906f880033d02aa35b34cda312d3a
-  data.tar.gz: 658444bdfca712dec061edb48cd0ddf9066b12a9
+  metadata.gz: 634026b870d878f4ab9ffc0f8d0f101ff2136317
+  data.tar.gz: 4a89fdf27b5acf0d237fa77848edec77a0d30f8c
 SHA512:
-  metadata.gz: 8fe6f9b7a91a2f2e6395f47d10e032f09f9026bfdfee2d4135a17523c317ec69b7e172ed338ed5d6a4cceeb36d3339ae02e9783f6ccf96756748e5f622aa7581
-  data.tar.gz: 930d57f88f318fa4273580b80f1771deec6a44540a628ef1e7d2e1e3757f5c628052aec86f48c5b540d3c8a251babadf4822caa58f8b9e7da0b1cb825f31ebf0
+  metadata.gz: ed2522f9cb021084721312501b7b7044c7fa7e8526f90a65f7eded30dad4426fa2c727686aa7a80e102968de5e6239e7286a952470a6c3615da5a091344c7c69
+  data.tar.gz: d23895c6afeb3b24dc22e30f2fa0b69b5a49f9f24e9ef28da418e5b3b1586755bb967c0fe7f92d70825418c0e55db7fe8f40025f08bb29c1c41e485d1bfc5fab

data/.gitignore

@@ -24,4 +24,5 @@ Gemfile.lock
 /spec/internal
 /jetty
 /pkg
-/tmp
+/tmp
+/.bundle

data/Gemfile

@@ -1,27 +1,18 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gemspec
 
-gem 'engine_cart'
+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)
+else
+  gem 'rails', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
 
-group :test do
-  gem 'devise'
-  gem 'devise-guests'
-  gem "bootstrap-sass"
-  gem 'turbolinks'
-end
-
-gem 'sass-rails'
-# If we don't specify 2.11.0 we'll end up with sprockets 2.12.0 in the main 
-# Gemfile.lock but since sass-rails gets generated (rails new) into the test app
-# it'll want sprockets 2.11.0 and we'll have a conflict
-gem 'sprockets', '2.11.0'
-
-# If we don't specify 3.2.15 we'll end up with sass 3.3.2 in the main 
-# Gemfile.lock but since sass-rails gets generated (rails new) into the test app
-# it'll want sass 3.2.0 and we'll have a conflict
-gem 'sass', '~> 3.2.0'
-
-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'
+  if ENV['RAILS_VERSION'] and ENV['RAILS_VERSION'] =~ /^4.2/
+    gem 'responders', "~> 2.0"
+    gem 'sass-rails', ">= 5.0"
+  else
+    gem 'sass-rails', "< 5.0"
+  end
 end

data/Rakefile

@@ -6,13 +6,11 @@ Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
 
-
-TEST_APP_TEMPLATES = 'spec/test_app_templates'
-TEST_APP = 'spec/internal'
 require 'engine_cart/rake_task'
 
-ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v4.0.0.zip"
-APP_ROOT = File.dirname(__FILE__)
+EngineCart.fingerprint_proc = EngineCart.rails_fingerprint_proc
+
+ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v4.10.3.zip"
 
 require 'jettywrapper'
 
@@ -23,7 +21,7 @@ RSpec::Core::RakeTask.new do |t|
 
 end
 
-task :ci => ['jetty:clean', 'engine_cart:clean', 'engine_cart:generate'] do
+task :ci => ['jetty:clean', 'engine_cart:generate'] do
   jetty_params = Jettywrapper.load_config('test')
   jetty_params[:startup_wait]= 60
   error = Jettywrapper.wrap(jetty_params) do

data/VERSION

@@ -1 +1 @@
-5.0.3
+5.0.4

data/blacklight_range_limit.gemspec

@@ -23,10 +23,11 @@ Gem::Specification.new do |s|
   # but not 6. can't seem to make it do so other than this:
   s.add_dependency "blacklight", ">= 5.0.0.pre4", "< 6"
 
-  s.add_development_dependency "rspec", ">= 2.0"
+  s.add_development_dependency "rspec", "~> 3.0"
   s.add_development_dependency "rspec-rails"
   s.add_development_dependency "capybara"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency 'launchy'
   s.add_development_dependency "jettywrapper", "~> 1.5", ">= 1.5.2"
+  s.add_development_dependency "engine_cart", "~> 0.6"
 end

data/lib/blacklight_range_limit/view_helper_override.rb

@@ -10,9 +10,9 @@
       super
     end
 
-    def has_range_limit_parameters?(params = params)
-      params[:range] && 
-        params[:range].any? do |key, v| 
+    def has_range_limit_parameters?(my_params = params)
+      my_params[:range] &&
+        my_params[:range].any? do |key, v|
           v.present? && v.respond_to?(:'[]') && 
           (v["begin"].present? || v["end"].present? || v["missing"].present?)
         end
@@ -23,8 +23,8 @@
       super || has_range_limit_parameters?
     end
 
-    def query_has_constraints?(params = params)         
-      super || has_range_limit_parameters?(params)
+    def query_has_constraints?(my_params = params)
+      super || has_range_limit_parameters?(my_params)
     end
 
     # Over-ride to recognize our custom params for range facets

data/spec/features/blacklight_range_limit_spec.rb

@@ -4,19 +4,19 @@ describe "Blacklight Range Limit" do
 
   it "should show the range limit facet" do
     visit catalog_index_path
-    page.should have_selector 'input.range_begin'
-    page.should have_selector 'input.range_end'
-    page.should have_selector 'label.sr-only[for="range_pub_date_sort_begin"]', :text => 'Publication Date Sort range begin'
-    page.should have_selector 'label.sr-only[for="range_pub_date_sort_end"]', :text => 'Publication Date Sort range end'
-    expect(page).to have_css 'input.submit', value: 'Limit'
+    expect(page).to have_selector 'input.range_begin'
+    expect(page).to have_selector 'input.range_end'
+    expect(page).to have_selector 'label.sr-only[for="range_pub_date_sort_begin"]', :text => 'Publication Date Sort range begin'
+    expect(page).to have_selector 'label.sr-only[for="range_pub_date_sort_end"]', :text => 'Publication Date Sort range end'
+    expect(page).to have_button 'Limit'
   end
 
   it "should provide distribution information" do
     visit catalog_index_path
     click_link 'View distribution'
 
-    page.should have_content("1500 to 1599 0")
-    page.should have_content("2000 to 2008 12")
+    expect(page).to have_content("1500 to 1599 0")
+    expect(page).to have_content("2000 to 2008 12")
   end
 
   it "should limit appropriately" do
@@ -24,7 +24,7 @@ describe "Blacklight Range Limit" do
     click_link 'View distribution'
     click_link '2000 to 2008'
 
-    page.should have_content "2000 to 2008 [remove] 12"
+    expect(page).to have_content "2000 to 2008 [remove] 12"
   end
 end
 
@@ -42,8 +42,8 @@ describe "Blacklight Range Limit with configured input labels" do
   
   it "should show the range limit facet" do
     visit '/catalog'
-    page.should have_selector 'label.sr-only[for="range_pub_date_sort_begin"]', :text => 'from publication date'
-    page.should have_selector 'label.sr-only[for="range_pub_date_sort_end"]', :text => 'to publication date'
+    expect(page).to have_selector 'label.sr-only[for="range_pub_date_sort_begin"]', :text => 'from publication date'
+    expect(page).to have_selector 'label.sr-only[for="range_pub_date_sort_end"]', :text => 'to publication date'
   end
 
 end

data/spec/spec_helper.rb

@@ -14,5 +14,16 @@ require 'capybara/rspec'
 
 RSpec.configure do |config|
 
+
+  # rspec-rails 3 will no longer automatically infer an example group's spec type
+  # from the file location. You can explicitly opt-in to the feature using this
+  # config option.
+  # To explicitly tag specs without using automatic inference, set the `:type`
+  # metadata manually:
+  #
+  #     describe ThingsController, :type => :controller do
+  #       # Equivalent to being in spec/controllers
+  #     end
+  config.infer_spec_type_from_file_location!
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_range_limit
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 5.0.4
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2015-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -69,16 +69,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -155,6 +155,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.2
+- !ruby/object:Gem::Dependency
+  name: engine_cart
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 description: 
 email:
 - blacklight-development@googlegroups.com
@@ -198,7 +212,6 @@ files:
 - spec/fixtures/solr_documents/zero_year.yml
 - spec/helpers/blacklight_range_limit_helper_spec.rb
 - spec/spec_helper.rb
-- spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - vendor/assets/javascripts/bootstrap-slider.js
 - vendor/assets/javascripts/flot/excanvas.min.js
@@ -225,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Blacklight Range Limit plugin
@@ -234,5 +247,4 @@ test_files:
 - spec/fixtures/solr_documents/zero_year.yml
 - spec/helpers/blacklight_range_limit_helper_spec.rb
 - spec/spec_helper.rb
-- spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb

data/spec/test_app_templates/Gemfile.extra

@@ -1,25 +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'
-  if defined? :JRUBY_VERSION
-    gem 'capybara', '~> 1.0'
-  else
-    gem 'capybara'
-  end
-  gem 'simplecov', :platform => :mri_19
-end
-
-gem 'jettywrapper', '>= 1.2.0'
-gem 'blacklight'