simple_record 1.1.64 → 1.1.65

data/lib/simple_record/attributes.rb

@@ -46,23 +46,27 @@ module SimpleRecord
                     set(arg, value)
                 end
 
-                # Now for dirty methods: http://api.rubyonrails.org/classes/ActiveRecord/Dirty.html
-                # define changed? method
-                send(:define_method, arg_s + "_changed?") do
-                    @dirty.has_key?(sdb_att_name(arg_s))
-                end
+                define_dirty_methods(arg_s)
+            end
+        end
 
-                # define change method
-                send(:define_method, arg_s + "_change") do
-                    old_val = @dirty[sdb_att_name(arg_s)]
-                    [old_val, get_attribute(arg_s)]
-                end
+        def define_dirty_methods(arg_s)
+            # Now for dirty methods: http://api.rubyonrails.org/classes/ActiveRecord/Dirty.html
+            # define changed? method
+            send(:define_method, arg_s + "_changed?") do
+                @dirty.has_key?(sdb_att_name(arg_s))
+            end
 
-                # define was method
-                send(:define_method, arg_s + "_was") do
-                    old_val = @dirty[sdb_att_name(arg_s)]
-                    old_val
-                end
+            # define change method
+            send(:define_method, arg_s + "_change") do
+                old_val = @dirty[sdb_att_name(arg_s)]
+                [old_val, get_attribute(arg_s)]
+            end
+
+            # define was method
+            send(:define_method, arg_s + "_was") do
+                old_val = @dirty[sdb_att_name(arg_s)]
+                old_val
             end
         end
 
@@ -132,7 +136,7 @@ module SimpleRecord
 
             # Define reader method
             send(:define_method, arg) do
-               return get_attribute(arg)
+                return get_attribute(arg)
             end
 
 
@@ -144,27 +148,18 @@ module SimpleRecord
 
             # Define ID reader method for reading the associated objects id without getting the entire object
             send(:define_method, arg_id) do
-                val1 = @attributes[arg_id]
-                if val1
-                    if val1.is_a?(Array)
-                        if val1.size > 0 && val1[0].present?
-                            return val1[0]
-                        end
-
-                    else
-                        return val1
-                    end
-                end
-                return nil
+                 get_attribute_sdb(arg_s)
             end
 
             # Define writer method for setting the _id directly without the associated object
             send(:define_method, arg_id + "=") do |value|
-                if value.nil?
-                    self[arg_id] = nil unless self[arg_id].nil? # if it went from something to nil, then we have to remember and remove attribute on save
-                else
-                    self[arg_id] = value
-                end
+#                rb_att_name = arg_s # n2 = name.to_s[0, name.length-3]
+                set(arg_id, value)
+#                if value.nil?
+#                    self[arg_id] = nil unless self[arg_id].nil? # if it went from something to nil, then we have to remember and remove attribute on save
+#                else
+#                    self[arg_id] = value
+#                end
             end
 
             send(:define_method, "create_"+arg.to_s) do |*params|
@@ -173,6 +168,8 @@ module SimpleRecord
                 arg_id = arg.to_s + '_id'
                 self[arg_id]=newsubrecord.id
             end
+
+            define_dirty_methods(arg_s)
         end
 
         def has_many(*args)

data/lib/simple_record/translations.rb

@@ -44,7 +44,7 @@ module SimpleRecord
 
         # Convert value from SimpleDB String version to real ruby value.
         def sdb_to_ruby(name, value)
-            puts 'sdb_to_ruby arg=' + name.inspect + ' - ' + name.class.name + ' - value=' + value.to_s
+#            puts 'sdb_to_ruby arg=' + name.inspect + ' - ' + name.class.name + ' - value=' + value.to_s
             return nil if value.nil?
             att_meta = defined_attributes_local[name.to_sym]
 

data/lib/simple_record.rb

@@ -218,14 +218,14 @@ module SimpleRecord
             sdb_att_name = sdb_att_name(arg)
             arg = arg.to_s
 
-            puts "Marking #{arg} dirty with #{value}"
+#            puts "Marking #{arg} dirty with #{value}"
             if @dirty.include?(sdb_att_name)
                 old = @dirty[sdb_att_name]
 #                puts "Was already dirty #{old}"
                 @dirty.delete(sdb_att_name) if value == old
             else
                 old = get_attribute_sdb(arg)
-                puts "dirtifying old=#{old} to new=#{value}"
+#                puts "dirtifying old=#{old} to new=#{value}"
                 @dirty[sdb_att_name] = old if value != old
             end
         end
@@ -324,7 +324,7 @@ module SimpleRecord
             clear_errors
             # todo: decide whether this should go before pre_save or after pre_save? pre_save dirties "updated" and perhaps other items due to callbacks
             if options[:dirty]
-                puts '@dirtyA=' + @dirty.inspect
+#                puts '@dirtyA=' + @dirty.inspect
                 return true if @dirty.size == 0 # Nothing to save so skip it
             end
             is_create = self[:id].nil?
@@ -332,7 +332,7 @@ module SimpleRecord
             if ok
                 begin
                     if options[:dirty]
-                        puts '@dirty=' + @dirty.inspect
+#                        puts '@dirty=' + @dirty.inspect
                         return true if @dirty.size == 0 # This should probably never happen because after pre_save, created/updated dates are changed
                         options[:dirty_atts] = @dirty
                     end
@@ -522,7 +522,7 @@ module SimpleRecord
         # Since SimpleDB supports multiple attributes per value, the values are an array.
         # This method will return the value unwrapped if it's the only, otherwise it will return the array.
         def get_attribute(arg)
-            puts "GET #{arg}"
+#            puts "GET #{arg}"
             # Check if this arg is already converted
             arg_s = arg.to_s
 #            instance_var = ("@" + arg_s)
@@ -531,13 +531,13 @@ module SimpleRecord
 #            puts "attribute #{instance_var} is defined"
             @attributes_rb = {} unless @attributes_rb # was getting errors after upgrade.
             ret = @attributes_rb[arg_s] # instance_variable_get(instance_var)
-            puts 'ret from rb=' + ret.inspect
+#            puts 'ret from rb=' + ret.inspect
             return ret if !ret.nil?
 #            end
             ret = get_attribute_sdb(arg)
-            puts 'ret from atts=' + ret.inspect
+#            puts 'ret from atts=' + ret.inspect
             ret = sdb_to_ruby(arg, ret)
-            puts 'ret from atts to rb=' + ret.inspect
+#            puts 'ret from atts to rb=' + ret.inspect
 #            puts "Setting instance var #{arg_s} to #{ret}"
 #            instance_variable_set(instance_var, ret)
             @attributes_rb[arg_s] = ret
@@ -545,8 +545,8 @@ module SimpleRecord
         end
 
         def set(name, value, dirtify=true)
-            puts "SET #{name}=#{value.inspect}"
-            puts "self=" + self.inspect
+#            puts "SET #{name}=#{value.inspect}"
+#            puts "self=" + self.inspect
             att_meta = defined_attributes_local[name.to_sym]
             if att_meta.nil?
                 # check if it ends with id and see if att_meta is there
@@ -573,7 +573,7 @@ module SimpleRecord
             end
             attvalue = strip_array(attvalue)
             make_dirty(name, attvalue) if dirtify
-            puts "ARG=#{attname.to_s} setting to #{attvalue}"
+#            puts "ARG=#{attname.to_s} setting to #{attvalue}"
             sdb_val = ruby_to_sdb(name, attvalue)
 #            puts "sdb_val=" + sdb_val.to_s
             @attributes[attname] = sdb_val

data/test/test_simple_record.rb

@@ -187,6 +187,7 @@ class TestSimpleRecord < TestBase
         assert mmc2.my_model == nil, "my_model not nil? #{mmc2.my_model.inspect}"
 
         mmc3 = MyChildModel.find(mmc.id)
+        puts "mmc3 1 =" + mmc3.inspect
         assert mmc3.my_model_id == nil, "my_model_id not nil? #{mmc3.my_model_id.inspect}"
         assert mmc3.my_model == nil
 
@@ -194,6 +195,7 @@ class TestSimpleRecord < TestBase
         assert mm3.save
 
         mmc3.my_model = mm3
+        assert mmc3.my_model_changed?
         assert mmc3.save(:dirty=>true)
 
         assert mmc3.my_model_id == mm3.id
@@ -204,6 +206,12 @@ class TestSimpleRecord < TestBase
         assert mmc3.my_model_id == mm3.id, "my_model_id=#{mmc3.my_model_id.inspect} mm3.id=#{mm3.id.inspect}"
         assert mmc3.my_model.id == mm3.id
 
+        mmc3 = MyChildModel.find(mmc3.id)
+        mmc3.my_model_id = mm2.id
+        assert mmc3.my_model_id == mm2.id
+        assert mmc3.changed?
+        assert mmc3.my_model_changed?
+        assert mmc3.my_model.id = mm2.id
 
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simple_record
 version: !ruby/object:Gem::Version 
-  version: 1.1.64
+  version: 1.1.65
 platform: ruby
 authors: 
 - Travis Reeder