kaminari-core 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 411d49d8ce83d73051514c6ef479b92ce907eea9
-  data.tar.gz: fa0c4408c8e22ccac81ced012536294624bb5b82
+  metadata.gz: 71383288887542c1c6fa3f97848d7c8808c832e6
+  data.tar.gz: 39eaef3145689f64c2d2811365f581d133891c7a
 SHA512:
-  metadata.gz: 85c3fc1e602c9eb2d23ea4a837cf38055adbb01943862b3c73323eeddc98c417cb6561b5f1c05b916b11af271ed0d5f00270ab052d5af120f41542eee753e735
-  data.tar.gz: dee9d87b0e03af6529afd73d586169382deb47d553dfea2702300895169366fbc1f881b5fcfe4205f35a8a4df0bb92657b87e44d666e5580981969e8c111e42b
+  metadata.gz: fd05edc2e7fe87e05f73837e6c299a9a944423a34e37972a790c448c490d3b3fdf749950174cbc7cbbbd832286015a5638df67c5c426fa5239903eff9e5540e1
+  data.tar.gz: 376afd5167b074d3a73afa27b38b4a3d86b7eb1071ebf392e64508484a9708ad7103ed06f1870e6fef4d770c1a3ac2bbeed6538facf366acc675165ec5066c30

data/CHANGELOG.md

@@ -0,0 +1 @@
+See https://github.com/kaminari/kaminari/tree/master/CHANGELOG.md for changes.

data/README.md

@@ -18,12 +18,12 @@ And bundle.
 
 This gem is basically an internal gem that will be automatically bundled from kaminari gem or kaminari adapter gems.
 
-See [Kaminari README](https://github.com/amatsuda/kaminari/blob/master/README.md) for the documentation.
+See [Kaminari README](https://github.com/kaminari/kaminari/blob/master/README.md) for the documentation.
 
 
 ## Contributing
 
-Pull requests are welcome on GitHub at https://github.com/amatsuda/kaminari.
+Pull requests are welcome on GitHub at https://github.com/kaminari/kaminari.
 
 
 ## License

data/kaminari-core.gemspec

@@ -12,8 +12,9 @@ Gem::Specification.new do |spec|
 
   spec.summary       = "Kaminari's core pagination library"
   spec.description   = 'kaminari-core includes pagination logic independent from ORMs and view libraries'
-  spec.homepage      = 'https://github.com/amatsuda/kaminari'
+  spec.homepage      = 'https://github.com/kaminari/kaminari'
   spec.license       = "MIT"
+  spec.required_ruby_version = '>= 2.0.0'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]

data/lib/kaminari/core/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Kaminari
   module Core
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

data/lib/kaminari/models/configuration_methods.rb

@@ -49,7 +49,7 @@ module Kaminari
       end
 
       def max_pages_per(val)
-        ActiveSupport::Deprecation.warn 'max_pages_per is deprecated. Use max_pages instead.', caller_locations(2)
+        ActiveSupport::Deprecation.warn 'max_pages_per is deprecated. Use max_pages instead.'
         max_pages val
       end
     end

data/lib/kaminari/models/page_scope_methods.rb

@@ -5,14 +5,12 @@ module Kaminari
     #   Model.page(3).per(10)
     def per(num, max_per_page: nil)
       max_per_page ||= ((defined?(@_max_per_page) && @_max_per_page) || self.max_per_page)
-      @_per = num
-      if num.nil? && max_per_page
-        limit(max_per_page).offset(offset_value / limit_value * max_per_page)
-      elsif (n = num.to_i) < 0 || !(/^\d/ =~ num.to_s)
+      @_per = (num || default_per_page).to_i
+      if (n = num.to_i) < 0 || !(/^\d/ =~ num.to_s)
         self
       elsif n.zero?
         limit(n)
-      elsif max_per_page && max_per_page < n
+      elsif max_per_page && (max_per_page < n)
         limit(max_per_page).offset(offset_value / limit_value * max_per_page)
       else
         limit(n).offset(offset_value / limit_value * n)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaminari-core
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-10 00:00:00.000000000 Z
+date: 2017-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -46,6 +46,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - MIT-LICENSE
 - README.md
 - app/views/kaminari/_first_page.html.erb
@@ -86,7 +87,7 @@ files:
 - lib/kaminari/models/configuration_methods.rb
 - lib/kaminari/models/page_scope_methods.rb
 - lib/kaminari/railtie.rb
-homepage: https://github.com/amatsuda/kaminari
+homepage: https://github.com/kaminari/kaminari
 licenses:
 - MIT
 metadata: {}
@@ -98,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="