m4dbi 0.8.3 → 0.8.4

data/lib/m4dbi/model.rb

@@ -2,7 +2,7 @@ module M4DBI
   class Model
     #attr_reader :row
     ancestral_trait_reader :dbh, :table
-    ancestral_trait_class_reader :dbh, :table, :pk, :columns, :st, :callbacks
+    ancestral_trait_class_reader :dbh, :table, :pk, :columns, :st, :hooks
 
     M4DBI_UNASSIGNED = '__m4dbi_unassigned__'
 
@@ -142,21 +142,21 @@ module M4DBI
           end
           if ! pk_hash.empty?
             rec = self.one_where( pk_hash )
-            if callbacks[:active]
-              callbacks[:after_create].each do |block|
-                callbacks[:active] = false
+            if hooks[:active]
+              hooks[:after_create].each do |block|
+                hooks[:active] = false
                 block.yield rec
-                callbacks[:active] = true
+                hooks[:active] = true
               end
             end
           else
             begin
               rec = last_record( dbh_ )
-              if callbacks[:active]
-                callbacks[:after_create].each do |block|
-                  callbacks[:active] = false
+              if hooks[:active]
+                hooks[:after_create].each do |block|
+                  hooks[:active] = false
                   block.yield rec
-                  callbacks[:active] = true
+                  hooks[:active] = true
                 end
               end
             rescue NoMethodError => e
@@ -236,15 +236,35 @@ module M4DBI
     end
 
     def self.after_create(&block)
-      callbacks[:after_create] << block
+      hooks[:after_create] << block
+    end
+
+    def self.remove_after_create_hooks
+      hooks[:after_create].clear
     end
 
     def self.after_update(&block)
-      callbacks[:after_update] << block
+      hooks[:after_update] << block
+    end
+
+    def self.remove_after_update_hooks
+      hooks[:after_update].clear
+    end
+
+    def self.before_delete(&block)
+      hooks[:before_delete] << block
     end
 
     def self.after_delete(&block)
-      callbacks[:after_delete] << block
+      hooks[:after_delete] << block
+    end
+
+    def self.remove_before_delete_hooks
+      hooks[:before_delete].clear
+    end
+
+    def self.remove_after_delete_hooks
+      hooks[:after_delete].clear
     end
 
     # Example:
@@ -395,11 +415,11 @@ 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
+        if self.class.hooks[:active]
+          self.class.hooks[:after_update].each do |block|
+            self.class.hooks[:active] = false
             block.yield self
-            self.class.callbacks[:active] = true
+            self.class.hooks[:active] = true
           end
         end
       end
@@ -408,16 +428,24 @@ module M4DBI
 
     # Returns true iff the record and only the record was successfully deleted.
     def delete
+      if self.class.hooks[:active]
+        self.class.hooks[:before_delete].each do |block|
+          self.class.hooks[:active] = false
+          block.yield self
+          self.class.hooks[:active] = true
+        end
+      end
+
       st = prepare("DELETE FROM #{table} WHERE #{pk_clause}")
       num_deleted = st.execute( *pk_values ).affected_count
       if num_deleted != 1
         false
       else
-        if self.class.callbacks[:active]
-          self.class.callbacks[:after_delete].each do |block|
-            self.class.callbacks[:active] = false
+        if self.class.hooks[:active]
+          self.class.hooks[:after_delete].each do |block|
+            self.class.hooks[:active] = false
             block.yield self
-            self.class.callbacks[:active] = true
+            self.class.hooks[:active] = true
           end
         end
         true
@@ -462,9 +490,10 @@ module M4DBI
         :pk        => pk_,
         :columns   => h.table_schema( table.to_sym ).columns,
         :st        => Hash.new,  # prepared statements for all queries
-        :callbacks => {
+        :hooks => {
           after_create: [],
           after_update: [],
+          before_delete: [],
           after_delete: [],
           active: true,
         },
@@ -518,11 +547,11 @@ 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
+          if self.class.hooks[:active]
+            self.class.hooks[:after_update].each do |block|
+              self.class.hooks[:active] = false
               block.yield self
-              self.class.callbacks[:active] = true
+              self.class.hooks[:active] = true
             end
           end
           new_value

data/lib/m4dbi/version.rb

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

data/spec/model.rb

@@ -41,7 +41,11 @@ describe 'A M4DBI::Model subclass' do
     @m_mc = Class.new( M4DBI::Model( :many_col_table ) )
     @m_nipk = Class.new( M4DBI::Model( :non_id_pk, :pk => [ :str ] ) )
     @m_mcpk = Class.new( M4DBI::Model( :mcpk, :pk => [ :kc1, :kc2 ] ) )
-    class Author < M4DBI::Model( :authors ); end
+    class Author < M4DBI::Model( :authors )
+      remove_after_create_hooks
+      remove_after_update_hooks
+      remove_after_delete_hooks
+    end
   end
 
   it 'can be defined' do
@@ -85,7 +89,7 @@ describe 'A M4DBI::Model subclass' do
     end
   end
 
-  it 'provides the database handle it is using' do
+  # it 'provides the database handle it is using' do
     # begin
       # @m_author.dbh.should.equal $dbh
 
@@ -96,7 +100,7 @@ describe 'A M4DBI::Model subclass' do
       # # Clean up handles for later specs
       # connect_to_spec_database
     # end
-  end
+  # end
 
   it 'maintains distinction from models of the same name in different databases' do
     begin
@@ -683,6 +687,20 @@ describe 'A M4DBI::Model subclass' do
     $test.should.equal 2
     a.name.should.equal 'different name'
   end
+
+  it 'provides a means to remove all after_create hooks' do
+    class Author < M4DBI::Model( :authors )
+      after_create do |author|
+        $test = 'remove after_create'
+      end
+    end
+    class Author < M4DBI::Model( :authors )
+      remove_after_create_hooks
+    end
+    $test.should.not.equal 'remove after_create'
+    a = Author.create(name: 'theauthor')
+    $test.should.not.equal 'remove after_create'
+  end
 end
 
 describe 'A created M4DBI::Model subclass instance' do
@@ -846,6 +864,51 @@ describe 'A created M4DBI::Model subclass instance' do
     $test.should.equal 3
     a.name.should.equal 'different name'
   end
+
+  it 'provides a means to remove all after_update hooks' do
+    class Author < M4DBI::Model( :authors )
+      after_update do |author|
+        $test = 'remove after_update'
+      end
+    end
+    class Author < M4DBI::Model( :authors )
+      remove_after_update_hooks
+    end
+    $test.should.not.equal 'remove after_update'
+    a = Author.create(name: 'theauthor')
+    a.name = 'another author'
+    $test.should.not.equal 'remove after_update'
+  end
+
+  it 'provides a means to remove all before_delete hooks' do
+    class Author < M4DBI::Model( :authors )
+      before_delete do |author|
+        $test = 'remove before_update'
+      end
+    end
+    class Author < M4DBI::Model( :authors )
+      remove_before_delete_hooks
+    end
+    $test.should.not.equal 'remove before_delete'
+    a = Author.create(name: 'theauthor')
+    a.delete
+    $test.should.not.equal 'remove before_delete'
+  end
+
+  it 'provides a means to remove all after_delete hooks' do
+    class Author < M4DBI::Model( :authors )
+      after_delete do |author|
+        $test = 'remove after_update'
+      end
+    end
+    class Author < M4DBI::Model( :authors )
+      remove_after_delete_hooks
+    end
+    $test.should.not.equal 'remove after_delete'
+    a = Author.create(name: 'theauthor')
+    a.delete
+    $test.should.not.equal 'remove after_delete'
+  end
 end
 
 describe 'A found M4DBI::Model subclass instance' do
@@ -973,6 +1036,19 @@ describe 'A found M4DBI::Model subclass instance' do
     reset_data
   end
 
+  it 'before deletion, executes code provided in an before_delete hook' do
+    class Author < M4DBI::Model( :authors )
+      before_delete do |author|
+        $test = author.name
+      end
+    end
+    $test.should.not.equal 'theauthor'
+    a = Author.create(name: 'theauthor')
+    $test.should.not.equal 'theauthor'
+    a.delete
+    $test.should.equal 'theauthor'
+  end
+
   it 'after deletion, executes code provided in an after_delete hook' do
     class Author < M4DBI::Model( :authors )
       after_delete do |author|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: m4dbi
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
   prerelease: 
 platform: ruby
 authors: