ocean-rails 1.24.2 → 1.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4525196be58ed89455e600f44b31119e0b5e0df
-  data.tar.gz: bae15361c52f1f4bc2f6c86c2d2e69b8d8c52af7
+  metadata.gz: d4503764ecbaf7727d17852978ec1bd891d1ad78
+  data.tar.gz: f481e468809272a0216791edfa6bacb4e54be380
 SHA512:
-  metadata.gz: d55a1efea9d2a2eb5c6297eb281b6d8a140b1b3b17fb1074ebc2ab7e2ea21977402ef247c005e4127edd92b654316484db7c63001e44541af92e1e83a0d4abb7
-  data.tar.gz: 017211f771c5d2c524ba0989b5506eb3a98cdcf013e4334ed79c0531c4be58ae34dd8153ab6d18427e21399b2c51ecfa0de7fafc1ce0ec2cd76bc6fadcb0e536
+  metadata.gz: 1e193a45bec1a86983317add48766a50eb6f5d5bdcdbdf419107fcd8132020416cbf7bb7be20f5157a264becc84b4b4dc9175f29a4c0f992924dcd054a4196cb
+  data.tar.gz: 12dd83d6db363cd40df5b6baea61385c669e028e9993682d44d962fdb5700f96bc7a9fcdebf6741f739c7bcc08157130a3f077ec419935ced42286cbc6e325f4

data/lib/generators/ocean_setup/templates/Gemfile

@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
-gem "ocean-rails", git: "git://github.com/OceanDev/ocean-rails.git"
+gem "ocean-rails", "~> 1.0"
+
 gem "rails", "~> 4.0"
 gem "mysql2"
 gem "foreigner"

data/lib/generators/ocean_setup/templates/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'simplecov'
 SimpleCov.start do
   add_filter "/vendor/"
+  add_filter "/spec/support/hyperlinks.rb"
 end
 
 # This file is copied to spec/ when you run 'rails generate rspec:install'

data/lib/ocean/api_resource.rb

@@ -47,7 +47,17 @@ module ApiResource
     def collection_internal(conds={}, group, search, page, page_size)
       if index_only != []
         new_conds = {}
-        index_only.each { |key| new_conds[key] = conds[key] if conds[key].present? }
+        ranges = {}
+        index_only.each do |key| 
+          val = conds[key]
+          next if val.blank?
+          if ranged_matchers.include?(key) && val.include?(",")
+            from, to = val.split(",")
+            new_conds[key] = DateTime.parse(from)..DateTime.parse(to)
+          else
+            new_conds[key] = val
+          end
+        end
         conds = new_conds
       end
       # Fold in the conditions

data/lib/ocean/ocean_resource_model.rb

@@ -35,7 +35,8 @@ module Ocean
       # enumerating the Varnish +BAN+ HTTP request URI suffixes to use to invalidate a
       # collection of resources.
       #
-      def ocean_resource_model(index:                 [:name], 
+      def ocean_resource_model(index:                 [:name],
+                               ranged:                [],
       	                       search:                :description,
                                page_size:             25,
                                invalidate_member:     INVALIDATE_MEMBER_DEFAULT,
@@ -43,11 +44,13 @@ module Ocean
       	                      )
       	include ApiResource
       	cattr_accessor :index_only
+        cattr_accessor :ranged_matchers
       	cattr_accessor :index_search_property
         cattr_accessor :collection_page_size
         cattr_accessor :varnish_invalidate_member
         cattr_accessor :varnish_invalidate_collection
       	self.index_only = index
+        self.ranged_matchers = ranged
       	self.index_search_property = search
         self.collection_page_size = page_size
         self.varnish_invalidate_member = invalidate_member

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "1.24.2"
+  VERSION = "1.25.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 1.24.2
+  version: 1.25.0
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-29 00:00:00.000000000 Z
+date: 2013-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday