blacklight_range_limit 7.3.2 → 7.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 451f955c7139901dea83fdc42af224ae655d4faaa02af17daf412e9e9d0f5814
-  data.tar.gz: ad3e1e7c612e3093f7de4c6a8af6356b7f0ec17e0c4bb3f812ac03aca314cd0e
+  metadata.gz: aafe9f1b4d756244ccd5bb1959e5f2199e50b7fbd0d7f7d175ee1c4ab9289dd2
+  data.tar.gz: 074d426035ad95446508c855bbfde9816c2a827a1cfa997100cb1de33df82413
 SHA512:
-  metadata.gz: 283f0872004cf567817be1211a8765a32e0aa4e963d5a4a1a85d0d1916951bb5c5ea79e5516f1d5291cc180601cc2df1ff5dca40c9e41445b63c1d55a3990473
-  data.tar.gz: bccd344d331fb8142a9e2f9782b3f30a0771c3c2f74afead717f0a810ca94bcf9907f87b45270ec8a6fad6dc89ce0fff69d16ba8a69f3ff2387898eed840c675
+  metadata.gz: b86814bfd16aa175d118d81f2c4b81cffb9d2891169939c34b852bca7b5e364f9251c18676e2f6665a2e22d38c94bd07cc8eeda937d14b5ce4f187f286764d68
+  data.tar.gz: fae0f6d0069a9ed48eda9f2a13f69ade7188c4b30c7c7eb2b83e003841d70e4d6a03df055cee740390b20633ff60c626fcaa65c8e084a592595e4a013b561cca

data/VERSION

@@ -1 +1 @@
-7.3.2
+7.4.0

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

@@ -200,7 +200,7 @@ Blacklight.onLoad(function() {
             //xaxis: { ticks: x_ticks },
             xaxis: { tickDecimals: 0 }, // force integer ticks
             series: { lines: { fill: true, steps: true }},
-            grid: {clickable: true, hoverable: true, autoHighlight: false},
+            grid: {clickable: true, hoverable: true, autoHighlight: false, margin: { left: -14, right: -12 }},
             selection: {mode: "x"}
           }));
         }

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

@@ -72,7 +72,7 @@ function isInt(n) {
       var begin_el = form.find("input.range_begin");
       var end_el = form.find("input.range_end");
 
-      var placeholder_input = $('<input type="text" data-slider-placeholder="true" style="width:100%;">').appendTo(range_element);
+      var placeholder_input = $('<input type="hidden" data-slider-placeholder="true" />').appendTo(range_element);
 
       // make sure slider is loaded
       if (placeholder_input.slider !== undefined) {

data/app/assets/stylesheets/blacklight_range_limit/blacklight_range_limit.css

@@ -3,13 +3,18 @@ form.range_limit {
   line-height: 3;
 }
 
+.range_limit .range-limit-input-group {
+  max-width: 350px;
+  width: 100% !important;
+}
+
 .range_limit input.range_begin, .range_limit input.range_end {
   display: inline-block;
   width: 4.5em;
 }
 
 .limit_content .subsection {
-  margin-top: 1em;
+  margin-top: 0.5em;
 }
 
 .hover_legend {
@@ -21,6 +26,14 @@ form.range_limit {
   background: #e8cfac;
 }
 
+.slider_js .slider-horizontal {
+  width: 100% !important;
+}
+
+.chart_js .flot-x-axis {
+  font-size: 14px;
+}
+
 .modal-body .view_larger {
   display: none;
 }

data/app/helpers/range_limit_helper.rb

@@ -14,9 +14,9 @@ module RangeLimitHelper
 
     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=>maxlength, :class => "form-control range_#{type}")
+    html = text_field_tag("range[#{solr_field}][#{type}]", default, :maxlength=>maxlength, :class => "form-control text-center range_#{type}")
+    html += label_tag("range[#{solr_field}][#{type}]", input_label, class: 'sr-only') if input_label.present?
+    html
   end
 
   # type is 'min' or 'max'

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

@@ -56,13 +56,16 @@
         <% end %>
     </div>
 
-    <%= form_tag search_action_path, :method => :get, class: [BlacklightRangeLimit.classes[:form], "range_#{field_name}"].join(' ') do %>
+    <%= form_tag search_action_path, :method => :get, class: [BlacklightRangeLimit.classes[:form], "range_#{field_name} d-flex justify-content-center"].join(' ') do %>
       <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:page)) %>
-      <%= content_tag :label, t('blacklight.range_limit.date_range_label'), class: 'range_limit_label' %>
-      <div class="d-inline-block">
-        <%= render_range_input(field_name, :begin, input_label_range_begin, maxlength) %> – <%= render_range_input(field_name, :end, input_label_range_end, maxlength) %>
+      <%= content_tag :label, t('blacklight.range_limit.date_range_label'), class: 'range_limit_label sr-only' %>
+      <div class="input-group input-group-sm mb-3 flex-nowrap range-limit-input-group">
+        <%= render_range_input(field_name, :begin, input_label_range_begin, maxlength) %>
+        <%= render_range_input(field_name, :end, input_label_range_end, maxlength) %>
+        <div class="input-group-append">
+          <%= submit_tag t('blacklight.range_limit.submit_limit'), class: BlacklightRangeLimit.classes[:submit] %>
+        </div>
       </div>
-      <%= submit_tag t('blacklight.range_limit.submit_limit'), class: BlacklightRangeLimit.classes[:submit] %>
     <% end %>
 
     <%= link_to t('blacklight.range_limit.view_larger', field_name: label),
