kaminari-mandatory_ordering 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8f508477e6af13a5d570312043deb83cfefb931
-  data.tar.gz: ada5e44036c2f4ea27eeff4f8378b7db21be8d7e
+  metadata.gz: 7773e3507b5b8276e9db8cd09c331a8b7bf7bf42
+  data.tar.gz: 17d6fc9277f4babecc5c0ed53a8d96ad222cde77
 SHA512:
-  metadata.gz: 5ae2cfdb4e336a4c5e8e91277ab0755d3a7838683d10755f873b373d1bb293fd70bb076a4a73baf0ff1ad903b792f478a30fec5207739139d8f094a8790bbea2
-  data.tar.gz: 536b20359a2fa1239ce99b84b1e28be603246a570885d4ee39f4817d70cfc69483d73b6955c7bcaa0bb748033a6e983b333fbb01285d69eff2fe38848484e467
+  metadata.gz: d0aa648e617c73a9c2aa0028d1aa5ac5e8be47f9a48597fdb134b377e2386e081359403fb5de76066bb902be052ff598f32422681d456b336743923a4d7e3e2f
+  data.tar.gz: 68660389c51527d9402ac7532de5676e7d899e9f3c1ea97af78758372ab6649e90a3f59cb68814939e980a735506909e60e5b94382e2b40ec20e5354bceead91

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+# 0.2.1
+
+Change how paging method is overriden
+
+# 0.2.0
+
+Drop ActiveRecord 4.1
+
+# 0.1.0
+
+Initial release

data/lib/kaminari/mandatory_ordering.rb

@@ -1,10 +1,9 @@
 require 'kaminari/mandatory_ordering/version'
-require 'kaminari/mandatory_ordering/error'
-require 'kaminari/mandatory_ordering/active_record_extension'
-require 'kaminari/mandatory_ordering/configuration'
+require 'active_support/lazy_load_hooks'
 
-module Kaminari
-  module MandatoryOrdering
-    ::ActiveRecord::Base.send :include, Kaminari::MandatoryOrdering::ActiveRecordExtension
-  end
+ActiveSupport.on_load :active_record do
+  require 'kaminari/mandatory_ordering/error'
+  require 'kaminari/mandatory_ordering/active_record_extension'
+  require 'kaminari/mandatory_ordering/configuration'
+  ::ActiveRecord::Base.send :include, Kaminari::MandatoryOrdering::ActiveRecordExtension
 end

data/lib/kaminari/mandatory_ordering/active_record_extension.rb

@@ -7,14 +7,14 @@ module Kaminari
 
       included do
         descendants.each do |klass|
-          klass.send(:prepend, Kaminari::MandatoryOrdering::ActiveRecordModelExtension)
+          klass.send(:include, Kaminari::MandatoryOrdering::ActiveRecordModelExtension) if klass.superclass == ::ActiveRecord::Base
         end
       end
 
       module ClassMethods
         def inherited(klass)
           super
-          klass.send(:prepend, Kaminari::MandatoryOrdering::ActiveRecordModelExtension)
+          klass.send(:include, Kaminari::MandatoryOrdering::ActiveRecordModelExtension) if klass.superclass == ::ActiveRecord::Base
         end
       end
     end

data/lib/kaminari/mandatory_ordering/active_record_model_extension.rb

@@ -2,18 +2,15 @@ module Kaminari
   module MandatoryOrdering
     module ActiveRecordModelExtension
       extend ActiveSupport::Concern
-
-      def self.prepended(klass)
-        return unless Kaminari.config.mandatory_ordering
-
-        original = klass.method(Kaminari.config.page_method_name)
-
-        klass.define_singleton_method(Kaminari.config.page_method_name) do |number|
-          if all.values.fetch(:order, []).none?
-            raise Kaminari::MandatoryOrdering::Error
-          else
-            # TODO: Find out why calling `super` fails to find the previously defined method.
-            original.call(number)
+      included do |base|
+        if Kaminari.config.mandatory_ordering
+          orig = base.method(Kaminari.config.page_method_name)
+          base.define_singleton_method(Kaminari.config.page_method_name) do |num = nil|
+            if all.values.fetch(:order, []).none?
+              raise Kaminari::MandatoryOrdering::Error
+            else
+              orig.call(num)
+            end
           end
         end
       end

data/lib/kaminari/mandatory_ordering/version.rb

@@ -1,5 +1,5 @@
 module Kaminari
   module MandatoryOrdering
-    VERSION = '0.2.0'.freeze
+    VERSION = '0.2.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaminari-mandatory_ordering
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Toms Mikoss
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-05 00:00:00.000000000 Z
+date: 2017-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kaminari
@@ -133,6 +133,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
@@ -167,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Makes sure ActiveRecord collections paged over by kaminari are ordered