flickrmocks 0.8.8 → 0.8.9

data/VERSION

@@ -1 +1 @@
-0.8.8
+0.8.9

data/flickrmocks.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{flickrmocks}
-  s.version = "0.8.8"
+  s.version = "0.8.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Takaltoo"]

data/lib/flickr_mocks/api/options.rb

@@ -53,7 +53,7 @@ module FlickrMocks
     def self.commons_institutions_params(params)
       return {
         :per_page => params[:per_page] || params[:perpage],
-        :current_page => params[:current_page] || 1
+        :current_page => params[:current_page] || params[:page] || 1
       }
     end
   end

data/lib/flickr_mocks/models/commons_institutions.rb

@@ -84,8 +84,7 @@ module FlickrMocks
 
     def current_page=(value)
       page = value.to_i < 1 ? 1 : value.to_i
-
-      max_page = total_entries  / @per_page
+      max_page = (total_entries  / @per_page) == 0 ? 1 : (total_entries  / @per_page)
       page = page > max_page ? max_page : page
       @current_page = page
     end

data/spec/api/options_spec.rb

@@ -165,6 +165,14 @@ describe APP::Api do
       subject.commons_institutions_params(:per_page => 20).should ==
         {:per_page => 20, :current_page => 1}
     end
+    it "returns :current_page in preference to :page" do
+      subject.commons_institutions_params(:per_page=>20,:page=>2,:current_page=>3).should ==
+        {:per_page => 20, :current_page => 3}
+    end
+    it "returns :page when :current_page is not specified" do
+      subject.commons_institutions_params(:per_page=>20,:page=>3).should ==
+        {:per_page => 20, :current_page => 3}
+    end
   end
   
   

data/spec/models/commons_institutions_spec.rb

@@ -62,6 +62,9 @@ describe APP::CommonsInstitutions do
           klass.new(fixture,:per_page => 20,
                                   :current_page => max_page+1).current_page.should == max_page
         end
+        it "should return 1 when :per_page is very large and current_page is not set" do
+          klass.new(fixture,:per_page => 200000).current_page.should == 1
+        end
       end
 
       specify {subject.should respond_to(:per_page)}

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 8
-  version: 0.8.8
+  - 9
+  version: 0.8.9
 platform: ruby
 authors: 
 - Takaltoo