simple_record 1.1.24 → 1.1.26

data/README.markdown

@@ -113,12 +113,11 @@ To set a global prefix across all your models, use:
 
 ### Connection Modes
 
-There are 4 different connection modes:
+There are 3 different connection modes:
 
 * per_request (default) - opens and closes a new connection to simpledb for every simpledb request. Not the best performance, but it's safe and can handle many concurrent requests at the same time (unlike single mode).
 * single - one connection across the entire application, not recommended unless the app is used by a single person.
 * per_thread - a connection is used for every thread in the application. This is good, but the catch is that you have to ensure to close the connection.
-* pool - NOT IMPLEMENTED YET - opens a maximum number of connections and round robins them for any simpledb request.
 
 You set the mode when you call establish_connection:
 
@@ -194,6 +193,12 @@ or
 
     o.something_id = x
 
+#### Batch Save
+
+To do a batch save using SimpleDB's batch saving feature to improve performance, simply create your objects, add them to an array, then call:
+
+    MyClass.batch_save(object_list)
+
 ## Kudos
 
 Special thanks to Garrett Cox for creating Activerecord2sdb which SimpleRecord is based on:

data/lib/simple_record.rb

@@ -83,25 +83,19 @@ module SimpleRecord
         def initialize(attrs={})
             # todo: Need to deal with objects passed in. iterate through belongs_to perhaps and if in attrs, set the objects id rather than the object itself
 
-#            if params[0]
-                #we have to handle the virtuals. Right now, this assumes that all parameters are passed from inside an array
-                #this is the usually the case when the parameters are passed passed via POST and obtained from the params array
-                @@virtuals.each do |virtual|
-                    #we first copy the information for the virtual to an instance variable of the same name
-                    eval("@#{virtual}=params[0]['#{virtual}']")
-                    #and then remove the parameter before it is passed to initialize, so that it is NOT sent to SimpleDB
-                    eval("params[0].delete('#{virtual}')")
-                end
-#                super(*params)
-#            else
-                super
-#            end
+            #we have to handle the virtuals.
+            @@virtuals.each do |virtual|
+                #we first copy the information for the virtual to an instance variable of the same name
+                eval("@#{virtual}=attrs['#{virtual}']")
+                #and then remove the parameter before it is passed to initialize, so that it is NOT sent to SimpleDB
+                eval("attrs.delete('#{virtual}')")
+            end
+            super
             @errors=SimpleRecord_errors.new
             @dirty = {}
         end
 
 
-
         # todo: move into Callbacks module
         #this bit of code creates a "run_blank" function for everything value in the @@callbacks array.
         #this function can then be inserted in the appropriate place in the save, new, destroy, etc overrides
@@ -509,7 +503,7 @@ module SimpleRecord
         end
 
         def set_updated
-#    puts 'SETTING UPDATED'
+            #puts 'SETTING UPDATED'
             #    @updated = DateTime.now
             self[:updated] = DateTime.now
 #    @tester = 'some test value updated'
@@ -520,7 +514,7 @@ module SimpleRecord
         @@padding = 20
         @@date_format = "%Y-%m-%dT%H:%M:%S"; # Time to second precision
 
-        def self.pad_and_offset(x)
+        def self.pad_and_offset(x) # Change name to something more appropriate like ruby_to_sdb
             # todo: add Float, etc
             #    puts 'padding=' + x.class.name + " -- " + x.inspect
             if x.kind_of? Integer
@@ -536,7 +530,9 @@ module SimpleRecord
                 # Amazon suggests: 2008-02-10T16:52:01.000-05:00
                 #                  "yyyy-MM-dd'T'HH:mm:ss.SSSZ"
                 #
-                if x.is_a? DateTime
+                 if x.is_a? Date
+                    x_str = x.strftime(@@date_format)
+                elsif x.is_a? DateTime
                     x_str = x.new_offset(0).strftime(@@date_format)
                 else
                     x_str = x.getutc.strftime(@@date_format)
@@ -613,7 +609,7 @@ module SimpleRecord
                         options[:dirty_atts] = @dirty
                     end
                     to_delete = get_atts_to_delete # todo: this should use the @dirty hash now
-#                    puts 'saving'
+#                    puts 'done to_delete ' + to_delete.inspect
                     if super(options)
 #          puts 'SAVED super'
                         self.class.cache_results(self)
@@ -646,6 +642,14 @@ module SimpleRecord
             end
         end
 
+        def save_with_validation!(options={})
+            if valid?
+                save
+            else
+                raise RecordInvalid.new(self)
+            end
+        end
+
         def pad_and_offset_ints_to_sdb()
 
             defined_attributes_local.each_pair do |name, att_meta|
@@ -687,7 +691,8 @@ module SimpleRecord
             ok = run_before_validation && (is_create ? run_before_validation_on_create : run_before_validation_on_update)
             return false unless ok
 
-            validate
+            validate()
+
             is_create ? validate_on_create : validate_on_update
 #      puts 'AFTER VALIDATIONS, ERRORS=' + errors.inspect
             if (!@errors.nil? && @errors.length > 0 )
@@ -730,9 +735,10 @@ module SimpleRecord
             # todo: this should use the @dirty hash now
             to_delete = []
             @attributes.each do |key, value|
-                #      puts 'value=' + value.inspect
-                if value.nil? || (value.is_a?(Array) && value.size == 0)
+#                puts 'key=' + key.inspect + ' value=' + value.inspect
+                if value.nil? || (value.is_a?(Array) && value.size == 0) || (value.is_a?(Array) && value.size == 1 && value[0] == nil)
                     to_delete << key
+                    @attributes.delete(key)
                 end
             end
             return to_delete
@@ -770,6 +776,7 @@ module SimpleRecord
         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
@@ -1131,5 +1138,17 @@ module SimpleRecord
         end
 
     end
+
+    class SimpleRecordError < StandardError
+
+    end
+
+    class RecordInvalid < SimpleRecordError
+        attr_accessor :record
+
+        def initialize(record)
+            @record = record
+        end
+    end
 end
 

data/lib/stats.rb

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

data/test/conversions.rb

@@ -0,0 +1,14 @@
+
+
+require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
+require "yaml"
+require 'right_aws'
+require 'my_model'
+require 'my_child_model'
+
+x = 0
+puts SimpleRecord::Base.pad_and_offset(x)
+
+x = 1
+puts SimpleRecord::Base.pad_and_offset(x)
+

data/test/my_base_model.rb

@@ -0,0 +1,7 @@
+require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
+
+class MyBaseModel < SimpleRecord::Base
+
+    has_strings :base_string
+    
+end

data/test/my_child_model.rb

@@ -1,34 +1,34 @@
-require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
-require 'my_model'
-
-class MyChildModel < SimpleRecord::Base
-    belongs_to :my_model
-    has_attributes :name, :child_attr
-
-end
-
-
-=begin
-
-
-puts 'word'
-
-mm = MyModel.new
-puts 'word2'
-
-mcm = MyChildModel.new
-
-puts 'mcm instance methods=' + MyChildModel.instance_methods(true).inspect
-#puts 'mcm=' + mcm.instance_methods(false)
-puts 'mcm class vars = ' + mcm.class.class_variables.inspect
-puts mcm.class == MyChildModel
-puts 'saved? ' + mm.save.to_s
-puts mm.errors.inspect
-
-puts "mm attributes=" + MyModel.defined_attributes.inspect
-puts "mcm attributes=" + MyChildModel.defined_attributes.inspect
-
-mcm2 = MyChildModel.new
-puts "mcm2 attributes=" + MyChildModel.defined_attributes.inspect
-
-=end
+require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
+require 'my_model'
+
+class MyChildModel < SimpleRecord::Base
+    belongs_to :my_model
+    has_attributes :name, :child_attr
+
+end
+
+
+=begin
+
+
+puts 'word'
+
+mm = MyModel.new
+puts 'word2'
+
+mcm = MyChildModel.new
+
+puts 'mcm instance methods=' + MyChildModel.instance_methods(true).inspect
+#puts 'mcm=' + mcm.instance_methods(false)
+puts 'mcm class vars = ' + mcm.class.class_variables.inspect
+puts mcm.class == MyChildModel
+puts 'saved? ' + mm.save.to_s
+puts mm.errors.inspect
+
+puts "mm attributes=" + MyModel.defined_attributes.inspect
+puts "mcm attributes=" + MyChildModel.defined_attributes.inspect
+
+mcm2 = MyChildModel.new
+puts "mcm2 attributes=" + MyChildModel.defined_attributes.inspect
+
+=end

data/test/my_model.rb

@@ -1,6 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
+require 'my_base_model'
 
-class MyModel < SimpleRecord::Base
+class MyModel < MyBaseModel
 
     has_strings :name, :nickname
     has_ints :age, :save_count
@@ -11,7 +12,7 @@ class MyModel < SimpleRecord::Base
     #callbacks
     before_create :set_nickname
 
-    after_save :bump_save_count
+    before_save :bump_save_count
 
     def set_nickname
         self.nickname = name if self.nickname.blank?

data/test/paging_array_test.rb

@@ -1,15 +1,15 @@
-
-require File.expand_path(File.dirname(__FILE__) + "/../lib/results_array")
-
-array = SimpleRecord::ResultsArray.new()
-#array.extend(ResultsArray)
-
-500.times do |i|
-    array << "_ob_" + i.to_s
-end
-
-array.each do |v|
-    puts v.to_s
-end
-
+
+require File.expand_path(File.dirname(__FILE__) + "/../lib/results_array")
+
+array = SimpleRecord::ResultsArray.new()
+#array.extend(ResultsArray)
+
+500.times do |i|
+    array << "_ob_" + i.to_s
+end
+
+array.each do |v|
+    puts v.to_s
+end
+
 puts array[10]

data/test/temp_test.rb

@@ -1,63 +1,63 @@
-# rubymine won't run 1.9 tests
-
-require 'minitest/unit'
-require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
-require "yaml"
-require 'right_aws'
-require 'my_model'
-require 'my_child_model'
-
-
-def setup
-    @config = YAML::load(File.read('test-config.yml'))
-    puts 'akey=' + @config['amazon']['access_key']
-    puts 'skey=' + @config['amazon']['secret_key']
-    RightAws::ActiveSdb.establish_connection(@config['amazon']['access_key'], @config['amazon']['secret_key'], :port=>80, :protocol=>"http")
-    SimpleRecord::Base.set_domain_prefix("simplerecord_tests_")
-end
-
-def teardown
-    RightAws::ActiveSdb.close_connection()
-end
-
-def test_dates
-    mm = MyModel.new
-    mm.name = "Travis"
-    mm.age = 32
-    mm.cool = true
-    mm.created = DateTime.now - 10
-    mm.updated = DateTime.now
-    mm.birthday = Time.now - (3600 * 24 * 365 * 10)
-    puts 'before save=' + mm.inspect
-    mm.save
-    puts 'after save=' + mm.inspect
-
-    mms = MyModel.find(:all, :conditions => ["created > ?", DateTime.now - 1])
-    puts 'mms=' + mms.inspect
-
-end
-
-def test_date_comparisons
-
-    t = SimpleRecord::Base.pad_and_offset(Time.now)
-    puts t
-    dt = SimpleRecord::Base.pad_and_offset(DateTime.now)
-    puts dt
-    dt_tomorrow = SimpleRecord::Base.pad_and_offset(DateTime.now + 1)
-
-
-    puts 'compare=' + (t <=> dt).to_s
-    puts 'compare=' + (t <=> dt_tomorrow).to_s
-
-    dts = DateTime.parse(dt_tomorrow)
-    puts dts.to_s
-    ts = Time.parse(dt)
-    puts ts.to_s
-end
-
-setup
-
-#test_dates
-    test_date_comparisons
-
-teardown
+# rubymine won't run 1.9 tests
+
+require 'minitest/unit'
+require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
+require "yaml"
+require 'right_aws'
+require 'my_model'
+require 'my_child_model'
+
+
+def setup
+    @config = YAML::load(File.read('test-config.yml'))
+    puts 'akey=' + @config['amazon']['access_key']
+    puts 'skey=' + @config['amazon']['secret_key']
+    RightAws::ActiveSdb.establish_connection(@config['amazon']['access_key'], @config['amazon']['secret_key'], :port=>80, :protocol=>"http")
+    SimpleRecord::Base.set_domain_prefix("simplerecord_tests_")
+end
+
+def teardown
+    RightAws::ActiveSdb.close_connection()
+end
+
+def test_dates
+    mm = MyModel.new
+    mm.name = "Travis"
+    mm.age = 32
+    mm.cool = true
+    mm.created = DateTime.now - 10
+    mm.updated = DateTime.now
+    mm.birthday = Time.now - (3600 * 24 * 365 * 10)
+    puts 'before save=' + mm.inspect
+    mm.save
+    puts 'after save=' + mm.inspect
+
+    mms = MyModel.find(:all, :conditions => ["created > ?", DateTime.now - 1])
+    puts 'mms=' + mms.inspect
+
+end
+
+def test_date_comparisons
+
+    t = SimpleRecord::Base.pad_and_offset(Time.now)
+    puts t
+    dt = SimpleRecord::Base.pad_and_offset(DateTime.now)
+    puts dt
+    dt_tomorrow = SimpleRecord::Base.pad_and_offset(DateTime.now + 1)
+
+
+    puts 'compare=' + (t <=> dt).to_s
+    puts 'compare=' + (t <=> dt_tomorrow).to_s
+
+    dts = DateTime.parse(dt_tomorrow)
+    puts dts.to_s
+    ts = Time.parse(dt)
+    puts ts.to_s
+end
+
+setup
+
+#test_dates
+    test_date_comparisons
+
+teardown

data/test/test_simple_record.rb

@@ -8,14 +8,19 @@ require 'my_child_model'
 class TestSimpleRecord < Test::Unit::TestCase
 
     def setup
-        @config = YAML::load(File.open(File.expand_path("~/.amazon/simple_record_tests.yml")))
-        #puts @config.inspect
-        SimpleRecord.establish_connection(@config['amazon']['access_key'], @config['amazon']['secret_key'], :port=>80, :protocol=>"http")
+        @config = YAML::load(File.open(File.expand_path("~/.test-configs/simple_record.yml")))
+        #puts 'inspecting config = ' + @config.inspect       
+        
+        # Establish AWS connection directly
+        @@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_")
     end
 
     def teardown
-        SimpleRecord.close_connection()
+        SimpleRecord.close_connection
     end
 
 
@@ -46,6 +51,15 @@ class TestSimpleRecord < Test::Unit::TestCase
         assert mm2.cool = true
         assert mm2.name = "Travis"
         assert mm2.created.is_a? DateTime
+
+        # test nilification
+        mm2.age = nil
+        mm2.save
+        puts mm2.errors.inspect
+        sleep 1
+        mm2 = MyModel.find(id)
+        puts mm2.inspect
+        assert mm2.age.nil?, "doh, age is " + mm2.age.inspect
     end
 
     def test_bad_query
@@ -133,7 +147,7 @@ class TestSimpleRecord < Test::Unit::TestCase
         mm2.name = "Travis 2"
         mm2.save(:dirty=>true)
 
-        # todo: how do we assert this?
+        # todo: how do we assert this?  perhaps change a value directly in sdb and see that it doesn't get overwritten
 
     end
 
@@ -206,14 +220,7 @@ class TestSimpleRecord < Test::Unit::TestCase
 
     # ensures that it uses next token and what not
     def test_big_result
-        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
+        i = clear_out_my_models
         num_made = 110
         num_made.times do |i|
             mm = MyModel.create(:name=>"Travis", :age=>i, :cool=>true)
@@ -228,6 +235,17 @@ class TestSimpleRecord < Test::Unit::TestCase
         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?
@@ -294,7 +312,80 @@ class TestSimpleRecord < Test::Unit::TestCase
 
         assert mm.valid?, mm.errors.inspect
         assert mm.save_count == 1
+    end
+
+
+    def test_nil_attr_deletion
+        mm = MyModel.new
+        mm.name = "Chad"
+        mm.age = 30
+        mm.cool = false
+        mm.save
+
+        # Should have 1 age attribute
+        assert @@sdb.get_attributes('simplerecord_tests_mymodel', mm.id, 'age')[:attributes].size == 1
+
+        mm.age = nil
+        mm.save
+
+        # Should be NIL
+        assert mm.age == nil
+
+        # Should have NO age attributes
+        assert @@sdb.get_attributes('simplerecord_tests_mymodel', mm.id, 'age')[:attributes].size == 0
+    end
+
+    def test_null
+        puts Time.now.to_i.to_s
+        clear_out_my_models
+
+        mm = MyModel.new(:name=>"birthay is null")
+        mm.save
+        mm2 = MyModel.new(:name=>"birthday is not null")
+        mm2.birthday = Time.now
+        mm2.save
+        sleep 2
+        mms = MyModel.find(:all, :conditions=>["birthday is null"])
+        mms.each do |m|
+            puts m.inspect
+        end
+        assert mms.size == 1
+        assert mms[0].id = mm.id
+         mms = MyModel.find(:all, :conditions=>["birthday is not null"])
+        mms.each do |m|
+            puts m.inspect
+        end
+        assert mms.size == 1
+        assert mms[0].id = mm2.id
+
+    end
+
+    # Test to add support for IN
+    def test_in_clause
+        mms = MyModel.find(:all)
+
+        mms2 = MyModel.find(:all, :conditions=>["id in ?"])
 
     end
 
+    def test_base_attributes
+        mm = MyModel.new()
+        mm.name = "test name"
+        mm.base_string = "in base class"
+        mm.save_with_validation!
+
+        mm2 = MyModel.find(mm.id)
+        assert mm2.base_string == mm.base_string
+
+        mm2.base_string = "changed base string"
+        mm2.save_with_validation!
+
+        mm3 = MyModel.find(mm2.id)
+        assert mm3.base_string == mm2.base_string
+        puts mm3.inspect
+
+
+    end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simple_record
 version: !ruby/object:Gem::Version 
-  version: 1.1.24
+  version: 1.1.26
 platform: ruby
 authors: 
 - Travis Reeder
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-12 00:00:00 -07:00
+date: 2009-10-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,6 +66,8 @@ signing_key:
 specification_version: 3
 summary: Drop in replacement for ActiveRecord to Amazon SimpleDB instead.
 test_files: 
+- test/conversions.rb
+- test/my_base_model.rb
 - test/my_child_model.rb
 - test/my_model.rb
 - test/paging_array_test.rb