api-pagination 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c24620f87870aa113532b4e5b68ac39d48196a8
-  data.tar.gz: c5b6ebc23e6db9248dcedfa86ae6def3ddd91b0f
+  metadata.gz: a5be5003544e0eb53e5149d0ce0e1062f081834a
+  data.tar.gz: b3df8c7d6d0fd12721c32283a27c1f5c05b40ab6
 SHA512:
-  metadata.gz: fe232ed61e1987363a1da75f58480f1f5d0485364180c08b9a3ce3ebf5079a1ec34c5448b43e2e94b019b29a72b820539371274cefde5835e96476204c9c3e70
-  data.tar.gz: 33bbf495e991be605c548d6f20c804a79339f1a45ec47eca36c469fb544389e6918daa7f9eb9fb9cfb8ef567a6be2945379b1168cfe46d780f499fb7a61e69ac
+  metadata.gz: 2a1b6e4a3cac799cfc8da269937defa9e309001502e156a66b571eaa465f67fd1681ab443c43eeac1c63d1ee39c03e8c77561136e9295da58f31dafa4b04c119
+  data.tar.gz: ed859205ed82ea72ac784e658ad25d5c92d55d0d47a5a34e745f0903b9ddb3708dff75117f2b46bc13b6f598ffb32b0124aaec989e025b33433048a2133933be

data/lib/api-pagination/configuration.rb

@@ -1,7 +1,5 @@
 module ApiPagination
   class Configuration
-    attr_reader :paginator
-
     attr_accessor :total_header
 
     attr_accessor :per_page_header
@@ -13,11 +11,14 @@ module ApiPagination
     def initialize
       @total_header    = 'Total'
       @per_page_header = 'Per-Page'
-      set_paginator
+    end
+
+    def paginator
+      @paginator || set_paginator
     end
 
     def paginator=(paginator)
-      case paginator
+      case paginator.to_sym
       when :kaminari
         use_kaminari
       when :will_paginate
@@ -34,39 +35,26 @@ module ApiPagination
         Kernel.warn <<-WARNING
 Warning: api-pagination relies on either Kaminari or WillPaginate, but both are
 currently active. If possible, you should remove one or the other. If you can't,
-you must configure api-pagination on your own. For example:
+you _must_ configure api-pagination on your own. For example:
 
 ApiPagination.configure do |config|
-  config.paginator = Kaminari
+  config.paginator = :kaminari
+end
+
+You should also configure Kaminari to use a different `per_page` method name as
+using these gems together causes a conflict; some information can be found at
+https://github.com/activeadmin/activeadmin/wiki/How-to-work-with-will_paginate
+
+Kaminari.configure do |config|
+  config.page_method_name = :per_page_kaminari
 end
 
 WARNING
       elsif defined?(Kaminari)
-        use_kaminari and return
+        return use_kaminari
       elsif defined?(WillPaginate::CollectionMethods)
-        use_will_paginate and return
-      end
-
-      begin
-        require 'kaminari'
-        use_kaminari and return
-      rescue LoadError
-      end
-
-      begin
-        require 'will_paginate'
-        use_will_paginate and return
-      rescue LoadError
+        return use_will_paginate
       end
-
-      Kernel.warn <<-WARNING
-Warning: api-pagination relies on either Kaminari or WillPaginate. Please
-install either dependency by adding one of the following to your Gemfile:
-
-gem 'kaminari'
-gem 'will_paginate'
-
-WARNING
     end
 
     def use_kaminari

data/lib/api-pagination/hooks.rb

@@ -15,3 +15,16 @@ if defined?(Grape::API)
   require 'grape/pagination'
   Grape::API.send(:include, Grape::Pagination)
 end
+
+begin; require 'kaminari';      rescue LoadError; end
+begin; require 'will_paginate'; rescue LoadError; end
+
+unless defined?(Kaminari) || defined?(WillPaginate::CollectionMethods)
+  Kernel.warn <<-WARNING.gsub(/^\s{4}/, '')
+    Warning: api-pagination relies on either Kaminari or WillPaginate. Please
+    install either dependency by adding one of the following to your Gemfile:
+
+    gem 'kaminari'
+    gem 'will_paginate'
+  WARNING
+end

data/lib/api-pagination/version.rb

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

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: api-pagination
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - David Celis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.9.0
 description: Link header pagination for Rails and Grape APIs
@@ -87,10 +87,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/api-pagination.rb
 - lib/api-pagination/configuration.rb
 - lib/api-pagination/hooks.rb
 - lib/api-pagination/version.rb
+- lib/api-pagination.rb
 - lib/grape/pagination.rb
 - lib/rails/pagination.rb
 - spec/grape_spec.rb
@@ -113,17 +113,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Link header pagination for Rails and Grape APIs. Don't use the request body.
@@ -138,4 +138,3 @@ test_files:
 - spec/support/shared_examples/first_page.rb
 - spec/support/shared_examples/last_page.rb
 - spec/support/shared_examples/middle_page.rb
-has_rdoc: