yap 0.2.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4209a6b39a6416deb044ff771ee02c69ca4a4aa
-  data.tar.gz: 263b674a929599199a7834784e6c8952ae98bc78
+  metadata.gz: f6b0e9e0e3dc3083f3d0b547b73c9798aea4df38
+  data.tar.gz: cb97d4f95634d81f5d5f9a7fd5bf15dbce071fff
 SHA512:
-  metadata.gz: 0f09333d7565e16f89b1f6ed11df04dfaeadc772fcb5e6bc9af9d805592ddfc6d15f3855742fd6170fcf94b50bca1571c3cbd55ff1d4bca14aa4e9eb1583f97e
-  data.tar.gz: 9d3f5de083c85b3ad493f93bcfd669a0f29e06d0a3dd693bec90ad124dc29a33043c10dfe5b52d82472eb41e3f9c8389a24cdfa80e647d114776c9995b1bf07a
+  metadata.gz: d10b61aed2e0f9757ca7b08006b4b60640a661c052f9d7dcbad5bd3bde800393f488f92ecd9add039bff0a574d44d9ee5af1485979f51ca003dd8c1504170235
+  data.tar.gz: fb430be1608425b2b82b06029c033812c987f1974cd652ff6401b5371f1015d889e89d52ea4727e66c5abe49fa1d570d8f4525257ed65ccf85e532882a55dc33

data/README.md

@@ -1,4 +1,4 @@
-# yap v0.2.1
+# yap v0.3.2
 
 Yet another paginator for Ruby on Rails, which adds a `paginate` scope to your ActiveRecords.
 
@@ -45,7 +45,7 @@ internal naming from users and to make sorting by associations possible (more on
 
 Assuming you included `Yap` into `User`, you can now do something like this:
 
-    User.paginate                       # => Page 1 with default order and size.
+    User.paginate                       # => Page 1 with default order and size
     User.paginate(
         page:       1,
         per_page:   10,
@@ -56,16 +56,19 @@ Assuming you included `Yap` into `User`, you can now do something like this:
     User.last_page                      # => Last page as a number for defaults
     User.last_page(params)              # => Last page for given params. Works the same way as paginate.
 
-    User.filter('gender' => 'f')        # => All female users.
+    User.filter('gender' => 'f')        # => All female users
     User.filter(
         'team_id' => '1,2',
         'gender' => 'm'
-    )                                   # => All males of teams 1 and 2.
-    User.filter('team_id' => '!null')   # => All users with any team.
+    )                                   # => All males of teams 1 and 2
+    User.filter(
+        'date_of_birth' => '1990-01-01..1991-01-01'
+    )                                   # => All users born in 1990
+    User.filter('team_id' => '!null')   # => All users with any team
     User.paginate(
         page:   1,
         filter: { 'team' => 'null' }
-    )                                   # => Combining filter and pagination.
+    )                                   # => Combining filter and pagination
 
     User.paginate(params)               # => Passing parameters in controller (http://localhost/users?filter[gender]=f)
 
@@ -124,3 +127,4 @@ If an option cannot be parsed it will raise `Yap::PaginationError` or `Yap::Filt
 
 * Methods for generating next, previous and last page links
 * Maximum for per_page
+* Rescue from sql errors

data/lib/yap/filter.rb

@@ -0,0 +1,32 @@
+module Yap
+  class Filter < Hash
+    def initialize
+      self[:where] = {}
+      self[:not] = {}
+    end
+
+    def parse!(column, values)
+      values.to_s.split(',').each do |value|
+        # Perform negative match if value starts with '!'.
+        if value =~/^!(.+)$/
+          match = :not
+          value = $1
+        else
+          match = :where
+        end
+
+        if value =~ /(.+)\.\.(.+)/
+          value = $1..$2
+        else
+          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
+  end
+end

data/lib/yap/filterable.rb

@@ -1,6 +1,7 @@
 require 'active_support/concern'
 require 'yap/exceptions'
 require 'yap/column_mapper'
+require 'yap/filter'
 
 ##
 # ActiveRecords can be filtered by their attributes if either Yap or Filterable is included into the model. Filters can
@@ -43,30 +44,13 @@ module Yap
       private
 
       def self.extract_filter_params(params)
-        filter = {
-            where: {},
-            not: {}
-        }
+        filter = Filter.new
 
         failed = []
         params.each do |key, values|
           column = map_column(key.to_s.downcase)
           if column
-            values.to_s.split(',').each do |value|
-              # Perform negative match if value starts with '!'.
-              if value =~/^!(.+)$/
-                match = :not
-                value = $1
-              else
-                match = :where
-              end
-
-              # Ensure filter contains an array to append to.
-              filter[match][column] ||= []
-
-              # Convert null to ruby nil to use 'IS NULL' in SQL.
-              filter[match][column] << (value.downcase == 'null' ? nil : value)
-            end
+            filter.parse!(column, values)
           else
             failed << key
           end

data/lib/yap.rb

@@ -36,7 +36,7 @@ module Yap
   module ClassMethods
     def last_page(params)
       per_page = extract_number(params[:per_page], DEFAULTS.per_page)
-      (count / per_page.to_f).ceil
+      (filter(params[:filter]).count / per_page.to_f).ceil
     end
   end
 
@@ -66,8 +66,9 @@ module Yap
     end
 
     def self.extract_number(number, default)
+      number ||= default
       begin
-        number = number.present? ? Integer(number) : default
+        number = Integer(number)
       rescue
         raise PaginationError.new("'#{number}' is not a valid number.")
       end
@@ -77,13 +78,15 @@ module Yap
     end
 
     def self.extract_column(sort)
-      column = map_column(sort.present? ? sort.to_s.downcase : DEFAULTS.sort)
+      sort ||= DEFAULTS.sort
+      column = map_column(sort.to_s.downcase)
       raise PaginationError.new("Cannot sort by '#{sort}'.") unless column
       column
     end
 
     def self.extract_direction(direction)
-      dir = direction.present? ? direction.to_s.upcase : DEFAULTS.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
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yap
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Finn Glöe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-19 00:00:00.000000000 Z
+date: 2015-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -50,6 +50,7 @@ files:
 - lib/yap.rb
 - lib/yap/column_mapper.rb
 - lib/yap/exceptions.rb
+- lib/yap/filter.rb
 - lib/yap/filterable.rb
 homepage: http://rubygems.org/gems/yap
 licenses: