yap 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8a8cb98d770164d8c28e7b5ecb574a7962430fe
-  data.tar.gz: 3841588ca088dc11673d04a8d2a9e7c8aa1705cc
+  metadata.gz: 90a7fb8f804bd7b631c632deeb7241bfcdac00ee
+  data.tar.gz: 4d2de49002fcdc9d79dd60786a3c191fac6275cb
 SHA512:
-  metadata.gz: 5ac5778aace7e20671a21195db90c12d2672e2de0e9244d063a429b1334b6ffefbd7791c0cb50ca75f8eb38b78a582449bdc9368077eddfdd4fe5df902d7e71b
-  data.tar.gz: 170f73e6b59ef73478fe75745336a53f1f8fa188a8aa613ae638ad97d5eff4837ef754ad39a302dcdadca32ad9dd5c3e3a6a3a5f937a8d8489c46be300190e85
+  metadata.gz: 1669e8d881f42da049c61c49c1b1c483340ece46642f281831dd104f999198320eca72b82c097d8d1df534830b8c97223a559c080fdae695671c8f9a9a36a89e
+  data.tar.gz: fac27392172ca4fbbf5fb96332f79bcf157893a87076335e094d50908589b9e85e6f1ee5cbaa55d900538bf688cbc7451751d985ec57af61a7e32af9db2d564e

data/README.md

@@ -162,6 +162,10 @@ If an option cannot be parsed it will raise `Yap::PaginationError` or `Yap::Filt
 
 ## Changelog
 
+### 1.4
+
+* added support for strings and dates with comparison parameters
+
 ### 1.3
 
 * added comparison operators <, >, <=, >= to filters
@@ -169,7 +173,7 @@ If an option cannot be parsed it will raise `Yap::PaginationError` or `Yap::Filt
     * will give you any element with and id equal to or greater 100
   * you can even combine multiple filters: ?filter[id]=>=100,<200
     * although the same result can be achieved through ?filter[id]=100...200
-* _currently, there is not support for strings and dates. This will be implemented in the future_
+* ~~_currently, there is no support for strings and dates. This will be implemented in the future._~~ (see version 1.4)
 
 ### 1.2
 

data/lib/string_infinity.rb

@@ -0,0 +1,14 @@
+class StringInfinity < String
+  def -@
+    String::INFINITY_NEGATIVE
+  end
+
+  def ==(value)
+    self.class == value.class
+  end
+end
+
+class StringInfinityNegative < StringInfinity; end
+
+String::INFINITY = StringInfinity.new
+String::INFINITY_NEGATIVE = StringInfinityNegative.new

data/lib/yap.rb

@@ -3,6 +3,7 @@ require 'yap/active_record/relation'
 require 'yap/column_mapper'
 require 'yap/filterable'
 require 'yap/exceptions'
+require 'string_infinity'
 
 ##
 # Support for Active Record pagination. All options can be safely accessed by the user through url query parameters. To

data/lib/yap/extended_range.rb

@@ -0,0 +1,25 @@
+module Yap
+  class ExtendedRange < Range
+    def begin
+      infinity_or_do_not_change super
+    end
+
+    def end
+      infinity_or_do_not_change super
+    end
+
+    def infinity_or_do_not_change(value)
+      if value.is_a? StringInfinity
+        if value == String::INFINITY
+          Float::INFINITY
+        elsif value == -String::INFINITY
+          -Float::INFINITY
+        else
+          raise ArgumentError, "Invalid value for StringInfinity."
+        end
+      else
+        value
+      end
+    end
+  end
+end

data/lib/yap/filter.rb

@@ -1,3 +1,5 @@
+require 'yap/extended_range'
+
 module Yap
   class Filter < Hash
     def initialize
@@ -37,18 +39,15 @@ module Yap
     private
 
     def handle_comparison_operators(match, column, operator, value)
-      # TODO make comparison operators work for String. See here: http://c4se.hatenablog.com/entry/2013/10/01/010305
-      value = Float(value) rescue raise(Yap::FilterError, 'You can only use float values with comparison operators <, >, <= and >=.')
-
       case operator
       when :<
         handle_comparison_operators(toggle_match(match), column, :>=, value)
       when :>
         handle_comparison_operators(toggle_match(match), column, :<=, value)
       when :<=
-        return match, -Float::INFINITY..value.to_f
+        return match, ExtendedRange.new(-String::INFINITY, value)
       when :>=
-        return match, value.to_f..Float::INFINITY
+        return match, ExtendedRange.new(value, String::INFINITY)
       end
     end
 

data/lib/yap/version.rb

@@ -1,3 +1,3 @@
 module Yap
-  VERSION = '1.3.0'
+  VERSION = '1.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yap
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Finn Glöe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -47,10 +47,12 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
+- lib/string_infinity.rb
 - lib/yap.rb
 - lib/yap/active_record/relation.rb
 - lib/yap/column_mapper.rb
 - lib/yap/exceptions.rb
+- lib/yap/extended_range.rb
 - lib/yap/filter.rb
 - lib/yap/filterable.rb
 - lib/yap/version.rb
@@ -74,8 +76,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Yet another paginator for Ruby on Rails
 test_files: []
+has_rdoc: