blacklight_range_limit 7.1.0 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcbdbc78c473e59d57bd6453adf5f6c09eec1786f5a537b57b53077a736602c8
-  data.tar.gz: 0eccabe9cd9231a0cb62d80d470762a056881aa93e34ea655a28268369d034ee
+  metadata.gz: ddb716f6bce403a2d7f369337d8f4a8da47dc279895c8c5bb3996a9ac2edcdae
+  data.tar.gz: f758c04d42477a7650b4f164c5ee4889a4edc903d22ddff3639c71ed216c3d70
 SHA512:
-  metadata.gz: 34088b2dab05fb33d092fca7b4e407e8d0418e4531995c58fc3371da00ff7dd1a27bb6d4e2a52ecb47ed27309ca586befb24ae52c03ce4d3e3e10793a2cade13
-  data.tar.gz: a6f1480b8b63f8ba8f1a2bed53518f45f9dca2efe42f73ff92af2553814650f25d74e46fc2c07222f7225afa06c9da287fa6f158c2d47041dc0019df103872de
+  metadata.gz: 1cb56737784cf18e63e857494d5f7b41216a4238ae7b02f2080f82146403e7e523d43beb1ad0e353d942df03fe4b5292a92d02fcfee53ab19c755c0da2e5e5e1
+  data.tar.gz: 6bb5e1f046e4db352ca9d9f0fcfe809af4d61bc75b75be55318bc40463f14be4421839669c60e7e9442cd8c51585ac76ee164c81eaa5b2af4c9b1f2bc16b75c6

data/.travis.yml

@@ -1,18 +1,21 @@
-notifications:
-  email: false
-
+dist: trusty
+language: ruby
 addons:
   chrome: stable
-
-language: ruby
-sudo: false
-rvm:
-  - 2.5.5
-
 before_install:
-  - gem install bundler
-  - google-chrome-stable --headless --no-sandbox --disable-gpu --remote-debugging-port=9222 http://localhost &
+  - google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost &
+
+notifications:
+  email: false
 
+matrix:
+  include:
+    - rvm: 2.6.5
+      env: "RAILS_VERSION=6.0.0 ENGINE_CART_RAILS_OPTIONS=\"--skip-webpack-install\""
+    - rvm: 2.6.5
+      env: "RAILS_VERSION=5.2.3"
+    - rvm: 2.5.7
+      env: "RAILS_VERSION=5.1.7"
 
 notifications:
   irc: "irc.freenode.org#blacklight"
@@ -22,4 +25,4 @@ notifications:
 global_env:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
 
-jdk: oraclejdk8
+jdk: oraclejdk9

data/Gemfile

@@ -1,6 +1,13 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
-gemspec
+# Please see blacklight.gemspec for dependency information.
+gemspec path: File.expand_path('..', __FILE__)
+
+group :test do
+  gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
+end
 
 # BEGIN ENGINE_CART BLOCK
 # engine_cart: 0.10.0
@@ -27,12 +34,17 @@ else
   end
 
   case ENV['RAILS_VERSION']
+  when /^5.[12]/, /^6.0/
+    gem 'sass-rails', '~> 5.0'
   when /^4.2/
     gem 'responders', '~> 2.0'
     gem 'sass-rails', '>= 5.0'
     gem 'coffee-rails', '~> 4.1.0'
+    gem 'json', '~> 1.8'
   when /^4.[01]/
     gem 'sass-rails', '< 5.0'
   end
 end
 # END ENGINE_CART BLOCK
+
+eval_gemfile File.expand_path("spec/test_app_templates/Gemfile.extra", File.dirname(__FILE__))

data/VERSION

@@ -1 +1 @@
-7.1.0
+7.2.0

data/app/assets/javascripts/blacklight_range_limit/range_limit_shared.js

@@ -11,7 +11,7 @@
   }
 
   BlacklightRangeLimit.parseNum = function parseNum(str) {
-    str = String(str).replace(/[^0-9]/g, '');
+    str = String(str).replace(/[^0-9-]/g, '');
     return parseInt(str, 10);
   };
 

data/app/helpers/range_limit_helper.rb

@@ -72,11 +72,6 @@ module RangeLimitHelper
     my_params["range"][solr_field] ||= {}
     my_params["range"][solr_field]["missing"] = "true"
 
-    # Need to ensure there's a search_field to trick Blacklight
-    # into displaying results, not placeholder page. Kind of hacky,
-    # but works for now.
-    my_params["search_field"] ||= "dummy_range"
-
     my_params
   end
 

data/app/views/blacklight_range_limit/_range_limit_panel.html.erb

@@ -28,13 +28,6 @@
     <%= form_tag search_action_path, :method => :get, class: [BlacklightRangeLimit.classes[:form], "range_#{field_name}"].join(' ') do %>
       <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:page)) %>
 
-      <!-- we need to include a dummy search_field parameter if none exists,
-           to trick blacklight into displaying actual search results instead
-           of home page. Not a great solution, but easiest for now. -->
-      <% unless params.has_key?(:search_field) %>
-        <%= hidden_field_tag("search_field", "dummy_range") %>
-      <% end %>
-
       <%= render_range_input(field_name, :begin, input_label_range_begin, maxlength) %> – <%= render_range_input(field_name, :end, input_label_range_end, maxlength) %>
       <%= submit_tag t('blacklight.range_limit.submit_limit'), class: BlacklightRangeLimit.classes[:submit] %>
     <% end %>

data/blacklight_range_limit.gemspec

@@ -17,16 +17,15 @@ Gem::Specification.new do |s|
 
   s.license     = 'Apache 2.0'
 
-  s.add_dependency 'rails', '>= 3.0'
   s.add_dependency 'blacklight', '>= 7.0'
 
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'rspec-rails'
-  s.add_development_dependency 'capybara'
+  s.add_development_dependency 'capybara', '~> 3'
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'launchy'
   s.add_development_dependency 'solr_wrapper', '~> 0.14'
-  s.add_development_dependency 'engine_cart', '~> 2.0'
-  s.add_development_dependency 'selenium-webdriver', '~> 3.12.0'
-  s.add_development_dependency 'webdrivers'
+  s.add_development_dependency 'engine_cart', '~> 2.1'
+  s.add_development_dependency 'selenium-webdriver', '>= 3.13.1'
+  s.add_development_dependency 'webdrivers', '~>3.0'
 end

data/lib/blacklight_range_limit/range_limit_builder.rb

@@ -12,46 +12,46 @@ module BlacklightRangeLimit
 
     # Method added to to fetch proper things for date ranges.
     def add_range_limit_params(solr_params)
-       ranged_facet_configs = 
-         blacklight_config.facet_fields.select { |key, config| config.range } 
+       ranged_facet_configs =
+         blacklight_config.facet_fields.select { |key, config| config.range }
        # In ruby 1.8, hash.select returns an array of pairs, in ruby 1.9
-       # it returns a hash. Turn it into a hash either way.  
+       # it returns a hash. Turn it into a hash either way.
        ranged_facet_configs = Hash[ ranged_facet_configs ] unless ranged_facet_configs.kind_of?(Hash)
-       
-       ranged_facet_configs.each_pair do |solr_field, config|
+
+       ranged_facet_configs.each_pair do |field_key, config|
         solr_params["stats"] = "true"
         solr_params["stats.field"] ||= []
-        solr_params["stats.field"] << solr_field    
-      
-        hash =  blacklight_params["range"] && blacklight_params["range"][solr_field] ?
-          blacklight_params["range"][solr_field] :
+        solr_params["stats.field"] << config.field
+
+        hash =  blacklight_params["range"] && blacklight_params["range"][field_key] ?
+          blacklight_params["range"][field_key] :
           {}
-          
+
         if !hash["missing"].blank?
           # missing specified in request params
           solr_params[:fq] ||= []
-          solr_params[:fq] << "-#{solr_field}:[* TO *]"
-          
+          solr_params[:fq] << "-#{config.field}:[* TO *]"
+
         elsif !(hash["begin"].blank? && hash["end"].blank?)
           # specified in request params, begin and/or end, might just have one
           start = hash["begin"].blank? ? "*" : hash["begin"]
           finish = hash["end"].blank? ? "*" : hash["end"]
-  
+
           solr_params[:fq] ||= []
-          solr_params[:fq] << "#{solr_field}: [#{start} TO #{finish}]"
-          
+          solr_params[:fq] << "#{config.field}: [#{start} TO #{finish}]"
+
           if (config.segments != false && start != "*" && finish != "*")
             # Add in our calculated segments, can only do with both boundaries.
-            add_range_segments_to_solr!(solr_params, solr_field, start.to_i, finish.to_i)
+            add_range_segments_to_solr!(solr_params, field_key, start.to_i, finish.to_i)
           end
-          
+
         elsif (config.segments != false &&
                boundaries = config.assumed_boundaries)
           # assumed_boundaries in config
-          add_range_segments_to_solr!(solr_params, solr_field, boundaries[0], boundaries[1])
+          add_range_segments_to_solr!(solr_params, field_key, boundaries[0], boundaries[1])
         end
       end
-      
+
       return solr_params
     end
 
@@ -67,12 +67,12 @@ module BlacklightRangeLimit
     # Specified field and parameters are specified in incoming parameters
     # range_field, range_start, range_end
     def fetch_specific_range_limit(solr_params)
-      solr_field = blacklight_params[:range_field] # what field to fetch for
+      field_key = blacklight_params[:range_field] # what field to fetch for
       start = blacklight_params[:range_start].to_i
       finish = blacklight_params[:range_end].to_i
 
-      add_range_segments_to_solr!(solr_params, solr_field, start, finish )
-        
+      add_range_segments_to_solr!(solr_params, field_key, start, finish )
+
       # Remove all field faceting for efficiency, we won't be using it.
       solr_params.delete("facet.field")
       solr_params.delete("facet.field".to_sym)

data/lib/blacklight_range_limit/segment_calculation.rb

@@ -11,21 +11,22 @@ module BlacklightRangeLimit
     # by subtracting one from subsequent boundary.
     #
     # Changes solr_params passed in.
-    def add_range_segments_to_solr!(solr_params, solr_field, min, max)
+    def add_range_segments_to_solr!(solr_params, facet_field, min, max)
       raise InvalidRange, "The min date must be before the max date" if min > max
+      field_config = blacklight_config.facet_fields[facet_field.to_s]
 
-      field_config = BlacklightRangeLimit.range_config(blacklight_config, solr_field)
+      range_config = BlacklightRangeLimit.range_config(blacklight_config, facet_field)
 
       solr_params[:"facet.query"] ||= []
 
-      boundaries = boundaries_for_range_facets(min, max, (field_config[:num_segments] || 10) )
+      boundaries = boundaries_for_range_facets(min, max, (range_config[:num_segments] || 10) )
 
       # Now make the boundaries into actual filter.queries.
       0.upto(boundaries.length - 2) do |index|
         first = boundaries[index]
         last =  boundaries[index+1].to_i - 1
 
-        solr_params[:"facet.query"] << "#{solr_field}:[#{first} TO #{last}]"
+        solr_params[:"facet.query"] << "#{field_config.field}:[#{first} TO #{last}]"
       end
 
       return solr_params

data/lib/blacklight_range_limit/view_helper_override.rb

@@ -97,7 +97,7 @@
       array = []
 
       @response["facet_counts"]["facet_queries"].each_pair do |query, count|
-        if query =~ /#{solr_field}: *\[ *(\d+) *TO *(\d+) *\]/
+        if query =~ /#{solr_field}: *\[ *(-?\d+) *TO *(-?\d+) *\]/
           array << {:from => $1, :to => $2, :count => count}
         end
       end

data/solr/conf/schema.xml

@@ -350,7 +350,6 @@
       <analyzer>
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
-        <filter class="solr.StandardFilterFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
       </analyzer>
@@ -359,7 +358,6 @@
     <fieldType  name="textSuggest" class="solr.TextField" positionIncrementGap="100">
        <analyzer>
           <tokenizer class="solr.KeywordTokenizerFactory"/>
-          <filter class="solr.StandardFilterFactory"/>
           <filter class="solr.LowerCaseFilterFactory"/>
           <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
        </analyzer>

data/spec/features/{javascript_spec.rb → a_javascript_spec.rb}

@@ -5,7 +5,12 @@ require 'spec_helper'
 describe 'JavaScript', js: true do
   it 'initializes canvas chart' do
     visit search_catalog_path
-    click_link 'Publication Date'
+
+    within('#facets .navbar') do
+      page.find('button.navbar-toggler').click
+    end
+
+    click_button 'Publication Date Sort'
     expect(page).to have_css '.flot-base'
   end
 end

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ EngineCart.load_application!
 require 'rspec/rails'
 require 'capybara/rspec'
 require 'selenium-webdriver'
+require 'webdrivers'
 
 Capybara.javascript_driver = :selenium_chrome_headless
 

data/spec/test_app_templates/Gemfile.extra

@@ -1 +1,3 @@
 gem 'blacklight', github: 'projectblacklight/blacklight', branch: 'master'
+gem 'rails-controller-testing'
+gem 'thor', '~> 0.20'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_range_limit
 version: !ruby/object:Gem::Version
-  version: 7.1.0
+  version: 7.2.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -9,22 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-09 00:00:00.000000000 Z
+date: 2019-11-22 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
@@ -71,16 +57,16 @@ dependencies:
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -129,42 +115,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.12.0
+        version: 3.13.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.12.0
+        version: 3.13.1
 - !ruby/object:Gem::Dependency
   name: webdrivers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 description: 
 email:
 - blacklight-development@googlegroups.com
@@ -228,8 +214,8 @@ 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/features/javascript_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
@@ -260,14 +246,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 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/features/javascript_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