simple_record 1.1.52 → 1.1.53

data/lib/simple_record.rb

@@ -530,13 +530,28 @@ module SimpleRecord
         def set(name, value)
 
             att_meta = defined_attributes_local[name.to_sym]
-            return if att_meta.nil?
-            if att_meta.type == :belongs_to
-                attname = name.to_s + '_id'
-                attvalue = value.nil? ? nil : value.id
+            if att_meta.nil?
+                # check if it ends with id and see if att_meta is there
+                ends_with = name.to_s[-3, 3]
+                if ends_with == "_id"
+                    puts 'ends with id'
+                    n2 = name.to_s[0, name.length-3]
+                    puts 'n2=' + n2
+                    att_meta = defined_attributes_local[n2.to_sym]
+                    puts 'defined_attributes_local=' + defined_attributes_local.inspect
+                    attname = name.to_s
+                    attvalue = value
+                    name = n2
+                end
+                return if att_meta.nil?
             else
-                attname = name.to_s
-                attvalue = value
+                if att_meta.type == :belongs_to
+                    attname = name.to_s + '_id'
+                    attvalue = value.nil? ? nil : value.id
+                else
+                    attname = name.to_s
+                    attvalue = value
+                end
             end
             attvalue = strip_array(attvalue)
             make_dirty(attname, attvalue)

data/lib/simple_record/attributes.rb

@@ -132,7 +132,7 @@ module SimpleRecord
 
             # Define reader method
             send(:define_method, arg) do
-#                puts 'GETTING ' + arg.to_s
+                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]
@@ -144,7 +144,8 @@ module SimpleRecord
                 #      puts 'val=' + @attributes[arg_id][0].inspect unless @attributes[arg_id].nil?
                 ret = nil
                 arg_id = arg.to_s + '_id'
-                if !@attributes[arg_id].nil? && @attributes[arg_id].size > 0 && @attributes[arg_id][0] != nil && @attributes[arg_id][0] != ''
+                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)
@@ -153,7 +154,7 @@ module SimpleRecord
 #          puts 'belongs_to incache=' + ret.inspect
                     end
                     if ret.nil?
-                        to_eval = "#{class_name}.find(@attributes['#{arg_id}'][0])"
+                        to_eval = "#{class_name}.find('#{arg_id_val}')"
 #      puts 'to eval=' + to_eval
                         begin
                             ret = eval(to_eval) # (defined? #{arg}_id)

data/test/test_base.rb

@@ -14,7 +14,7 @@ class TestBase < Test::Unit::TestCase
         #puts 'inspecting config = ' + @config.inspect
 
         # Establish AWS connection directly
-        @@sdb = Aws::SdbInterface.new(@config['amazon']['access_key'], @config['amazon']['secret_key'], {:connection_mode => :per_request, :protocol => "http", :port => 80})
+        @@sdb = Aws::SdbInterface.new(@config['amazon']['access_key'], @config['amazon']['secret_key'], {:connection_mode => :per_request})
 
         SimpleRecord.establish_connection(@config['amazon']['access_key'], @config['amazon']['secret_key'], :connection_mode=>:single)
         SimpleRecord::Base.set_domain_prefix("simplerecord_tests_")

data/test/test_simple_record.rb

@@ -458,6 +458,19 @@ class TestSimpleRecord < TestBase
         assert mm.name = mm2.name
     end
 
+     def test_constructor_using_belongs_to_ids
+        mm = MyModel.new({:name=>"myname"})
+        mm.save
+
+        mm2 = MyChildModel.new({"name"=>"myname2", :my_model_id=>mm.id})
+        puts 'mm2=' + mm2.inspect
+        assert mm.id == mm2.my_model_id, "#{mm.id} != #{mm2.my_model_id}"
+        mm3 = mm2.my_model
+        puts 'mm3=' + mm3.inspect
+        assert mm.name == mm3.name
+
+    end
+
     def test_update_attributes
         mm = MyModel.new({:name=>"myname"})
         mm.save

metadata

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