kaminari 0.10.3 → 0.10.4

data/CHANGELOG

@@ -1,3 +1,10 @@
+== 0.10.4
+
+* Do not break ActiveRecord::Base.descendants, by making sure to call super
+from ActiveRecord::Base.inherited #34 [rolftimmermans]
+
+* Fixed vanishing mongoid criteria after calling page() #26 [tyok]
+
 == 0.10.3
 
 * Fixed a bug that total_count() didn't work when chained with group() scope

data/VERSION

@@ -1 +1 @@
-0.10.3
+0.10.4

data/kaminari.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kaminari}
-  s.version = "0.10.3"
+  s.version = "0.10.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Akira Matsuda"]
-  s.date = %q{2011-02-23}
+  s.date = %q{2011-02-24}
   s.description = %q{Kaminari is a Scope & Engine based, clean, powerful, customizable and sophisticated paginator for Rails 3}
   s.email = %q{ronnie@dio.jp}
   s.extra_rdoc_files = [

data/lib/kaminari/models/active_record_extension.rb

@@ -24,6 +24,8 @@ module Kaminari
             include Kaminari::PageScopeMethods
           end
         end
+
+        super
       end
     end
   end

data/lib/kaminari/models/mongoid_extension.rb

@@ -5,7 +5,9 @@ module Kaminari
       extend ActiveSupport::Concern
 
       included do
-        delegate :page, :per, :num_pages, :current_page, :limit_value, :offset_value, :pagination_count, :to => '@klass'
+        def page(*args)
+          self.klass.page(*args).criteria.merge(self)
+        end
       end
     end
 

data/spec/models/mongoid_spec.rb

@@ -6,6 +6,7 @@ describe Kaminari::MongoidExtension do
   before :all do
     class Developer
       include ::Mongoid::Document
+      field :salary, :type => Integer
     end
   end
   before do
@@ -39,6 +40,25 @@ describe Kaminari::MongoidExtension do
       its(:num_pages) { should == 12 }
       it { should skip 0 }
     end
+
+    context 'with criteria before' do
+      subject { Developer.where(:salary => 1).page 2 }
+      its(:selector) { should == {:salary => 1} }
+      its(:current_page) { should == 2 }
+      its(:limit_value) { should == 25 }
+      its(:num_pages) { should == 12 }
+      it { should skip 25 }
+    end
+
+    context 'with criteria after' do
+      subject { Developer.page(2).where(:salary => 1) }
+      its(:selector) { should == {:salary => 1} }
+      its(:current_page) { should == 2 }
+      its(:limit_value) { should == 25 }
+      its(:num_pages) { should == 12 }
+      it { should skip 25 }
+    end
+
   end
 
   describe '#per' do

data/spec/models/scopes_spec.rb

@@ -101,4 +101,9 @@ describe Kaminari::ActiveRecordExtension do
     its(:total_count) { should == 11 }
     its(:num_pages) { should == 3 }
   end
+
+  context 'activerecord descendants' do
+    subject { ActiveRecord::Base.descendants }
+    its(:length) { should_not == 0 }
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kaminari
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 63
   prerelease: 
   segments: 
   - 0
   - 10
-  - 3
-  version: 0.10.3
+  - 4
+  version: 0.10.4
 platform: ruby
 authors: 
 - Akira Matsuda
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-23 00:00:00 +09:00
+date: 2011-02-24 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency