simple_record 1.1.63 → 1.1.64

data/lib/simple_record.rb

@@ -184,14 +184,22 @@ module SimpleRecord
             domain_name_for_class
         end
 
-        def get_attribute_sdb(arg)
+        def get_attribute_sdb(name)
 #            arg = arg.to_s
 #            puts "get_attribute_sdb(#{arg}) - #{arg.class.name}"
 #            puts 'self[]=' + self.inspect
-            ret = strip_array(self[arg])
+            ret = strip_array(@attributes[sdb_att_name(name)])
             return ret
         end
 
+        def sdb_att_name(name)
+            att_meta = defined_attributes_local[name.to_sym]
+            if att_meta.type == :belongs_to
+                return "#{name}_id"
+            end
+            name.to_s
+        end
+
         def strip_array(arg)
             if arg.class==Array
                 if arg.length==1
@@ -207,16 +215,18 @@ module SimpleRecord
 
 
         def make_dirty(arg, value)
+            sdb_att_name = sdb_att_name(arg)
             arg = arg.to_s
-#            puts "Marking #{arg} dirty with #{value}"
-            if @dirty.include?(arg)
-                old = @dirty[arg]
+
+            puts "Marking #{arg} dirty with #{value}"
+            if @dirty.include?(sdb_att_name)
+                old = @dirty[sdb_att_name]
 #                puts "Was already dirty #{old}"
-                @dirty.delete(arg) if value == old
+                @dirty.delete(sdb_att_name) if value == old
             else
-                old = get_attribute(arg)
-#                puts "dirtifying #{old} to #{value}"
-                @dirty[arg] = old if value != old
+                old = get_attribute_sdb(arg)
+                puts "dirtifying old=#{old} to new=#{value}"
+                @dirty[sdb_att_name] = old if value != old
             end
         end
 
@@ -314,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 '@dirty=' + @dirty.inspect
+                puts '@dirtyA=' + @dirty.inspect
                 return true if @dirty.size == 0 # Nothing to save so skip it
             end
             is_create = self[:id].nil?
@@ -322,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
@@ -512,6 +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}"
             # Check if this arg is already converted
             arg_s = arg.to_s
 #            instance_var = ("@" + arg_s)
@@ -520,11 +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=' + ret.to_s
+            puts 'ret from rb=' + ret.inspect
             return ret if !ret.nil?
 #            end
             ret = get_attribute_sdb(arg)
+            puts 'ret from atts=' + ret.inspect
             ret = sdb_to_ruby(arg, ret)
+            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
@@ -532,7 +545,8 @@ module SimpleRecord
         end
 
         def set(name, value, dirtify=true)
-
+            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
@@ -559,13 +573,14 @@ 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
-            attvalue = wrap_if_required(name, attvalue, sdb_val)
+#            attvalue = wrap_if_required(name, attvalue, sdb_val)
 #            puts 'attvalue2=' + attvalue.to_s
-            @attributes_rb[attname] = attvalue
+            @attributes_rb.delete(name.to_s) # todo: we should set the value here so it doesn't reget anything
+
 
 #            instance_var = "@" + attname.to_s
 #            instance_variable_set(instance_var, attvalue)
@@ -575,6 +590,7 @@ module SimpleRecord
 #            puts 'to_delete=' + to_delete.inspect
             if to_delete.size > 0
 #      puts 'Deleting attributes=' + to_delete.inspect
+                SimpleRecord.stats.deletes += 1
                 delete_attributes to_delete
             end
         end

data/lib/simple_record/attributes.rb

@@ -49,18 +49,18 @@ module SimpleRecord
                 # 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?(arg_s)
+                    @dirty.has_key?(sdb_att_name(arg_s))
                 end
 
                 # define change method
                 send(:define_method, arg_s + "_change") do
-                    old_val = @dirty[arg_s]
+                    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[arg_s]
+                    old_val = @dirty[sdb_att_name(arg_s)]
                     old_val
                 end
             end
@@ -132,44 +132,7 @@ module SimpleRecord
 
             # Define reader method
             send(:define_method, arg) do
-#                puts 'GETTING ' + arg.to_s
-                attribute = defined_attributes_local[arg]
-                options2 = attribute.options # @@belongs_to_map[arg]
-                class_name = options2[:class_name] || arg.to_s[0...1].capitalize + arg.to_s[1...arg.to_s.length]
-
-                # Camelize classnames with underscores (ie my_model.rb --> MyModel)
-                class_name = class_name.camelize
-
-                #      puts "attr=" + @attributes[arg_id].inspect
-                #      puts 'val=' + @attributes[arg_id][0].inspect unless @attributes[arg_id].nil?
-                ret = nil
-                arg_id = arg.to_s + '_id'
-                arg_id_val = send("#{arg_id}")
-                if arg_id_val
-                    if !cache_store.nil?
-#                        arg_id_val = @attributes[arg_id][0]
-                        cache_key = self.class.cache_key(class_name, arg_id_val)
-#          puts 'cache_key=' + cache_key
-                        ret = cache_store.read(cache_key)
-#          puts 'belongs_to incache=' + ret.inspect
-                    end
-                    if ret.nil?
-                        to_eval = "#{class_name}.find('#{arg_id_val}')"
-#      puts 'to eval=' + to_eval
-                        begin
-                            ret = eval(to_eval) # (defined? #{arg}_id)
-                        rescue Aws::ActiveSdb::ActiveSdbError
-                            if $!.message.include? "Couldn't find"
-                                ret = nil
-                            else
-                                raise $!
-                            end
-                        end
-
-                    end
-                end
-#      puts 'ret=' + ret.inspect
-                return ret
+               return get_attribute(arg)
             end
 
 

data/lib/simple_record/stats.rb

@@ -1,15 +1,17 @@
 module SimpleRecord
     class Stats
-        attr_accessor :selects, :puts
+        attr_accessor :selects, :puts, :deletes
 
         def initialize
             @selects = 0
             @puts = 0
+            @deletes = 0
         end
 
         def clear
             self.selects = 0
             self.puts = 0
+            self.deletes = 0
         end
     end
 end

data/lib/simple_record/translations.rb

@@ -44,11 +44,11 @@ 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]
 
-            if att_meta.options
+             if att_meta.options
                 if att_meta.options[:encrypted]
                     value = Translations.decrypt(value, att_meta.options[:encrypted])
                 end
@@ -57,7 +57,41 @@ module SimpleRecord
                 end
             end
 
-            if att_meta.type == :int
+
+            if att_meta.type == :belongs_to
+                class_name = att_meta.options[:class_name] || name.to_s[0...1].capitalize + name.to_s[1...name.to_s.length]
+                # Camelize classnames with underscores (ie my_model.rb --> MyModel)
+                class_name = class_name.camelize
+                #      puts "attr=" + @attributes[arg_id].inspect
+                #      puts 'val=' + @attributes[arg_id][0].inspect unless @attributes[arg_id].nil?
+                ret = nil
+                arg_id = name.to_s + '_id'
+                arg_id_val = send("#{arg_id}")
+                if arg_id_val
+                    if !cache_store.nil?
+#                        arg_id_val = @attributes[arg_id][0]
+                        cache_key = self.class.cache_key(class_name, arg_id_val)
+#          puts 'cache_key=' + cache_key
+                        ret = cache_store.read(cache_key)
+#          puts 'belongs_to incache=' + ret.inspect
+                    end
+                    if ret.nil?
+                        to_eval = "#{class_name}.find('#{arg_id_val}')"
+#      puts 'to eval=' + to_eval
+                        begin
+                            ret = eval(to_eval) # (defined? #{arg}_id)
+                        rescue Aws::ActiveSdb::ActiveSdbError
+                            if $!.message.include? "Couldn't find"
+                                ret = nil
+                            else
+                                raise $!
+                            end
+                        end
+
+                    end
+                end
+                value = ret
+            elsif att_meta.type == :int
                 value = Translations.un_offset_int(value)
             elsif att_meta.type == :date
                 value = to_date(value)

data/test/test_simple_record.rb

@@ -148,7 +148,7 @@ class TestSimpleRecord < TestBase
         # Get the object back
         mm2 = MyModel.find(id)
         puts 'mm2=' + mm2.inspect
-        puts 'got=' + mm2.name + ' and he/she is ' + mm2.age.to_s + ' years old and he/she is cool? ' + mm2.cool.to_s
+        puts 'got=' + mm2.name.to_s + ' and he/she is ' + mm2.age.to_s + ' years old and he/she is cool? ' + mm2.cool.to_s
         assert mm2.id == mm.id
         assert mm2.age == mm.age
         assert mm2.cool == mm.cool
@@ -171,12 +171,39 @@ class TestSimpleRecord < TestBase
         mmc.x = mm
         mmc.save
 
-        mmc.my_model = nil
-        mmc.x = nil
+        mmc2 = MyChildModel.find(mmc.id)
+        assert mmc2.my_model_id == mmc.my_model_id, "mm2.my_model_id=#{mmc2.my_model_id} mmc.my_model_id=#{mmc.my_model_id}"
+        puts 'setting my_model to nil'
+        mmc2.my_model = nil
+        mmc2.x = nil
+        puts 'saving my_model to nil'
+        SimpleRecord.stats.clear
+        assert mmc2.save(:dirty=>true)
+        puts SimpleRecord.stats.puts.to_s
+        assert SimpleRecord.stats.puts == 1 # 1 put only for updated, should have a count of attributes saved in stats
+        assert SimpleRecord.stats.deletes == 1
+        assert mmc2.id == mmc.id
+        assert mmc2.my_model_id == nil
+        assert mmc2.my_model == nil, "my_model not nil? #{mmc2.my_model.inspect}"
+
+        mmc3 = MyChildModel.find(mmc.id)
+        assert mmc3.my_model_id == nil, "my_model_id not nil? #{mmc3.my_model_id.inspect}"
+        assert mmc3.my_model == nil
+
+        mm3 = MyModel.new(:name=>"test")
+        assert mm3.save
+
+        mmc3.my_model = mm3
+        assert mmc3.save(:dirty=>true)
+
+        assert mmc3.my_model_id == mm3.id
+        assert mmc3.my_model.id == mm3.id
+
+        mmc3 = MyChildModel.find(mmc3.id)
+        puts "mmc3=" + mmc3.inspect
+        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
 
-        mmc = MyChildModel.find(mmc.id)
-        mmc.my_model = nil
-        mmc.x = nil
 
     end
 

metadata

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