blacklight_range_limit 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fd71837c9733a9d2ea4ca5eb4bbff71697ab2e1
-  data.tar.gz: fdc729acd63a5a49852b837d51becea0b3cb4b70
+  metadata.gz: 89595f56ef1dc7e43d42cd5bc1be1c5a9539c539
+  data.tar.gz: 9effaf5e93dcc4f4e713b922de751c01e3ae582c
 SHA512:
-  metadata.gz: dbdeb05576a7296203d86e15ff697053f8b59e0d938a00f5f3948946a11fc96ee3ae8a4f1bfdc83690936fb3fccbc71759efd64ec7ce57f168b51a5a40899a98
-  data.tar.gz: 5a30c15bf81ab9eee1fb553a7c2752d907aa0f6ac48124238b3e8d735c59043db5f2a5210cad67107bf9bd793b8e3be1e8f817f79bd2ac7960e55cc487647eeb
+  metadata.gz: 279878417fcd97af663de16ea2d12ab5a81889879ce70b75d6201ccc40c1369b351fe2098215de4a2b1c8340f713c254cf6b2b8dcde2ba07736ba79e1035101a
+  data.tar.gz: c91d84eca6dd6cfc46c3c4a97a1ac8f780f21d62b3cd8e8cfc3a1d59c8044ea6dc617df6359d1c4f3e7048f2bce06c5ec553528b8957ca7cd88f1804d05ca92a

data/.gitignore

@@ -20,8 +20,8 @@ pkg
 Gemfile.lock
 
 ## PROJECT::SPECIFIC
-
+.internal_test_app
 /spec/internal
 /jetty
 /pkg
-/tmp
+/tmp

data/.rspec

@@ -0,0 +1 @@
+--color

data/.travis.yml

@@ -1,11 +1,17 @@
-notifications:
-  email: false
-
+sudo: false
+language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
+  - 2.3.7
+
+matrix:
+  include:
+    - rvm: 2.3.7
+      env: "RAILS_VERSION=4.0.13"
+    - rvm: 2.3.7
+      env: "RAILS_VERSION=4.1.16"
+    - rvm: 2.3.7
+      env: "RAILS_VERSION=4.2.10"
 
 notifications:
   irc: "irc.freenode.org#blacklight"
-  email:
-      - blacklight-commits@googlegroups.com
+  email: false

data/Gemfile

@@ -1,16 +1,42 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gemspec
 
-gem 'engine_cart'
-
-group :test do
-  gem 'devise'
-  gem 'devise-guests'
-  gem "bootstrap-sass"
-  gem 'turbolinks'
+# BEGIN ENGINE_CART BLOCK
+# engine_cart: 1.0.1
+# engine_cart stanza: 0.10.0
+# the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
+file = File.expand_path('Gemfile', ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path('.internal_test_app', File.dirname(__FILE__)))
+if File.exist?(file)
+  begin
+    eval_gemfile file
+  rescue Bundler::GemfileError => e
+    Bundler.ui.warn '[EngineCart] Skipping Rails application dependencies:'
+    Bundler.ui.warn e.message
+  end
+else
+  Bundler.ui.warn "[EngineCart] Unable to find test application dependencies in #{file}, using placeholder dependencies"
+  if ENV['RAILS_VERSION']
+    if ENV['RAILS_VERSION'] == 'edge'
+      gem 'rails', github: 'rails/rails'
+      ENV['ENGINE_CART_RAILS_OPTIONS'] = '--edge --skip-turbolinks'
+    else
+      gem 'rails', ENV['RAILS_VERSION']
+    end
+  end
+  case ENV['RAILS_VERSION']
+  when /^4.2/
+    gem 'responders', '~> 2.0'
+    gem 'sass-rails', '>= 5.0'
+    gem 'coffee-rails', '~> 4.1.0'
+  when /^4.[01]/
+    gem 'sass-rails', '< 5.0'
+  end
 end
+# END ENGINE_CART BLOCK
 
 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'
 end
+
+gem 'json', '~> 1.8'

data/VERSION

@@ -1 +1 @@
-2.2.0
+2.3.0

data/blacklight_range_limit.gemspec

@@ -17,15 +17,19 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-
   s.add_dependency "rails", ">= 3.0", "< 5.0"
   s.add_dependency "jquery-rails" # our JS needs jquery_rails
   s.add_dependency "blacklight", "~> 4.0"
 
-  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"
+  s.add_development_dependency 'engine_cart', '~> 2.0'
+  s.add_development_dependency 'devise'
+  s.add_development_dependency 'devise-guests'
+  s.add_development_dependency 'bootstrap-sass'
+  s.add_development_dependency 'turbolinks'
 end

data/lib/blacklight_range_limit/view_helper_override.rb

@@ -3,10 +3,10 @@
   # display. 
   module BlacklightRangeLimit::ViewHelperOverride
 
-    def has_range_limit_parameters?(params = params)
-      params[:range] && 
-        params[:range].any? do |key, v| 
-          v.present? && v.respond_to?(:'[]') && 
+    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
     end
@@ -16,10 +16,10 @@
       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(my_params) || has_range_limit_parameters?(my_params)
     end
-    
+
     def facet_partial_name(display_facet)
       return "blacklight_range_limit/range_limit_panel" if range_config(display_facet.name) and should_show_limit(display_facet.name)
       super

data/spec/features/blacklight_range_limit_spec.rb

@@ -12,16 +12,16 @@ describe "Blacklight Range Limit" do
 
   it "should show the range limit facet" do
     visit '/catalog'
-    page.should have_selector 'input.range_begin'
-    page.should have_selector 'input.range_end'
+    expect(page).to have_selector 'input.range_begin'
+    expect(page).to have_selector 'input.range_end'
   end
 
   it "should provide distribution information" do
     visit '/catalog'
     click_link 'View distribution'
 
-    page.should have_content("1941 to 1944 (1)")
-    page.should have_content("2005 to 2008 (7)")
+    expect(page).to have_content("1941 to 1944 (1)")
+    expect(page).to have_content("2005 to 2008 (7)")
   end
 
   it "should limit appropriately" do
@@ -29,6 +29,6 @@ describe "Blacklight Range Limit" do
     click_link 'View distribution'
     click_link '1941 to 1944'
 
-    page.should have_content "1941 to 1944 (1) [remove]"
+    expect(page).to have_content "1941 to 1944 (1) [remove]"
   end
 end

data/spec/spec_helper.rb

@@ -1,18 +1,12 @@
-require 'rubygems'
-require 'bundler/setup'
-
 ENV["RAILS_ENV"] ||= 'test'
 
 require 'rsolr'
-
 require 'engine_cart'
 EngineCart.load_application!
 
 require 'rspec/rails'
 require 'capybara/rspec'
 
-
 RSpec.configure do |config|
-
+  config.infer_spec_type_from_file_location!
 end
-

data/spec/test_app_templates/Gemfile.extra

@@ -1,9 +1,3 @@
-platforms :jruby do
-  gem 'jdbc-sqlite3'
-  gem 'mediashelf-loggable', '>= 0.4.8'
-  gem 'therubyrhino'
-end
-
 platforms :ruby do
  gem 'sqlite3'
 end
@@ -11,15 +5,8 @@ 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
-  gem 'simplecov-rcov', :platform => :mri_19
+  gem 'capybara'
 end
 
 gem 'jettywrapper', '>= 1.2.0'

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

@@ -1,21 +1,32 @@
 require 'rails/generators'
 
 class TestAppGenerator < Rails::Generators::Base
-  source_root File.expand_path("../../../../test_app_templates", __FILE__)
+  source_root '../spec/test_app_templates'
 
   def copy_blacklight_test_app_rake_task
     copy_file "lib/tasks/blacklight_test_app.rake"
   end
 
   def run_blacklight_generator
-    say_status("warning", "GENERATING BL", :yellow)       
+    say_status("warning", "GENERATING BL", :yellow)
 
     generate 'blacklight', '--devise'
   end
 
   def run_blacklight_range_limit_generator
-    say_status("warning", "GENERATING BL", :yellow)       
+    say_status("warning", "GENERATING BL", :yellow)
 
     generate 'blacklight_range_limit'
   end
+
+  # Add favicon.ico to asset path
+  # ADD THIS LINE Rails.application.config.assets.precompile += %w( favicon.ico )
+  # TO config/assets.rb
+  def add_favicon_to_asset_path
+    say_status("warning", "ADDING FAVICON TO ASSET PATH", :yellow)
+
+    append_to_file 'config/initializers/assets.rb' do
+      'Rails.application.config.assets.precompile += %w( favicon.ico )'
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_range_limit
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Jonathan Rochkind
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-13 00:00:00.000000000 Z
+date: 2018-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -62,16 +62,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
@@ -142,6 +142,76 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: engine_cart
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: devise
+  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: devise-guests
+  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: bootstrap-sass
+  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: turbolinks
+  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'
 description: 
 email:
 - blacklight-development@googlegroups.com
@@ -150,6 +220,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - Gemfile
 - MIT-LICENSE
@@ -207,7 +278,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: blacklight
-rubygems_version: 2.2.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Blacklight Range Limit plugin