@@ -70,17 +73,19 @@
         class: 'view_larger mt-1',
         data: { blacklight_modal: 'trigger' } %>
 
-    <% 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 t('blacklight.range_limit.missing'), search_action_url(add_range_missing(field_name).except(:controller, :action)) %>
-          </span>
-          <%# note important there be no whitespace inside facet-count to avoid
-              bug in some versions of Blacklight (including 7.1.0.alpha) %>
-          <span class="facet-count"><%= number_with_delimiter(stats["missing"]) %></span>
-        </li>
-      </ul>
+    <% unless request.xhr? %>
+      <% 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 t('blacklight.range_limit.missing'), search_action_url(add_range_missing(field_name).except(:controller, :action)) %>
+            </span>
+            <%# note important there be no whitespace inside facet-count to avoid
+                bug in some versions of Blacklight (including 7.1.0.alpha) %>
+            <span class="facet-count"><%= number_with_delimiter(stats["missing"]) %></span>
+          </li>
+        </ul>
+      <% end %>
     <% end %>
   <% end %>
 </div>

data/config/locales/blacklight_range_limit.ar.yml

@@ -0,0 +1,14 @@
+ar:
+  blacklight:
+    range_limit:
+      range_begin: "%{field_label} بداية المدة"
+      range_end: "%{field_label} نهاية المدة"
+      submit_limit: 'تطبيق'
+      remove_limit: 'حذف'
+      missing: 'غير معروف'
+      view_distribution: 'عرض التوزيع'
+      view_larger: 'عرض بحجم أكبر »'
+      date_range_label: 'الفترة التاريخية:'
+      results_range_html: 'تمتد النتائج الحالية من <span class="min">%{min}</span> إلى<span class="max">%{max}</span>'
+      single_html: '<span class="single">%{begin}</span>'
+      range_html: '<span class="from">%{begin}</span> إلى<span class="to">%{end}</span>'

data/config/locales/blacklight_range_limit.en.yml

@@ -3,7 +3,7 @@ en:
     range_limit:
       range_begin: "%{field_label} range begin"
       range_end: "%{field_label} range end"
-      submit_limit: 'Limit'
+      submit_limit: 'Apply'
       remove_limit: 'remove'
       missing: 'Unknown'
       view_distribution: 'View distribution'

data/solr/conf/solrconfig.xml

@@ -48,7 +48,7 @@
           alternative_title_tsim
           active_fedora_model_ssi
           title_tsim
-          author_tsimesim
+          author_tsim
           subject_tsim
           all_text_timv
         </str>

data/spec/features/a_javascript_spec.rb

@@ -20,4 +20,32 @@ describe 'JavaScript', js: true do
       expect(page).to have_css '.flot-base'
     end
   end
+
+  describe '"Unknown" link' do
+    context 'when in the facet (e.g. non-xhr)' do
+      it 'is displayed' do
+        visit search_catalog_path
+
+        click_button 'Publication Date Sort'
+
+        within 'ul.subsection.missing' do
+          expect(page).to have_link 'Unknown'
+        end
+      end
+    end
+
+    context 'when in the modal (e.g. via xhr)' do
+      it 'is not displayed' do
+        visit search_catalog_path
+
+        click_button 'Publication Date Sort'
+        sleep(1) # resize is debounced
+        click_link 'View larger »'
+
+        within '.modal-body' do
+          expect(page).not_to have_css 'ul.subsection.missing'
+        end
+      end
+    end
+  end
 end

data/spec/features/blacklight_range_limit_spec.rb

@@ -8,7 +8,7 @@ describe "Blacklight Range Limit" do
     expect(page).to have_selector 'input.range_end'
     expect(page).to have_selector 'label.sr-only[for="range_pub_date_si_begin"]', :text => 'Publication Date Sort range begin'
     expect(page).to have_selector 'label.sr-only[for="range_pub_date_si_end"]', :text => 'Publication Date Sort range end'
-    expect(page).to have_button 'Limit'
+    expect(page).to have_button 'Apply'
   end
 
   it "should provide distribution information" do
@@ -31,7 +31,7 @@ describe "Blacklight Range Limit" do
     visit search_catalog_path(page: 2)
     click_link 'View distribution'
     click_link '2000 to 2008'
-    click_button 'Limit'
+    click_button 'Apply'
     expect(page.current_url).not_to include('page')
   end
 

data/spec/fixtures/solr_documents/unknown_year.yml

@@ -0,0 +1,2 @@
+id: 'unknown_doc_id'
+title_tsim: 'Unknown year doc'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_range_limit
 version: !ruby/object:Gem::Version
-  version: 7.3.2
+  version: 7.4.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-27 00:00:00.000000000 Z
+date: 2019-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -180,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.ar.yml
 - config/locales/blacklight_range_limit.en.yml
 - config/routes.rb
 - config/solr.yml
@@ -217,6 +218,7 @@ files:
 - solr/sample_solr_documents.yml
 - spec/features/a_javascript_spec.rb
 - spec/features/blacklight_range_limit_spec.rb
+- spec/fixtures/solr_documents/unknown_year.yml
 - 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,6 +262,7 @@ summary: Blacklight Range Limit plugin
 test_files:
 - spec/features/a_javascript_spec.rb
 - spec/features/blacklight_range_limit_spec.rb
+- spec/fixtures/solr_documents/unknown_year.yml
 - spec/fixtures/solr_documents/zero_year.yml
 - spec/helpers/blacklight_range_limit_helper_spec.rb
 - spec/lib/blacklight_range_limit/segment_calculation_spec.rb