medea 0.7.1 → 0.7.2

data/lib/medea/jasondb.rb

@@ -38,8 +38,8 @@ module Medea
                'X-VERSION' => TEMPLATE_VERSION}
     curr_version = TEMPLATE_VERSION.split "."
     base_url = url ? url : JasonDB::db_auth_url
-    Dir.glob(File.expand_path(File.join(template_dir, "*.template"))).select do |file|
-      #for each template, we need to post it to ..#{filename}:html_template
+    Dir.glob(File.expand_path(File.join(template_dir, "*.*"))).select do |file|
+      #for each template, we need to post it to ..#{filenam e}:html_template
       file =~ name_pattern
       template_path = "#{base_url}..#{$1}:#{$2}"
 

data/lib/medea/jasondeferredquery.rb

@@ -92,8 +92,12 @@ module Medea
             #for each k/v in the hash, we want to add an entry to filter_array
             val.each do |field ,value|
               if value.is_a? Array
-                value.each do |i|
-                  filter_array << URI.escape("#{name.to_s}=#{field}:#{i}", unsafe)
+                if field == :HTTP_X_PARENT
+                  filter_array << URI.escape("#{name.to_s}={#{field}:[#{value.join ","}]}", unsafe)
+                else
+                  value.each do |i|
+                    filter_array << URI.escape("#{name.to_s}=#{field}:#{i}", unsafe)
+                  end
                 end
               else
                 filter_array << URI.escape("#{name.to_s}=#{field.to_s}:#{value.to_s}", unsafe)
@@ -144,11 +148,10 @@ module Medea
     def execute_query content=true
       #hit the URL
       #fill self.contents with :ghost versions of JasonObjects
-      
-      begin
-        response = RestClient.get to_url
+      self.contents = []
+      response = RestClient.get to_url
+      if response.code == 200 #OK
         result = JSON.parse(response)
-        self.contents = []
         #results are in a hash, their keys are just numbers
         result.keys.each do |k|
           if k =~ /^[0-9]+$/
@@ -167,15 +170,14 @@ module Medea
             self.contents << item
           end
         end
-
         self.state = :postfetch
-      rescue JSON::ParserError
-        #we assume that a parser error means that there are no results, or a problem with the template
-        #(currently a problem with the template is causing a parser error when there's no results)
-        self.contents = []
+        self.contents
+      elsif response.code == 204 #No Content
         self.state = :postfetch
+        self.contents
+      else #response wasn't OK or empty!
+        self.state = :prefetch
       end
-      result
     end
   end
 end

data/lib/medea/jasonlistproperty.rb

@@ -16,6 +16,10 @@ module Medea
       self.filters[:FILTER][:HTTP_X_CLASS] = list_class.name if list_type == :value
       @list_name = list_name
       @parent = parent
+      if @parent.is_a? JasonObject
+        self.filters[:FILTER][:HTTP_X_PARENT] = @parent.jason_key
+      end
+      
       @state = :prefetch
       @contents = []
       @list_type = list_type
@@ -118,23 +122,18 @@ module Medea
 
 
     def to_url
-      url = "#{JasonDB::db_auth_url}@#{@time_limit}.#{@result_format}?"
-      params = ["VERSION0"]
-      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?)
+      if not @parent.is_a? JasonObject
+        # @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.
 
         #puts "   = Fetching subquery stupidly. (#{@parent.to_url})"
         @parent.result_format = :keylist
         subquery = (RestClient.get @parent.to_url).strip
-        #puts "   =   Result: #{subquery}"
-        params << "FILTER={HTTP_X_PARENT:#{subquery}}"
+
+        self.filters[:FILTER][:HTTP_X_PARENT] = subquery.split ","
       end
 
-      url << URI.escape(params.join("&"), Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
+      super
     end
   end
 end

data/lib/medea/templates/content.metadata

@@ -0,0 +1,3 @@
+{
+	"MIME_TYPE":"json"
+}

data/lib/medea/templates/keylist.metadata

@@ -0,0 +1,3 @@
+{
+	"MIME_TYPE":"json"
+}

data/lib/medea/templates/keylist.template

@@ -1 +1 @@
-[<!--%item% [%HTTP_X_KEY%][%COMMA%]%item%-->]
+<!--%item% [%HTTP_X_KEY%][%COMMA%]%item%-->

data/lib/medea/templates/search.metadata

@@ -0,0 +1,3 @@
+{
+	"MIME_TYPE":"json"
+}

data/lib/medea/templates/search.template

@@ -5,11 +5,12 @@
 	"SELF_LINK":"--%SELF_LINK%--",
 	"AUTH_USER":"--%AUTH_USER%--",
 	"RESTFULDB_VERSION":"--%RESTFULDB_VERSION%--",
+	"RESTFULDB_VER":"--%RESTFULDB_VER%--",
 	"QUERY_URL":"--%QUERY_URL%--",
 	"TOTAL_STATE_ERRORS":"--%TOTAL_STATE_ERRORS%--",
-	"TOTAL_VALID_STATES_ERRORS":"--%TOTAL_VALID_STATES_ERRORS%--",
+	"TOTAL_VALID_STATES_ERRORS":"--%TOTAL_VALID_STATES_ERRORS%--"
 	<!--%item%
-		"[%ITEM_NUMBER%]":
+		,"[%ITEM_NUMBER%]":
 		{
 			"POST_TO":"[%POST_TO%]",
 			"RELATIVE_VERSION":"[%RELATIVE_VERSION%]",
@@ -24,6 +25,6 @@
       "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.7.1"
+  VERSION = "0.7.2"
 
   #When the templates are changed, this version should be incremented
   #This version is used when uploading/updating the templates
-  TEMPLATE_VERSION = "1.1.1"
+  TEMPLATE_VERSION = "1.1.3"
 end

data/spec/spec_helper.rb

@@ -6,6 +6,10 @@ require 'medea'
 class Message < Medea::JasonObject
 end
 
+ENV["jason_user"] = "michael"
+ENV["jason_topic"] = "medea-test"
+ENV["jason_password"] = "password"
+
 class User < Medea::JasonObject
   has_location
   has_many :followees, User
@@ -21,7 +25,3 @@ class DummyResponse
      :timestamp => "12345678"}
   end
 end
-
-ENV["jason_user"] = "michael"
-ENV["jason_topic"] = "medea-test"
-ENV["jason_password"] = "password"

metadata

@@ -2,7 +2,7 @@
 name: medea
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors: 
 - Michael Jensen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-07 00:00:00 +11:00
+date: 2011-03-29 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,8 +84,11 @@ files:
 - lib/medea/jasonlistproperty.rb
 - lib/medea/jasonobject.rb
 - lib/medea/meta_properties.rb
+- lib/medea/templates/content.metadata
 - lib/medea/templates/content.template
+- lib/medea/templates/keylist.metadata
 - lib/medea/templates/keylist.template
+- lib/medea/templates/search.metadata
 - lib/medea/templates/search.template
 - lib/medea/version.rb
 - medea.gemspec