yap 1.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 977481c7c3322da6e497d1d853a316cfa58e8322
-  data.tar.gz: e5aee06760c0f49d79539c3f1105eb30625291d1
+  metadata.gz: 7c06ad590d341b79057d52f99af8c20400b8ac9e
+  data.tar.gz: f6b3102bf46259bf4a60fc1178a864e357236b39
 SHA512:
-  metadata.gz: 34b7c4a7a2b88477e0bb1578c807f94fbf2743ce7c582d6d12eb48acdc1e6401954b66c92fa217982d014f902f61b648f3f365639a021f08d6a2fcbb217cfe68
-  data.tar.gz: 522e1d53ba3134c86ce946b743a91e7abd3529b69f98094755dc6d2e237625d9ed809d800d4307474c968e614b31403070b4b30486c65d115f9a6882226bdefa
+  metadata.gz: 76221f22ab11ecc78f5c9f9f7b27b576d9be29621f2fa62a02ceef6d24158a7ef7311fec1872af0b62960fa2816fd44c316a0b9c3ee74ffc153e35e28259fc75
+  data.tar.gz: 25a75e83e8d189a70d24b0d71682840816236743541d1230ee98969bfe254b82009df3b483e1311b2de48da237ebd85b2132105aebd5b8d9ebe465b608dc8654

data/README.md

@@ -67,6 +67,17 @@ Assuming you included `Yap` into `User`, you can now do something like this:
     end
     # => total number of results
 
+    User.paginate(
+      sort: {
+        'gender'        => 'desc',
+        'date_of_birth' => 'asc'
+      }
+    )
+    # => Sort by gender and date_of_birth (method 1)
+
+    User.paginate(sort: 'gender,date_of_birth', direction: 'desc,asc')
+    # => Sort by gender and date_of_birth (method 2)
+
     User.filter('gender' => 'f')
     # => All female users
 
@@ -149,11 +160,14 @@ If an option cannot be parsed it will raise `Yap::PaginationError` or `Yap::Filt
       end
     end
 
-## ToDos
+## Changelog
 
-* Make gathering total/range optional
+### 1.2
 
-## Changelog
+* added sorting by multiple elements
+  * method 1: ?sort[team]=desc&sort[date_of_birth]=asc
+  * method 2: ?sort=team,date_of_birth&direction=desc,asc
+    * missing directions will fall back to default
 
 ### 1.1
 

data/lib/yap.rb

@@ -55,10 +55,9 @@ module Yap
       if DEFAULTS.hard_limit && per_page > DEFAULTS.hard_limit
         raise PaginationError.new("Not more than #{DEFAULTS.hard_limit} items per page accepted.")
       end
-      sort = extract_column(params[:sort])
-      direction = extract_direction(params[:direction])
+      sort = extract_order(params[:sort], params[:direction])
 
-      return page, per_page, (sort =~ /\./ ? "#{sort} #{direction}" : { sort => direction })
+      return page, per_page, sort
     end
 
     def self.extract_number(number, default)
@@ -73,6 +72,36 @@ module Yap
       number
     end
 
+    def self.extract_order(sort, direction)
+      sort = sort.split(',') if sort.is_a?(String) && sort =~ /,/
+      direction = direction.split(',') if direction.is_a?(String) && direction =~ /,/
+
+      case sort
+      when Array
+        order = []
+        direction = Array.wrap direction
+        sort.each_with_index do |s, i|
+          order << build_order_by(s, direction[i] || DEFAULTS.direction)
+        end
+
+        order
+      when Hash
+        sort.map do |s, d|
+          build_order_by(s, d)
+        end
+      else
+        build_order_by sort, direction
+      end
+    end
+
+    def self.build_order_by(sort, direction)
+      sort = extract_column(sort)
+      direction = extract_direction(direction)
+
+      (sort =~ /\./ ? "#{sort} #{direction}" : { sort => direction })
+    end
+    private_class_method :build_order_by
+
     def self.extract_column(sort)
       sort ||= DEFAULTS.sort
       column = map_column(sort.to_s.downcase)

data/lib/yap/filter.rb

@@ -21,13 +21,13 @@ module Yap
         when /(.+)\.{2}(.+)/
           value = $1..$2
         else
+          # Convert null to ruby nil to use 'IS NULL' in SQL.
           value = value.downcase == 'null' ? nil : value
         end
 
         # Ensure filter contains an array to append to.
         self[match][column] ||= []
 
-        # Convert null to ruby nil to use 'IS NULL' in SQL.
         self[match][column] << value
       end
     end

data/lib/yap/version.rb

@@ -0,0 +1,3 @@
+module Yap
+  VERSION = '1.2.2'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yap
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: 1.2.2
 platform: ruby
 authors:
 - Finn Glöe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -53,7 +53,8 @@ files:
 - lib/yap/exceptions.rb
 - lib/yap/filter.rb
 - lib/yap/filterable.rb
-homepage: http://rubygems.org/gems/yap
+- lib/yap/version.rb
+homepage: https://github.com/1and1/yap
 licenses:
 - GPL v2
 metadata: {}
@@ -73,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Yet another paginator for Ruby on Rails