simple_record 1.1.67 → 1.1.68

data/lib/simple_record.rb

@@ -135,9 +135,8 @@ module SimpleRecord
 
         attr_accessor :errors
 
-        @domain_prefix = ''
         class << self;
-            attr_accessor :domain_prefix;
+            attr_accessor :domain_prefix
         end
 
         #@domain_name_for_class = nil
@@ -172,14 +171,14 @@ module SimpleRecord
 
 
         def domain
-            super # super.domain
+            self.class.domain # super # super.domain
         end
 
         def self.domain
             #return self.get_domain_name unless self.get_domain_name.nil?
             d = super
-            #puts 'in self.domain, d=' + d.to_s + ' domain_prefix=' + SimpleRecord::Base.domain_prefix.to_s
-            domain_name_for_class = SimpleRecord::Base.domain_prefix + d.to_s
+            puts 'in self.domain, d=' + d.to_s + ' domain_prefix=' + SimpleRecord::Base.domain_prefix.to_s
+            domain_name_for_class = (SimpleRecord::Base.domain_prefix || "") + d.to_s
             #self.set_domain_name(domain_name_for_class)
             domain_name_for_class
         end
@@ -221,11 +220,11 @@ module SimpleRecord
 #            puts "Marking #{arg} dirty with #{value}"
             if @dirty.include?(sdb_att_name)
                 old = @dirty[sdb_att_name]
-#                puts "Was already dirty #{old}"
+#                puts "#{sdb_att_name} 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}"
+                old = get_attribute(arg)
+#                puts "dirtifying #{sdb_att_name} old=#{old.inspect} to new=#{value.inspect}"
                 @dirty[sdb_att_name] = old if value != old
             end
         end
@@ -338,11 +337,10 @@ module SimpleRecord
                         options[:dirty_atts] = @dirty
                     end
                     to_delete = get_atts_to_delete # todo: this should use the @dirty hash now
-#                    puts 'done to_delete ' + to_delete.inspect
-#                    puts 'options=' + options.inspect
                     SimpleRecord.stats.puts += 1
+#                    puts 'SELF BEFORE super=' + self.inspect
                     if super(options)
-#          puts 'SAVED super'
+#                        puts 'SELF AFTER super=' + self.inspect
                         self.class.cache_results(self)
                         delete_niled(to_delete)
                         if (is_create ? run_after_create : run_after_update) && run_after_save
@@ -624,6 +622,11 @@ module SimpleRecord
             end
         end
 
+        def self.create(attributes={})
+#            puts "About to create in domain #{domain}"
+            super
+        end
+
         @@regex_no_id = /.*Couldn't find.*with ID.*/
 
         #

data/lib/simple_record/attributes.rb

@@ -29,7 +29,7 @@ module SimpleRecord
                 if arg.is_a?(Hash)
                     # then attribute may have extra options
                     arg_options = arg
-                    arg = arg_options[:name]
+                    arg = arg_options[:name].to_sym
                 end
                 attr = Attribute.new(:string, arg_options)
                 defined_attributes[arg] = attr if defined_attributes[arg].nil?

data/test/model_with_enc.rb

@@ -1,4 +1,3 @@
-require 'attr_encrypted'
 
 class ModelWithEnc < SimpleRecord::Base
     has_strings :name,

data/test/test_base.rb

@@ -9,15 +9,10 @@ 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})
+    def setup
+        reset_connection()
 
-        SimpleRecord.establish_connection(@config['amazon']['access_key'], @config['amazon']['secret_key'], :connection_mode=>:single)
-        SimpleRecord::Base.set_domain_prefix("simplerecord_tests_")
     end
 
     def teardown
@@ -25,4 +20,16 @@ class TestBase < Test::Unit::TestCase
     end
 
 
+    def reset_connection
+        @config = YAML::load(File.open(File.expand_path("~/.test-configs/simple_record.yml")))
+        #puts 'inspecting config = ' + @config.inspect
+
+        SimpleRecord::Base.set_domain_prefix("simplerecord_tests_")
+        SimpleRecord.establish_connection(@config['amazon']['access_key'], @config['amazon']['secret_key'], :connection_mode=>:single)
+
+        # Establish AWS connection directly
+        @@sdb = Aws::SdbInterface.new(@config['amazon']['access_key'], @config['amazon']['secret_key'], {:connection_mode => :per_request})
+
+    end
+
 end

data/test/test_dirty.rb

@@ -0,0 +1,79 @@
+require 'test/unit'
+require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
+require "yaml"
+require 'aws'
+require 'my_model'
+require 'my_child_model'
+require 'active_support'
+require 'test_base'
+
+
+class Person < SimpleRecord::Base
+    has_strings :name, :i_as_s
+    has_ints :age
+end
+class DirtyTest < TestBase
+
+    def setup
+        super
+
+        Person.create_domain
+        @person = Person.new(:name => 'old', :age => 70)
+        @person.save
+
+        assert !@person.changed?
+        assert !@person.name_changed?
+    end
+
+    def teardown
+        Person.delete_domain
+        SimpleRecord.close_connection
+    end
+
+    def test_same_value_are_not_dirty
+        @person.name = "old"
+
+        assert !@person.changed?
+        assert !@person.name_changed?
+
+        @person.age = 70
+        puts 'age_change2=' + @person.age_change.inspect
+        assert !@person.changed?
+        assert !@person.age_changed?
+    end
+
+    def test_reverted_changes_are_not_dirty
+        @person.name = "new"
+        assert @person.changed?
+        assert @person.name_changed?
+
+        @person.name = "old"
+        assert !@person.changed?
+        assert !@person.name_changed?
+
+        @person.age = 15
+        assert @person.changed?
+        assert @person.age_changed?
+
+        @person.age = 70
+        puts 'age_change2=' + @person.age_change.inspect
+        assert !@person.changed?
+        assert !@person.age_changed?
+    end
+
+    def test_storing_int_as_string
+        @person.i_as_s = 5
+        assert @person.changed?
+        assert @person.i_as_s_changed?
+        @person.save
+
+        sleep 2
+
+        @person.i_as_s = 5
+        puts 'i_as_s_changed=' + @person.i_as_s_change.inspect
+        # Maybe this should fail? What do we expect this behavior to be?
+#        assert !@person.changed?
+#        assert !@person.i_as_s_changed?
+
+    end
+end

data/test/test_global_options.rb

@@ -0,0 +1,43 @@
+require 'test/unit'
+require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
+require "yaml"
+require 'aws'
+require 'my_model'
+require 'my_child_model'
+require 'active_support'
+require 'test_base'
+
+
+class Person < SimpleRecord::Base
+    has_strings :name, :i_as_s
+    has_ints :age
+end
+class TestGlobalOptions < TestBase
+
+    def setup
+
+        SimpleRecord::Base.set_domain_prefix("someprefix_")
+
+        super
+    end
+
+    def test_domain_prefix
+
+#        SimpleRecord::Base.set_domain_prefix("someprefix_")
+
+        p = Person.create(:name=>"my prefix name")
+
+        sleep 1
+
+         sdb_atts = @@sdb.select("select * from someprefix_people")
+        puts 'sdb_atts=' + sdb_atts.inspect
+
+         @@sdb.delete_domain("someprefix_people") # doing it here so it's done before assertions might fail
+
+        assert sdb_atts[:items].size == 1, "hmmm, not size 1: " + sdb_atts[:items].size.to_s
+
+
+
+    end
+
+end

data/test/test_simple_record.rb

@@ -21,6 +21,7 @@ class TestSimpleRecord < TestBase
         mm.age = 32
         mm.cool = true
         mm.save
+        sleep 1
 
         assert !mm.created.nil?
         assert !mm.updated.nil?
@@ -53,6 +54,40 @@ class TestSimpleRecord < TestBase
         assert mm2.age.nil?, "doh, age is " + mm2.age.inspect
     end
 
+
+
+    def test_updates
+        mm = MyModel.new
+        mm.name = "Travis"
+        mm.age = 32
+        mm.cool = true
+        mm.s1 = "Initial value"
+        mm.save
+        id = mm.id
+        sleep 1
+
+        mm = MyModel.find(id)
+        mm.name = "Travis2"
+        mm.age = 10
+        mm.cool = false
+        mm.s1 = "" # test blank string
+
+        puts 'mm=' + mm.inspect
+        mm.save
+        sleep 1
+
+        puts 'mm2=' + mm.inspect
+
+        assert mm.s1 == "", "mm.s1 is not empty string, it is " + mm.s1.inspect
+
+        mm = MyModel.find(id)
+        assert mm.name == "Travis2"
+        assert mm.age == 10
+        assert mm.cool == false
+        assert mm.s1 == "", "mm.s1 is not empty string, it is #{mm.s1.inspect}"
+
+    end
+
     def test_funky_values
         mm = MyModel.new(:name=>"Funky")
         mm.s1 = "other/2009-11-10/04/84.eml" # reported here: http://groups.google.com/group/simple-record/browse_thread/thread/3659e82491d03a2c?hl=en
@@ -90,6 +125,7 @@ class TestSimpleRecord < TestBase
         mm.cool = false
         items << mm
         MyModel.batch_save(items)
+        sleep 1
         items.each do |item|
             puts 'id=' + item.id
             new_item = MyModel.find(item.id)
@@ -138,6 +174,7 @@ class TestSimpleRecord < TestBase
         # test queued callback before_create
         mm.name = "Travis"
         assert mm.save
+        sleep 1
         # now nickname should be set on before_create
         assert mm.nickname == mm.name
 
@@ -183,6 +220,8 @@ class TestSimpleRecord < TestBase
         mmc.x = mm
         mmc.save
 
+        sleep 1
+
         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'
@@ -198,6 +237,8 @@ class TestSimpleRecord < TestBase
         assert mmc2.my_model_id == nil
         assert mmc2.my_model == nil, "my_model not nil? #{mmc2.my_model.inspect}"
 
+        sleep 1
+
         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}"
