hanswurst 0.5.3 → 0.5.4

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.5.4

data/lib/hanswurst.rb

@@ -145,9 +145,13 @@ class Hanswurst
 
   # helper for easy access to role attributes
   class As
-    def initialize(doc, obj)
+    def initialize(doc, role)
       @doc = doc
-      @obj = obj
+      @role = role
+    end
+  
+    def _role
+      @role
     end
 
     def _id
@@ -160,9 +164,13 @@ class Hanswurst
 
     # we suppose, we have a subrole
     def method_missing(meth, *args, &code)
-      obj = @obj.send(meth, *args)
+      # a hack around http://api.rubyonrails.org/classes/ActiveModel/Dirty.html
+      # since ActiveModel::Dirty does not recognize when property is a hash and hashentries do change
+      @doc.update_roles! if meth =~ /=$/
+
+      obj = @role.send(meth, *args)
       if obj.is_a? CouchPotato::Persistence
-        obj = self.class.new(@doc, @obj.send(meth, *args))
+        obj = self.class.new(@doc, @role.send(meth, *args))
       end
       obj.instance_eval(&code) if code
       obj
@@ -225,18 +233,15 @@ class Hanswurst
   include CouchPotato::Persistence
 
   module MethodMissing
-    # dispatches self.role___prop calls and self.role= setters
+    # dispatches self.role calls and self.role= setters
     def method_missing(meth, *args, &code)
       value = args.first
       case meth
-      when /^([^=]+)___([^=]+)(\=)?$/ # obj.role__prop # => we get / set a property
-        raise "use of ___ methods is deprecated, please use Hanswurst#as"
-      #  role, property, setter = $1, $2, $3
-      #  return setter ? set_property(role, property, value) : read(role, property, *args)
       when /^([^=]+)\=$/ # obj.role = ... # => we set a role
         role=$1
         add_role(role, value.class) unless role_exists?(role)
-        return set_role(role, value) if role_exists?(role)
+        set_role(role, value) if role_exists?(role)
+        return as(meth)
       else
         return as(meth) if role_exists?(meth.to_s)
       end
@@ -277,7 +282,6 @@ class Hanswurst
     hanswust_data = attributes.delete :hanswurst_data
     obj = self.class.new attributes
     hanswust_data.each do |role,val|
-      #obj.set role, val
       obj.send(:"#{role}=", val.dup)
     end
     obj
@@ -287,6 +291,12 @@ class Hanswurst
     add_roles(hsh)
   end
 
+  # a hack around http://api.rubyonrails.org/classes/ActiveModel/Dirty.html
+  # since ActiveModel::Dirty does not recognize when property is a hash and hashentries do change
+  def update_roles!
+    self.hanswurst_data_will_change!
+  end
+
   private
 
   # add a role
@@ -314,8 +324,8 @@ class Hanswurst
       raise "class expected: #{klass.inspect}" unless klass.is_a? Class
       handle_shared(role, klass)
       self.hanswurst_roles.update role.to_s => klass.name
-      
     end
+    update_roles!
     self.hanswurst_roles
   end
 
@@ -329,13 +339,6 @@ class Hanswurst
     self.hanswurst_data and self.hanswurst_data[role.to_s]
   end
 
-  # set a property of a role
-  def set_property(role, property, value)
-    return unless role_exists? role
-    create(role) unless hanswurst_data_exists? role
-    update role, property, value
-  end
-
   # set a role
   def set_role(role, value)
     value ? set(role, value) : delete_role(role)
@@ -351,6 +354,7 @@ class Hanswurst
   def set(role, val)
     self.hanswurst_data ||= {}
     self.hanswurst_data.update role.to_s => val
+    update_roles!
   end
 
   # create a new instance of a role
@@ -358,26 +362,20 @@ class Hanswurst
     raise "unknown role #{role.inspect}" unless role_exists? role.to_s
     self.hanswurst_data ||= {}
     self.hanswurst_data[role.to_s] = self.class.getClass(self.hanswurst_roles[role.to_s]).new
+    update_roles!
   end
 
   # delete a role
   def delete(role)
     self.hanswurst_data ||= {}
-    hsh = self.hanswurst_data
-    hsh.delete(role.to_s)
-    self.hanswurst_data = {} # we have to do this, otherwise it won't save?!
-    self.hanswurst_data = hsh
-  end
-
-  # read a property of a role
-  def read(role, property, *args)
-    if hanswurst_data_exists?(role.to_s)
-      return self.hanswurst_data[role.to_s].send(property.to_sym, *args)
-    end
-    nil
+    self.hanswurst_data.delete(role.to_s)
+    update_roles!
+    #self.hanswurst_data = {} # we have to do this, otherwise it won't save?!
+    #self.hanswurst_data = hsh
   end
 
   def as(role, &code)
+    return nil unless role_exists?(role)
     unless hanswurst_data[role.to_s]                 
       create(role.to_s)
     end
@@ -388,16 +386,5 @@ class Hanswurst
     end
     nil
   end
-
-  # update a property of a role
-  # we have to use this method in order to make sure that everything is saved
-  def update(role, property, value)
-    if hanswurst_data_exists? role
-      self.hanswurst_data[role.to_s].send(:"#{property}=", value)
-      hsh = self.hanswurst_data.merge(role.to_s => self.hanswurst_data[role.to_s])
-      self.hanswurst_data = {} # we have to do this, otherwise it won't save?!
-      self.hanswurst_data = hsh
-    end
-  end
 end
 

data/test/test_hanswurst.rb

@@ -166,6 +166,29 @@ class TestCouch < Test::Unit::TestCase
       assert_equal 'Donald', o.person.firstname
     end
 
+    should "update role properties" do
+      o = Hanswurst.new
+      o.product = Prod.new( :article_number => 'xyz', :name => 'prod1' )
+      save o
+      o = load(o._id)
+      o.product.article_number = '123'
+      save o
+      o = load(o._id)
+      assert_equal 'prod1', o.product.name
+      assert_equal '123', o.product.article_number
+
+
+      h = Hanswurst.new( :f => F.new(:d => D.new(:my_prop => 'D')) )
+      save h
+      h = load(h._id)
+      assert_equal 'D', h.f.d.my_prop
+
+      h.f.d.my_prop = 'd'
+      save h
+      h = load(h._id)
+      assert_equal 'd', h.f.d.my_prop
+    end
+
     should "save hanswurst_roles" do
       o = Hanswurst.new
       o.person = Pers.new
@@ -191,7 +214,7 @@ class TestCouch < Test::Unit::TestCase
       o = load(o._id)
       assert_equal 'prod1', o.product.name
       assert_equal 'Bugs', o.person.firstname
-      assert_equal 'abc', o.product.article_number
+      assert_equal 'cde', o.product.article_number
 
       o.product = nil
       save o

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanswurst
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couch_potato
-  requirement: &18119560 !ruby/object:Gem::Requirement
+  requirement: &19722520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18119560
+  version_requirements: *19722520
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &18118720 !ruby/object:Gem::Requirement
+  requirement: &19721800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *18118720
+  version_requirements: *19721800
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &18117960 !ruby/object:Gem::Requirement
+  requirement: &19720980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *18117960
+  version_requirements: *19720980
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &18117280 !ruby/object:Gem::Requirement
+  requirement: &19720300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *18117280
+  version_requirements: *19720300
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &18116680 !ruby/object:Gem::Requirement
+  requirement: &19719700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18116680
+  version_requirements: *19719700
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &18115920 !ruby/object:Gem::Requirement
+  requirement: &19719020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18115920
+  version_requirements: *19719020
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &18115200 !ruby/object:Gem::Requirement
+  requirement: &19686960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18115200
+  version_requirements: *19686960
 - !ruby/object:Gem::Dependency
   name: linecache19
-  requirement: &18091980 !ruby/object:Gem::Requirement
+  requirement: &19686300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18091980
+  version_requirements: *19686300
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &18091400 !ruby/object:Gem::Requirement
+  requirement: &19685720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18091400
+  version_requirements: *19685720
 - !ruby/object:Gem::Dependency
   name: couch_potato
-  requirement: &18090780 !ruby/object:Gem::Requirement
+  requirement: &19685160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18090780
+  version_requirements: *19685160
 description: flexible enhancement of couch potato
 email: ! 'Base64.decode64(''bGludXhAbWFyY3JlbmVhcm5zLmRl
 
@@ -155,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 103633383308200188
+      hash: -3336574218003098224
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: