m4dbi 0.8.4 → 0.8.5

data/lib/m4dbi/model.rb

@@ -122,6 +122,7 @@ module M4DBI
       values = keys.map { |key| hash[ key ] }
       value_placeholders = values.map { |v| '?' }.join( ',' )
       rec = nil
+      num_inserted = 0
 
       dbh.transaction do |dbh_|
         if keys.empty? && defined?( RDBI::Driver::PostgreSQL ) && RDBI::Driver::PostgreSQL === dbh.driver
@@ -142,23 +143,9 @@ module M4DBI
           end
           if ! pk_hash.empty?
             rec = self.one_where( pk_hash )
-            if hooks[:active]
-              hooks[:after_create].each do |block|
-                hooks[:active] = false
-                block.yield rec
-                hooks[:active] = true
-              end
-            end
           else
             begin
               rec = last_record( dbh_ )
-              if hooks[:active]
-                hooks[:after_create].each do |block|
-                  hooks[:active] = false
-                  block.yield rec
-                  hooks[:active] = true
-                end
-              end
             rescue NoMethodError => e
               # ignore
               #puts "not implemented: #{e.message}"
@@ -167,6 +154,14 @@ module M4DBI
         end
       end
 
+      if hooks[:active] && num_inserted > 0
+        hooks[:after_create].each do |block|
+          hooks[:active] = false
+          block.yield rec
+          hooks[:active] = true
+        end
+      end
+
       rec
     end
 

data/lib/m4dbi/version.rb

@@ -1,3 +1,3 @@
 module M4DBI
-  VERSION = '0.8.4'
+  VERSION = '0.8.5'
 end

data/spec/model.rb

@@ -686,6 +686,16 @@ describe 'A M4DBI::Model subclass' do
     a = Author.create(name: 'theauthor')
     $test.should.equal 2
     a.name.should.equal 'different name'
+
+    class Post < M4DBI::Model( :posts ); end
+    class Author < M4DBI::Model( :authors )
+      after_create do |author|
+        Post.create(author_id: author.id, text: 'foobar')
+      end
+    end
+    n = Post.count
+    a = Author.create(name: 'theauthor')
+    Post.count.should == n+1
   end
 
   it 'provides a means to remove all after_create hooks' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: m4dbi
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-01 00:00:00.000000000 Z
+date: 2012-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metaid