yap 0.0.2 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 652e0f8b08ebf6db3a3d4abcef18ff18c2b396dd
-  data.tar.gz: bc167399e7a104e1a2976c321e234a1ae6ef0e73
+  metadata.gz: a6132b923e8420349b899bae89b59facfd4b3e3f
+  data.tar.gz: a951a562f70ad37f9ab830f4816a028c08da99da
 SHA512:
-  metadata.gz: 1ddb459b81ce8a96002c204820ddda8ded839280f9033c943dc48b98b44533593e829c48d5671faa8c72eef95ff47171b46b8a93fec34cb1807179d8fab21262
-  data.tar.gz: 9f27ba7825b48da80fd3a2d520c3709498aa99a8da7a53b7530c7c0bb5a89490128e232b1caacf06ccccd7b9148a1168a76b5baa255270e632ce34fac706fa6d
+  metadata.gz: ca05f1a2d8d221441b19bd30936a57868b726263f00425feac3ac8aa2f3075508c3b36cc148419a0c4ae0e91ce8f87f78d9e20da5e51c8d01b629b29a3cf4e26
+  data.tar.gz: 195d596aae8ef0dcf931642b68049fce688220ef00b4a92609e513a8287c41c49b2cd040927c7730af09a2d98baaa2cc9beb371ee76abbceb9644979869b458e

data/lib/yap.rb

@@ -18,8 +18,8 @@ require 'active_support/concern'
 module Yap
   extend ActiveSupport::Concern
 
-  DEFAULTS = Struct.new(:page, :per_page, :sort, :direction)
-                 .new(1, 10, :id, :asc)
+  DEFAULTS = Struct.new(:page, :per_page, :sort, :direction, :disable_warnings)
+                 .new(1, 10, 'id', 'ASC', false)
 
   def self.configure
     raise ArgumentError, 'No block given.' unless block_given?
@@ -30,8 +30,8 @@ module Yap
     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)
+      page, per_page, column, direction = extract_pagination_params(params)
+      limit(per_page).offset((page-1)*per_page).order("#{column} #{direction}")
     }
 
     private
@@ -39,7 +39,7 @@ module Yap
     def self.extract_pagination_params(params)
       page = extract_number(params[:page], DEFAULTS.page)
       per_page = extract_number(params[:per_page], DEFAULTS.per_page)
-      sort = extract_sort(params[:sort])
+      sort = extract_column(params[:sort])
       direction = extract_direction(params[:direction])
 
       return page, per_page, sort, direction
@@ -56,17 +56,28 @@ module Yap
       number
     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
+    def self.extract_column(sort)
+      column = map_column(sort.present? ? sort.to_s.downcase : DEFAULTS.sort)
+      raise PaginationError.new("Cannot sort by '#{sort}'.") unless column
+      column
     end
 
     def self.extract_direction(direction)
-      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 = direction.present? ? direction.to_s.upcase : DEFAULTS.direction
+      raise PaginationError.new("'#{direction}' is not a valid direction. Use 'asc' or 'desc'.") unless %w[ASC DESC].include? dir
       dir
     end
+
+    private
+
+    def self.map_column(name)
+      begin
+        map_name_to_column(name)
+      rescue
+        warn "#{self.name} does not implement map_name_to_column. If you do not need column mapping set disable_warnings=true" unless DEFAULTS.disable_warnings
+        nil
+      end || (column_names.include?(name) ? name : nil)
+    end
   end
 
   module ClassMethods

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yap
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.1
 platform: ruby
 authors:
 - Finn Glöe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-09 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Yet another paginator for Ruby on Rails