simple_record 1.1.43 → 1.1.44

data/lib/simple_record.rb

@@ -204,25 +204,6 @@ module SimpleRecord
             return ret
         end
 
-        # 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)
-            # Check if this arg is already converted
-            arg_s = arg.to_s
-            instance_var = ("@" + arg_s)
-#            puts "defined?(#{instance_var.to_sym}) " + (defined?(instance_var.to_sym)).inspect
-#            if defined?(instance_var.to_sym) # this returns "method" for some reason??
-#            puts "attribute #{instance_var} is defined"
-            ret = instance_variable_get(instance_var)
-#            puts 'ret=' + ret.to_s
-            return ret if !ret.nil?
-#            end
-            ret = get_attribute_sdb(arg)
-            ret = sdb_to_ruby(arg, ret)
-#            puts "Setting instance var #{instance_var}"
-            instance_variable_set(instance_var, ret)
-            return ret
-        end
 
         def make_dirty(arg, value)
             arg = arg.to_s
@@ -513,40 +494,53 @@ module SimpleRecord
             return run_before_destroy && delete && run_after_destroy
         end
 
-        def delete_niled(to_delete)
-#            puts 'to_delete=' + to_delete.inspect
-            if to_delete.size > 0
-#      puts 'Deleting attributes=' + to_delete.inspect
-                delete_attributes to_delete
-            end
-        end
 
+        # 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)
+            # Check if this arg is already converted
+            arg_s = arg.to_s
+            instance_var = ("@" + arg_s)
+#            puts "defined?(#{instance_var.to_sym}) " + (defined?(instance_var.to_sym)).inspect
+#            if defined?(instance_var.to_sym) # this returns "method" for some reason??
+#            puts "attribute #{instance_var} is defined"
+            ret = instance_variable_get(instance_var)
+#            puts 'ret=' + ret.to_s
+            return ret if !ret.nil?
+#            end
+            ret = get_attribute_sdb(arg)
+            ret = sdb_to_ruby(arg, ret)
+#            puts "Setting instance var #{instance_var}"
+            instance_variable_set(instance_var, ret)
+            return ret
+        end
+        
         def set(name, value)
 
             att_meta = defined_attributes_local[name.to_sym]
             return if att_meta.nil?
             if att_meta.type == :belongs_to
-                set_belongs_to(name, value)
-                return
+                attname = name.to_s + '_id'
+                attvalue = value.nil? ? nil : value.id
+            else
+                attname = name
+                attvalue = value
             end
-            value = strip_array(value)
-            make_dirty(name, value)
-            instance_var = "@" + name.to_s
+            value = strip_array(attvalue)
+            make_dirty(attname, attvalue)
+            instance_var = "@" + attname.to_s
 #                    puts 'ARG=' + arg.to_s
-            sdb_val = ruby_to_sdb(name, value)
-            @attributes[name.to_s] = sdb_val
+            sdb_val = ruby_to_sdb(name, attvalue)
+            @attributes[attname.to_s] = sdb_val
             value = wrap_if_required(name, value, sdb_val)
-            instance_variable_set(instance_var, value)
+            instance_variable_set(instance_var, attvalue)
         end
 
-        def set_belongs_to(name, value)
-            arg_id = name.to_s + '_id'
-            if value.nil?
-                make_dirty(arg_id, nil)
-                self[arg_id]=nil unless self[arg_id].nil? # todo: can we remove unless check since dirty should take care of things?
-            else
-                make_dirty(arg_id, value.id)
-                self[arg_id]=value.id
+        def delete_niled(to_delete)
+#            puts 'to_delete=' + to_delete.inspect
+            if to_delete.size > 0
+#      puts 'Deleting attributes=' + to_delete.inspect
+                delete_attributes to_delete
             end
         end
 

data/lib/simple_record/attributes.rb

@@ -119,11 +119,11 @@ module SimpleRecord
         # This method will also create an {association)_id method that will return the ID of the foreign object
         # without actually materializing it.
         def belongs_to(association_id, options = {})
-            attribute = Attribute.new(:belongs_to, options)
-            defined_attributes[association_id] = attribute
             arg = association_id
             arg_s = arg.to_s
             arg_id = arg.to_s + '_id'
+            attribute = Attribute.new(:belongs_to, options)
+            defined_attributes[arg] = attribute
 
             # todo: should also handle foreign_key http://74.125.95.132/search?q=cache:KqLkxuXiBBQJ:wiki.rubyonrails.org/rails/show/belongs_to+rails+belongs_to&hl=en&ct=clnk&cd=1&gl=us
             #    puts "arg_id=#{arg}_id"
@@ -132,6 +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]
@@ -173,7 +174,7 @@ module SimpleRecord
 
             # Define writer method
             send(:define_method, arg.to_s + "=") do |value|
-                set_belongs_to(arg, value)
+                set(arg, value)
             end
 
 
@@ -222,6 +223,8 @@ module SimpleRecord
 
         end
 
+
+
         def self.handle_virtuals(attrs)
             @@virtuals.each do |virtual|
                 #we first copy the information for the virtual to an instance variable of the same name

data/lib/simple_record/translations.rb

@@ -13,7 +13,7 @@ module SimpleRecord
             name = name.to_s
 
 #            puts "Converting #{name} to sdb value=#{value}"
-#            puts "atts_local=" + defined_attributes_local.inspect
+            puts "atts_local=" + defined_attributes_local.inspect
 
             att_meta = defined_attributes_local[name.to_sym]
 

data/test/test_simple_record.rb

@@ -114,10 +114,14 @@ class TestSimpleRecord < Test::Unit::TestCase
         child.my_model = mm
         child.save
 
+        puts "child=" + child.inspect
         sleep 1
 
         child = MyChildModel.find(child.id)
-        puts child.my_model_id
+        puts "child find=" + child.inspect
+        puts "child.my_model_id = " + child.my_model_id.to_s
+        assert !child.my_model_id.nil?
+        assert !child.my_model.nil?
         assert child.my_model_id == mm.id
     end
 

metadata

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