wor-paginate 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: b525d480a4cfe283c91c14c2a8e2ce570b65ded15e2678d76f1e9c0f35143a24
-  data.tar.gz: 585dfb16534cc0daafe39dbe52d238a8f1142f80bc65085c95acc9f2e506e9d1
+SHA1:
+  metadata.gz: 8dd511971868270eef7127d6f538cc172293f668
+  data.tar.gz: bf95f5b82639f6ebfc7fcfedf678d282e5156676
 SHA512:
-  metadata.gz: da4b6ae0100e232077386f260c4465412d8cf010240a24011cd68308176f1c7082bbef1890c6f893c10a831d3ec56b8d2e005d33ec877d3f1d299d4888e4b053
-  data.tar.gz: 83e2ded8da3f41efb31765ed6ef29c076ec659e227c4aab579bf02a490f4c4afc6343a8a45fe3e456767195490fcd52f819a1b1e5f59bad85bb35e83693f4622
+  metadata.gz: 35e3fab61135534b3503248ea77a5a3ba42e1e98d738acda1fefb88c61ca030e05f18e7d0b617cd5282290cc0ee8e99135d75f38bb9b4e90e314ba111db36e33
+  data.tar.gz: d092291dba845fce0f0a21b1a5088124cc19f334fb84d21f6153433853c2ad8823df05ef4d94351047053fdd61de38a95230ceb9b27bda832a3bf09447851c39

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Change log
 
