blacklight_range_limit 5.0.1 → 5.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 34d5e12f33dab6b85a0a6124a1debc14c3ee422f
+  data.tar.gz: 696ebe4c0d178bfc0b6d1923be6863d2a6694a1f
+SHA512:
+  metadata.gz: 7343e933270b6409e504b5d1dcb3476018c888f63539a0f9fe8c4720503aa6abdc9744d418cb8f1c4cb00115c86b16e395ac4d5285352c2cb708fab04fc2515c
+  data.tar.gz: 894027d5d73feb173af418b104e2b81810c4146acd119508d4e54282e011b1e5091e751800c56e9003e8f0fff9f83206d6edd3e39f07321222cea50b18fe09e9

data/Gemfile

@@ -11,6 +11,17 @@ group :test do
   gem 'turbolinks'
 end
 
+gem 'sass-rails'
+# If we don't specify 2.11.0 we'll end up with sprockets 2.12.0 in the main 
+# Gemfile.lock but since sass-rails gets generated (rails new) into the test app
+# it'll want sprockets 2.11.0 and we'll have a conflict
+gem 'sprockets', '2.11.0'
+
+# If we don't specify 3.2.15 we'll end up with sass 3.3.2 in the main 
+# Gemfile.lock but since sass-rails gets generated (rails new) into the test app
+# it'll want sass 3.2.0 and we'll have a conflict
+gem 'sass', '~> 3.2.0'
+
 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/VERSION

@@ -1 +1 @@
-5.0.1
+5.0.2

data/app/helpers/range_limit_helper.rb

@@ -2,12 +2,14 @@
 module RangeLimitHelper
 
   # type is 'begin' or 'end'
-  def render_range_input(solr_field, type)
+  def render_range_input(solr_field, type, input_label = nil)
     type = type.to_s
-    
+
     default = params["range"][solr_field][type] if params["range"] && params["range"][solr_field] && params["range"][solr_field][type]
-    
-    text_field_tag("range[#{solr_field}][#{type}]", default, :maxlength=>4, :class => "form-control range_#{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}")
   end
 
   # type is 'min' or 'max'
@@ -88,8 +90,8 @@ module RangeLimitHelper
     my_params.delete("range_field")
     my_params.delete("range_start")
     my_params.delete("range_end")
-    
+
     return my_params
   end
-  
+
 end

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

@@ -1,6 +1,10 @@
 <%- # requires solr_config local passed in
 
-  field_config = range_config(solr_field)
+  field_config = range_config(solr_field)  
+  label = blacklight_config.facet_fields[solr_field].label
+  
+  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)
 -%>
 
 <div class="limit_content range_limit">  
@@ -35,7 +39,7 @@
         <%= hidden_field_tag("search_field", "dummy_range") %>
       <% end %>
       
-      <%= render_range_input(solr_field, :begin) %> – <%= render_range_input(solr_field, :end) %>
+      <%= render_range_input(solr_field, :begin, input_label_range_begin) %> – <%= render_range_input(solr_field, :end, input_label_range_end) %>
       <%= submit_tag 'Limit', :class=>'submit btn btn-default' %>
     
     <% end %>

data/config/locales/blacklight_range_limit.en.yml

@@ -0,0 +1,5 @@
+en:
+  blacklight:
+    range_limit:
+      range_begin: "%{field_label} range begin"
+      range_end: "%{field_label} range end"

data/lib/generators/blacklight_range_limit/assets_generator.rb

@@ -1,4 +1,4 @@
-# Copy BlacklightRangeLimit assets to public folder in current app. 
+# Copy BlacklightRangeLimit assets to public folder in current app.
 # If you want to do this on application startup, you can
 # add this next line to your one of your environment files --
 # generally you'd only want to do this in 'development', and can
@@ -8,7 +8,7 @@
 
 
 # Need the requires here so we can call the generator from environment.rb
-# as suggested above. 
+# as suggested above.
 require 'rails/generators'
 require 'rails/generators/base'
 module BlacklightRangeLimit
@@ -16,7 +16,7 @@ module BlacklightRangeLimit
     source_root File.join(BlacklightRangeLimit::Engine.root, 'app', 'assets')
 
     def assets
-      application_css = Dir["app/assets/stylesheets/application{.css,.scss,.css.scs}"].first
+      application_css = Dir["app/assets/stylesheets/application{.css,.scss,.css.scss}"].first
 
       if application_css
 
@@ -25,7 +25,7 @@ module BlacklightRangeLimit
  *
  * Used by blacklight_range_limit
  *= require  'blacklight_range_limit'
- *         
+ *
 }
         end
       else
@@ -39,12 +39,11 @@ module BlacklightRangeLimit
 // this:
 //= require 'blacklight_range_limit'
 
-}          
+}
       end
     end
-    
+
 
 
   end
 end
-

data/spec/features/blacklight_range_limit_spec.rb

@@ -4,16 +4,17 @@ describe "Blacklight Range Limit" do
   before do
     CatalogController.blacklight_config = Blacklight::Configuration.new
     CatalogController.configure_blacklight do |config|
-      config.add_facet_field 'pub_date_sort', :range => true
+      config.add_facet_field 'pub_date_sort', :label => 'Publication Date Sort', :range => true
       config.default_solr_params[:'facet.field'] = config.facet_fields.keys
     end
-
   end
 
   it "should show the range limit facet" do
     visit '/catalog'
     page.should have_selector 'input.range_begin'
     page.should have_selector 'input.range_end'
+    page.should have_selector 'label.sr-only[for="range_pub_date_sort_begin"]', :text => 'Publication Date Sort range begin'
+    page.should have_selector 'label.sr-only[for="range_pub_date_sort_end"]', :text => 'Publication Date Sort range end'
   end
 
   it "should provide distribution information" do
@@ -32,3 +33,23 @@ describe "Blacklight Range Limit" do
     page.should have_content "1941 to 1944 [remove] 1"
   end
 end
+
+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 => {
+        :input_label_range_begin => 'from publication date',
+        :input_label_range_end => 'to publication date'
+      }
+      config.default_solr_params[:'facet.field'] = config.facet_fields.keys
+    end  
+  end    
+  
+  it "should show the range limit facet" do
+    visit '/catalog'
+    page.should have_selector 'label.sr-only[for="range_pub_date_sort_begin"]', :text => 'from publication date'
+    page.should have_selector 'label.sr-only[for="range_pub_date_sort_end"]', :text => 'to publication date'
+  end
+
+end

data/spec/helpers/blacklight_range_limit_helper_spec.rb

@@ -0,0 +1,10 @@
+require "spec_helper"
+
+describe "Blacklight Range Limit Helper" do
+
+  it "should render range text fields with/without labels" do 
+    expect(helper.render_range_input('pub_date', 'begin')).to match /^<input class=\"form-control range_begin\" id=\"range_pub_date_begin\" maxlength=\"4\"/
+    expect(helper.render_range_input('pub_date', 'begin', 'from pub date')).to match /^<label class=\"sr-only\" for=\"range_pub_date_begin\">from pub date<\/label>/
+  end
+
+end

data/spec/test_app_templates/Gemfile.extra

@@ -19,7 +19,6 @@ group :test do
     gem 'capybara'
   end
   gem 'simplecov', :platform => :mri_19
-  gem 'simplecov-rcov', :platform => :mri_19
 end
 
 gem 'jettywrapper', '>= 1.2.0'

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

@@ -3,8 +3,9 @@ require 'rails/generators'
 class TestAppGenerator < Rails::Generators::Base
   source_root File.expand_path("../../../../test_app_templates", __FILE__)
 
-  def copy_blacklight_test_app_rake_task
-    copy_file "lib/tasks/blacklight_test_app.rake"
+  # This is only necessary for Rails 3
+  def remove_index
+    remove_file "public/index.html"
   end
 
   def run_blacklight_generator

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_range_limit
 version: !ruby/object:Gem::Version
-  version: 5.0.1
-  prerelease: 
+  version: 5.0.2
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -10,168 +9,150 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0.pre4
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0.pre4
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.2
 description: 
@@ -181,8 +162,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -199,6 +180,7 @@ files:
 - app/views/blacklight_range_limit/range_segments.html.erb
 - blacklight_range_limit.gemspec
 - config/jetty.yml
+- config/locales/blacklight_range_limit.en.yml
 - config/routes.rb
 - config/solr.yml
 - doc/example-screenshot.png
@@ -212,10 +194,10 @@ files:
 - lib/generators/blacklight_range_limit/assets_generator.rb
 - lib/generators/blacklight_range_limit/blacklight_range_limit_generator.rb
 - spec/features/blacklight_range_limit_spec.rb
+- spec/helpers/blacklight_range_limit_helper_spec.rb
 - spec/spec_helper.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
-- spec/test_app_templates/lib/tasks/blacklight_test_app.rake
 - vendor/assets/javascripts/bootstrap-slider.js
 - vendor/assets/javascripts/flot/excanvas.min.js
 - vendor/assets/javascripts/flot/jquery.flot.js
@@ -224,32 +206,30 @@ files:
 homepage: https://github.com/projectblacklight/blacklight_range_limit
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Blacklight Range Limit plugin
 test_files:
 - spec/features/blacklight_range_limit_spec.rb
+- spec/helpers/blacklight_range_limit_helper_spec.rb
 - spec/spec_helper.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
-- spec/test_app_templates/lib/tasks/blacklight_test_app.rake
-has_rdoc: 

data/spec/test_app_templates/lib/tasks/blacklight_test_app.rake

@@ -1,14 +0,0 @@
-require 'rspec/core/rake_task'
-
-desc "run the blacklight gem spec"
-gem_home = File.expand_path('../../../../..', __FILE__)
-
-namespace :blacklight_test_app do
-
-  RSpec::Core::RakeTask.new(:spec) do |t|
-    t.pattern = gem_home + '/spec/**/*_spec.rb'
-    t.rspec_opts = "--colour"
-    t.ruby_opts = "-I#{gem_home}/spec"
-  end
-
-end