ocean-rails 1.25.4 → 1.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1df7ce5c2c56309411dddf649f819d3653229bf0
-  data.tar.gz: 9151f2afff53ade22492b7cdf5fcf3198377ac37
+  metadata.gz: ed17df413aa988bc3f8fb0657bb64a0badd3e867
+  data.tar.gz: 8d343d76ebad720f9f6848a7dcc8e7ab5ce1df37
 SHA512:
-  metadata.gz: fe9bd5aba3a921143b415bda7e6726baf3655dba9fa0ee4b52f6c95389f54356d101b0e492c3d1f54022b26f569acd8c0d833cd310296588a132af91e991b5fc
-  data.tar.gz: 872d8a2a40c5b01880fa1a624941edd28a9dc88e68e3f1fbf66169d526baeecdcef5dff10fd9dab8bf253a7862f77afead8ed0a01444ea20fe4d3f90b51ae170
+  metadata.gz: 6908a52cc7d59b1925efe758f886625c24061fb0d72b7ffd7731e1e2f6020681380aba8bdc7935aa66b58a726a588d77fa6f42fcbd3aca222b09c43f3b532785
+  data.tar.gz: cfe17eb55a1e0d8b03defc0017c5d61edc69e08243e8cd8044ea05420784ce8a04d155eb1c90de0d1f3b4d27ad0ac331722112dc879c9be905df1d4cda65b064

data/lib/ocean/api_resource.rb

@@ -50,15 +50,10 @@ module ApiResource
         index_only.each do |key| 
           val = conds[key]
           next unless val
-          if ranged_matchers.include?(key) 
-            if val.include?(",")
-              from, to = val.split(",")
-              new_conds[key] = Range.new(DateTime.parse(from), DateTime.parse(to))
-            else
-              new_conds[key] = DateTime.parse(val)
-            end
+          if ranged_matchers.include?(key) && val.include?(",")
+            new_conds[key] = parse_range(val)
           else
-            new_conds[key] = val
+            new_conds[key] = parse_scalar(val)
           end
         end
         conds = new_conds
@@ -84,6 +79,27 @@ module ApiResource
     end
 
 
+    def parse_range(val)
+      from, to = val.split(",")
+      Range.new(parse_scalar(from), parse_scalar(to))
+    end
+
+    def parse_scalar(val)
+      case val
+      when ""
+        ""
+      when val.to_i.to_s == val
+        val.to_i
+      when val.to_f.to_s == val
+        val.to_f
+      when /[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z/
+        DateTime.parse(val)
+      else
+        val
+      end
+    end
+
+
     #
     # Returns the latest version for the resource class. E.g.:
     #

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "1.25.4"
+  VERSION = "1.26.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 1.25.4
+  version: 1.26.0
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -323,7 +323,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: This gem implements common Ocean behaviour for Ruby and Ruby on Rails.