medea 0.2.22 → 0.2.23

data/VERSION

@@ -1 +1 @@
-0.2.22
+0.2.23

data/lib/medea/jasondeferredquery.rb

@@ -1,12 +1,16 @@
 module Medea
   class JasonDeferredQuery
     require 'rest_client'
+    require 'uri'
 
     attr_accessor :time_limit, :result_format, :type, :time_limit, :state, :contents, :filters
 
     def initialize a_class, format=:search
       self.type = a_class
-      self.filters = {:FILTER => {:HTTP_X_CLASS => a_class.name.to_s}, :VERSION0 => nil}
+      self.filters = { :VERSION0 => nil }
+      if self.type
+        self.filters[:FILTER] = {:HTTP_X_CLASS => a_class.name.to_s}
+      end
       self.result_format = format
       self.time_limit = 0
       self.state = :prefetch
@@ -70,10 +74,10 @@ module Medea
             val.each do |field ,value|
               if value.is_a? Array
                 value.each do |i|
-                  filter_array << "#{name.to_s}=#{field}:#{i}"
+                  filter_array << "#{name.to_s}=#{URI.escape(field)}:#{URI.escape(i)}"
                 end
               else
-                filter_array << "#{name.to_s}=#{field.to_s}:#{value.to_s}"
+                filter_array << "#{name.to_s}=#{URI.escape(field.to_s)}:#{URI.escape(value.to_s)}"
               end
             end
           end
@@ -100,7 +104,7 @@ module Medea
     end
     #end array interface
 
-    def execute_query content=false
+    def execute_query
       #hit the URL
       #fill self.contents with :ghost versions of JasonObjects
       begin
@@ -114,17 +118,21 @@ module Medea
             /\/([^\/]*)\/([^\/]*)$/.match result[k]["POST_TO"]
             #$1 is the class name, $2 is the key
             item = type.new($2, :lazy)
-            if result[k].has_key? "CONTENT" && content
+            if result[k].has_key? "CONTENT" && result[k]["CONTENT"] != ""
               item.instance_variable_set(:@__jason_data, result[k]["CONTENT"])
               item.instance_variable_set(:@__jason_state, :stale)
             end
+            if result[k].has_key? "HTTP_X_PARENT" && result[k]["HTTP_X_PARENT"] != ""
+              item.jason_parent_key = result[k]["HTTP_X_PARENT"]
+            end
             self.contents << item
           end
         end
+
+        self.state = :postfetch
+        result
       rescue
         self.contents = []
-      ensure
-        self.state = :postfetch
       end
     end
   end

data/lib/medea/jasonobject.rb

@@ -54,6 +54,31 @@ module Medea
     end
     #end query interface
 
+    #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 JasonObject.resolve(key, mode=:lazy)
+      q = JasonDeferredQuery.new nil
+      q.filters[:FILTER] ||= {}
+      q.filters[:FILTER][:HTTP_X_KEY] = key
+      resp = JSON.parse(RestClient.get(q.to_url))
+      if resp.has_key? "1"
+        #this is the object, figure out its class
+        resp["1"]["POST_TO"] =~ /([^\/]+)\/#{key}/
+        begin
+          result = Kernel.const_get($1).get_by_key key, :lazy
+          if result["1"].has_key? "CONTENT"
+            result.instance_variable_set(:@__jason_data, result["1"]["CONTENT"])
+            result.instance_variable_set(:@__jason_state, :stale)
+          end
+          if mode == :eager
+            result.send(:load)
+          end
+        rescue
+          nil
+        end
+      end
+    end
+
     #"flexihash" access interface
     def []=(key, value)
       @__jason_data ||= {}
@@ -116,6 +141,26 @@ module Medea
 
     def jason_parent
       @__jason_parent ||= nil
+      if @__jason_parent == nil && @__jason_parent_key
+        #key is set but parent not? load the parent
+        @__jason_parent = JasonObject.resolve @__jason_parent_key
+      end
+      @__jason_parent
+    end
+
+    def jason_parent= parent
+      @__jason_parent = parent
+      @__jason_parent_key = parent.jason_key
+    end
+
+    def jason_parent_key
+      @__jason_parent_key ||= nil
+    end
+
+    def jason_parent_key= value
+      @__jason_parent_key = value
+      #reset the parent here?
+      @__jason_parent = nil
     end
 
     def jason_parent_list
@@ -126,10 +171,6 @@ module Medea
       @__jason_parent_list = value
     end
 
-    def jason_parent= parent
-      @__jason_parent = parent
-    end
-
     #object persistence methods
 
     #POSTs the current values of this object back to JasonDB
@@ -197,15 +238,21 @@ module Medea
     def load
       #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 = "#{JasonDB::db_auth_url}@0.content?"
-      #params = [
-      #    "VERSION0",
-      #    #"FILTER=HTTP_X_CLASS:#{self.class.name}",
-      #    "FILTER=HTTP_X_KEY:#{self.jason_key}"
-      #]
-
-      #url << params.join("&")
-      url = "#{JasonDB::db_auth_url}#{self.class.name}/#{self.jason_key}"
+      url = "#{JasonDB::db_auth_url}@0.content?"
+      params = [
+          "VERSION0",
+          "FILTER=HTTP_X_KEY:#{self.jason_key}"
+      ]
+
+      if not self.class.owned
+        #if the class is owned, we don't want to filter by class name (X-CLASS will be the list name)
+        #if it isn't owned, it is safe to filter by X-CLASS
+        #if this item is "had" rather than owned, we MUST filter by class, otherwise we get the references.
+        params << "FILTER=HTTP_X_CLASS:#{self.class.name}"
+      end
+
+      url << params.join("&")
+      #url = "#{JasonDB::db_auth_url}#{self.class.name}/#{self.jason_key}"
 
       #puts "   = Retrieving #{self.class.name} at #{url}"
       response = RestClient.get url

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 22
-  version: 0.2.22
+  - 23
+  version: 0.2.23
 platform: ruby
 authors: 
 - Michael Jensen