blacklight_range_limit 6.5.0 → 7.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 454aced55fe12cf920d7f33fc5338f40707ae450e78f3863f2d99a7721c9dc40
-  data.tar.gz: 19b80f76873f3a1a3e59ffaa7291c1f8d2f7af680a7979a8e3f3655adf716296
+SHA1:
+  metadata.gz: 678418e9299f580737c1229110ba043559d6ab4b
+  data.tar.gz: d18f33c673d219e596b1ccf95f9fc51fe9e92fc2
 SHA512:
-  metadata.gz: d8e45fed92431f1f46db61c9c76986f4552a7c01aba77aa1f85890cae4a8fc0dee42812ef4c4de0a11473653fceb1dc1e8a4f07588ae67761ecae6fa52410bab
-  data.tar.gz: 2bf5fccb09e9f21de9c7a783e4f0e426d1eb5299010a0cea108619c30182d11d20e1df0ba58110d0f7ac036828fcdbd16e6dd243f50d8a1078a783f05317a049
+  metadata.gz: e7ecc681047532fdebde37e297ad35ffce54e0d0041902a7c1dba12b1f1ae9fba91ec24c82c2b2fd0be19a1e0a193327a0b6927f74f891cd51b612ee8173f1d6
+  data.tar.gz: ae23fa2040d85911a63019310fbc9c4d016ad6b761ae2d66b30de1e141cdea85e0ea20da06afcfc2c1945ebcdfce2f6faf095b506a487f0bba04d8d8d6d5efc9

data/.solr_wrapper.yml

@@ -1,7 +1,6 @@
 # Place any default configuration for solr_wrapper here
 port: 8983
 verbose: true
-version: 7.7.2
 collection:
   dir: solr/conf/
   name: blacklight-core

data/.travis.yml

@@ -4,11 +4,10 @@ notifications:
 language: ruby
 sudo: false
 rvm:
-  - 2.5.8
-  - 2.6.5
+  - 2.3.1
 
 before_install:
-  - google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost &
+  - gem install bundler
 
 notifications:
   irc: "irc.freenode.org#blacklight"
@@ -18,4 +17,4 @@ notifications:
 global_env:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
 
-jdk: oraclejdk9
+jdk: oraclejdk8

data/Gemfile

@@ -36,7 +36,3 @@ else
   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

data/Rakefile

@@ -6,6 +6,8 @@ require 'rspec/core/rake_task'
 require 'engine_cart/rake_task'
 require 'solr_wrapper'
 
+EngineCart.fingerprint_proc = EngineCart.rails_fingerprint_proc
+
 task :default => :ci
 
 desc "Run specs"

data/VERSION

@@ -1 +1 @@
-6.5.0
+7.0.0.rc1

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

@@ -1,5 +1,4 @@
 // for Blacklight.onLoad:
-//= require blacklight/core
 
 /* A custom event "plotDrawn.blacklight.rangeLimit" will be sent when flot plot
    is (re-)drawn on screen possibly with a new size. target of event will be the DOM element
@@ -199,14 +198,14 @@ Blacklight.onLoad(function() {
 
         find_segment_for = function_for_find_segment(pointer_lookup);
         var last_segment = null;
-        $('.distribution').tooltip({'placement': 'bottom', 'trigger': 'manual', 'delay': { show: 0, hide: 100}});
+        $(container).tooltip({'placement': 'bottom', 'trigger': 'manual', 'delay': { show: 0, hide: 100}});
 
         $(container).bind("plothover", function (event, pos, item) {
           segment = find_segment_for(pos.x);
 
           if(segment != last_segment) {
             var title = find_segment_for(pos.x).label  + ' (' + BlacklightRangeLimit.parseNum(segment.count) + ')';
-            $('.distribution').attr("title", title).tooltip("fixTitle").tooltip("show");
+            $(container).attr("title", title).tooltip("_fixTitle").tooltip("show");
 
             last_segment  = segment;
            }
@@ -214,7 +213,7 @@ Blacklight.onLoad(function() {
 
         $(container).bind("mouseout", function() {
           last_segment = null;
-          $('.distribution').tooltip('hide');
+          $(container).tooltip('hide');
         });
         $(container).bind("plotclick", function (event, pos, item) {
             if ( plot.getSelection() == null) {

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

@@ -10,15 +10,15 @@
     this.options = options || {};
   }
 
-  BlacklightRangeLimit.noConflict = function noConflict() {
-    global.BlacklightRangeLimit = previousBlacklightRangeLimit;
-    return BlacklightRangeLimit;
-  };
-
   BlacklightRangeLimit.parseNum = function parseNum(str) {
     str = String(str).replace(/[^0-9]/g, '');
     return parseInt(str, 10);
   };
 
+  BlacklightRangeLimit.noConflict = function noConflict() {
+    global.BlacklightRangeLimit = previousBlacklightRangeLimit;
+    return BlacklightRangeLimit;
+  };
+
   global.BlacklightRangeLimit = BlacklightRangeLimit;
-}(this);
+}(this);

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

@@ -1,5 +1,4 @@
 // for Blacklight.onLoad:
-//= require blacklight/core
 
 Blacklight.onLoad(function() {
         

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

@@ -1,19 +1,19 @@
 <%- # requires solr_config local passed in
-  field_config = range_config(solr_field)  
-  label = facet_field_label(solr_field)
-  
+  field_config = range_config(field_name)
+  label = facet_field_label(field_name)
+
   input_label_range_begin = field_config[:input_label_range_begin] || t("blacklight.range_limit.range_begin", field_label: label)
   input_label_range_end   = field_config[:input_label_range_end] || t("blacklight.range_limit.range_end", field_label: label)
   maxlength = field_config[:maxlength]
 -%>
 
 <div class="limit_content range_limit">
-  <% if has_selected_range_limit?(solr_field) %>
+  <% if has_selected_range_limit?(field_name) %>
     <ul class="current list-unstyled facet-values">
       <li class="selected">
         <span class="facet-label">
-          <span class="selected"><%= range_display(solr_field) %></span> 
-           <%= link_to remove_range_param(solr_field), :class=>"remove", :title => t('blacklight.range_limit.remove_limit') do %>
+          <span class="selected"><%= range_display(field_name) %></span>
+           <%= link_to remove_range_param(field_name), :class=>"remove", :title => t('blacklight.range_limit.remove_limit') do %>
             <span class="glyphicon glyphicon-remove"></span>
             <span class="sr-only">[<%= t('blacklight.range_limit.remove_limit') %>]</span>
            <% end %>
@@ -21,64 +21,63 @@
         <span class="selected facet-count"><%= number_with_delimiter(@response.total) %></span>
       </li>
     </ul>
-         
+
   <% end %>
 
-  <% unless selected_missing_for_range_limit?(solr_field) %>
-    <%= form_tag search_action_path, :method => :get, class: [BlacklightRangeLimit.classes[:form], "range_#{solr_field}"].join(' ') do %>
+  <% unless selected_missing_for_range_limit?(field_name) %>
+    <%= 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(solr_field, :begin, input_label_range_begin, maxlength) %> – <%= render_range_input(solr_field, :end, input_label_range_end, maxlength) %>
+
+      <%= 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 %>
   <% end %>
-    
+
   <!-- no results profile if missing is selected -->
-  <% unless selected_missing_for_range_limit?(solr_field) %>
+  <% unless selected_missing_for_range_limit?(field_name) %>
     <!-- you can hide this if you want, but it has to be on page if you want
          JS slider and calculated facets to show up, JS sniffs it. -->
     <div class="profile">
-        <% if stats_for_field?(solr_field) %>
+        <% if stats_for_field?(field_name) %>
           <!-- No stats information found for field  in search response -->
         <% end %>
 
-        <% if (min = range_results_endpoint(solr_field, :min)) &&
-              (max = range_results_endpoint(solr_field, :max)) %>
+        <% if (min = range_results_endpoint(field_name, :min)) &&
+              (max = range_results_endpoint(field_name, :max)) %>
           <p class="range subsection <%= "slider_js" unless field_config[:slider_js] == false  %>">
-            Current results range from <span class="min"><%= range_results_endpoint(solr_field, :min) %></span> to <span class="max"><%= range_results_endpoint(solr_field, :max) %></span>
+            Current results range from <span class="min"><%= range_results_endpoint(field_name, :min) %></span> to <span class="max"><%= range_results_endpoint(field_name, :max) %></span>
           </p>
-          
+
           <% if field_config[:segments] != false %>
             <div class="distribution subsection <%= 'chart_js' unless field_config[:chart_js] == false %>">
               <!-- if  we already fetched segments from solr, display them
                    here. Otherwise, display a link to fetch them, which JS
                    will AJAX fetch.  -->
-              <% if solr_range_queries_to_a(solr_field).length > 0 %>
-                    
-                 <%= render(:partial => "blacklight_range_limit/range_segments", :locals => {:solr_field => solr_field}) %>
-                 
-              <% else %> 
-                <%= link_to('View distribution', main_app.url_for(search_state.to_h.merge(action: 'range_limit', range_field: solr_field, range_start: min, range_end: max)), :class => "load_distribution") %>
+              <% if solr_range_queries_to_a(field_name).length > 0 %>
+
+                 <%= render(:partial => "blacklight_range_limit/range_segments", :locals => {:solr_field => field_name}) %>
+
+              <% else %>
+                <%= link_to('View distribution', main_app.url_for(search_state.to_h.merge(action: 'range_limit', range_field: field_name, range_start: min, range_end: max)), :class => "load_distribution") %>
               <% end %>
             </div>
-          <% end %>  
+          <% end %>
         <% end %>
-        
-        
-        
-        <% if (stats = stats_for_field(solr_field)) && stats["missing"] > 0 %>
+
+
+
+        <% if (stats = stats_for_field(field_name)) && stats["missing"] > 0 %>
           <ul class="missing list-unstyled facet-values subsection">
             <li>
               <span class="facet-label">
-                <%= link_to BlacklightRangeLimit.labels[:missing], add_range_missing(solr_field) %>
+                <%= link_to BlacklightRangeLimit.labels[:missing], add_range_missing(field_name) %>
               </span>
               <span class="facet-count">
                 <%= number_with_delimiter(stats["missing"]) %>
@@ -89,4 +88,3 @@
     </div>
   <% end %>
 </div>
- 

data/blacklight_range_limit.gemspec

@@ -17,18 +17,16 @@ Gem::Specification.new do |s|
 
   s.license     = 'Apache 2.0'
 
-  s.add_dependency 'rails', '>= 4.2', '< 6'
+  s.add_dependency 'rails', '>= 3.0'
   s.add_dependency 'jquery-rails' # our JS needs jquery_rails
-  s.add_dependency 'blacklight', '~> 6.10'
+  s.add_dependency 'blacklight'
+  s.add_dependency 'tether-rails'
 
-  s.add_development_dependency 'chromedriver-helper'
   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 'selenium-webdriver'
-  s.add_development_dependency 'solr_wrapper', '~> 2.2'
-  s.add_development_dependency 'engine_cart', '~> 2.0'
-  s.add_development_dependency 'webdrivers'
+  s.add_development_dependency 'solr_wrapper', '~> 0.14'
+  s.add_development_dependency 'engine_cart', '~> 1.0'
 end

data/lib/blacklight_range_limit.rb

@@ -19,7 +19,7 @@ module BlacklightRangeLimit
   }
   self.classes = {
     form: 'range_limit subsection form-inline',
-    submit: 'submit btn btn-default'
+    submit: 'submit btn btn-secondary'
   }
 
   # Add element to array only if it's not already there

data/lib/blacklight_range_limit/controller_override.rb

@@ -9,7 +9,6 @@ module BlacklightRangeLimit
     included do
       helper BlacklightRangeLimit::ViewHelperOverride
       helper RangeLimitHelper
-      helper_method :has_range_limit_parameters?
     end
 
     # Action method of our own!
@@ -23,24 +22,10 @@ module BlacklightRangeLimit
       # field (with start/end params) mentioned in query params
       # range_field, range_start, and range_end
 
-      @response, _ = search_results(params) do |search_builder|
+      @response, _ = search_service.search_results do |search_builder|
         search_builder.except(:add_range_limit_params).append(:fetch_specific_range_limit)
       end
-
       render('blacklight_range_limit/range_segments', :locals => {:solr_field => params[:range_field]}, :layout => !request.xhr?)
     end
-
-    # over-ride, call super, but make sure our range limits count too
-    def has_search_parameters?
-      super || has_range_limit_parameters?
-    end
-
-    def has_range_limit_parameters?(my_params = params)
-      my_params[:range] &&
-        my_params[:range].to_unsafe_h.any? do |key, v|
-          v.present? && v.respond_to?(:'[]') &&
-          (v["begin"].present? || v["end"].present? || v["missing"].present?)
-        end
-    end
   end
 end

data/lib/blacklight_range_limit/engine.rb

@@ -2,6 +2,7 @@ require 'blacklight'
 require 'blacklight_range_limit'
 require 'rails'
 require 'jquery-rails'
+require 'tether-rails'
 
 module BlacklightRangeLimit
   class Engine < Rails::Engine

data/lib/blacklight_range_limit/range_limit_builder.rb

@@ -12,48 +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|
         solr_params["stats"] = "true"
         solr_params["stats.field"] ||= []
-        solr_params["stats.field"] << solr_field
-
-        range_config = BlacklightRangeLimit.range_config(blacklight_config, config.field)
-
+        solr_params["stats.field"] << solr_field    
+      
         hash =  blacklight_params["range"] && blacklight_params["range"][solr_field] ?
           blacklight_params["range"][solr_field] :
           {}
-
+          
         if !hash["missing"].blank?
           # missing specified in request params
           solr_params[:fq] ||= []
           solr_params[:fq] << "-#{solr_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}]"
-
-          if (range_config[:segments] != false && start != "*" && 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)
           end
-
-        elsif (range_config[:segments] != false &&
-               boundaries = range_config[:assumed_boundaries])
+          
+        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])
         end
       end
-
+      
       return solr_params
     end
 
@@ -61,10 +59,10 @@ module BlacklightRangeLimit
     # Another processing method, this one is NOT included in default processing chain,
     # it is specifically swapped in *instead of* add_range_limit_params for
     # certain ajax requests that only want to fetch range limit segments for
-    # ONE field.
+    # ONE field. 
     #
     # It turns off facetting and sets rows to 0 as well, only results for
-    # single specified field are needed.
+    # single specified field are needed. 
     #
     # Specified field and parameters are specified in incoming parameters
     # range_field, range_start, range_end
@@ -74,13 +72,13 @@ module BlacklightRangeLimit
       finish = blacklight_params[:range_end].to_i
 
       add_range_segments_to_solr!(solr_params, solr_field, 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)
 
       # We don't need any actual rows either
-      solr_params[:rows] = 0
+      solr_params[:rows] = 0      
 
       return solr_params
     end

data/lib/blacklight_range_limit/segment_calculation.rb

@@ -16,8 +16,6 @@ module BlacklightRangeLimit
 
       field_config = BlacklightRangeLimit.range_config(blacklight_config, solr_field)
 
-      return solr_params unless field_config
-
       solr_params[:"facet.query"] ||= []
 
       boundaries = boundaries_for_range_facets(min, max, (field_config[:num_segments] || 10) )
@@ -30,7 +28,7 @@ module BlacklightRangeLimit
         solr_params[:"facet.query"] << "#{solr_field}:[#{first} TO #{last}]"
       end
 
-      solr_params
+      return solr_params
     end
 
     # returns an array of 'boundaries' for producing approx num_div

data/lib/blacklight_range_limit/view_helper_override.rb

@@ -11,6 +11,19 @@
       super
     end
 
+    def has_range_limit_parameters?(my_params = params)
+      my_params[:range] &&
+        my_params[:range].to_unsafe_h.any? do |key, v|
+          v.present? && v.respond_to?(:'[]') &&
+          (v["begin"].present? || v["end"].present? || v["missing"].present?)
+        end
+    end
+
+    # over-ride, call super, but make sure our range limits count too
+    def has_search_parameters?
+      super || has_range_limit_parameters?
+    end
+
     def query_has_constraints?(my_params = params)
       super || has_range_limit_parameters?(my_params)
     end
@@ -29,26 +42,39 @@
     end
 
     def render_constraints_filters(my_params = params)
+      content = super(my_params)
       # add a constraint for ranges?
-      range_params(my_params).keys.each_with_object(super) do |solr_field, content|
-        content << render_constraint_element(
-          facet_field_label(solr_field),
-          range_display(solr_field, my_params),
-          escape_value: false,
-          remove: remove_range_param(solr_field, my_params)
-        )
+      unless my_params[:range].blank?
+        my_params[:range].each_pair do |solr_field, hash|
+
+          next unless hash["missing"] || (!hash["begin"].blank?) || (!hash["end"].blank?)
+          content << render_constraint_element(
+            facet_field_label(solr_field),
+            range_display(solr_field, my_params),
+            :escape_value => false,
+            :remove => remove_range_param(solr_field, my_params)
+          )
+        end
       end
+      return content
     end
 
     def render_search_to_s_filters(my_params)
+      content = super(my_params)
       # add a constraint for ranges?
-      range_params(my_params).keys.each_with_object(super) do |solr_field, content|
-        content << render_search_to_s_element(
-          facet_field_label(solr_field),
-          range_display(solr_field, my_params),
-          escape_value: false
-        )
+      unless my_params[:range].blank?
+        my_params[:range].each_pair do |solr_field, hash|
+          next unless hash["missing"] || (!hash["begin"].blank?) || (! hash["end"].blank?)
+
+          content << render_search_to_s_element(
+            facet_field_label(solr_field),
+            range_display(solr_field, my_params),
+            :escape_value => false
+          )
+
+        end
       end
+      return content
     end
 
     def remove_range_param(solr_field, my_params = params)
@@ -84,17 +110,4 @@
       BlacklightRangeLimit.range_config(blacklight_config, solr_field)
     end
 
-    private
-
-    def range_params(my_params = params)
-      return {} unless my_params[:range].is_a?(ActionController::Parameters) || my_params[:range].is_a?(Hash)
-
-      my_params[:range].select do |_solr_field, range_options|
-        next unless range_options
-
-        [range_options['missing'].presence,
-         range_options['begin'].presence,
-         range_options['end'].presence].any?
-      end
-    end
   end