kaminari 0.16.2 → 0.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2627d8c87c7ace1ca82760c49c31f7cd7cc0dc3b
-  data.tar.gz: e8f5c196e7e5a01ad32579f7b3157912b6f2fe9c
+  metadata.gz: 1b60c50194b2623ea0fdfedba7baea9a4d675557
+  data.tar.gz: 9f98c924aea42ab769c9800e39d739e0ae1ea477
 SHA512:
-  metadata.gz: 0cc0e4d37b650625b17c42545cfe6ffb71a7e716a0a7b28bb29330ee506d99a5b4bb820c8cc9ea1ea4379ce45cc00c93772e3d3e966b2808d827e5c5582b006a
-  data.tar.gz: 26bcfb07c7a0ea59728afd2e140683a66c350687fd96ac40f015530008b1700c1410d481bb25aa935cd6c60c37629105ddb201841432de43cad436f913c006b3
+  metadata.gz: 160ad63b6c8b586d82c37bf2c29230b1cb41375679073d628112b6d0023c3eee7e91de6ced19f31f6af02dd0fd5371fd1ab122120645a0f82cda005ff7e26a21
+  data.tar.gz: a0bca0e742f945a4ad67dd02406f74df8ae51f4a94bfcb5ff3025cfed5c1ad9522fea38bfdb4cd12f0e11ae8c0f2e7483594ee115a6af06cfb3b5088d914a2a9

data/CHANGELOG.rdoc

@@ -1,3 +1,10 @@
+== 0.16.3
+
+* Fixed a "stack level too deep" bug in mongoid #642 [bartes]
+
+* Fixed a bug that Kaminari possibly crashes when combined with other gems
+that define `inherited` method on model classes, such as aasm. #651 [zeitnot]
+
 == 0.16.2
 
 * Fixed a bug where cloned Relations remember previous relations'

data/lib/kaminari/models/active_record_extension.rb

@@ -3,16 +3,16 @@ require 'kaminari/models/active_record_model_extension'
 module Kaminari
   module ActiveRecordExtension
     extend ActiveSupport::Concern
-    included do
+
+    module ClassMethods
       # Future subclasses will pick up the model extension
-      class << self
-        def inherited_with_kaminari(kls) #:nodoc:
-          inherited_without_kaminari kls
-          kls.send(:include, Kaminari::ActiveRecordModelExtension) if kls.superclass == ::ActiveRecord::Base
-        end
-        alias_method_chain :inherited, :kaminari
+      def inherited(kls) #:nodoc:
+        super
+        kls.send(:include, Kaminari::ActiveRecordModelExtension) if kls.superclass == ::ActiveRecord::Base
       end
+    end
 
+    included do
       # Existing subclasses pick up the model extension as well
       self.descendants.each do |kls|
         kls.send(:include, Kaminari::ActiveRecordModelExtension) if kls.superclass == ::ActiveRecord::Base

data/lib/kaminari/models/mongoid_extension.rb

@@ -13,13 +13,12 @@ module Kaminari
           include Kaminari::MongoidCriteriaMethods
           include Kaminari::PageScopeMethods
         end
+      end
 
-        class << self
-          def inherited_with_kaminari(kls)
-            inherited_without_kaminari(kls)
-            kls.send(:include, Kaminari::MongoidExtension::Document.dup)
-          end
-          alias_method_chain :inherited, :kaminari
+      module ClassMethods
+        def inherited(kls)
+          super
+          kls.send(:include, Kaminari::MongoidExtension::Document.dup)
         end
       end
     end

data/lib/kaminari/version.rb

@@ -1,3 +1,3 @@
 module Kaminari
-  VERSION = '0.16.2'
+  VERSION = '0.16.3'
 end

data/spec/fake_app/mongoid/models.rb

@@ -20,6 +20,10 @@ class Device < Product
   paginates_per 100
 end
 
+class Android < Device
+  paginates_per 200
+end
+
 class MongoMongoidExtensionDeveloper
   include ::Mongoid::Document
   field :salary, :type => Integer

data/spec/fake_gem.rb

@@ -1,4 +1,20 @@
-# Simulate a gem providing a subclass of ActiveRecord::Base before the Railtie is loaded.
+module Kaminari
+  module FakeGem
+    extend ActiveSupport::Concern
 
-class GemDefinedModel < ActiveRecord::Base
+    module ClassMethods
+      def inherited(kls)
+        super
+        def kls.fake_gem_defined_method; end
+      end
+    end
+  end
+end
+
+ActiveSupport.on_load :active_record do
+  ActiveRecord::Base.send :include, Kaminari::FakeGem
+
+  # Simulate a gem providing a subclass of ActiveRecord::Base before the Railtie is loaded.
+  class GemDefinedModel < ActiveRecord::Base
+  end
 end

data/spec/models/active_record/inherited_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+if defined? ActiveRecord
+  describe Kaminari::ActiveRecordModelExtension do
+    subject { Class.new(ActiveRecord::Base) }
+    it { should respond_to :page }
+    it { should respond_to :fake_gem_defined_method }
+  end
+end

data/spec/models/active_record/scopes_spec.rb

@@ -31,10 +31,13 @@ if defined? ActiveRecord
   end
 
   describe Kaminari::ActiveRecordExtension do
-    before do
-      1.upto(100) {|i| User.create! :name => "user#{'%03d' % i}", :age => (i / 10)}
-      1.upto(100) {|i| GemDefinedModel.create! :name => "user#{'%03d' % i}", :age => (i / 10)}
-      1.upto(100) {|i| Device.create! :name => "user#{'%03d' % i}", :age => (i / 10)}
+    before :all do
+      [User, GemDefinedModel, Device].each do |m|
+        1.upto(100) {|i| m.create! :name => "user#{'%03d' % i}", :age => (i / 10)}
+      end
+    end
+    after :all do
+      [User, GemDefinedModel, Device].each {|m| m.delete_all }
     end
 
     [User, Admin, GemDefinedModel, Device].each do |model_class|

data/spec/models/mongoid/mongoid_spec.rb

@@ -218,6 +218,11 @@ if defined? Mongoid
         subject { Device.all.page 1 }
         its(:limit_value) { should == 100 }
       end
+
+      context 'when paginates_per is defined in subclass of subclass' do
+        subject { Android.all.page 1 }
+        its(:limit_value) { should == 200 }
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kaminari
 version: !ruby/object:Gem::Version
-  version: 0.16.2
+  version: 0.16.3
 platform: ruby
 authors:
 - Akira Matsuda
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-20 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -259,6 +259,7 @@ files:
 - spec/helpers/sinatra_helpers_spec.rb
 - spec/helpers/tags_spec.rb
 - spec/models/active_record/active_record_relation_methods_spec.rb
+- spec/models/active_record/inherited_spec.rb
 - spec/models/active_record/scopes_spec.rb
 - spec/models/array_spec.rb
 - spec/models/configuration_methods_spec.rb
@@ -317,6 +318,7 @@ test_files:
 - spec/helpers/sinatra_helpers_spec.rb
 - spec/helpers/tags_spec.rb
 - spec/models/active_record/active_record_relation_methods_spec.rb
+- spec/models/active_record/inherited_spec.rb
 - spec/models/active_record/scopes_spec.rb
 - spec/models/array_spec.rb
 - spec/models/configuration_methods_spec.rb