@@ -205,14 +246,15 @@ class TestSimpleRecord < TestBase
 
         mm3 = MyModel.new(:name=>"test")
         assert mm3.save
+        sleep 1
 
         mmc3.my_model = mm3
         assert mmc3.my_model_changed?
         assert mmc3.save(:dirty=>true)
-
         assert mmc3.my_model_id == mm3.id
         assert mmc3.my_model.id == mm3.id
 
+        sleep 1
         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}"
@@ -331,6 +373,7 @@ class TestSimpleRecord < TestBase
         # my_model should be treated differently since it's a belong_to
         mcm = MyChildModel.new(:name=>"johnny", :my_model=>mm)
         mcm.save
+        sleep 1
 
         assert mcm.my_model != nil
 
@@ -376,6 +419,7 @@ class TestSimpleRecord < TestBase
 
         mm.age = nil
         mm.save
+        sleep 1
 
         # Should be NIL
         assert mm.age == nil
@@ -422,12 +466,14 @@ class TestSimpleRecord < TestBase
         mm.name = "test name"
         mm.base_string = "in base class"
         mm.save_with_validation!
+        sleep 1
 
         mm2 = MyModel.find(mm.id)
         assert mm2.base_string == mm.base_string
 
         mm2.base_string = "changed base string"
         mm2.save_with_validation!
+        sleep 1
 
         mm3 = MyModel.find(mm2.id)
         assert mm3.base_string == mm2.base_string
@@ -512,6 +558,7 @@ class TestSimpleRecord < TestBase
 
         mm.save
         mm2.save
+        sleep 1
 
         mm = MyModel.find(mm.id)
         mm2 = MyModel.find(mm2.id)
@@ -521,6 +568,7 @@ class TestSimpleRecord < TestBase
     def test_constructor_using_belongs_to_ids
         mm = MyModel.new({:name=>"myname"})
         mm.save
+        sleep 1
 
         mm2 = MyChildModel.new({"name"=>"myname2", :my_model_id=>mm.id})
         puts 'mm2=' + mm2.inspect
@@ -545,6 +593,7 @@ class TestSimpleRecord < TestBase
     def test_explicit_class_name
         mm = MyModel.new({:name=>"myname"})
         mm.save
+sleep 1
 
         mm2 = MyChildModel.new({"name"=>"myname2"})
         mm2.x = mm
@@ -562,6 +611,7 @@ class TestSimpleRecord < TestBase
         mm.date1 = Time.now
         mm.date2 = DateTime.now
         mm.save
+        sleep 1
 
         raw = @@sdb.get_attributes(MyModel.domain, mm.id)
         puts "raw=" + raw.inspect
@@ -579,4 +629,5 @@ class TestSimpleRecord < TestBase
         mme = ModelWithEnc.new(:ssn=>nil, :password=>nil)
     end
 
+
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: simple_record
 version: !ruby/object:Gem::Version 
-  version: 1.1.67
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 68
+  version: 1.1.68
 platform: ruby
 authors: 
 - Travis Reeder
@@ -11,19 +16,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-23 00:00:00 -08:00
+date: 2010-03-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: aws
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: Drop in replacement for ActiveRecord to Amazon SimpleDB instead.
 email: travis@appoxy.com
 executables: []
@@ -56,24 +63,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Drop in replacement for ActiveRecord to Amazon SimpleDB instead.
 test_files: 
 - test/conversions.rb
-- test/dirty_test.rb
 - test/model_with_enc.rb
 - test/my_base_model.rb
 - test/my_child_model.rb
@@ -81,6 +89,8 @@ test_files:
 - test/paging_array_test.rb
 - test/temp_test.rb
 - test/test_base.rb
+- test/test_dirty.rb
+- test/test_global_options.rb
 - test/test_helpers.rb
 - test/test_results_array.rb
 - test/test_simple_record.rb

data/test/dirty_test.rb

@@ -1,52 +0,0 @@
-require 'test/unit'
-require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
-require "yaml"
-require 'right_aws'
-require 'my_model'
-require 'my_child_model'
-require 'active_support'
-
-
-class Person < SimpleRecord::Base
-    has_strings :name
-    has_ints :age
-end
-class DirtyTest < Test::Unit::TestCase
-    
-    def setup
-        @config = YAML::load(File.open(File.join(File.dirname(__FILE__), "test-config.yml")))
-        @@sdb = RightAws::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_")
-        
-        Person.create_domain
-        @person = Person.new(:name => 'old', :age => '70')
-        @person.save
-        
-        assert !@person.changed?
-        assert !@person.name_changed?
-    end
-
-    def teardown
-        Person.delete_domain
-        SimpleRecord.close_connection
-    end
-    
-    def test_same_value_are_not_dirty
-        @person.name = "old"
-        
-        assert !@person.changed?
-        assert !@person.name_changed?
-    end
-    
-    def test_reverted_changes_are_not_dirty
-        @person.name = "new"
-        assert @person.changed?
-        assert @person.name_changed?
-        
-        @person.name = "old"
-        assert !@person.changed?
-        assert !@person.name_changed?
-    end
-end