medea 0.2.29 → 0.2.30

data/lib/medea.rb

@@ -1,5 +1,6 @@
 
 module Medea
+  require 'rubygems'
   require 'medea/inheritable_attributes'
   require 'medea/active_model_methods'
   require 'medea/list_properties'

data/lib/medea/jasondb.rb

@@ -2,6 +2,7 @@ module JasonDB
   #jason_url here doesn't include the http[s]:// part, but does include the domain and a trailing '/'
   #( so it's "rest.jasondb.com/<domain>/" )
   def JasonDB::db_auth_url mode=:secure
+    return "https://michael:password@rest.jasondb.com/medea-dev/"
     config = Rails.configuration.database_configuration[Rails.env]
     
     user = config["user"]

data/lib/medea/jasondeferredquery.rb

@@ -1,18 +1,15 @@
 module Medea
-  class JasonDeferredQuery
+  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 = { :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
+    def initialize opts={}
+      self.type = opts[:class] if opts[:class]
+      self.filters = opts[:filters] if opts[:filters]
+      self.result_format = opts[:format] ? opts[:format] : :search
+      self.time_limit = opts[:time_limit] ? opts[:time_limit] : 0
       self.state = :prefetch
       self.contents = []
     end
@@ -62,9 +59,10 @@ module Medea
     def to_url
       url = "#{JasonDB::db_auth_url}@#{self.time_limit}.#{self.result_format}?"
       filter_array = []
+      unsafe = Regexp.new("[^#{URI::PATTERN::UNRESERVED}]")
       self.filters.each do |name, val|
         if not val
-          filter_array << name.to_s
+          filter_array << URI.escape(name.to_s, unsafe)
           next
         else
           #FILTER's value is a hash (to avoid dupes)
@@ -74,10 +72,10 @@ module Medea
             val.each do |field ,value|
               if value.is_a? Array
                 value.each do |i|
-                  filter_array << "#{name.to_s}=#{URI.escape(field)}:#{URI.escape(i)}"
+                  filter_array << URI.escape("#{name.to_s}=#{field}:#{i}", unsafe)
                 end
               else
-                filter_array << "#{name.to_s}=#{URI.escape(field.to_s)}:#{URI.escape(value.to_s)}"
+                filter_array << URI.escape("#{name.to_s}=#{field.to_s}:#{value.to_s}", unsafe)
               end
             end
           end
@@ -112,7 +110,7 @@ module Medea
     end
     #end array interface
 
-    def execute_query
+    def execute_query content=true
       #hit the URL
       #fill self.contents with :ghost versions of JasonObjects
       begin
@@ -123,10 +121,8 @@ module Medea
         result.keys.each do |k|
           if k =~ /^[0-9]+$/
             #this is a result! get the key
-            /\/([^\/]*)\/([^\/]*)$/.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") && result[k]["CONTENT"] != ""
+            item = type.new(result[k]["HTTP_X_KEY"], :lazy)
+            if content && 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

data/lib/medea/jasonlistproperty.rb

@@ -6,14 +6,18 @@ module Medea
     attr_accessor :list_name, :parent, :list_type
 
     def initialize parent, list_name, list_class, list_type
-      @type = list_class
+      super :class => list_class,
+            :format => :search,
+            :filters => {
+                :VERSION0 => nil,
+                :FILTER => {:HTTP_X_LIST => list_name}}
+
+      self.filters[:FILTER][:HTTP_X_CLASS] = list_class.name if list_type == :value
       @list_name = list_name
-      @list_type = list_type
       @parent = parent
-      @result_format = :search
-      @time_limit = 0
       @state = :prefetch
       @contents = []
+      @list_type = list_type
     end
 
     def method_missing name, *args, &block
@@ -39,11 +43,9 @@ module Medea
         member.jason_parent_list = @list_name
       elsif @list_type == :reference
 
-        #post to JasonDB::db_auth_url/a_class.name/
-        url = "#{JasonDB::db_auth_url}#{@type.name}/#{@parent.jason_key}/#{@list_name}/#{member.jason_key}"
+        url = "#{JasonDB::db_auth_url}#{@parent.class.name}/#{@parent.jason_key}/#{@list_name}/#{member.jason_key}"
         post_headers = {
               :content_type => 'application/json',
-              "X-CLASS" => @list_name.to_s,
               "X-KEY" => member.jason_key,
               "X-PARENT" => @parent.jason_key,
               "X-LIST" => @list_name.to_s
@@ -106,26 +108,31 @@ module Medea
       @state = :prefetch
     end
 
+    def execute_query
+      #call super, but don't use the content to populate if this is a reference list
+      content = @list_type == :reference ? false : true
+      super content
+    end
+
+
     def to_url
       url = "#{JasonDB::db_auth_url}@#{@time_limit}.#{@result_format}?"
       params = ["VERSION0"]
-
-      params << "FILTER=HTTP_X_CLASS:#{@list_name.to_s}"
+      params << "FILTER=HTTP_X_LIST:#{@list_name.to_s}"
 
       if @parent.is_a? JasonObject
         params << "FILTER=HTTP_X_PARENT:#{@parent.jason_key}"
       else # @parent.is_a? JasonListProperty ##(or DeferredQuery?)
         #we can get the insecure url here, because it will be resolved and executed at JasonDB - on a secure subnet.
 
-        #subquery = "<%@LANGUAGE=\"URL\" #{@parent.to_url}%>"
         #puts "   = Fetching subquery stupidly. (#{@parent.to_url})"
-
+        @parent.result_format = :keylist
         subquery = (RestClient.get @parent.to_url).strip
         #puts "   =   Result: #{subquery}"
-        params << URI.escape("FILTER={HTTP_X_PARENT:#{subquery}}", Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
+        params << "FILTER={HTTP_X_PARENT:#{subquery}}"
       end
 
-      url << params.join("&")
+      url << URI.escape(params.join("&"), Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
     end
   end
 end

data/lib/medea/jasonobject.rb

@@ -24,7 +24,7 @@ module Medea
     #create a JasonDeferredQuery with no conditions, other than HTTP_X_CLASS=self.name
     #if mode is set to :eager, we create the JasonDeferredQuery, invoke it's execution and then return it
     def JasonObject.all(mode=:lazy)
-      JasonDeferredQuery.new self
+      JasonDeferredQuery.new :class => self, :filters => {:FILTER => {:HTTP_X_CLASS => self}}
     end
 
     #returns the JasonObject by directly querying the URL
@@ -38,7 +38,8 @@ module Medea
     #find_by_<property>(value)
     #Will return a JasonDeferredQuery for this class with the appropriate data filter set
     def JasonObject.method_missing(name, *args, &block)
-      q = JasonDeferredQuery.new self
+
+      q = all
       if name.to_s =~ /^members_of$/
         #use the type and key of the first arg (being a JasonObject)
         return q.members_of args[0]
@@ -57,7 +58,7 @@ module Medea
     #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 = JasonDeferredQuery.new :filters => {:FILTER => {:HTTP_X_KEY => key}}
       q.filters[:FILTER] ||= {}
       q.filters[:FILTER][:HTTP_X_KEY] = key
       resp = JSON.parse(RestClient.get(q.to_url))
@@ -183,7 +184,6 @@ module Medea
         payload = self.to_json
         post_headers = {
             :content_type => 'application/json',
-
             "X-KEY" => self.jason_key,
             "X-CLASS" => self.class.name
             #also want to add the eTag here!
@@ -194,12 +194,12 @@ module Medea
         if self.class.owned
           #the parent object needs to be defined!
           raise "#{self.class.name} cannot be saved without setting a parent and list!" unless self.jason_parent && self.jason_parent_list
-          post_headers["X-PARENT"] = self.jason_parent.jason_key
-          #url = "#{JasonDB::db_auth_url}#{self.jason_parent.class.name}/#{self.jason_parent.jason_key}/#{self.jason_parent_list}/#{self.jason_key}"
-          post_headers["X-LIST"] = self.jason_parent_list
-          #override the class to be the list name. Much simpler to search on.
-          post_headers["X-CLASS"] = self.jason_parent_list
         end
+
+        post_headers["X-PARENT"] = self.jason_parent.jason_key if self.jason_parent
+        post_headers["X-LIST"] = self.jason_parent_list if self.jason_parent_list
+
+
         url = JasonDB::db_auth_url + self.class.name + "/" + self.jason_key
 
         #puts "Posted to JasonDB!"
@@ -241,15 +241,9 @@ module Medea
       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
+          "FILTER=HTTP_X_KEY:#{self.jason_key}",
+          "FILTER=HTTP_X_CLASS:#{self.class.name}"
+      ] 
 
       url << params.join("&")
       #url = "#{JasonDB::db_auth_url}#{self.class.name}/#{self.jason_key}"

data/lib/medea/version.rb

@@ -1,3 +1,3 @@
 module Medea
-  VERSION = "0.2.29"
+  VERSION = "0.2.30"
 end

data/lib/testjdq.rb

@@ -1,4 +1,5 @@
 $: << "~/Projects/Medea/lib"
+require 'rubygems'
 require 'medea'
 
 class Person < Medea::JasonObject

data/lib/testjlp.rb

@@ -1,11 +1,12 @@
 $: << "~/Projects/Medea/lib"
+require 'rubygems'
 require 'medea'
 
 class Person < Medea::JasonObject
   has_many :followees, Person
 end
 
-p = Person.get_by_key "p6c75c02f-ed93-4ee8-9746-3603e915be23"
+p = Person.get_by_key "pa76b65a2-ba64-4cf0-8b37-7ad6a30ee8db"
 
 puts p.followees.to_url
 puts p.followees.count

data/lib/testmeta.rb

@@ -1,4 +1,5 @@
 $: << "~/Projects/Medea/lib"
+require 'rubygems'
 require 'medea'
 
 class Message < Medea::JasonObject

data/lib/testsublist.rb

@@ -1,4 +1,5 @@
 $: << "~/Projects/Medea/lib"
+require 'rubygems'
 require 'medea'
 
 class Message < Medea::JasonObject; end
@@ -17,7 +18,6 @@ u2.name = "George"
 u2.save!
 
 u1.followees.add! u2
-u1.followees.add! (User.get_by_key "p438639000")
 u1.followees.add! u1
 
 m1 = Message.new

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: medea
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 43
   prerelease: false
   segments: 
   - 0
   - 2
-  - 29
-  version: 0.2.29
+  - 30
+  version: 0.2.30
 platform: ruby
 authors: 
 - Michael Jensen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-05 00:00:00 +11:00
+date: 2011-01-06 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency