blacklight_range_limit 6.5.0 → 7.0.0.rc1

data/spec/features/blacklight_range_limit_spec.rb

@@ -6,8 +6,8 @@ describe "Blacklight Range Limit" do
     visit search_catalog_path
     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_selector 'label.sr-only[for="range_pub_date_si_begin"]', :text => 'Publication Date Sort range begin'
+    expect(page).to have_selector 'label.sr-only[for="range_pub_date_si_end"]', :text => 'Publication Date Sort range end'
     expect(page).to have_button 'Limit'
   end
 
@@ -24,15 +24,7 @@ describe "Blacklight Range Limit" do
     click_link 'View distribution'
     click_link '2000 to 2008'
 
-    within '.blacklight-pub_date_sort' do
-      expect(page).to have_content "2000 to 2008 [remove] 12"
-    end
-
-    within '#appliedParams'  do
-      expect(page).to have_content '2000 to 2008'
-    end
-
-    expect(page).to have_content '1 - 10 of 12'
+    expect(page).to have_content "2000 to 2008 [remove] 12"
   end
 
   it "should not include page parameter" do
@@ -45,7 +37,7 @@ describe "Blacklight Range Limit" do
 
   context 'when I18n translation is available' do
     before do
-      I18n.backend.store_translations(:en, blacklight: {search: {fields: {facet: {pub_date_sort: 'Publication Date I18n'}}}})
+      I18n.backend.store_translations(:en, blacklight: {search: {fields: {facet: {pub_date_si: 'Publication Date I18n'}}}})
     end
 
     it 'should render the I18n label' do
@@ -63,21 +55,21 @@ describe "Blacklight Range Limit with configured input labels" do
   before do
     CatalogController.blacklight_config = Blacklight::Configuration.new
     CatalogController.configure_blacklight do |config|
-      config.add_facet_field 'pub_date_sort', range: {
+      config.add_facet_field 'pub_date_si', range: {
         input_label_range_begin: 'from publication date',
         input_label_range_end: 'to publication date',
         maxlength: 6
       }
       config.default_solr_params[:'facet.field'] = config.facet_fields.keys
-    end
-  end
-
+    end  
+  end    
+  
   it "should show the range limit facet with configured labels and maxlength" do
     visit '/catalog'
-    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'
-    expect(page).to have_selector 'input#range_pub_date_sort_begin[maxlength="6"]'
-    expect(page).to have_selector 'input#range_pub_date_sort_end[maxlength="6"]'
+    expect(page).to have_selector 'label.sr-only[for="range_pub_date_si_begin"]', :text => 'from publication date'
+    expect(page).to have_selector 'label.sr-only[for="range_pub_date_si_end"]', :text => 'to publication date'
+    expect(page).to have_selector 'input#range_pub_date_si_begin[maxlength="6"]'
+    expect(page).to have_selector 'input#range_pub_date_si_end[maxlength="6"]'
   end
 
 end

data/spec/fixtures/solr_documents/zero_year.yml

@@ -1,3 +1,3 @@
 id: 'zero_doc_id'
-title_display: 'Zero year doc'
-pub_date: 1000
+title_tsim: 'Zero year doc'
+pub_date_si: 1000

data/spec/lib/blacklight_range_limit/segment_calculation_spec.rb

@@ -4,10 +4,6 @@ RSpec.describe BlacklightRangeLimit::SegmentCalculation do
   let(:dummy_class) do
     Class.new do
       include BlacklightRangeLimit::SegmentCalculation
-
-      def blacklight_config
-        Blacklight::Configuration.new
-      end
     end
   end
 
@@ -49,15 +45,5 @@ RSpec.describe BlacklightRangeLimit::SegmentCalculation do
                                           'The min date must be before the max date'
       end
     end
-
-    context 'when a field that does not exist is passed in' do
-      let(:min) { 100 }
-      let(:max) { 800 }
-      let(:solr_field) { 'i_am_not_real' }
-
-      it 'returns the original solr_params (and does not raise an error)' do
-        expect(subject).to eq({})
-      end
-    end
   end
 end

data/spec/spec_helper.rb

@@ -5,21 +5,6 @@ EngineCart.load_application!
 
 require 'rspec/rails'
 require 'capybara/rspec'
-require 'selenium-webdriver'
-require 'webdrivers'
-
-Capybara.javascript_driver = :headless_chrome
-
-Capybara.register_driver :headless_chrome do |app|
-  Capybara::Selenium::Driver.load_selenium
-  browser_options = ::Selenium::WebDriver::Chrome::Options.new.tap do |opts|
-    opts.args << '--headless'
-    opts.args << '--disable-gpu'
-    opts.args << '--no-sandbox'
-    opts.args << '--window-size=1280,1696'
-  end
-  Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options)
-end
 
 RSpec.configure do |config|
   # rspec-rails 3 will no longer automatically infer an example group's spec type

data/spec/test_app_templates/Gemfile.extra

@@ -1 +1 @@
-gem 'sprockets', '< 4'
+gem 'blacklight', github: 'projectblacklight/blacklight', branch: 'master'

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

@@ -27,7 +27,7 @@ class TestAppGenerator < Rails::Generators::Base
 
   def inject_into_catalog_controller
     inject_into_file 'app/controllers/catalog_controller.rb', after: /config.add_facet_field 'format'.*$/ do
-      "\n    config.add_facet_field 'pub_date_sort', label: 'Publication Date Sort', range: true"
+      "\n    config.add_facet_field 'pub_date_si', label: 'Publication Date Sort', range: true"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_range_limit
 version: !ruby/object:Gem::Version
-  version: 6.5.0
+  version: 7.0.0.rc1
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-26 00:00:00.000000000 Z
+date: 2018-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,20 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -49,24 +43,24 @@ dependencies:
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.10'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: chromedriver-helper
+  name: tether-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -143,62 +137,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: selenium-webdriver
-  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: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: webdrivers
-  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'
+        version: '1.0'
 description: 
 email:
 - blacklight-development@googlegroups.com
@@ -262,12 +228,10 @@ files:
 - solr/conf/xslt/example_rss.xsl
 - solr/conf/xslt/luke.xsl
 - solr/sample_solr_documents.yml
-- spec/features/a_javascript_spec.rb
 - spec/features/blacklight_range_limit_spec.rb
 - spec/fixtures/solr_documents/zero_year.yml
 - spec/helpers/blacklight_range_limit_helper_spec.rb
 - spec/lib/blacklight_range_limit/segment_calculation_spec.rb
-- spec/lib/blacklight_range_limit/view_helper_override_helper_spec.rb
 - spec/spec_helper.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
@@ -291,21 +255,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
+rubyforge_project: 
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Blacklight Range Limit plugin
 test_files:
-- spec/features/a_javascript_spec.rb
 - spec/features/blacklight_range_limit_spec.rb
 - spec/fixtures/solr_documents/zero_year.yml
 - spec/helpers/blacklight_range_limit_helper_spec.rb
 - spec/lib/blacklight_range_limit/segment_calculation_spec.rb
-- spec/lib/blacklight_range_limit/view_helper_override_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/features/a_javascript_spec.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe 'JavaScript', js: true do
-  context 'when assumed boundaries configured' do
-    before do
-      CatalogController.blacklight_config.facet_fields['pub_date_sort'].range = {
-        assumed_boundaries: [1990, 2000]
-      }
-    end
-
-    after do
-      CatalogController.blacklight_config.facet_fields['pub_date_sort'].range = true
-    end
-
-    it 'should show the range limit with set boundaries' do
-      visit '/catalog'
-
-      click_link 'Publication Date Sort'
-      expect(page).to have_field :range_pub_date_sort_begin, with: '1990'
-      expect(page).to have_field :range_pub_date_sort_end, with: '2000'
-    end
-  end
-end

data/spec/lib/blacklight_range_limit/view_helper_override_helper_spec.rb

@@ -1,127 +0,0 @@
-require 'spec_helper'
-
-RSpec.describe BlacklightRangeLimit::ViewHelperOverride, type: :helper do
-  describe '#render_constraints_filters' do
-    before do
-      allow(helper).to receive_messages(
-        facet_field_label: 'Date Range',
-        remove_range_param: '/remove'
-      )
-    end
-
-    it 'does not return any content when the range parameter invalid' do
-      params = ActionController::Parameters.new(range: 'garbage')
-
-      expect(helper.render_constraints_filters(params)).to eq ''
-    end
-
-    it 'renders a constraint for the given data in the range param' do
-      params = ActionController::Parameters.new(
-        range: { range_field: { 'begin' => 1900, 'end' => 2000 } }
-      )
-      constraints = helper.render_constraints_filters(params)
-
-      expect(constraints).to have_css(
-        '.constraint .filterName', text: 'Date Range'
-      )
-      expect(constraints).to have_css(
-        '.constraint .filterValue', text: '1900 to 2000'
-      )
-    end
-  end
-
-  describe 'render_search_to_s_filters' do
-    before do
-      allow(helper).to receive_messages(facet_field_label: 'Date Range')
-    end
-
-    it 'does not return any content when the range parameter invalid' do
-      params = ActionController::Parameters.new(range: 'garbage')
-
-      expect(helper.render_search_to_s_filters(params)).to eq ''
-    end
-
-    it 'renders a constraint for the given data in the range param' do
-      params = ActionController::Parameters.new(
-        range: { range_field: { 'begin' => 1900, 'end' => 2000 } }
-      )
-      constraints = helper.render_search_to_s_filters(params)
-
-      expect(constraints).to have_css(
-        '.constraint .filterName', text: 'Date Range:'
-      )
-      expect(constraints).to have_css(
-        '.constraint .filterValues', text: '1900 to 2000'
-      )
-    end
-  end
-
-  describe '#range_params' do
-    it 'handles no range input' do
-      expect(
-        helper.send(:range_params, ActionController::Parameters.new(q: 'blah'))
-      ).to eq({})
-    end
-
-    it 'handles non-compliant range input' do
-      expect(
-        helper.send(:range_params, ActionController::Parameters.new(range: 'blah'))
-      ).to eq({})
-
-      expect(
-        helper.send(:range_params, ActionController::Parameters.new(range: ['blah']))
-      ).to eq({})
-
-      expect(
-        helper.send(:range_params, ActionController::Parameters.new(range: { 'wrong' => 'data' }))
-      ).to eq({})
-
-      expect(
-        helper.send(
-          :range_params,
-          ActionController::Parameters.new(range: { field_name: { 'wrong' => 'data' } })
-        )
-      ).to eq({})
-
-      expect(
-        helper.send(
-          :range_params,
-          ActionController::Parameters.new(range: { field_name: { 'begin' => '', 'end' => '' } })
-        )
-      ).to eq({})
-    end
-
-    it 'returns the range parameters that are present' do
-      expect(
-        helper.send(
-          :range_params,
-          ActionController::Parameters.new(range: { field_name: { 'missing' => true } })
-        ).permit!.to_h
-      ).to eq({ 'field_name' => { 'missing' => true } })
-
-      expect(
-        helper.send(
-          :range_params,
-          ActionController::Parameters.new(range: { field_name: { 'begin' => '1800', 'end' => '1900' } })
-        ).permit!.to_h
-      ).to eq({ 'field_name' => { 'begin' => '1800', 'end' => '1900' } })
-
-      expect(
-        helper.send(
-          :range_params,
-          ActionController::Parameters.new(
-            range: {
-              field_name: { 'begin' => '1800', 'end' => '1900' },
-              field_name2: { 'begin' => '1800', 'end' => '1900' }
-            }
-          )
-        ).permit!.to_h
-      ).to eq(
-        {
-          'field_name' => { 'begin' => '1800', 'end' => '1900' },
-          'field_name2' => { 'begin' => '1800', 'end' => '1900' }
-        }
-      )
-    end
-  end
-end