blacklight 5.17.1 → 5.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bca7c3cd93bf159e1b2272c4992af95d00e0f7a
-  data.tar.gz: 6bdd13fd311e7a333900dbda9405cace911124d5
+  metadata.gz: cb02cacbad8a1eae5549c29ea63d69d742755284
+  data.tar.gz: 5ce395c3e3dc278d89fdec2dfbc56845377db6ac
 SHA512:
-  metadata.gz: 0dea3c31338322661ddcf300d747a51d01ad96c8969f8ae28508a925e58e7b3917348bf1aaa7921e5c6c7cf820b175bb3d6baa0884711ddd985638b2275ae9e2
-  data.tar.gz: 912096ba17142a60e2f46730221c236c3292e8d5ed2ada3d2afd6f7965a663b0af1e99d2fde00368e9723c1628fc74222530edcc9a6e68f739ca105b8dbcfa67
+  metadata.gz: 09f6375583aa2751d3420688eb39dec519f92fb7cbd99b993ff8616e59246c9716c7d33d00c139bb7e7b890550c04f36a584e33d8ad091bd3fd2bc22236c03d5
+  data.tar.gz: 3dbf5104d494af8f835fb76b7e1bdbe1093dd40705d3fcc4ee6545b475c66f71b8dc6378c7c6265b9ca3ca662bdf765689207369327ef8d8c5bb84d953ba7e9d

data/VERSION

@@ -1 +1 @@
-5.17.1
+5.17.2

data/app/models/blacklight/facet_paginator.rb

@@ -36,7 +36,7 @@ module Blacklight
     # :sort => 'count' or 'index', solr tokens for facet value sorting, default 'count'. 
     def initialize(all_facet_values, arguments)
       # to_s.to_i will conveniently default to 0 if nil
-      @offset = arguments[:offset].to_s.to_i 
+      @offset = arguments[:offset].to_s.to_i
       @limit = arguments[:limit]
       @sort = arguments[:sort]
 
@@ -57,7 +57,8 @@ module Blacklight
     end
 
     def current_page
-      if limit == 0 #check for divide by zero
+      # A nil limit is unlimited, thus only one page.
+      if limit.nil? || limit == 0 #check for divide by zero
         1
       else
         @offset / limit + 1

data/spec/models/blacklight/facet_paginator_spec.rb

@@ -71,11 +71,22 @@ describe Blacklight::FacetPaginator do
   end
 
   context "for a nil :limit" do
-    subject { described_class.new(seven_facet_values, offset: 0, limit: nil) }
-    it "should return all the items" do
-      expect(subject.items).to eq seven_facet_values
+    let(:paginator) { described_class.new(seven_facet_values, offset: 0, limit: nil) }
+
+    describe "#items" do
+      subject { paginator.items }
+      it { is_expected.to eq seven_facet_values }
+    end
+
+    describe "#last_page?" do
+      subject { paginator.last_page? }
+      it { is_expected.to be true }
+    end
+
+    describe "#current_page" do
+      subject { paginator.current_page }
+      it { is_expected.to eq 1 }
     end
-    it { should be_last_page }
   end
 
   describe "#as_json" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 5.17.1
+  version: 5.17.2
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2016-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails