yap 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6b0e9e0e3dc3083f3d0b547b73c9798aea4df38
-  data.tar.gz: cb97d4f95634d81f5d5f9a7fd5bf15dbce071fff
+  metadata.gz: 25cfbc9977c71d10fc1a33ab813eff876c633401
+  data.tar.gz: ab538d4945cd053de7db5072e5238a6e9655cf48
 SHA512:
-  metadata.gz: d10b61aed2e0f9757ca7b08006b4b60640a661c052f9d7dcbad5bd3bde800393f488f92ecd9add039bff0a574d44d9ee5af1485979f51ca003dd8c1504170235
-  data.tar.gz: fb430be1608425b2b82b06029c033812c987f1974cd652ff6401b5371f1015d889e89d52ea4727e66c5abe49fa1d570d8f4525257ed65ccf85e532882a55dc33
+  metadata.gz: 94eb394ae4b57e7fd28adcc819501095337be522cec96b9982f909c6c1d79e30cfe538e8b134cf0fb90ee6e8eab366a23df3010222a7ed57a16bb27ed2ac0661
+  data.tar.gz: 0f6a6fe7afd9e646253809a99de8b926804f2550c40ee4236631dbcc2bafc4560866f8ca87c481323029b643b9a69046fbe38a505d762aceadfe689e6457200a

data/README.md

@@ -1,4 +1,4 @@
-# yap v0.3.2
+# yap v0.3.3
 
 Yet another paginator for Ruby on Rails, which adds a `paginate` scope to your ActiveRecords.
 

data/lib/yap/filter.rb

@@ -15,7 +15,10 @@ module Yap
           match = :where
         end
 
-        if value =~ /(.+)\.\.(.+)/
+        case value
+        when /(.+)\.{3}(.+)/
+          value = $1...$2
+        when /(.+)\.{2}(.+)/
           value = $1..$2
         else
           value = value.downcase == 'null' ? nil : value

data/lib/yap.rb

@@ -26,7 +26,7 @@ module Yap
   include Filterable
 
   DEFAULTS = Struct.new(:page, :per_page, :sort, :direction, :disable_warnings)
-                 .new(1, 10, 'id', 'ASC', false)
+                 .new(1, 10, :id, :asc, false)
 
   def self.configure
     raise ArgumentError, 'No block given.' unless block_given?
@@ -50,8 +50,8 @@ module Yap
     # @param [Hash] The parameters used for pagination (:page, :per_page, :sort, :direction)
     #
     scope :paginate, -> (params = {}) {
-      page, per_page, column, direction = extract_pagination_params(params)
-      filter(params[:filter]).limit(per_page).offset((page-1)*per_page).order("#{column} #{direction}")
+      page, per_page, order_by = extract_pagination_params(params)
+      filter(params[:filter]).limit(per_page).offset((page-1)*per_page).order(order_by)
     }
 
     private
@@ -62,7 +62,7 @@ module Yap
       sort = extract_column(params[:sort])
       direction = extract_direction(params[:direction])
 
-      return page, per_page, sort, direction
+      return page, per_page, (sort =~ /\./ ? "#{sort} #{direction}" : { sort => direction })
     end
 
     def self.extract_number(number, default)
@@ -86,8 +86,8 @@ module Yap
 
     def self.extract_direction(direction)
       direction ||= DEFAULTS.direction
-      dir = (direction).to_s.upcase
-      raise PaginationError.new("'#{direction}' is not a valid direction. Use 'asc' or 'desc'.") unless %w[ASC DESC].include? dir
+      dir = (direction).to_sym.downcase
+      raise PaginationError.new("'#{direction}' is not a valid direction. Use 'asc' or 'desc'.") unless [:asc, :desc].include? dir
       dir
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yap
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Finn Glöe
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement