medea 0.2.13 → 0.2.14

data/VERSION

@@ -1 +1 @@
-0.2.13
+0.2.14

data/lib/medea/jasondb.rb

@@ -1,20 +1,35 @@
 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::class_exists? class_name
+    const = Module.const_get(class_name)
+    return const.is_a? Class
+  rescue NameError
+    return false
+  end
 
-    def JasonDB::db_auth_url mode=:secure
+  #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
+    #check to see if this is a Rails environment
+    if class_exists? "Rails"
       config = Rails.configuration.database_configuration[Rails.env]
-      user = config["user"]
-      topic = config["topic"]
-      password = config["password"]
-      if config["jason_host"]
-        host = config["jason_host"]
-      else
-        host = "rest.jasondb.com"
-      end
-      protocol = "http"
-      protocol << "s" if mode == :secure
-      "#{protocol}://#{user}:#{password}@#{host}/#{topic}/"
+    else
+      #if not, use some defaults for testing medea.
+      config = {"user" => "michael",
+                "topic" => "medea-test",
+                "password" => "password"}
     end
 
+    user = config["user"]
+    topic = config["topic"]
+    password = config["password"]
+    if config["jason_host"]
+      host = config["jason_host"]
+    else
+      host = "rest.jasondb.com"
+    end
+    protocol = "http"
+    protocol << "s" if mode == :secure
+    "#{protocol}://#{user}:#{password}@#{host}/#{topic}/"
+  end
+
 end

data/lib/medea/jasondeferredquery.rb

@@ -100,7 +100,7 @@ module Medea
     end
     #end array interface
 
-    def execute_query
+    def execute_query content=false
       #hit the URL
       #fill self.contents with :ghost versions of JasonObjects
       begin
@@ -114,7 +114,7 @@ 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"
+            if result[k].has_key? "CONTENT" && content
               item.instance_variable_set(:@__jason_data, result[k]["CONTENT"])
               item.instance_variable_set(:@__jason_state, :stale)
             end

data/lib/medea/jasonlistproperty.rb

@@ -10,7 +10,7 @@ module Medea
       @list_name = list_name
       @list_type = list_type
       @parent = parent
-      @result_format = :json
+      @result_format = :search
       @time_limit = 0
       @state = :prefetch
       @contents = []
@@ -43,7 +43,7 @@ module Medea
         url = "#{JasonDB::db_auth_url}#{@type.name}/#{@parent.jason_key}/#{@list_name}/#{member.jason_key}"
         post_headers = {
               :content_type => 'application/json',
-              "X-CLASS" => @type.name,
+              "X-CLASS" => @list_name.to_s,
               "X-KEY" => member.jason_key,
               "X-PARENT" => @parent.jason_key,
               "X-LIST" => @list_name.to_s
@@ -81,7 +81,7 @@ module Medea
       url = "#{JasonDB::db_auth_url}@#{@time_limit}.#{@result_format}?"
       params = ["VERSION0"]
 
-      params << "FILTER=HTTP_X_CLASS:#{@type.name}"
+      params << "FILTER=HTTP_X_CLASS:#{@list_name.to_s}"
 
       if @parent.is_a? JasonObject
         params << "FILTER=HTTP_X_PARENT:#{@parent.jason_key}"

data/lib/medea/jasonobject.rb

@@ -152,12 +152,10 @@ module Medea
           #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}"
+          #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
-        else
-          url = JasonDB::db_auth_url + self.class.name + "/" + self.jason_key
         end
-
+        url = JasonDB::db_auth_url + self.class.name + "/" + self.jason_key
 
         #puts "Posted to JasonDB!"
 
@@ -195,14 +193,15 @@ 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}@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}"
 
       #puts "   = Retrieving #{self.class.name} at #{url}"
       response = RestClient.get url

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: medea
 version: !ruby/object:Gem::Version 
-  hash: 13
   prerelease: false
   segments: 
   - 0
   - 2
-  - 13
-  version: 0.2.13
+  - 14
+  version: 0.2.14
 platform: ruby
 authors: 
 - Michael Jensen
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-24 00:00:00 +11:00
+date: 2010-12-29 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -40,7 +38,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -54,7 +51,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -93,7 +89,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -102,7 +97,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"