feedbuilder 0.0.3 → 0.0.4

data/lib/feedbuilder/provider.rb

@@ -26,16 +26,20 @@ module FeedBuilder
         feed.updated = feed_updated
         feed.links << Atom::Link.new(:href => url_builder.html_url, :rel => :via, :type => 'text/html')
         feed.links << Atom::Link.new(:href => url_builder.self_url, :rel => :self, :type => 'application/atom+xml')
-        if collection.respond_to?(:total_pages) && collection.respond_to?(:current_page)
+        if collection.respond_to?(:total_pages) && collection.respond_to?(:current_page) &&
+            collection.respond_to?(:per_page)
           if collection.total_pages > 1
-            feed.links << Atom::Link.new(:href => url_builder.first_url, :rel => :first)
+            feed.links << Atom::Link.new(:href => url_builder.first_url(collection.per_page), :rel => :first)
             if collection.current_page > 1
-              feed.links << Atom::Link.new(:href => url_builder.prev_url(collection.current_page), :rel => :previous)
+              feed.links << Atom::Link.new(:href => url_builder.prev_url(collection.current_page, collection.per_page),
+                :rel => :previous)
             end
             if collection.current_page < collection.total_pages
-              feed.links << Atom::Link.new(:href => url_builder.next_url(collection.current_page), :rel => :next)
+              feed.links << Atom::Link.new(:href => url_builder.next_url(collection.current_page, collection.per_page),
+                :rel => :next)
             end
-            feed.links << Atom::Link.new(:href => url_builder.last_url(collection.total_pages), :rel => :last)
+            feed.links << Atom::Link.new(:href => url_builder.last_url(collection.total_pages, collection.per_page),
+              :rel => :last)
           end
         end
         collection.each {|model| feed.entries << build_entry(model, &block)}

data/lib/feedbuilder/url_builder.rb

@@ -16,32 +16,33 @@ module FeedBuilder
         end
       end
       @page_param = options[:page_param] || :page
-      @page_size_param = options[:page_size_param] || :page_size
+      @per_page_param = options[:per_page_param] || :per_page
     end
 
-    def first_url(page_size)
-      add_params(self_url, @page_param => 1, @page_size_param => page_size)
+    def first_url(per_page)
+      add_params(self_url, @page_param => 1, @per_page_param => per_page)
     end
 
-    def next_url(current_page, page_size)
-      add_params(self_url, @page_param => current_page + 1, @page_size_param => page_size)
+    def next_url(current_page, per_page)
+      add_params(self_url, @page_param => current_page + 1, @per_page_param => per_page)
     end
 
-    def prev_url(current_page, page_size)
-      add_params(self_url, @page_param => current_page - 1, @page_size_param => page_size)
+    def prev_url(current_page, per_page)
+      add_params(self_url, @page_param => current_page - 1, @per_page_param => per_page)
     end
 
-    def last_url(total_pages, page_size)
-      add_params(self_url, @page_param => total_pages, @page_size_param => page_size)
+    def last_url(total_pages, per_page)
+      add_params(self_url, @page_param => total_pages, @per_page_param => per_page)
     end
 
     def add_params(url, params = {})
+      copy = url.dup
       unless params.empty?
         qs = params.inject([]) {|m, kv| m << "#{kv[0]}=#{kv[1]}"}
-        sep = url =~ /\?/ ? '&' : '?'
-        url << "#{sep}#{URI.escape(qs.join('&'))}"
+        sep = copy =~ /\?/ ? '&' : '?'
+        copy << "#{sep}#{URI.escape(qs.join('&'))}"
       end
-      url
+      copy
     end
   end
 end

data/lib/feedbuilder/version.rb

@@ -1,3 +1,3 @@
 module FeedBuilder
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: feedbuilder
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Brian Moseley