simple_record 1.1.46 → 1.1.47

data/lib/simple_record.rb

@@ -100,7 +100,8 @@ module SimpleRecord
             @errors=SimpleRecord_errors.new
             @dirty = {}
 
-            @attributes = {}
+            @attributes = {} # sdb values
+            @attributes_rb = {} # ruby values
             @new_record = true
 
         end
@@ -414,8 +415,18 @@ module SimpleRecord
             ok
         end
 
-        def save_attributes(*params)
-            ret = super(*params)
+        def save_attributes(atts)
+#            puts 'atts=' + atts.inspect
+            ret = super(atts)
+#            puts '@atts=' + @attributes.inspect
+            atts.each_pair do |k, v|
+                if k.is_a?(Symbol)
+                    @attributes[k.to_s] = v
+                    @attributes.delete(k)
+                end
+            end
+#            puts '@atts2=' + @attributes.inspect
+            @attributes_rb.clear # clear out the ruby versions so they can reload on next get.
             if ret
                 self.class.cache_results(self)
             end
@@ -500,18 +511,19 @@ module SimpleRecord
         def get_attribute(arg)
             # Check if this arg is already converted
             arg_s = arg.to_s
-            instance_var = ("@" + arg_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)
+            ret = @attributes_rb[arg_s] # 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)
+#            puts "Setting instance var #{arg_s} to #{ret}"
+#            instance_variable_set(instance_var, ret)
+            @attributes_rb[arg_s] = ret
             return ret
         end
 
@@ -523,17 +535,19 @@ module SimpleRecord
                 attname = name.to_s + '_id'
                 attvalue = value.nil? ? nil : value.id
             else
-                attname = name
+                attname = name.to_s
                 attvalue = value
             end
-            value = strip_array(attvalue)
+            attvalue = strip_array(attvalue)
             make_dirty(attname, attvalue)
-            instance_var = "@" + attname.to_s
 #                    puts 'ARG=' + arg.to_s
             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, attvalue)
+            @attributes[attname] = sdb_val
+            attvalue = wrap_if_required(name, value, sdb_val)
+            @attributes_rb[attname] = attvalue
+
+#            instance_var = "@" + attname.to_s
+#            instance_variable_set(instance_var, attvalue)
         end
 
         def delete_niled(to_delete)
@@ -548,8 +562,8 @@ module SimpleRecord
             super()
         end
 
-        def update_attributes(*params)
-            return save_attributes(*params)
+        def update_attributes(atts)
+            return save_attributes(atts)
         end
 
         def self.quote_regexp(a, re)
@@ -696,44 +710,6 @@ module SimpleRecord
 
     end
 
-    class SimpleRecord_errors
-        def initialize(*params)
-            super(*params)
-            @errors=[]
-        end
-
-        def add_to_base(value)
-            @errors+=[value]
-        end
-
-        def add(attribute, value)
-            @errors+=["#{attribute.to_s} #{value}"]
-        end
-
-        def count
-            return length
-        end
-
-        def length
-            return @errors.length
-        end
-
-        def size
-            return length
-        end
-
-        def full_messages
-            return @errors
-        end
-
-        def clear
-            @errors.clear
-        end
-
-        def empty?
-            @errors.empty?
-        end
-    end
 
     class Activerecordtosdb_subrecord_array
         def initialize(subname, referencename, referencevalue)

data/lib/simple_record/errors.rb

@@ -12,6 +12,46 @@ module SimpleRecord
             @record = record
         end
     end
+
+
+    class SimpleRecord_errors
+        def initialize(*params)
+            super(*params)
+            @errors=[]
+        end
+
+        def add_to_base(value)
+            @errors+=[value]
+        end
+
+        def add(attribute, value)
+            @errors+=["#{attribute.to_s} #{value}"]
+        end
+
+        def count
+            return length
+        end
+
+        def length
+            return @errors.length
+        end
+
+        def size
+            return length
+        end
+
+        def full_messages
+            return @errors
+        end
+
+        def clear
+            @errors.clear
+        end
+
+        def empty?
+            @errors.empty?
+        end
+    end
     
 end
 

data/test/results_tests.rb

@@ -0,0 +1,37 @@
+# These ones take longer to run
+
+require 'test/unit'
+require File.join(File.dirname(__FILE__), "/../lib/simple_record")
+require File.join(File.dirname(__FILE__), "./test_helpers")
+require File.join(File.dirname(__FILE__), "./test_base")
+require "yaml"
+require 'aws'
+require 'my_model'
+require 'my_child_model'
+require 'active_support'
+
+# Tests for SimpleRecord
+#
+
+class TestResultsArray < TestBase
+
+
+    # ensures that it uses next token and what not
+    def test_big_result
+        i = TestHelpers.clear_out_my_models
+        num_made = 110
+        num_made.times do |i|
+            mm = MyModel.create(:name=>"Travis", :age=>i, :cool=>true)
+        end
+        rs = MyModel.find(:all) # should get 100 at a time
+        assert rs.size == num_made
+        i = 0
+        rs.each do |x|
+            #puts 'x=' + x.id
+            i+=1
+        end
+        assert i == num_made
+    end
+    
+    
+end

data/test/test_base.rb

@@ -0,0 +1,28 @@
+require 'test/unit'
+require File.join(File.dirname(__FILE__), "/../lib/simple_record")
+require File.join(File.dirname(__FILE__), "./test_helpers")
+require "yaml"
+require 'aws'
+require 'my_model'
+require 'my_child_model'
+require 'active_support'
+
+class TestBase < Test::Unit::TestCase
+
+    def setup
+        @config = YAML::load(File.open(File.expand_path("~/.test-configs/simple_record.yml")))
+        #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})
+
+        SimpleRecord.establish_connection(@config['amazon']['access_key'], @config['amazon']['secret_key'], :connection_mode=>:single)
+        SimpleRecord::Base.set_domain_prefix("simplerecord_tests_")
+    end
+
+    def teardown
+        SimpleRecord.close_connection
+    end
+
+
+end

data/test/test_helpers.rb

@@ -0,0 +1,15 @@
+
+class TestHelpers
+    
+    def self.clear_out_my_models
+        mms = MyModel.find(:all)
+        puts 'mms.size=' + mms.size.to_s
+        i = 0
+        mms.each do |x|
+            puts 'deleting=' + i.to_s
+            x.delete
+            i+=1
+        end
+    end
+
+end

data/test/test_simple_record.rb

@@ -1,5 +1,7 @@
 require 'test/unit'
-require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
+require File.join(File.dirname(__FILE__), "/../lib/simple_record")
+require File.join(File.dirname(__FILE__), "./test_helpers")
+require File.join(File.dirname(__FILE__), "./test_base")
 require "yaml"
 require 'aws'
 require 'my_model'
@@ -9,22 +11,7 @@ require 'active_support'
 # Tests for SimpleRecord
 #
 
-class TestSimpleRecord < Test::Unit::TestCase
-
-    def setup
-        @config = YAML::load(File.open(File.expand_path("~/.test-configs/simple_record.yml")))
-        #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})
-
-        SimpleRecord.establish_connection(@config['amazon']['access_key'], @config['amazon']['secret_key'], :connection_mode=>:single)
-        SimpleRecord::Base.set_domain_prefix("simplerecord_tests_")
-    end
-
-    def teardown
-        SimpleRecord.close_connection
-    end
+class TestSimpleRecord < TestBase
 
 
     def test_save_get
@@ -238,34 +225,6 @@ class TestSimpleRecord < Test::Unit::TestCase
 
     end
 
-    # ensures that it uses next token and what not
-    def test_big_result
-        i = clear_out_my_models
-        num_made = 110
-        num_made.times do |i|
-            mm = MyModel.create(:name=>"Travis", :age=>i, :cool=>true)
-        end
-        rs = MyModel.find(:all) # should get 100 at a time
-        assert rs.size == num_made
-        i = 0
-        rs.each do |x|
-            #puts 'x=' + x.id
-            i+=1
-        end
-        assert i == num_made
-    end
-
-    def clear_out_my_models
-        mms = MyModel.find(:all)
-        puts 'mms.size=' + mms.size.to_s
-        i = 0
-        mms.each do |x|
-            puts 'deleting=' + i.to_s
-            x.delete
-            i+=1
-        end
-    end
-
     def test_results_array
         mms = MyModel.find(:all) # select 2
         assert !mms.first.nil?
@@ -363,7 +322,7 @@ class TestSimpleRecord < Test::Unit::TestCase
 
     def test_null
         puts Time.now.to_i.to_s
-        clear_out_my_models
+        TestHelpers.clear_out_my_models
 
         mm = MyModel.new(:name=>"birthay is null")
         mm.save
@@ -495,4 +454,13 @@ class TestSimpleRecord < Test::Unit::TestCase
         assert mm.name = mm2.name
     end
 
+    def test_update_attributes
+        mm = MyModel.new({:name=>"myname"})
+        mm.save
+
+        mm.update_attributes(:name=>"name2", :age=>21)
+        assert mm.name == "name2", "Name is #{mm.name}"
+        assert mm.age == 21
+    end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simple_record
 version: !ruby/object:Gem::Version 
-  version: 1.1.46
+  version: 1.1.47
 platform: ruby
 authors: 
 - Travis Reeder
@@ -79,5 +79,8 @@ test_files:
 - test/my_child_model.rb
 - test/my_model.rb
 - test/paging_array_test.rb
+- test/results_tests.rb
 - test/temp_test.rb
+- test/test_base.rb
+- test/test_helpers.rb
 - test/test_simple_record.rb