will_paginate_couchrest 0.2.0 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.2

data/lib/will_paginate_couchrest/class_methods.rb

@@ -110,36 +110,34 @@ module CouchRest
           paginated_view(:all, options)
         end
 
-        protected
-
-          ##
-          # Return a WillPaginate collection suitable for usage
-          # 
-          def paginated_view(view_name, options = {})
-            raise "Missing per_page parameter" if options[:per_page].nil?
+        ##
+        # Return a WillPaginate collection suitable for usage
+        # 
+        def paginated_view(view_name, options = {})
+          raise "Missing per_page parameter" if options[:per_page].nil?
 
-            options[:page] ||= 1
+          options[:page] ||= 1
 
-            ::WillPaginate::Collection.create( options[:page], options[:per_page] ) do |pager|
-              # perform view count first (should create designs if missing)
-              if view_name.to_sym == :all
-                pager.total_entries = count()
-              else
-                total = view( view_name, options.update(:reduce => true) )['rows'].pop
-                pager.total_entries = total ? total['value'] : 0
-              end
-              p_options = options.merge(
-                :design_doc => self.to_s, :view_name => view_name,
-                  :include_docs => true
-              )
-              # Only provide the reduce parameter when necessary. This is when the view has
-              # been set with a reduce method and requires the reduce boolean parameter
-              # to be either true or false on all requests.
-              p_options[:reduce] = false unless view_name.to_sym == :all
-              results = paginate(p_options)
-              pager.replace( results )
+          ::WillPaginate::Collection.create( options[:page], options[:per_page] ) do |pager|
+            # perform view count first (should create designs if missing)
+            if view_name.to_sym == :all
+              pager.total_entries = count({:database => options[:database]})
+            else
+              total = view( view_name, options.dup.update(:reduce => true) )['rows'].pop
+              pager.total_entries = total ? total['value'] : 0
             end
+            p_options = options.merge(
+              :design_doc => self.to_s, :view_name => view_name,
+              :include_docs => true
+            )
+            # Only provide the reduce parameter when necessary. This is when the view has
+            # been set with a reduce method and requires the reduce boolean parameter
+            # to be either true or false on all requests.
+            p_options[:reduce] = false unless view_name.to_sym == :all
+            results = paginate(p_options)
+            pager.replace( results )
           end
+        end
       end
       
     end

data/lib/will_paginate_couchrest/proxy_methods.rb

@@ -5,12 +5,23 @@ module CouchRest
 
         def method_missing(m, *args, &block)
           if m.to_s =~ /^paginate_(.+)/ && @klass.respond_to?(m)
-            @klass.send(m, *args)
+            view_name = $1 # view name
+            opts = args.shift || {}
+            paginated_view(view_name, opts)
           else
             super
           end
         end
 
+        def paginated_view(view_name, opts = {})
+          opts = { 
+            :database => @database
+          }.merge(opts)
+          result = @klass.paginated_view(view_name, opts)
+          result.each{|doc| doc.database = @database if respond_to?(:database) } if result
+          result
+        end
+
       end
     end
   end

data/spec/will_paginate_couchrest_spec.rb

@@ -80,14 +80,19 @@ describe CouchRest::Mixins::WillPaginate do
 
 
   describe "using pagination via proxy class" do
-    before(:all) do
+    before(:each) do
       @proxy = SomeDoc.on(SPEC_COUCH)
     end
 
-    it "should allow paginate call on proxy" do
-      SomeDoc.should_receive(:paginate_by_name)
+    it "should allow paginate call on proxy with database" do
+      SomeDoc.should_receive(:paginated_view).with('by_name', {:key => 'foo', :database => SPEC_COUCH})
       @proxy.paginate_by_name :key => 'foo'
     end
+
+    it "should call paginate parent with database" do
+      SomeDoc.should_receive(:paginate).with(hash_including(:database => SPEC_COUCH)).and_return([])
+      @proxy.paginate_by_name :key => 'foo', :per_page => 10
+    end
   end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - samlown