medea 0.5.4 → 0.6.0

data/.rvmrc

@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+# adapted from: http://rvm.beginrescueend.com/workflow/rvmrc/
+
+ruby_string="1.9.2"
+gemset_name="medea"
+
+if rvm list strings | grep -q "${ruby_string}" ; then
+
+  # Load or create the specified environment
+  if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
+    && -s "${rvm_path:-$HOME/.rvm}/environments/${ruby_string}@${gemset_name}" ]] ; then
+    \. "${rvm_path:-$HOME/.rvm}/environments/${ruby_string}@${gemset_name}"
+  else
+    rvm --create  "${ruby_string}@${gemset_name}"
+  fi
+
+else
+
+  # Notify the user to install the desired interpreter before proceeding.
+  echo "${ruby_string} was not found, please run 'rvm install ${ruby_string}' and then cd back into the project directory."
+
+fi
+
+#turn on the prompt in PS1
+#RVM prompt
+if [ -z "$RVM_PROMPT" ]
+then
+  RVM_PROMPT=true
+  PS1="[\$(/usr/local/bin/rvm-prompt v g)] $PS1"
+fi
+

data/lib/medea.rb

@@ -5,6 +5,8 @@ module Medea
   require 'medea/inheritable_attributes'
   require 'medea/active_model_methods'
   require 'medea/meta_properties'
+  require 'medea/jason_base'
+  require 'medea/jason_blob'
   require 'medea/jasonobject'
   require 'medea/jasondeferredquery'
   require 'medea/jasonlistproperty'

data/lib/medea/jason_base.rb

@@ -0,0 +1,134 @@
+module Medea
+  class JasonBase
+    #meta-programming interface for lists
+    include ClassLevelInheritableAttributes
+    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)
+      q = JasonDeferredQuery.new :filters => {:VERSION0 => nil, :FILTER => {:HTTP_X_KEY => key, :HTTP_X_ACTION => :POST}}
+      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
+
+    def ==(other)
+      return false if not other.is_a? JasonBase
+      jason_key == other.jason_key
+    end
+
+    def jason_key
+        #Generate a random UUID for this object.
+	      #since jason urls must start with a letter, we'll use the first letter of the class name
+        @__id ||= "#{self.class.name[0].chr.downcase}#{UUIDTools::UUID::random_create.to_s}"
+    end
+
+    def jason_state
+      @__jason_state
+    end
+
+    def jason_etag
+      @__jason_etag ||= ""
+    end
+
+    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
+      @__jason_parent_list ||= nil
+    end
+
+    def jason_parent_list= value
+      @__jason_parent_list = value
+    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!
+      if cascade && (self.class.class_variable_defined? :@@lists)
+        @@lists.keys.each do |list_name|
+          #for each list that I have
+          list = send(list_name)
+          list.each do |item|
+            #remove each item from the list, deleting it if possible
+            list.remove! item, true
+          end
+        end
+      end
+      persist_changes :delete
+    end
+
+    def build_url
+      url    = "#{JasonDB::db_auth_url}@0.content?"
+      params = [
+          "VERSION0",
+          "FILTER=HTTP_X_KEY:#{self.jason_key}",
+          "FILTER=HTTP_X_CLASS:#{self.class.name}"
+      ]
+
+      url << params.join("&")
+      url
+    end
+
+
+    #fetches the data from the JasonDB
+    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()
+      
+      response = RestClient.get url
+      @__jason_data = JSON.parse response
+      @__jason_etag = response.headers[:etag]
+      @__jason_state = :stale
+    end
+
+
+  end
+end

data/lib/medea/jason_blob.rb

@@ -0,0 +1,110 @@
+module Medea
+  class JasonBlob < JasonBase
+    attr_accessor :parent, :attachment_name
+
+    def initialize initialiser=nil, mode=:eager
+      if initialiser
+        if initialiser.is_a? Hash
+          @parent = initialiser[:parent]
+          @attachment_name = initialiser[:name]
+          @__jason_state = :ghost
+          if initialiser[:content]
+            self.contents = initialiser[:content]
+            @__jason_state = :new
+          end
+          return
+        end
+        @__id = initialiser
+        if mode == :eager
+          load_from_jasondb
+        else
+          @__jason_state = :ghost
+        end
+      else
+        @__jason_state = :new
+        @__jason_data = nil
+      end
+    end
+
+    def to_url
+      "#{@parent.to_url}/#{@attachment_name}"
+    end
+
+    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 = to_url
+      response = nil
+      begin
+        response = RestClient.get url
+
+        #don't JSON parse blob data!
+        @__jason_data = response
+        @__jason_etag = response.headers[:etag]
+        @__jason_state = :stale
+      rescue
+        #an exception here means a bad url or a 404.
+        #404 simply means no data yet for this attachment
+        @__jason_state = :new
+        @__jason_data = nil
+        return
+      end
+    end
+
+    def contents
+      load_from_jasondb if @__jason_state == :ghost
+      @__jason_data
+    end
+
+    def contents= data
+      @__jason_data = data
+      @__jason_state = :dirty
+    end
+
+    def set_content_type type=nil
+      if type
+        @content_type = type
+      elsif contents.is_a? IO
+        @content_type = image_type(contents)
+      elsif contents.is_a? String
+        @content_type = "text/plain"
+      else
+        @content_type = "application/octet-stream"
+      end
+    end
+
+    def image_type(file)
+        case IO.read(file, 10)
+          when /^GIF8/; 'image/gif'
+          when /^\x89PNG/; 'image/png'
+          when /^\xff\xd8\xff\xe0\x00\x10JFIF/; 'image/jpeg'
+          when /^\xff\xd8\xff\xe1(.*){2}Exif/; 'image/jpeg'
+        else 'unknown'
+        end
+      end
+
+    def save!
+      return if @__jason_state == :stale or @__jason_state == :ghost
+      set_content_type
+      #write the contents of @__jason_data to parent url/attachment name
+      post_headers = {
+          :content_type => @content_type,
+          :length       => contents.size,
+          "X-KEY"       => self.jason_key,
+          "X-CLASS"     => self.class.name,
+          "X-PARENT"    => @parent.jason_key,
+          "X_LIST"      => @attachment_name
+          #also want to add the eTag here!
+          #may also want to add any other indexable fields that the user specifies?
+      }
+
+      resp = RestClient.post to_url, contents, post_headers
+
+      if resp.code == 201
+        true
+      else
+        false
+      end
+    end
+  end
+end

data/lib/medea/jasonobject.rb

@@ -5,21 +5,15 @@ module Medea
   require 'json'
   require 'uuidtools'
 
-  class JasonObject
+  class JasonObject < JasonBase
 
     include Medea::ActiveModelMethods
     if defined? ActiveModel
       extend ActiveModel::Naming
     end
-    #include JasonDB
-
-    #meta-programming interface for lists
-    include ClassLevelInheritableAttributes
-    inheritable_attributes :owned
-    @owned = false
 
     include JasonObjectMetaProperties
-
+    attr_accessor :attachments
     #end meta
 
     #Here we're going to put the "query" interface
@@ -30,12 +24,6 @@ module Medea
       JasonDeferredQuery.new :class => self, :filters => {:VERSION0 => nil, :FILTER => {:HTTP_X_CLASS => self, :HTTP_X_ACTION => :POST}}
     end
 
-    #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 JasonObject.get_by_key(key, mode=:eager)
-      return self.new key, mode
-    end
-
     #here we will capture:
     #members_of(object) (where object is an instance of a class that this class can be a member of)
     #find_by_<property>(value)
@@ -58,38 +46,12 @@ 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 :filters => {:VERSION0 => nil, :FILTER => {:HTTP_X_KEY => key, :HTTP_X_ACTION => :POST}}
-      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
-
-    def ==(other)
-      return false if not other.is_a? JasonObject
-      jason_key == other.jason_key
-    end
-
     #"flexihash" access interface
     def []=(key, value)
+      if @attachments.keys.include? key.to_sym
+        @attachments[key.to_sym] = Medea::JasonBlob.new({:parent => self, :name => key, :content => value})
+        return
+      end
       @__jason_data ||= {}
       @__jason_state = :dirty if jason_state == :stale
 
@@ -97,6 +59,14 @@ module Medea
     end
 
     def [](key)
+      if @attachments.keys.include? key.to_sym
+        if not @attachments[key.to_sym]
+          #retrieve the JasonBlob for this key
+          @attachments[key.to_sym] = Medea::JasonBlob.new({:parent => self, :name => key})
+        end
+
+        return @attachments[key.to_sym].contents
+      end
       @__jason_data[key]
     end
 
@@ -104,7 +74,7 @@ module Medea
     # "weak object" that can take any attribute.
     # Assigning any attribute will add it to the object's hash (and then be POSTed to JasonDB on the next save)
     def method_missing(name, *args, &block)
-        load if @__jason_state == :ghost
+        load_from_jasondb if @__jason_state == :ghost
         field = name.to_s
         if field =~ /(.*)=$/  # We're assigning
             self[$1] = args[0]
@@ -130,6 +100,13 @@ module Medea
     end
 
     def initialize initialiser = nil, mode = :eager
+      @attachments = {}
+      if self.class.class_variable_defined? :@@attachments
+        (self.class.class_variable_get :@@attachments).each do |k|
+          @attachments[k] = nil
+        end
+      end
+
       if initialiser
         if initialiser.is_a? Hash
           @__jason_state = :new
@@ -137,7 +114,7 @@ module Medea
         else
           @__id = initialiser
           if mode == :eager
-            load
+            load_from_jasondb
           else
             @__jason_state = :ghost
           end
@@ -148,54 +125,13 @@ module Medea
       end
     end
 
-    def jason_key
-        #Generate a random UUID for this object.
-	      #since jason urls must start with a letter, we'll use the first letter of the class name
-        @__id ||= "#{self.class.name[0].chr.downcase}#{UUIDTools::UUID::random_create.to_s}"
-    end
-
     def to_s
       jason_key
     end
 
-    def jason_state
-      @__jason_state
-    end
-
-    def jason_etag
-      @__jason_etag ||= ""
-    end
-
-    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
-      @__jason_parent_list ||= nil
-    end
-
-    def jason_parent_list= value
-      @__jason_parent_list = value
+    #converts the data hash (that is, @__jason_data) to JSON format
+    def serialise
+      JSON.generate(@__jason_data)
     end
 
     #object persistence methods
@@ -217,61 +153,26 @@ module Medea
         return false
       end
     end
+    
     def save!
-        #no changes? no save!
-        return if @__jason_state == :stale or @__jason_state == :ghost
-
-        persist_changes :post
-    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!
-      if cascade && (self.class.class_variable_defined? :@@lists)
-        @@lists.keys.each do |list_name|
-          #for each list that I have
-          list = send(list_name)
-          list.each do |item|
-            #remove each item from the list, deleting it if possible
-            list.remove! item, true
+        @attachments.each do |k, v|
+          if v
+            v.save!
           end
         end
-      end
-      persist_changes :delete
-    end
 
-    #end object persistence
+        #no changes? no save!
+        return if @__jason_state == :stale or @__jason_state == :ghost
 
-    #converts the data hash (that is, @__jason_data) to JSON format
-    def to_json
-      JSON.generate(@__jason_data)
+        persist_changes :post
     end
 
-    private
-
-    #fetches the data from the JasonDB
-    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_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}"
-
-      #puts "   = Retrieving #{self.class.name} at #{url}"
-      response = RestClient.get url
-      @__jason_data = JSON.parse response
-      @__jason_etag = response.headers[:etag]
-      @__jason_state = :stale
+    def to_url
+      "#{JasonDB::db_auth_url}#{self.class.name}/#{self.jason_key}"
     end
 
     def persist_changes method = :post
-      payload = self.to_json
+      payload = self.serialise
 
       post_headers = {
           :content_type => 'application/json',
@@ -290,7 +191,7 @@ module Medea
       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
+      url = to_url()
 
       #puts "Saving to #{url}"
       if method == :post
@@ -313,5 +214,6 @@ module Medea
       @__jason_state = :stale
     end
 
+    #end object persistence
   end
 end

data/lib/medea/meta_properties.rb

@@ -28,6 +28,14 @@ module JasonObjectMetaProperties
       list_class.owned = true
     end
 
+    def has_attachment attachment_name
+      attachments = []
+      attachments = self.send(:class_variable_get, :@@attachments) if self.class_variable_defined? :@@attachments
+      attachments << attachment_name
+      attachments.uniq!
+      self.send(:class_variable_set, "@@attachments", attachments)
+    end
+
     def key_field field_name
       #this field must be present to save, and it must be unique
       self.send(:class_variable_set, :@@key_field, field_name)

data/lib/medea/version.rb

@@ -1,5 +1,5 @@
 module Medea
-  VERSION = "0.5.4"
+  VERSION = "0.6.0"
 
   #When the templates are changed, this version should be incremented
   #This version is used when uploading/updating the templates

data/spec/jason_blob_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe "Jason Blob" do
+
+  class Update < Medea::JasonObject
+    has_attachment :avatar
+  end
+
+  before :each do
+    @update = Update.new
+  end
+
+  after :each do
+    @update.delete!
+  end
+
+  it "should be persisted" do
+    @update.avatar = "Here's some text!"
+    @update.save!
+    u2 = Update.get_by_key(@update.jason_key)
+    u2.avatar.should eq("Here's some text!")
+    u2.avatar.size.should eq("Here's some text!".size)
+  end
+
+  it "should work for larger images" do
+    f = File.new("./spec/test.jpg", "r")
+    @update.avatar = f
+    @update.save!
+    Update.get_by_key(@update.jason_key).avatar.size.should eq(f.size)
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 4
-  version: 0.5.4
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Michael Jensen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-19 00:00:00 +11:00
+date: 2011-02-01 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,6 +79,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .rvmrc
 - Gemfile
 - README
 - Rakefile
@@ -88,6 +89,8 @@ files:
 - lib/medea/active_model_methods.rb
 - lib/medea/dummy_logger.rb
 - lib/medea/inheritable_attributes.rb
+- lib/medea/jason_base.rb
+- lib/medea/jason_blob.rb
 - lib/medea/jasondb.rb
 - lib/medea/jasondeferredquery.rb
 - lib/medea/jasonlistproperty.rb
@@ -99,10 +102,12 @@ files:
 - lib/medea/version.rb
 - medea.gemspec
 - spec/deferred_query_spec.rb
+- spec/jason_blob_spec.rb
 - spec/jason_object_spec.rb
 - spec/list_properties_spec.rb
 - spec/medea_spec.rb
 - spec/spec_helper.rb
+- spec/test.jpg
 has_rdoc: true
 homepage: ""
 licenses: []