api_only_pagination 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6d061e8e8b177a9162d5d74908e3cc3ba5e2fc2bae27e5d4623c036b31a8690
-  data.tar.gz: 6a8de04ac9425d054808fbb3c5d4554c28a3444753229f2a047891ebaa183a63
+  metadata.gz: 826fde0fb392a394358a65a5759171b45cc47f449785bf2877d6728f7dfb4f0e
+  data.tar.gz: 1b13d3e52a7cdac0de53a8a54c5751283fb5e6419fdf0ac85457b74124b0e600
 SHA512:
-  metadata.gz: e187502965e71964a3224647ffbaa34e13763780c292d8f01a3c2e350632bff1738d314a10a8b9534bf84522f6fdfdf8bad020c6dca122907040f27cc19a692b
-  data.tar.gz: d2d059b67a91be138b6aae23d0506c41c5d5c8ee957f5de172e338d5e2c2c53a6786d51f77606e24295f452fd354e7f0a986dd0a28c794032391effbbc4ae9b5
+  metadata.gz: 14eb5e9588e159cc148149135bdc6ef7b2b6879394300d4aa71d6da36fc7fe8049357aab703c9f2e3488fc7290c9671bede4eda9c9b2562fbb875d962b25935a
+  data.tar.gz: 47d8acd2be2b1f6ea72a689124156e9728404be2214232782fa733b01912e8a6875f0c62bd67eecba7c4b784d21d92ad0d5697b4f1cde2975d47e95eb3872bd5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    api_only_pagination (0.1.2)
+    api_only_pagination (0.1.4)
       activerecord (>= 5.0)
 
 GEM

data/lib/api_only_pagination/active_record_paginate.rb

@@ -6,18 +6,19 @@ module ApiOnlyPagination
   module ActiveRecordPaginate
     extend ActiveSupport::Concern
     module ClassMethods
-      def do_paginate(page = ApiOnlyPagination.configuration.default_page,
-                      per_page = ApiOnlyPagination.configuration.default_page_size)
-        pagination = ApiOnlyPagination::Pagination.new(all, { page: page, per_page: per_page })
-        meta_data = pagination.metadata
+      %i[do_paginate paginate paginated_response].each do |access_method|
+        define_method(access_method) do |page = ApiOnlyPagination.configuration.default_page, per_page = ApiOnlyPagination.configuration.default_page_size| # or even |*args|
+          pagination = ApiOnlyPagination::Pagination.new(all, { page: page, per_page: per_page })
+          meta_data = pagination.metadata
 
-        ApiOnlyPagination::PaginatedData
-          .new(data: pagination.results,
-               per_page: meta_data.per_page,
-               current_page: page,
-               total_pages: meta_data.total_pages,
-               total_records: meta_data.count)
-      end
+          ApiOnlyPagination::PaginatedData
+            .new(data: pagination.results,
+                 per_page: meta_data.per_page,
+                 current_page: meta_data.page,
+                 total_pages: meta_data.total_pages,
+                 total_records: meta_data.count)
+        end
+      end 
     end
   end
 end

data/lib/api_only_pagination/paginate.rb

@@ -9,6 +9,13 @@ module ApiOnlyPagination
       @count    = count
       @per_page = [(per_page.to_i || ApiOnlyPagination.configuration.default_page_size),
                    ApiOnlyPagination.configuration.max_per_page].min
+
+      validate_params
+    end
+
+    def validate_params
+      @page = @page.zero? ? ApiOnlyPagination.configuration.default_page : @page
+      @per_page = @per_page.zero? ? ApiOnlyPagination.configuration.default_page_size : @per_page
     end
 
     def offset

data/lib/api_only_pagination/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ApiOnlyPagination
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api_only_pagination
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Ashok
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-10 00:00:00.000000000 Z
+date: 2023-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord