ocean-rails 1.29.8 → 1.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28a1c6e8f241193e243d74f615f22d5d5f86920d
-  data.tar.gz: 2819b6adb6e7197052dee4d7ed5c20093fb11a18
+  metadata.gz: 863039deb04d7de0a448aabad3e79e9d46750b6f
+  data.tar.gz: 852f15e75dc0a64597fc5efec6f2afecae849d4d
 SHA512:
-  metadata.gz: 13a439e08406f55ffd6b4d9f231cecf60d76f863375ddd4773fea9fce68157a2f973af188f8c7a820eb5fceee82f2f483888edd9ba471dc162aed031dc775f45
-  data.tar.gz: 8903643bc5207ff8f1b4a74188a7582861a67e2dfc698064b47ea4a862f5e9e9e903659e15ff3a99f06eb2f184ff9be154839c7c4b28f9e4b4ab56c61257740f
+  metadata.gz: ca1a728efdbf916de100afe944768a2f149ec5a6cdb767a3523eb5c9350ae418483e2e43b4660b64746a5f536fefadc156e00ec1041d8394a551875b86596069
+  data.tar.gz: f918875849a5b4bf410a639d6620590afdbd75d9f0a7d40ff7555629916a194c42e12e25f7df823d242b691a262d2b0b7c1a1fbdf52525c5d462b71e19c230e8

data/lib/ocean/ocean_application_controller.rb

@@ -206,8 +206,14 @@ module OceanApplicationController
   # member.
   #
   def collection_etag(coll)
-    coll.name.constantize # Force a load of the class (for secondary collections)
-    last_updated = coll.order(:updated_at).last.updated_at.utc rescue 0
+    klass = coll.name.constantize # Force a load of the class (for secondary collections)
+    timestamp = klass.update_timestamp || klass.create_timestamp
+    if (timestamp)
+      last_item = coll.reorder(timestamp).last
+      last_updated = last_item ? last_item.send(timestamp).utc : 0
+    else
+      last_updated = 0
+    end
     # We could also, in the absence of an updated_at attribute, use created_at.
     { etag: "#{coll.name}:#{coll.count}:#{last_updated}"
     }

data/lib/ocean/ocean_resource_model.rb

@@ -38,12 +38,18 @@ module Ocean
       # enumerating the Varnish +BAN+ HTTP request URI suffixes to use to invalidate a
       # collection of resources.
       #
+      # +create_timestamp+ and +update_timestamp+ default to +:created_at+ and +:updated_at+,
+      # respectively, naming the attribute containing the timestamps for resource creation
+      # and modification. Either one may be nil or false.
+      #
       def ocean_resource_model(index:                 [:name],
                                ranged:                [],
       	                       search:                :description,
                                page_size:             25,
                                invalidate_member:     INVALIDATE_MEMBER_DEFAULT,
-                               invalidate_collection: INVALIDATE_COLLECTION_DEFAULT
+                               invalidate_collection: INVALIDATE_COLLECTION_DEFAULT,
+                               create_timestamp:      :created_at,
+                               update_timestamp:      :updated_at
       	                      )
       	include ApiResource
       	cattr_accessor :index_only
@@ -52,12 +58,16 @@ module Ocean
         cattr_accessor :collection_page_size
         cattr_accessor :varnish_invalidate_member
         cattr_accessor :varnish_invalidate_collection
-      	self.index_only = index
+        cattr_accessor :create_timestamp
+        cattr_accessor :update_timestamp
+        self.index_only = index
         self.ranged_matchers = ranged
-      	self.index_search_property = search
+        self.index_search_property = search
         self.collection_page_size = page_size
         self.varnish_invalidate_member = invalidate_member
         self.varnish_invalidate_collection = invalidate_collection
+        self.create_timestamp = create_timestamp
+        self.update_timestamp = update_timestamp
       end
     end
   end

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "1.29.8"
+  VERSION = "1.30.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 1.29.8
+  version: 1.30.0
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday