simple_record 2.1.2 → 2.1.3

data/lib/simple_record/validations.rb

@@ -18,10 +18,10 @@ module SimpleRecord
     end
 
     def valid?
-      puts 'in rails2 valid?'
+#      puts 'in rails2 valid?'
       errors.clear
 
-      if defined?(:am_valid?)
+      if respond_to?(:am_valid?)
         # And now ActiveModel validations too
         am_valid?
       end

data/lib/simple_record.rb

@@ -179,6 +179,7 @@ module SimpleRecord
 
 
     if defined?(ActiveModel)
+      puts "Using ActiveModel validations."
       @@active_model = true
       extend ActiveModel::Naming
       include ActiveModel::Conversion
@@ -188,11 +189,9 @@ module SimpleRecord
       define_model_callbacks :save, :create, :update, :destroy
       include SimpleRecord::Callbacks3
       alias_method :am_valid?, :valid?
-
-
     else
       @@active_model = false
-      puts "using rails2 validations."
+      puts "NOT using ActiveModel validations."
       attr_accessor :errors
       include SimpleRecord::Callbacks
     end
@@ -454,69 +453,68 @@ module SimpleRecord
 #                puts '@dirtyA=' + @dirty.inspect
         return true if @dirty.size == 0 # Nothing to save so skip it
       end
-      is_create = self[:id].nil?
-      ok        = pre_save(options) # Validates and sets ID
-      if ok
-#        puts 'ok'
-        begin
-          dirty = @dirty
-#                    puts 'dirty before=' + @dirty.inspect
-          if options[:dirty]
-#                        puts '@dirty=' + @dirty.inspect
-            return true if @dirty.size == 0 # This should probably never happen because after pre_save, created/updated dates are changed
-            options[:dirty_atts] = @dirty
-          end
-          to_delete = get_atts_to_delete
 
-
-          if self.class.is_sharded?
-            options[:domain] = sharded_domain
-          end
-
-          if @@active_model
-            x = save_super(dirty, is_create, options, to_delete)
-#            puts 'save_super result = ' + x.to_s
-            return x
-          else
-#            puts 'not activemodel callbacks'
-            return save_super(dirty, is_create, options, to_delete)
-          end
-        rescue Aws::AwsError => ex
-          raise ex
+      ok = pre_save(options) # Validates and sets ID
+      if ok
+        if @@active_model
+          ok = create_or_update(options)
+        else
+          ok = do_actual_save(options)
         end
-      else
-#        puts 'returning false'
-        return false
       end
+      return ok
     end
 
-    if @@active_model
-      alias_method :old_save, :save
+    def do_actual_save(options)
+      begin
+        is_create = new_record? # self[:id].nil?
+
+        dirty     = @dirty
+#                    puts 'dirty before=' + @dirty.inspect
+        if options[:dirty]
+#                        puts '@dirty=' + @dirty.inspect
+          return true if @dirty.size == 0 # This should probably never happen because after pre_save, created/updated dates are changed
+          options[:dirty_atts] = @dirty
+        end
+        to_delete = get_atts_to_delete
 
-      def save(options={})
-#        puts 'extended save'
-        x = create_or_update
-#        puts 'save x=' + x.to_s
-        x
+        if self.class.is_sharded?
+          options[:domain] = sharded_domain
+        end
+        return save_super(dirty, is_create, options, to_delete)
+      rescue Aws::AwsError => ex
+        raise ex
       end
+
     end
 
-    def create_or_update #:nodoc:
+#    if @@active_model
+#      alias_method :old_save, :save
+#
+#      def save(options={})
+##        puts 'extended save'
+#        x = create_or_update
+##        puts 'save x=' + x.to_s
+#        x
+#      end
+#    end
+
+    def create_or_update(options) #:nodoc:
 #      puts 'create_or_update'
       ret = true
       _run_save_callbacks do
-        result = new_record? ? create : update
+        result = new_record? ? create(options) : update(options)
 #        puts 'save_callbacks result=' + result.inspect
-        ret = result
+        ret    = result
       end
       ret
     end
 
-    def create #:nodoc:
+    def create(options) #:nodoc:
       puts '3 create'
       ret = true
       _run_create_callbacks do
-        x = old_save
+        x   = do_actual_save(options)
 #        puts 'create old_save result=' + x.to_s
         ret = x
       end
@@ -524,11 +522,11 @@ module SimpleRecord
     end
 
 #
-    def update(*) #:nodoc:
+    def update(options) #:nodoc:
       puts '3 update'
       ret = true
       _run_update_callbacks do
-        x = old_save
+        x   = do_actual_save(options)
 #        puts 'update old_save result=' + x.to_s
         ret = x
       end
@@ -700,6 +698,7 @@ module SimpleRecord
 
     def pre_save(options)
 
+#      puts '@@active_model ? ' + @@active_model.inspect
 
       ok        = true
       is_create = self[:id].nil?
@@ -728,11 +727,13 @@ module SimpleRecord
 
       # Now for callbacks
       unless @@active_model
-        ok = respond_to?('before_save') ? before_save : true
+        ok = respond_to?(:before_save) ? before_save : true
         if ok
-          if is_create && respond_to?('before_create')
+#          puts 'ok'
+          if is_create && respond_to?(:before_create)
+#            puts 'responsds to before_create'
             ok = before_create
-          elsif !is_create && respond_to?('before_update')
+          elsif !is_create && respond_to?(:before_update)
             ok = before_update
           end
         end

data/test/my_model.rb

@@ -19,7 +19,7 @@ class MyModel < MyBaseModel
 
   has_clobs :clob1, :clob2
 
-  attr_accessor :attr_before_save, :attr_after_save, :attr_before_create, :attr_after_create
+  attr_accessor :attr_before_save, :attr_after_save, :attr_before_create, :attr_after_create, :attr_after_update
 
   #callbacks
   before_create :set_nickname
@@ -28,6 +28,7 @@ class MyModel < MyBaseModel
   before_save :before_save
 
   after_save :after_save
+  after_update :after_update
 
   def set_nickname
     puts 'before_create set nickname'
@@ -50,6 +51,10 @@ class MyModel < MyBaseModel
     @attr_after_save = true
     bump_save_count
   end
+    def after_update
+    puts "after_update"
+    @attr_after_update = true
+  end
 
   def bump_save_count
     puts 'after_save bump save_count=' + save_count.to_s

data/test/test_validations.rb

@@ -21,7 +21,7 @@ class TestSimpleRecord < TestBase
     assert !mm.attr_before_create
     assert !mm.valid?
     assert mm.save == false, mm.errors.inspect
-    assert mm.attr_before_create
+    assert !mm.attr_before_create # should not get called if not valid
     assert !mm.attr_after_save
     assert !mm.attr_after_create
     mm.name = "abcd"
@@ -36,10 +36,20 @@ class TestSimpleRecord < TestBase
     assert mm.save, mm.errors.inspect
 
     p mm
+    assert mm.attr_before_create
     assert mm.attr_after_save
     assert mm.attr_after_create
+    assert !mm.attr_after_update
 
     assert mm.valid?, mm.errors.inspect
     assert mm.save_count == 1
+
+    mm.name = "abc123"
+    assert mm.save
+
+    assert mm.attr_after_update
+
+
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_record
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,12 +11,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-02-09 00:00:00.000000000 -08:00
+date: 2011-02-11 00:00:00.000000000 -08:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws
-  requirement: &25980384 !ruby/object:Gem::Requirement
+  requirement: &26752296 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,7 +24,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25980384
+  version_requirements: *26752296
 description: ActiveRecord like interface for Amazon SimpleDB. Store, query, shard,
   etc. By http://www.appoxy.com
 email: travis@appoxy.com