m4dbi 0.8.2 → 0.8.3

data/lib/m4dbi/model.rb

@@ -142,14 +142,22 @@ module M4DBI
           end
           if ! pk_hash.empty?
             rec = self.one_where( pk_hash )
-            callbacks[:after_create].each do |block|
-              block.yield rec
+            if callbacks[:active]
+              callbacks[:after_create].each do |block|
+                callbacks[:active] = false
+                block.yield rec
+                callbacks[:active] = true
+              end
             end
           else
             begin
               rec = last_record( dbh_ )
-              callbacks[:after_create].each do |block|
-                block.yield rec
+              if callbacks[:active]
+                callbacks[:after_create].each do |block|
+                  callbacks[:active] = false
+                  block.yield rec
+                  callbacks[:active] = true
+                end
               end
             rescue NoMethodError => e
               # ignore
@@ -231,6 +239,14 @@ module M4DBI
       callbacks[:after_create] << block
     end
 
+    def self.after_update(&block)
+      callbacks[:after_update] << block
+    end
+
+    def self.after_delete(&block)
+      callbacks[:after_delete] << block
+    end
+
     # Example:
     #   M4DBI::Model.one_to_many( Author, Post, :posts, :author, :author_id )
     #   her_posts = some_author.posts
@@ -379,6 +395,13 @@ module M4DBI
         hash.each do |key,value|
           @row[ key ] = value
         end
+        if self.class.callbacks[:active]
+          self.class.callbacks[:after_update].each do |block|
+            self.class.callbacks[:active] = false
+            block.yield self
+            self.class.callbacks[:active] = true
+          end
+        end
       end
       num_updated
     end
@@ -387,7 +410,18 @@ module M4DBI
     def delete
       st = prepare("DELETE FROM #{table} WHERE #{pk_clause}")
       num_deleted = st.execute( *pk_values ).affected_count
-      num_deleted == 1
+      if num_deleted != 1
+        false
+      else
+        if self.class.callbacks[:active]
+          self.class.callbacks[:after_delete].each do |block|
+            self.class.callbacks[:active] = false
+            block.yield self
+            self.class.callbacks[:active] = true
+          end
+        end
+        true
+      end
     end
 
     # save does nothing.  It exists to provide compatibility with other ORMs.
@@ -429,8 +463,11 @@ module M4DBI
         :columns   => h.table_schema( table.to_sym ).columns,
         :st        => Hash.new,  # prepared statements for all queries
         :callbacks => {
-          after_create: []
-        }
+          after_create: [],
+          after_update: [],
+          after_delete: [],
+          active: true,
+        },
       } )
 
       meta_def( 'pk_str'.to_sym ) do
@@ -481,6 +518,14 @@ module M4DBI
           if num_changed > 0
             @row[ colname ] = new_value
           end
+          if self.class.callbacks[:active]
+            self.class.callbacks[:after_update].each do |block|
+              self.class.callbacks[:active] = false
+              block.yield self
+              self.class.callbacks[:active] = true
+            end
+          end
+          new_value
         end
 
         class_def( '[]='.to_sym ) do |colname, new_value|

data/lib/m4dbi/version.rb

@@ -1,3 +1,3 @@
 module M4DBI
-  VERSION = '0.8.2'
+  VERSION = '0.8.3'
 end

data/spec/model.rb

@@ -823,6 +823,29 @@ describe 'A created M4DBI::Model subclass instance' do
     a_ = @m_author[ 1 ]
     h[ a_ ].should.equal 123
   end
+
+  it 'after setting data, executes code provided in an after_update hook' do
+    class Author < M4DBI::Model( :authors )
+      after_update do |author|
+        $test = 3
+        author.name = 'different name'
+      end
+    end
+
+    $test.should.not.equal 3
+    a = Author.create(name: 'theauthor')
+    $test.should.not.equal 3
+    a.set  name: 'foobar'
+    $test.should.equal 3
+    a.name.should.equal 'different name'
+
+    $test = nil
+    a = Author.create(name: 'theauthor')
+    $test.should.not.equal 3
+    a.name = 'foobar'
+    $test.should.equal 3
+    a.name.should.equal 'different name'
+  end
 end
 
 describe 'A found M4DBI::Model subclass instance' do
@@ -950,6 +973,19 @@ describe 'A found M4DBI::Model subclass instance' do
     reset_data
   end
 
+  it 'after deletion, executes code provided in an after_delete hook' do
+    class Author < M4DBI::Model( :authors )
+      after_delete do |author|
+        $test = 4
+      end
+    end
+    $test.should.not.equal 4
+    a = Author.create(name: 'theauthor')
+    $test.should.not.equal 4
+    a.delete
+    $test.should.equal 4
+  end
+
   it 'does nothing on #save' do
     p = @m_post[ 1 ]
     should.not.raise do

metadata

@@ -1,61 +1,58 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: m4dbi
-version: !ruby/object:Gem::Version 
-  hash: 59
+version: !ruby/object:Gem::Version
+  version: 0.8.3
   prerelease: 
-  segments: 
-  - 0
-  - 8
-  - 2
-  version: 0.8.2
 platform: ruby
-authors: 
+authors:
 - Pistos
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-25 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: metaid
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rdbi
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdbi
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-description: M4DBI provides models, associations and some convenient extensions to RDBI.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: M4DBI provides models, associations and some convenient extensions to
+  RDBI.
 email: m4dbi dot pistos at purepistos dot net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - CHANGELOG
 - LICENCE
-files: 
+files:
 - README.rdoc
 - CHANGELOG
 - LICENCE
@@ -76,38 +73,30 @@ files:
 - spec/hash.rb
 homepage: https://github.com/Pistos/m4dbi
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-requirements: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - bacon (optional)
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.18
 signing_key: 
 specification_version: 3
 summary: Models (and More) for RDBI
-test_files: 
+test_files:
 - spec/database.rb
 - spec/model.rb
 - spec/helper.rb