+### V0.1.7
+* [#61](https://github.com/Wolox/wor-paginate/pull/61) Allows requests on offset pages for enumerables - [@mtejedorwolox](https://github.com/mtejedorwolox).
+* [#63](https://github.com/Wolox/wor-paginate/pull/63) Add max_limit with optional parameter - [@blacksam07](https://github.com/blacksam07).
+* [#71](https://github.com/Wolox/wor-paginate/pull/71) Group by fix - [@mnmallea](https://github.com/mnmallea).
+* [#82](https://github.com/Wolox/wor-paginate/pull/71) Rails 6 support - [@mnmallea](https://github.com/mnmallea).
+
 ### V0.1.6
 * [#62](https://github.com/Wolox/wor-paginate/pull/62): Add options in active model serializer - [@blacksam07](https://github.com/blacksam07).
 

data/Gemfile

@@ -29,7 +29,7 @@ group :development, :test do
   gem 'rubocop', '~> 0.49.1'
   gem 'rubocop-rspec', '~> 1.15.0'
   gem 'simplecov', '~> 0.13.0'
-  gem 'sqlite3', '~> 1.3.0'
+  gem 'sqlite3', '~> 1.4'
   gem 'webmock', '~> 3.0.0'
   gem 'will_paginate', '~> 3.1.0'
 end

data/README.md

@@ -12,6 +12,7 @@ Wor::Paginate
     - [Basic usage](#basic-usage)
     - [Customizing output](#customizing-output)
       - [Custom serializers](#custom-serializers)
+      - [Custom options](#custom-options)
       - [Custom formatters](#custom-formatters)
     - [Working with Kaminari or will_paginate](#working-with-kaminari-or-will_paginate)
     - [Test helpers](#test-helpers)
@@ -105,11 +106,22 @@ render_paginated DummyModel, each_serializer: CustomDummyModelSerializer
 where the serializer is just an [`ActiveModel::Serializer`](https://github.com/rails-api/active_model_serializers).
 
 #### Custom options
+##### max_limit
+The max amount of items is passed through the `max_limit` option, You can set the value in the initializer or in the `render_paginated` method, (If none is supplied, take the default value configured in the initializer). Default is 50.
+
+```ruby
+  render_paginated DummyModel, max_limit: 100
+```
+
+##### current_user
 Using custom options in serializer, example method `current_user`
+
 ```ruby
 render_paginated DummyModel, each_serializer: CustomDummyModelSerializer, current_user: current_user
 ```
+
 In serializer
+
 ```ruby
 class CustomSerializer < ActiveModel::Serializer
   def method

data/lib/wor/paginate/adapters/active_record.rb

@@ -1,3 +1,5 @@
+require_relative 'helpers/total_count'
+
 # Used when render_paginated is called with an ActiveRecord directly, without a
 # pagination gem like kaminari or will_paginate
 ### render_paginated DummyModel
@@ -5,6 +7,8 @@ module Wor
   module Paginate
     module Adapters
       class ActiveRecord < Base
+        include Helpers::TotalCount
+
         attr_reader :page
 
         def required_methods
@@ -15,10 +19,8 @@ module Wor
           @paginated_content ||= @content.offset(offset).limit(@limit)
         end
 
-        delegate :count, to: :paginated_content
-
-        def total_count
-          @content.count
+        def count
+          paginated_content.size
         end
 
         def total_pages

data/lib/wor/paginate/adapters/enumerable.rb

@@ -13,7 +13,7 @@ module Wor
         def paginated_content
           return @paginated_content if @paginated_content
           content_array = @content.to_a
-          @paginated_content = content_array.slice((page - 1) * @limit, @limit)
+          @paginated_content = content_array.slice((page - 1) * @limit, @limit) || []
         end
 
         delegate :count, to: :paginated_content

data/lib/wor/paginate/adapters/helpers/total_count.rb

@@ -0,0 +1,17 @@
+module Wor
+  module Paginate
+    module Adapters
+      module Helpers
+        module TotalCount
+          def total_count
+            content = @content.reorder(nil)
+            content_size = content.size
+            return content.to_a.size if content_size.is_a? Hash
+
+            content_size
+          end
+        end
+      end
+    end
+  end
+end

data/lib/wor/paginate/adapters/will_paginate.rb

@@ -1,3 +1,5 @@
+require_relative 'helpers/total_count'
+
 # Used when render_paginated is called with an ActiveModel directly, with will_paginate
 # already required. Something like
 ### render_paginated DummyModel
@@ -5,6 +7,8 @@ module Wor
   module Paginate
     module Adapters
       class WillPaginate < Base
+        include Helpers::TotalCount
+
         attr_reader :page
 
         def required_methods
@@ -19,10 +23,6 @@ module Wor
           paginated_content.to_a.size
         end
 
-        def total_count
-          paginated_content.count
-        end
-
         delegate :total_pages, :next_page, to: :paginated_content
       end
     end

data/lib/wor/paginate/paginate.rb

@@ -44,6 +44,10 @@ module Wor
       options[:limit].to_i unless options[:limit].nil?
     end
 
+    def option_max_limit(options)
+      options[:max_limit].to_i unless options[:max_limit].nil?
+    end
+
     def param_limit
       params[Config.per_page_param].to_i unless params[Config.per_page_param].nil?
     end
@@ -54,7 +58,7 @@ module Wor
 
     def limit(options)
       [
-        Config.max_limit,
+        option_max_limit(options) || Config.max_limit,
         option_limit(options) || param_limit || Config.default_per_page
       ].min
     end

data/lib/wor/paginate/version.rb

@@ -1,5 +1,5 @@
 module Wor
   module Paginate
-    VERSION = '0.1.6'.freeze
+    VERSION = '0.1.7'.freeze
   end
 end

data/wor-paginate.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
 
-  s.add_dependency 'railties', '>= 4.1.0', "< 5.3"
+  s.add_dependency 'railties', '>= 4.1.0', "<= 6.0.0"
   s.add_dependency 'rails', '>= 4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wor-paginate
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - icoluccio
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-13 00:00:00.000000000 Z
+date: 2019-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -20,9 +20,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.0
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,9 +30,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.0
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -74,6 +74,7 @@ files:
 - lib/wor/paginate/adapters/active_record.rb
 - lib/wor/paginate/adapters/base.rb
 - lib/wor/paginate/adapters/enumerable.rb
+- lib/wor/paginate/adapters/helpers/total_count.rb
 - lib/wor/paginate/adapters/kaminari.rb
 - lib/wor/paginate/adapters/kaminari_already_paginated.rb
 - lib/wor/paginate/adapters/will_paginate.rb
@@ -107,7 +108,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubyforge_project: 
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Simplified pagination for Rails API controllers