medea 0.4.0 → 0.5.0

data/lib/medea/jasonobject.rb

@@ -15,7 +15,7 @@ module Medea
     inheritable_attributes :owned
     @owned = false
 
-    include JasonObjectListProperties
+    include JasonObjectMetaProperties
 
     #end meta
 
@@ -113,13 +113,31 @@ module Medea
     end
     #end "flexihash" access
 
-    def initialize key = nil, mode = :eager
-      if key
-        @__id = key
-        if mode == :eager
-          load
+    def sanitize hash
+      #remove the keys in hash that aren't allowed
+      forbidden_keys = ["jason_key",
+                        "jason_state",
+                        "jason_parent",
+                        "jason_parent_key",
+                        "jason_parent_list"]
+      hash.delete_if { |k,v| forbidden_keys.include? k }
+      result = {}
+      hash.each { |k, v| result[k.to_s] = v }
+      result
+    end
+
+    def initialize initialiser = nil, mode = :eager
+      if initialiser
+        if initialiser.is_a? Hash
+          @__jason_state = :new
+          @__jason_data = sanitize initialiser
         else
-          @__jason_state = :ghost
+          @__id = initialiser
+          if mode == :eager
+            load
+          else
+            @__jason_state = :ghost
+          end
         end
       else
         @__jason_state = :new
@@ -179,8 +197,22 @@ module Medea
 
     #object persistence methods
 
+    def update_attributes attributes
+      @__jason_data = sanitize attributes
+      save
+    end
+
     #POSTs the current values of this object back to JasonDB
     #on successful post, sets state to STALE and updates eTag
+    def save
+      return false if @__jason_state == :stale or @__jason_state == :ghost
+      begin
+        save!
+        return true
+      rescue
+        return false
+      end
+    end
     def save!
         #no changes? no save!
         return if @__jason_state == :stale or @__jason_state == :ghost

data/lib/medea/{list_properties.rb → meta_properties.rb}

@@ -1,9 +1,9 @@
-module JasonObjectListProperties
+module JasonObjectMetaProperties
   def self.included(base)
-    base.extend(MetaListProperties)
+    base.extend(MetaProperties)
   end
   
-  module MetaListProperties
+  module MetaProperties
     def create_member_list list_name, list_class, list_type
       list = {}
       list = self.send(:class_variable_get, :@@lists) if self.class_variable_defined? :@@lists
@@ -27,5 +27,10 @@ module JasonObjectListProperties
       #list_type.class_variable_set :@@owner, self
       list_class.owned = true
     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)
+    end
   end
 end

data/lib/medea/version.rb

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

data/lib/medea.rb

@@ -4,7 +4,7 @@ module Medea
   require 'medea/version'
   require 'medea/inheritable_attributes'
   require 'medea/active_model_methods'
-  require 'medea/list_properties'
+  require 'medea/meta_properties'
   require 'medea/jasonobject'
   require 'medea/jasondeferredquery'
   require 'medea/jasonlistproperty'

data/spec/jason_object_spec.rb

@@ -52,4 +52,33 @@ describe "JasonObject" do
       usr.should_not eq(u)
     end
   end
+
+  it "should be initialisable with a hash" do
+    @user = User.new({:name => "Jimmy", :age => 31})
+    @user.name.should eq("Jimmy")
+    @user.age.should eq(31)
+  end
+
+  it "should be updateable with update_attributes" do
+
+    field_hash = {:name => "Robert",
+                  :age => 25}
+    @user.name = "Fred"
+    @user.age = 20
+
+    @user.stub(:save).and_return true
+    @user.should_receive :save
+    (@user.update_attributes field_hash).should eq(true)
+
+    @user.name.should eq(field_hash[:name])
+    @user.age.should eq(field_hash[:age])
+  end
+
+  it "should pass the result of save back through update_attributes" do
+    @user.stub(:save).and_return true
+    (@user.update_attributes({})).should eq(true)
+
+    @user.stub(:save).and_return false
+    (@user.update_attributes({})).should eq(false)
+  end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Michael Jensen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-13 00:00:00 +11:00
+date: 2011-01-18 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -92,7 +92,7 @@ files:
 - lib/medea/jasondeferredquery.rb
 - lib/medea/jasonlistproperty.rb
 - lib/medea/jasonobject.rb
-- lib/medea/list_properties.rb
+- lib/medea/meta_properties.rb
 - lib/medea/version.rb
 - medea.gemspec
 - spec/jason_object_spec.rb