wor-paginate 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: b7c776afdec6b7a3b5d25d291feee578bf5c197ab0504764cd820bad2d7a4ff0
-  data.tar.gz: 5a8daf10d3c2c4946ba9a3f93b4e471b6d7df4f36fb3dbd7dc012b8aae7ee482
+SHA1:
+  metadata.gz: c6a4d0f06558e5204961f4db988546335b5e51b3
+  data.tar.gz: b56ec43ef75a22e28c255c9ca0a7f4054a66fbed
 SHA512:
-  metadata.gz: 563abfa98659357d211b0a2a82879c4ebfb990d3a1305a1ce45520457fccc40a01fd1337d3454a1e292a3fcdb3250fb0905a9b6558f81685af9ea0ed5db17626
-  data.tar.gz: c48165f34eaf321463d679fbb252bde74250b789cc82c3789e0d88cfa271f492bb8d6f24b77cbdc812e64ab32695361ab2aa44aa612439646855f724d1805880
+  metadata.gz: a75d8db76635df594ad2870088cc12b151c7dc4c65af4029c3dc92a527f6eb370fa2a0744e9a704fc47776d913df6c744128abebecd9f278e555b8810be7c7a7
+  data.tar.gz: b40078aee535d5c676afd501b96e9bfbd781c17143dbb7ac3923ea8593f98c5db66be41f8ab7c4e477e7e748a57c6a5ee494c0ac19a8eccad2473b569444d47e

data/.rubocop.yml

@@ -5,6 +5,7 @@ AllCops:
     - spec/dummy/db/**/*
     - spec/dummy/config/**/*
     - spec/spec_helper.rb
+  TargetRubyVersion: 2.3.8
 
 Documentation:
   Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Change log
 
+### V0.1.9
+* [#88](https://github.com/Wolox/wor-paginate/pull/88) Default adapter - [@mtejedorwolox](https://github.com/mtejedorwolox).
+* [#87](https://github.com/Wolox/wor-paginate/pull/87) Supporting expect(response).to be_paginated - [@mnmallea](https://github.com/mnmallea).
+* [#86](https://github.com/Wolox/wor-paginate/pull/86) Added previous_page parameter - [@juanpablo-rojas](https://github.com/juanpablo-rojas).
+
 ### V0.1.8
 * [#85](https://github.com/Wolox/wor-paginate/pull/85) Delete max Railties dependency in gemspec - [@lucasvoboril](https://github.com/lucasvoboril).
 

data/README.md

@@ -88,6 +88,7 @@ The response to the index will then be:
   "total_pages": 2,
   "total_count": 28,
   "current_page": 1,
+  "previous_page": null,
   "next_page": 2
 }
 ```

data/lib/generators/templates/wor_paginate.rb

@@ -10,4 +10,16 @@ Wor::Paginate.configure do |config|
   # For more info about available methods for formatters see:
   # https://github.com/Wolox/wor-paginate/blob/master/lib/wor/paginate/formatter.rb
   # config.formatter = Wor::Paginate::Formatter
+
+  # Configure a default adapter to use on pagination
+  # config.default_adapter = nil
+
+  # Default: nil
+  # Possible values:
+  # Wor::Paginate::Adapters::KaminariAlreadyPaginated
+  # Wor::Paginate::Adapters::WillPaginateAlreadyPaginated
+  # Wor::Paginate::Adapters::WillPaginate
+  # Wor::Paginate::Adapters::Kaminari
+  # Wor::Paginate::Adapters::ActiveRecord
+  # Wor::Paginate::Adapters::Enumerable
 end

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

@@ -24,8 +24,15 @@ module Wor
 
         def next_page
           return nil if page >= total_pages
+
           page + 1
         end
+
+        def previous_page
+          return nil if page == 1
+
+          page - 1
+        end
       end
     end
   end

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

@@ -4,11 +4,10 @@ module Wor
       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 ||= @content.reorder(nil).size
+            return @content_size.keys.size if @content_size.is_a? Hash
 
-            content_size
+            @content_size
           end
         end
       end

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

@@ -13,6 +13,10 @@ module Wor
           @paginated_content ||= @content.page(@page).per(@limit)
         end
 
+        def previous_page
+          paginated_content.prev_page
+        end
+
         delegate :count, :total_count, :total_pages, :next_page, to: :paginated_content
       end
     end

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

@@ -23,7 +23,7 @@ module Wor
           paginated_content.to_a.size
         end
 
-        delegate :total_pages, :next_page, to: :paginated_content
+        delegate :total_pages, :previous_page, :next_page, to: :paginated_content
       end
     end
   end

data/lib/wor/paginate/config.rb

@@ -7,7 +7,8 @@ module Wor
         page_param: :page,
         per_page_param: :limit,
         formatter: Wor::Paginate::Formatter,
-        max_limit: 50
+        max_limit: 50,
+        default_adapter: nil
       }.freeze
 
       module_function

data/lib/wor/paginate/formatter.rb

@@ -15,13 +15,14 @@ module Wor
           total_pages: total_pages,
           total_count: total_count,
           current_page: current_page,
+          previous_page: previous_page,
           next_page: next_page
         }
       end
 
       protected
 
-      delegate :count, :total_count, :total_pages, :next_page, to: :adapter
+      delegate :count, :total_count, :total_pages, :previous_page, :next_page, to: :adapter
 
       def current_page
         adapter.page.to_i

data/lib/wor/paginate/paginate.rb

@@ -32,8 +32,9 @@ module Wor
     end
 
     def find_adapter_for_content(content, options)
-      ADAPTERS.map { |adapter| adapter.new(content, page(options), limit(options)) }
-              .find(&:adapt?)
+      Config.default_adapter&.new(content, page(options), limit(options)) ||
+        ADAPTERS.map { |adapter| adapter.new(content, page(options), limit(options)) }
+                .find(&:adapt?)
     end
 
     def page(options)

data/lib/wor/paginate/rspec.rb

@@ -28,9 +28,14 @@ end
 
 RSpec::Matchers.define :be_paginated do
   match do |actual_response|
+    response = parse_response(actual_response)
     formatter = @custom_formatter || Wor::Paginate::Formatter
     @formatted_keys = formatter.new(MockedAdapter.new).format.as_json.keys
-    actual_response.keys == @formatted_keys
+    response.keys == @formatted_keys
+  end
+
+  def parse_response(response)
+    response.is_a?(Hash) ? response : JSON.parse(response.body)
   end
 
   chain :with do |custom_formatter|
@@ -38,10 +43,11 @@ RSpec::Matchers.define :be_paginated do
   end
 
   failure_message do |actual_response|
-    "expected that #{actual_response} to be paginated with keys #{@formatted_keys}"
+    "expected that #{parse_response(actual_response)} to be paginated with keys #{@formatted_keys}"
   end
 
   failure_message_when_negated do |actual_response|
-    "expected that #{actual_response} not to be paginated with keys #{@formatted_keys}"
+    "expected that #{parse_response(actual_response)} not " \
+     "to be paginated with keys #{@formatted_keys}"
   end
 end

data/lib/wor/paginate/version.rb

@@ -1,5 +1,5 @@
 module Wor
   module Paginate
-    VERSION = '0.1.8'.freeze
+    VERSION = '0.1.9'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wor-paginate
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - icoluccio
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-12 00:00:00.000000000 Z
+date: 2019-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -82,6 +82,7 @@ files:
 - lib/wor/paginate/rspec.rb
 - lib/wor/paginate/version.rb
 - pull_request_template.md
+- test.sqlite3
 - wor-paginate.gemspec
 homepage: https://github.com/Wolox/wor-paginate
 licenses:
@@ -102,7 +103,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubyforge_project: 
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Simplified pagination for Rails API controllers