blacklight_range_limit 6.0.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88ce4d1a9977401229bc5968d114d72ffcb78300
-  data.tar.gz: d74d58e4259a6308a77738fc612c6b25e8e33747
+  metadata.gz: 9a7e3c9e6d2481f927f6708d27337418e2edfcca
+  data.tar.gz: 60c2fb4b80413efc33004628c5917cd988f24878
 SHA512:
-  metadata.gz: 90d24009d5a9c91e3dd11c49f730367e923d8ab175fa5948d4f4f232af0ec8a99827a1b708b78793ab2ab357539220e760719f87c8104aed9567e900b7ee95e5
-  data.tar.gz: d329af1791c03d119e8b22855c03783edbdd643fbd688d00babb9b4b4d0819c15e6d33e3310e2807476329a5fe37d65442691fd1e082dbed3580a74e5eb50a06
+  metadata.gz: a26003bd6a7dae668e7fbaeaa4624d4f14cc1827ed5de1c0e8496d41fab1b54e2fe9308f33cd292757db2051039040fbde879cabfe7e3b495fee684fece3fb3d
+  data.tar.gz: 62a295ad0d129b5a43224455656fad137ec2c38e7da9b63e1ac2cae36ffeaace78bf6f355ffb1316595e91d6f93bbece84b7125819d59a0b1e4759d5efb303c0

data/.rspec

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

data/.solr_wrapper.yml

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

data/.travis.yml

@@ -4,7 +4,7 @@ notifications:
 language: ruby
 sudo: false
 rvm:
-  - 2.2.2
+  - 2.3.1
 
 before_install:
   - gem install bundler
@@ -15,4 +15,6 @@ notifications:
       - blacklight-commits@googlegroups.com
 
 global_env:
-  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+
+jdk: oraclejdk8

data/Gemfile

@@ -3,10 +3,10 @@ source 'https://rubygems.org'
 gemspec
 
 # BEGIN ENGINE_CART BLOCK
-# engine_cart: 0.8.0
-# engine_cart stanza: 0.8.0
+# engine_cart: 0.10.0
+# 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__)))
+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
@@ -17,15 +17,22 @@ if File.exist?(file)
 else
   Bundler.ui.warn "[EngineCart] Unable to find test application dependencies in #{file}, using placeholder dependencies"
 
-  gem 'rails', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
+  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
 
-  if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^4.2/
-    gem 'bootstrap-sass', '>= 3.3.5.1'
-    gem 'responders', "~> 2.0"
-    gem 'sass-rails', ">= 5.0"
-  else
-    gem 'bootstrap-sass', '< 3.3.5' # 3.3.5 requires sass 3.3, incompatible with sass-rails 4.x
-    gem 'sass-rails', "< 5.0"
+  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

data/README.md

@@ -86,7 +86,8 @@ config.add_facet_field 'pub_date', label: 'Publication Year',
                        range: {
                          num_segments: 6,
                          assumed_boundaries: [1100, Time.now.year + 2],
-                         segments: false    
+                         segments: false,
+                         maxlength: 4
                        }
 ```
 
@@ -96,6 +97,8 @@ config.add_facet_field 'pub_date', label: 'Publication Year',
   * Default null. For a result set that has not yet been limited, instead of taking boundaries from results and making a second AJAX request to fetch segments, just assume these given boundaries. If you'd like to avoid this second AJAX Solr call, you can set :assumed_boundaries to a two-element array of integers instead, and the assumed boundaries will always be used. Note this is live ruby code, you can put calculations in there like Time.now.year + 2. 
 * **:segments** :
   * Default true. If set to false, then distribution segment facets will not be loaded at all.  
+* **:maxlength** :
+  * Default 4. Changes the value of the `maxlength` attribute of the text boxes, which determines how many digits can be entered.
    
 ## Javascript dependencies
 
@@ -134,10 +137,10 @@ is probably the best touch UI anyway, if it can be made to work well.
 
 # Tests
 
-Test coverage is not great, but there are some tests, using rspec.  Run `rake ci` or just `rake` to seed and
+Test coverage is not great, but there are some tests, using rspec.  Run `bundle exec rake ci` or just `bundle exec rake` to seed and
 start a demo jetty server, build a clean test app, and run tests. 
 
-Just `rake spec` to just run tests against an existing test app and jetty server. 
+Just `bundle exec rake spec` to just run tests against an existing test app and jetty server. 
 
 # Possible future To Do
 

data/Rakefile

@@ -1,45 +1,34 @@
 require 'rake'
-
-
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
-
 require 'engine_cart/rake_task'
+require 'solr_wrapper'
 
 EngineCart.fingerprint_proc = EngineCart.rails_fingerprint_proc
 
-ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v4.10.4.zip"
-
-require 'jettywrapper'
-
 task :default => :ci
 
 desc "Run specs"
-RSpec::Core::RakeTask.new do |t|
+RSpec::Core::RakeTask.new
 
-end
-
-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
-    Rake::Task["test:seed"].invoke
-    Rake::Task['spec'].invoke
+task ci: ['engine_cart:generate'] do
+  SolrWrapper.wrap do |solr|
+    solr.with_collection(name: 'blacklight-core', dir: File.join(File.expand_path(File.dirname(__FILE__)), "solr", "conf")) do
+      Rake::Task["test:seed"].invoke
+      Rake::Task['spec'].invoke
+    end
   end
-  raise "test failures: #{error}" if error
 end
 
 namespace :test do
-
   desc "Put sample data into solr"
-  task :seed => ['engine_cart:generate'] do
+  task seed: ['engine_cart:generate'] do
     within_test_app do
       ENV['RAILS_ENV'] ||= 'test'
       system "rake blacklight:index:seed"
       system "rake blacklight_range_limit:seed"
     end
   end
-
 end

data/VERSION

@@ -1 +1 @@
-6.0.0
+6.1.0

data/app/helpers/range_limit_helper.rb

@@ -2,14 +2,14 @@
 module RangeLimitHelper
 
   # type is 'begin' or 'end'
-  def render_range_input(solr_field, type, input_label = nil)
+  def render_range_input(solr_field, type, input_label = nil, maxlength=4)
     type = type.to_s
 
     default = params["range"][solr_field][type] if params["range"] && params["range"][solr_field] && params["range"][solr_field][type]
 
     html = label_tag("range[#{solr_field}][#{type}]", input_label, class: 'sr-only') if input_label.present?
     html ||= ''.html_safe
-    html += text_field_tag("range[#{solr_field}][#{type}]", default, :maxlength=>4, :class => "form-control range_#{type}")
+    html += text_field_tag("range[#{solr_field}][#{type}]", default, :maxlength=>maxlength, :class => "form-control range_#{type}")
   end
 
   # type is 'min' or 'max'
@@ -63,7 +63,7 @@ module RangeLimitHelper
   end
 
   def add_range_missing(solr_field, my_params = params)
-    my_params = Marshal.load(Marshal.dump(my_params))
+    my_params = Blacklight::SearchState.new(my_params, blacklight_config).to_h
     my_params["range"] ||= {}
     my_params["range"][solr_field] ||= {}
     my_params["range"][solr_field]["missing"] = "true"
@@ -77,7 +77,7 @@ module RangeLimitHelper
   end
 
   def add_range(solr_field, from, to, my_params = params)
-    my_params = Marshal.load(Marshal.dump(my_params))
+    my_params = Blacklight::SearchState.new(my_params, blacklight_config).to_h
     my_params["range"] ||= {}
     my_params["range"][solr_field] ||= {}
 

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

@@ -1,10 +1,10 @@
 <%- # requires solr_config local passed in
-
   field_config = range_config(solr_field)  
   label = facet_field_label(solr_field)
   
   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">  
@@ -39,7 +39,7 @@
         <%= hidden_field_tag("search_field", "dummy_range") %>
       <% end %>
       
-      <%= render_range_input(solr_field, :begin, input_label_range_begin) %> – <%= render_range_input(solr_field, :end, input_label_range_end) %>
+      <%= render_range_input(solr_field, :begin, input_label_range_begin, maxlength) %> – <%= render_range_input(solr_field, :end, input_label_range_end, maxlength) %>
       <%= submit_tag t('blacklight.range_limit.submit_limit'), :class=>'submit btn btn-default' %>
     
     <% end %>
@@ -67,7 +67,7 @@
                  <%= render(:partial => "blacklight_range_limit/range_segments", :locals => {:solr_field => solr_field}) %>
                  
               <% else %> 
-                <%= link_to('View distribution', params.merge(:action => 'range_limit', :range_field => solr_field, :range_start => min, :range_end => max), :class => "load_distribution") %>
+                <%= link_to('View distribution', search_state.to_h.merge(action: 'range_limit', range_field: solr_field, range_start: min, range_end: max), :class => "load_distribution") %>
               <% end %>
             </div>
           <% end %>  

data/blacklight_range_limit.gemspec

@@ -1,31 +1,31 @@
 # -*- coding: utf-8 -*-
-require File.join(File.dirname(__FILE__), "lib/blacklight_range_limit/version")
+require File.join(File.dirname(__FILE__), 'lib/blacklight_range_limit/version')
 
 Gem::Specification.new do |s|
-  s.name = "blacklight_range_limit"
-  s.version = BlacklightRangeLimit::VERSION
+  s.name     = 'blacklight_range_limit'
+  s.version  = BlacklightRangeLimit::VERSION
   s.platform = Gem::Platform::RUBY
-  s.authors = ["Jonathan Rochkind", "Chris Beer"]
-  s.email = ["blacklight-development@googlegroups.com"]
-  s.homepage    = "https://github.com/projectblacklight/blacklight_range_limit"
-  s.summary = "Blacklight Range Limit plugin"
+  s.authors  = ['Jonathan Rochkind', 'Chris Beer']
+  s.email    = ['blacklight-development@googlegroups.com']
+  s.homepage = 'https://github.com/projectblacklight/blacklight_range_limit'
+  s.summary  = 'Blacklight Range Limit plugin'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
 
-  s.license     = "Apache 2.0"
+  s.license     = 'Apache 2.0'
 
-  s.add_dependency "rails", ">= 3.0", "< 5.0"
-  s.add_dependency "jquery-rails" # our JS needs jquery_rails  
-  s.add_dependency "blacklight", ">= 6.0.0.pre2", "< 7"
-
-  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_dependency 'rails', '>= 3.0'
+  s.add_dependency 'jquery-rails' # our JS needs jquery_rails
+  s.add_dependency 'blacklight', '~> 6.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.8"
+  s.add_development_dependency 'solr_wrapper', '~> 0.14'
+  s.add_development_dependency 'engine_cart', '~> 1.0'
 end

data/lib/blacklight_range_limit/view_helper_override.rb

@@ -77,6 +77,7 @@
     end
 
     def remove_range_param(solr_field, my_params = params)
+      my_params = Blacklight::SearchState.new(my_params, blacklight_config).to_h
       if ( my_params["range"] )
         my_params = my_params.dup
         my_params["range"] = my_params["range"].dup

data/solr/conf/_rest_managed.json

@@ -0,0 +1,3 @@
+{
+  "initArgs":{},
+  "managedList":[]}

data/solr/conf/admin-extra.html

@@ -0,0 +1,31 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- The content of this page will be statically included into the top
+of the admin page.  Uncomment this as an example to see there the content
+will show up.
+
+<hr>
+<i>This line will appear before the first table</i>
+<tr>
+<td colspan="2">
+This row will be appended to the end of the first table
+</td>
+</tr>
+<hr>
+
+-->

data/solr/conf/elevate.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- If this file is found in the config directory, it will only be
+     loaded once at startup.  If it is found in Solr's data
+     directory, it will be re-loaded every commit.
+-->
+
+<elevate>
+ <query text="foo bar">
+  <doc id="1" />
+  <doc id="2" />
+  <doc id="3" />
+ </query>
+ 
+ <query text="ipod">
+   <doc id="MA147LL/A" />  <!-- put the actual ipod at the top -->
+   <doc id="IW-02" exclude="true" /> <!-- exclude this cable -->
+ </query>
+ 
+</elevate>

data/solr/conf/mapping-ISOLatin1Accent.txt

@@ -0,0 +1,246 @@
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Syntax:
+#   "source" => "target"
+#     "source".length() > 0 (source cannot be empty.)
+#     "target".length() >= 0 (target can be empty.)
+
+# example:
+#   "??" => "A"
+#   "\u00C0" => "A"
+#   "\u00C0" => "\u0041"
+#   "??" => "ss"
+#   "\t" => " "
+#   "\n" => ""
+
+# ?? => A
+"\u00C0" => "A"
+
+# ?? => A
+"\u00C1" => "A"
+
+# ?? => A
+"\u00C2" => "A"
+
+# ?? => A
+"\u00C3" => "A"
+
+# ?? => A
+"\u00C4" => "A"
+
+# ?? => A
+"\u00C5" => "A"
+
+# ?? => AE
+"\u00C6" => "AE"
+
+# ?? => C
+"\u00C7" => "C"
+
+# ?? => E
+"\u00C8" => "E"
+
+# ?? => E
+"\u00C9" => "E"
+
+# ?? => E
+"\u00CA" => "E"
+
+# ?? => E
+"\u00CB" => "E"
+
+# ?? => I
+"\u00CC" => "I"
+
+# ?? => I
+"\u00CD" => "I"
+
+# ?? => I
+"\u00CE" => "I"
+
+# ?? => I
+"\u00CF" => "I"
+
+# ?? => IJ
+"\u0132" => "IJ"
+
+# ?? => D
+"\u00D0" => "D"
+
+# ?? => N
+"\u00D1" => "N"
+
+# ?? => O
+"\u00D2" => "O"
+
+# ?? => O
+"\u00D3" => "O"
+
+# ?? => O
+"\u00D4" => "O"
+
+# ?? => O
+"\u00D5" => "O"
+
+# ?? => O
+"\u00D6" => "O"
+
+# ?? => O
+"\u00D8" => "O"
+
+# ?? => OE
+"\u0152" => "OE"
+
+# ??
+"\u00DE" => "TH"
+
+# ?? => U
+"\u00D9" => "U"
+
+# ?? => U
+"\u00DA" => "U"
+
+# ?? => U
+"\u00DB" => "U"
+
+# ?? => U
+"\u00DC" => "U"
+
+# ?? => Y
+"\u00DD" => "Y"
+
+# ?? => Y
+"\u0178" => "Y"
+
+# ?? => a
+"\u00E0" => "a"
+
+# ?? => a
+"\u00E1" => "a"
+
+# ?? => a
+"\u00E2" => "a"
+
+# ?? => a
+"\u00E3" => "a"
+
+# ?? => a
+"\u00E4" => "a"
+
+# ?? => a
+"\u00E5" => "a"
+
+# ?? => ae
+"\u00E6" => "ae"
+
+# ?? => c
+"\u00E7" => "c"
+
+# ?? => e
+"\u00E8" => "e"
+
+# ?? => e
+"\u00E9" => "e"
+
+# ?? => e
+"\u00EA" => "e"
+
+# ?? => e
+"\u00EB" => "e"
+
+# ?? => i
+"\u00EC" => "i"
+
+# ?? => i
+"\u00ED" => "i"
+
+# ?? => i
+"\u00EE" => "i"
+
+# ?? => i
+"\u00EF" => "i"
+
+# ?? => ij
+"\u0133" => "ij"
+
+# ?? => d
+"\u00F0" => "d"
+
+# ?? => n
+"\u00F1" => "n"
+
+# ?? => o
+"\u00F2" => "o"
+
+# ?? => o
+"\u00F3" => "o"
+
+# ?? => o
+"\u00F4" => "o"
+
+# ?? => o
+"\u00F5" => "o"
+
+# ?? => o
+"\u00F6" => "o"
+
+# ?? => o
+"\u00F8" => "o"
+
+# ?? => oe
+"\u0153" => "oe"
+
+# ?? => ss
+"\u00DF" => "ss"
+
+# ?? => th
+"\u00FE" => "th"
+
+# ?? => u
+"\u00F9" => "u"
+
+# ?? => u
+"\u00FA" => "u"
+
+# ?? => u
+"\u00FB" => "u"
+
+# ?? => u
+"\u00FC" => "u"
+
+# ?? => y
+"\u00FD" => "y"
+
+# ?? => y
+"\u00FF" => "y"
+
+# ??? => ff
+"\uFB00" => "ff"
+
+# ??? => fi
+"\uFB01" => "fi"
+
+# ??? => fl
+"\uFB02" => "fl"
+
+# ??? => ffi
+"\uFB03" => "ffi"
+
+# ??? => ffl
+"\uFB04" => "ffl"
+
+# ??? => ft
+"\uFB05" => "ft"
+
+# ??? => st
+"\uFB06" => "st"