ocean-rails 1.26.0 → 1.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed17df413aa988bc3f8fb0657bb64a0badd3e867
-  data.tar.gz: 8d343d76ebad720f9f6848a7dcc8e7ab5ce1df37
+  metadata.gz: d5185b58e21da14504bb65ab1c314b0def4ebb39
+  data.tar.gz: 4df08ec09d8d7c3549d5ed049b43d0a83848a8c2
 SHA512:
-  metadata.gz: 6908a52cc7d59b1925efe758f886625c24061fb0d72b7ffd7731e1e2f6020681380aba8bdc7935aa66b58a726a588d77fa6f42fcbd3aca222b09c43f3b532785
-  data.tar.gz: cfe17eb55a1e0d8b03defc0017c5d61edc69e08243e8cd8044ea05420784ce8a04d155eb1c90de0d1f3b4d27ad0ac331722112dc879c9be905df1d4cda65b064
+  metadata.gz: e27b2ae036163701a0ee86a96171aa388bf831314dd227de5013f210eb37739ece6f6f86c597444283980b37fc926c60a1b06d7e49e16ac14d0b5cd25771ca9e
+  data.tar.gz: 7374426c6bbc58f67a6bd4ea0983b810db76b13b32c771acd7df36c12a96fb67e7c57fe950064510a6153418ba92ac0265ee6083fb3ade21df560dad4872fe06

data/lib/ocean/api_resource.rb

@@ -24,7 +24,8 @@ module ApiResource
     #
     # The whole params hash can safely be passed as the input arg: keys are filtered so 
     # that matches only are done against the attributes declared in the controller using 
-    # +ocean_resource_model+.
+    # +ocean_resource_model+. Ranges are allowed for those attributes declared to accept
+    # them using the +ranged+ parameter of +ocean_resource_model+.
     #
     # The +group:+ keyword arg, if present, adds a +GROUP+ clause to the generated SQL.
     #
@@ -44,6 +45,8 @@ module ApiResource
     end
 
 
+    private 
+
     def collection_internal(conds={}, group, search, page, page_size)
       if index_only != []
         new_conds = {}
@@ -88,9 +91,9 @@ module ApiResource
       case val
       when ""
         ""
-      when val.to_i.to_s == val
+      when /^[+-][0-9]+$/
         val.to_i
-      when val.to_f.to_s == val
+      when /^[+-]([0-9]*\.[0-9]+|[0-9]+\.[0-9]*)$/
         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)
@@ -100,6 +103,8 @@ module ApiResource
     end
 
 
+    public 
+
     #
     # Returns the latest version for the resource class. E.g.:
     #

data/lib/ocean/ocean_resource_model.rb

@@ -21,6 +21,9 @@ module Ocean
       # +index+: defaults to <code>[:name]</code>. Enumerates the model attributes which
       # may be used for parameter matching and grouping.
       #
+      # +ranged+: defaults to <code>[]</code>. An array of attributes which should accept
+      # ranges in collection match operations.
+      #
       # +search+: defaults to +:description+. Names the model attribute used for substring
       # searches. The attribute must be a string or text attribute.
       #

data/lib/ocean/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 1.26.0
+  version: 1.26.1
 platform: ruby
 authors:
 - Peter Bengtson
@@ -323,7 +323,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: This gem implements common Ocean behaviour for Ruby and Ruby on Rails.