api-pagination 4.7.1 → 4.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4cf55ba5db9b488ae0e9e16e9d14b839a8ada930697c39c00d1192f7cfc5456
-  data.tar.gz: a79c32b444ab9b6b84d3f5bbf6312feb46a031ae5ee8b930b3dd553456b207d2
+  metadata.gz: fcd1a8e55bce363ef14c8fca2ff4a06ea1cf325e61fe2eba564d6bcbcb0cbb43
+  data.tar.gz: 66a8a77cc4e1fa163ce3e644c2828388778efaab24783967c2c9e7986a83ac30
 SHA512:
-  metadata.gz: 6208062d94a1f57d62be3cbf2cd552d6fe86a2af30ae3dde1d2efe1f3ff2c629215ec69aa6c5fd04452ce99be6e79c9395af76a0821e5f4fb039d44c470b8d44
-  data.tar.gz: c91fa40ad83fade4d1d76f0977828b7263d07b6d5d3b1b47e76a65f9fb3bd8530ed143548b6b89e8ba1b1f73b0a04a3498cd0bfb0e3f4541a379aad4e4b5ac38
+  metadata.gz: 475209b5986a009d9bc52cded5269fec22998e6d94c419635772950ee17ea7a1b0a01818b6791f009fe9da545022522f2ba0303a5fae93d81a364f3bc740cb1e
+  data.tar.gz: 355d8e7786bf49318941d48ea57ff6fd81fd6cf9b97d9e185fb1302eb20dc4144100f3fce675809d73bffc0341b0f100e37fb3f12a2e6c51ea9b98e4d9db5a03

data/lib/api-pagination/hooks.rb

@@ -1,26 +1,3 @@
-begin; require 'rails'; rescue LoadError; end
-begin; require 'rails-api'; rescue LoadError; end
-
-if defined?(Rails)
-  module ApiPagination
-    module Hooks
-      def self.rails_parent_controller
-        if Gem::Version.new(Rails.version) >= Gem::Version.new('5') || defined?(ActionController::API)
-          ActionController::API
-        else
-          ActionController::Base
-        end
-      end
-    end
-  end
-
-  require 'rails/pagination'
-
-  ActiveSupport.on_load(:action_controller) do
-    ApiPagination::Hooks.rails_parent_controller.send(:include, Rails::Pagination)
-  end
-end
-
 begin; require 'grape'; rescue LoadError; end
 if defined?(Grape::API)
   require 'grape/pagination'
@@ -40,3 +17,18 @@ unless defined?(Kaminari) || defined?(WillPaginate::CollectionMethods)
   WARNING
 end
 
+if defined?(Rails)
+  module ApiPagination
+    module Hooks
+      def self.rails_parent_controller
+        if Rails::VERSION::MAJOR >= 5 || defined?(ActionController::API)
+          ActionController::API
+        else
+          ActionController::Base
+        end
+      end
+    end
+  end
+
+  require 'api-pagination/railtie'
+end

data/lib/api-pagination/railtie.rb

@@ -0,0 +1,19 @@
+require 'rails/railtie'
+
+module ApiPagination
+  class Railtie < ::Rails::Railtie
+    initializer :api_pagination do
+      ActiveSupport.on_load(:action_controller) do
+        require 'rails/pagination'
+
+        klass = if Rails::VERSION::MAJOR >= 5 || defined?(ActionController::API)
+          ActionController::API
+        else
+          ActionController::Base
+        end
+
+        klass.send(:include, Rails::Pagination)
+      end
+    end
+  end
+end

data/lib/api-pagination/version.rb

@@ -2,7 +2,7 @@ module ApiPagination
   class Version
     MAJOR = 4
     MINOR = 7
-    PATCH = 1
+    PATCH = 2
 
     def self.to_s
       [MAJOR, MINOR, PATCH].join('.')

data/spec/support/numbers_controller.rb

@@ -1,4 +1,4 @@
-require 'action_controller'
+require 'action_controller/railtie'
 require 'api-pagination/hooks'
 require 'ostruct'
 
@@ -59,7 +59,7 @@ class NumbersSerializer
   end
 end
 
-class NumbersController < ApiPagination::Hooks.rails_parent_controller
+class NumbersController < ActionController::API
   include Rails.application.routes.url_helpers
 
   def index
@@ -99,3 +99,5 @@ class NumbersController < ApiPagination::Hooks.rails_parent_controller
     render json: NumbersSerializer.new(numbers)
   end
 end
+
+ApiPagination::Railtie.initializers.each(&:run)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api-pagination
 version: !ruby/object:Gem::Version
-  version: 4.7.1
+  version: 4.7.2
 platform: ruby
 authors:
 - David Celis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-25 00:00:00.000000000 Z
+date: 2018-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -90,6 +90,7 @@ files:
 - lib/api-pagination.rb
 - lib/api-pagination/configuration.rb
 - lib/api-pagination/hooks.rb
+- lib/api-pagination/railtie.rb
 - lib/api-pagination/version.rb
 - lib/grape/pagination.rb
 - lib/rails/pagination.rb