medea 0.6.5 → 0.6.6

data/lib/medea/jason_base.rb

@@ -5,13 +5,6 @@ module Medea
     inheritable_attributes :owned
     @owned = false
 
-    
-    #returns the JasonObject by directly querying the URL
-    #if mode is :lazy, we return a GHOST, if mode is :eager, we return a STALE JasonObject
-    def self.get_by_key(key, mode=:eager)
-      return self.new key, mode
-    end
-
     #the resolve method takes a key and returns the JasonObject that has that key
     #This is useful when you have the key, but not the class
     def self.resolve(key, mode=:lazy)
@@ -88,6 +81,10 @@ module Medea
       @__jason_parent_list = value
     end
 
+    def jason_timestamp
+      @__jason_timestamp
+    end
+
     def delete! cascade=false
       #TODO: Put this into some kind of async method or have JasonDB able to set flags on many records at once
       #This will be REALLY REALLY slowww!
@@ -121,11 +118,12 @@ module Medea
     def load_from_jasondb
       #because this object might be owned by another, we need to search by key.
       #not passing a format to the query is a shortcut to getting just the object.
-      url = build_url()
+      url = to_url
       
       response = RestClient.get url
       @__jason_data = JSON.parse response
       @__jason_etag = response.headers[:etag]
+      @__jason_timestamp = response.headers[:timestamp]
       @__jason_state = :stale
     end
 

data/lib/medea/jasondeferredquery.rb

@@ -153,6 +153,9 @@ module Medea
             if result[k].has_key?("HTTP_X_PARENT") && result[k]["HTTP_X_PARENT"] != ""
               item.jason_parent_key = result[k]["HTTP_X_PARENT"]
             end
+            if result[k].has_key?("TIMESTAMP")
+              item.instance_variable_set :@__jason_timestamp, result[k]["TIMESTAMP"]
+            end
             self.contents << item
           end
         end

data/lib/medea/jasonobject.rb

@@ -51,6 +51,12 @@ module Medea
     end
     #end query interface
 
+    #returns the JasonObject by directly querying the URL
+    #if mode is :lazy, we return a GHOST, if mode is :eager, we return a STALE JasonObject
+    def self.get_by_key(key, mode=:eager)
+      return self.new key, mode
+    end
+
     #"flexihash" access interface
     def []=(key, value)
       if @attachments.keys.include? key.to_sym
@@ -211,7 +217,8 @@ module Medea
         #save successful!
         #store the new eTag for this object
         #puts response.raw_headers
-        #@__jason_etag = response.headers[:location] + ":" + response.headers[:content_md5]
+        @__jason_etag = response.headers[:Etag]
+        @__jason_timestamp = response.headers[:timestamp]
       else
         raise "#{method.to_s.upcase} failed! Could not persist changes"
       end

data/lib/medea/templates/search.template

@@ -15,13 +15,14 @@
 			"RELATIVE_VERSION":"[%RELATIVE_VERSION%]",
 			"RECID":"[%RECID%]",
 			"RECNO":"[%RECNO%]",
+			"TIMESTAMP":"[%TIMESTAMP%]",
 			"ETag":"[%ETag%]",
 			"HTTP_X_SCHEMA":"[%HTTP_X_SCHEMA%]",
 			"HTTP_X_GENERATED_PASSWORD":"[%HTTP_X_GENERATED_PASSWORD%]",
-            "HTTP_X_CLASS":"[%HTTP_X_CLASS%]",
-            "HTTP_X_LIST":"[%HTTP_X_LIST%]",
-            "HTTP_X_KEY":"[%HTTP_X_KEY%]",
-            "HTTP_X_PARENT":"[%HTTP_X_PARENT%]",
+      "HTTP_X_CLASS":"[%HTTP_X_CLASS%]",
+      "HTTP_X_LIST":"[%HTTP_X_LIST%]",
+      "HTTP_X_KEY":"[%HTTP_X_KEY%]",
+      "HTTP_X_PARENT":"[%HTTP_X_PARENT%]",
 			"CONTENT":[%CONTENT%]
 		}[%COMMA%]
 	%item%-->

data/lib/medea/version.rb

@@ -1,7 +1,7 @@
 module Medea
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
 
   #When the templates are changed, this version should be incremented
   #This version is used when uploading/updating the templates
-  TEMPLATE_VERSION = "1.0.0"
+  TEMPLATE_VERSION = "1.1.0"
 end

data/spec/jason_object_spec.rb

@@ -81,4 +81,15 @@ describe "JasonObject" do
     @user.stub(:save).and_return false
     (@user.update_attributes({})).should eq(false)
   end
+
+  it "should provide access to its timestamp from JasonDB" do
+    @user.save!
+    @user.jason_timestamp.should_not be_nil
+    t = @user.jason_timestamp
+    @user.name = "Smithy"
+    @user.save!
+    user2 = User.get_by_key(@user.jason_key)
+    user2.jason_timestamp.should_not be_nil
+    user2.jason_timestamp.should be > t
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 5
-  version: 0.6.5
+  - 6
+  version: 0.6.6
 platform: ruby
 authors: 
 - Michael Jensen