blacklight_range_limit 5.0.2 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34d5e12f33dab6b85a0a6124a1debc14c3ee422f
-  data.tar.gz: 696ebe4c0d178bfc0b6d1923be6863d2a6694a1f
+  metadata.gz: bfbd60cfa11906f880033d02aa35b34cda312d3a
+  data.tar.gz: 658444bdfca712dec061edb48cd0ddf9066b12a9
 SHA512:
-  metadata.gz: 7343e933270b6409e504b5d1dcb3476018c888f63539a0f9fe8c4720503aa6abdc9744d418cb8f1c4cb00115c86b16e395ac4d5285352c2cb708fab04fc2515c
-  data.tar.gz: 894027d5d73feb173af418b104e2b81810c4146acd119508d4e54282e011b1e5091e751800c56e9003e8f0fff9f83206d6edd3e39f07321222cea50b18fe09e9
+  metadata.gz: 8fe6f9b7a91a2f2e6395f47d10e032f09f9026bfdfee2d4135a17523c317ec69b7e172ed338ed5d6a4cceeb36d3339ae02e9783f6ccf96756748e5f622aa7581
+  data.tar.gz: 930d57f88f318fa4273580b80f1771deec6a44540a628ef1e7d2e1e3757f5c628052aec86f48c5b540d3c8a251babadf4822caa58f8b9e7da0b1cb825f31ebf0

data/.travis.yml

@@ -1,6 +1,9 @@
 notifications:
   email: false
 
+language: ruby
+cache: bundler
+sudo: false
 rvm:
   - 1.9.3
   - 2.0.0

data/Rakefile

@@ -40,6 +40,7 @@ namespace :test do
     within_test_app do
       ENV['RAILS_ENV'] ||= 'test'
       system "rake blacklight:solr:seed"
+      system "rake blacklight_range_limit:seed"
     end
   end
 

data/VERSION

@@ -1 +1 @@
-5.0.2
+5.0.3

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

@@ -10,7 +10,7 @@ $(".range_limit .profile .range.slider_js").each(function() {
    var min = boundaries[0];
    var max = boundaries[1];
 
-   if (min && max) {
+   if (isInt(min) && isInt(max)) {
      $(this).contents().wrapAll('<div style="display:none" />');
      
      var range_element = $(this);
@@ -46,7 +46,6 @@ $(".range_limit .profile .range.slider_js").each(function() {
      }
    }
 
-        
   begin_el.val(min);
   end_el.val(max);
         
@@ -112,4 +111,11 @@ function min_max(range_element) {
    return [min, max]
 }
 
+
+// Check to see if a value is an Integer
+// see: http://stackoverflow.com/questions/3885817/how-to-check-if-a-number-is-float-or-integer
+function isInt(n) {
+  return n % 1 === 0;
+}
+
 });

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

@@ -17,9 +17,9 @@
       <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 => "remove" do %>
+           <%= link_to remove_range_param(solr_field), :class=>"remove", :title => t('blacklight.range_limit.remove_limit') do %>
             <span class="glyphicon glyphicon-remove"></span>
-            <span class="sr-only">[remove]</span>
+            <span class="sr-only">[<%= t('blacklight.range_limit.remove_limit') %>]</span>
            <% end %>
         </span>
         <span class="selected facet-count"><%= number_with_delimiter(@response.total) %></span>
@@ -40,7 +40,7 @@
       <% 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' %>
+      <%= submit_tag t('blacklight.range_limit.submit_limit'), :class=>'submit btn btn-default' %>
     
     <% end %>
   <% end %>

data/config/locales/blacklight_range_limit.en.yml

@@ -3,3 +3,5 @@ en:
     range_limit:
       range_begin: "%{field_label} range begin"
       range_end: "%{field_label} range end"
+      submit_limit: 'Limit'
+      remove_limit: 'remove'

data/lib/generators/blacklight_range_limit/blacklight_range_limit_generator.rb

@@ -7,5 +7,4 @@ class BlacklightRangeLimitGenerator < Rails::Generators::Base
   def copy_public_assets
     BlacklightRangeLimit::AssetsGenerator.start
   end
-
 end

data/lib/tasks/blacklight_range_limit.rake

@@ -0,0 +1,10 @@
+require 'rails/generators'
+
+namespace :blacklight_range_limit do
+  desc 'Add in additional Solr docs'
+  task seed: :environment do
+    docs = Dir['spec/fixtures/solr_documents/*.yml'].map { |f| YAML.load File.read(f) }.flatten
+    Blacklight.solr.add docs
+    Blacklight.solr.commit
+  end
+end

data/spec/features/blacklight_range_limit_spec.rb

@@ -1,36 +1,30 @@
 require 'spec_helper'
 
 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', :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'
+    visit catalog_index_path
     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'
+    expect(page).to have_css 'input.submit', value: 'Limit'
   end
 
   it "should provide distribution information" do
-    visit '/catalog'
+    visit catalog_index_path
     click_link 'View distribution'
 
-    page.should have_content("1941 to 1944 1")
-    page.should have_content("2005 to 2008 7")
+    page.should have_content("1500 to 1599 0")
+    page.should have_content("2000 to 2008 12")
   end
 
   it "should limit appropriately" do
-    visit '/catalog'
+    visit catalog_index_path
     click_link 'View distribution'
-    click_link '1941 to 1944'
+    click_link '2000 to 2008'
 
-    page.should have_content "1941 to 1944 [remove] 1"
+    page.should have_content "2000 to 2008 [remove] 12"
   end
 end
 

data/spec/fixtures/solr_documents/zero_year.yml

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

data/spec/helpers/blacklight_range_limit_helper_spec.rb

@@ -2,9 +2,11 @@ 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>/
+  it "should render range text fields with/without labels" do
+    begin_html = Capybara.string(helper.render_range_input('pub_date', 'begin'))
+    begin_from_pub_html = Capybara.string(helper.render_range_input('pub_date', 'begin', 'from pub date'))
+    expect(begin_html).to have_css 'input.form-control.range_begin#range_pub_date_begin'
+    expect(begin_from_pub_html).to have_css 'label.sr-only[for="range_pub_date_begin"]'
   end
 
 end

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

@@ -19,4 +19,15 @@ class TestAppGenerator < Rails::Generators::Base
 
     generate 'blacklight_range_limit'
   end
+
+  def fixtures
+    FileUtils.mkdir_p 'spec/fixtures/solr_documents'
+    directory 'solr_documents', 'spec/fixtures/solr_documents'
+  end
+
+  def inject_into_catalog_controller
+    inject_into_file 'app/controllers/catalog_controller.rb', after: "config.add_facet_field 'example_pivot_field', :label => 'Pivot Field', :pivot => ['format', 'language_facet']" do
+      "\n    config.add_facet_field 'pub_date_sort', :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: 5.0.2
+  version: 5.0.3
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-13 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -193,7 +193,9 @@ files:
 - lib/blacklight_range_limit/view_helper_override.rb
 - lib/generators/blacklight_range_limit/assets_generator.rb
 - lib/generators/blacklight_range_limit/blacklight_range_limit_generator.rb
+- lib/tasks/blacklight_range_limit.rake
 - spec/features/blacklight_range_limit_spec.rb
+- spec/fixtures/solr_documents/zero_year.yml
 - spec/helpers/blacklight_range_limit_helper_spec.rb
 - spec/spec_helper.rb
 - spec/test_app_templates/Gemfile.extra
@@ -229,6 +231,7 @@ specification_version: 4
 summary: Blacklight Range Limit plugin
 test_files:
 - spec/features/blacklight_range_limit_spec.rb
+- spec/fixtures/solr_documents/zero_year.yml
 - spec/helpers/blacklight_range_limit_helper_spec.rb
 - spec/spec_helper.rb
 - spec/test_app_templates/Gemfile.extra