yap 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a6e5086f1ca35d0aaf0fadbc47d90b07734bd2b
-  data.tar.gz: 42d6f6430addc6accecfb55958c689528aa11131
+  metadata.gz: 652e0f8b08ebf6db3a3d4abcef18ff18c2b396dd
+  data.tar.gz: bc167399e7a104e1a2976c321e234a1ae6ef0e73
 SHA512:
-  metadata.gz: 015d9317569706f7fe83ac1e877b4c750480fd05e09d79f048df30083b505448f5d6f021d588dae713a0fc7bdb89d7fca278989e56996af33e90f5fd32fa22bc
-  data.tar.gz: 3c98bd37fa8c4988dec2e2cd8a4cdac610f3c179f92d4c884e35f46e14559403bfdc708407f8f564577197fad4dfea9436d25dff35033ae694929e2336c807ed
+  metadata.gz: 1ddb459b81ce8a96002c204820ddda8ded839280f9033c943dc48b98b44533593e829c48d5671faa8c72eef95ff47171b46b8a93fec34cb1807179d8fab21262
+  data.tar.gz: 9f27ba7825b48da80fd3a2d520c3709498aa99a8da7a53b7530c7c0bb5a89490128e232b1caacf06ccccd7b9148a1168a76b5baa255270e632ce34fac706fa6d

data/lib/yap.rb

@@ -27,6 +27,8 @@ module Yap
   end
 
   included do
+    extend ClassMethods
+
     scope :paginate, -> (params = {}) {
       page, per_page, sort, direction = extract_pagination_params(params)
       limit(per_page).offset((page-1)*per_page).order(sort => direction)
@@ -35,17 +37,17 @@ module Yap
     private
 
     def self.extract_pagination_params(params)
-      page = params[:page].present? ? extract_number(params[:page]) : DEFAULTS.page
-      per_page = params[:per_page].present? ? extract_number(params[:per_page]) : DEFAULTS.per_page
-      sort = params[:sort].present? ? extract_sort(params[:sort]) : DEFAULTS.sort
-      direction = params[:direction].present? ? extract_direction(params[:direction]) : DEFAULTS.direction
+      page = extract_number(params[:page], DEFAULTS.page)
+      per_page = extract_number(params[:per_page], DEFAULTS.per_page)
+      sort = extract_sort(params[:sort])
+      direction = extract_direction(params[:direction])
 
       return page, per_page, sort, direction
     end
 
-    def self.extract_number(number)
+    def self.extract_number(number, default)
       begin
-        number = Integer(number)
+        number = number.present? ? Integer(number) : default
       rescue
         raise PaginationError.new("'#{number}' is not a valid number.")
       end
@@ -55,16 +57,24 @@ module Yap
     end
 
     def self.extract_sort(sort)
+      sort = sort.present? ? sort : DEFAULTS.sort
       raise PaginationError.new("Cannot sort by '#{sort}'.") unless column_names.include? sort.to_s
       sort
     end
 
     def self.extract_direction(direction)
-      dir = direction.downcase.to_sym
+      dir = direction.present? ? direction.downcase.to_sym : DEFAULTS.direction
       raise PaginationError.new("'#{direction}' is not a valid direction. Use 'asc' or 'desc'.") unless [:asc, :desc].include? dir
       dir
     end
   end
 
+  module ClassMethods
+    def last_page(params)
+      per_page = extract_number(params[:per_page], DEFAULTS.per_page)
+      (count / per_page.to_f).ceil
+    end
+  end
+
   class PaginationError < StandardError; end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yap
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Finn Glöe
@@ -58,7 +58,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="