simple_record 1.0.3 → 1.0.4

data/lib/simple_record.rb

@@ -29,7 +29,7 @@ require 'local_cache'
 
 module SimpleRecord
 
-VERSION = '1.0.3'
+VERSION = '1.0.4'
 
   class Base < RightAws::ActiveSdb::Base
 
@@ -386,7 +386,44 @@ VERSION = '1.0.3'
 
     def save(*params)
       #    puts 'SAVING: ' + self.inspect
+      ok = pre_save(*params)
+      if ok
+        begin
+          #        puts 'is frozen? ' + self.frozen?.to_s + ' - ' + self.inspect
+          to_delete = get_atts_to_delete
+          if super(*params)
+#          puts 'SAVED super'
+            self.class.cache_results(self)
+            delete_niled(to_delete)
+            if run_after_save && is_create ? run_after_create : run_after_update
+              return true
+            else
+              #I thought about calling destroy here, but rails doesn't behave that way, so neither will I
+              return false
+            end
+          else
+            return false
+          end
+        rescue RightAws::AwsError
+          # puts "RESCUED in save: " + $!
+          if (domain_ok($!))
+            if !@create_domain_called
+              @create_domain_called = true
+              save(*params)
+            else
+              raise $!
+            end
+          else
+            raise $!
+          end
+        end
+      else
+        #@debug = "not saved"
+        return false
+      end
+    end
 
+    def pre_save(*params)
       if respond_to?('validate')
         validate
 #      puts 'AFTER VALIDATIONS, ERRORS=' + errors.inspect
@@ -405,7 +442,10 @@ VERSION = '1.0.3'
           ok = before_update
         end
       end
-      if ok && run_before_save && is_create ? run_before_create : run_before_update
+      if ok
+        ok = run_before_save && is_create ? run_before_create : run_before_update
+      end
+      if ok
 #      puts 'ABOUT TO SAVE: ' + self.inspect
         # First we gotta pad and offset
         if !@@ints.nil?
@@ -416,9 +456,7 @@ VERSION = '1.0.3'
               #            puts @attributes.inspect
               #            puts @attributes[i.to_s].inspect
               arr = @attributes[i.to_s]
-              arr.collect!{ |x|
-                self.class.pad_and_offset(x)
-              }
+              arr.collect!{ |x| self.class.pad_and_offset(x) }
               @attributes[i.to_s] = arr
 #            puts 'after: ' + @attributes[i.to_s].inspect
             else
@@ -426,39 +464,8 @@ VERSION = '1.0.3'
             end
           end
         end
-        begin
-          #        puts 'is frozen? ' + self.frozen?.to_s + ' - ' + self.inspect
-          to_delete = get_atts_to_delete
-          if super(*params)
-#          puts 'SAVED super'
-            self.class.cache_results(self)
-            delete_niled(to_delete)
-            if run_after_save && is_create ? run_after_create : run_after_update
-              return true
-            else
-              #I thought about calling destroy here, but rails doesn't behave that way, so neither will I
-              return false
-            end
-          else
-            return false
-          end
-        rescue RightAws::AwsError
-          # puts "RESCUED in save: " + $!
-          if (domain_ok($!))
-            if !@create_domain_called
-              @create_domain_called = true
-              save(*params)
-            else
-              raise $!
-            end
-          else
-            raise $!
-          end
-        end
-      else
-        #@debug = "not saved"
-        return false
       end
+      ok
     end
 
     def save_attributes(*params)
@@ -480,6 +487,25 @@ VERSION = '1.0.3'
       return to_delete
     end
 
+    # Run pre_save on each object, then runs batch_put_attributes
+    # Returns
+    def self.batch_save(objects)
+      results = []
+      to_save = []
+      if objects && objects.size > 0
+        objects.each do |o|
+          ok = o.pre_save
+          raise "Pre save failed on object with id = " + o.id if !ok
+          results << ok
+          next if !ok
+          o.pre_save2
+          to_save << RightAws::SdbInterface::Item.new(o.id, o.attributes, true)
+        end
+      end
+      connection.batch_put_attributes(domain, to_save)
+      results
+    end
+
     #
     # Usage: ClassName.delete id
     # todo: move to RightAWS

data/test/test_simple_record.rb

@@ -35,6 +35,29 @@ class TestSimpleRecord < Test::Unit::TestCase
     assert mm2.cool == mm.cool
   end
 
+  def test_batch_save
+    items = []
+    mm = MyModel.new
+    mm.name = "Travis"
+    mm.age = 32
+    mm.cool = true
+    items << mm
+    mm = MyModel.new
+    mm.name = "Tritt"
+    mm.age = 44
+    mm.cool = false
+    items << mm
+    MyModel.batch_save(items)
+    items.each do |item|
+      puts 'id=' + item.id
+      new_item = MyModel.find(item.id)
+      puts 'new=' + new_item.inspect
+      assert item.id == new_item.id
+      assert item.name == new_item.name
+      assert item.cool == new_item.cool
+    end
+  end
+
   def test_callbacks
     # these DO NOT work right now, all objects get all callbacks
     #	I tried like this, seem to be getting somewhere.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simple_record
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Travis Reeder
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-19 00:00:00 -07:00
+date: 2009-05-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency