tphases 0.2.0 → 0.2.2

data/README.md

@@ -73,6 +73,9 @@ If a transactional violation occurs in a TPhase, the code will continue to run,
 #### `ensure_no_transactions_on`
 Call `ensure_no_transactions_on` on controllers to prevent DB transactions within the views of controller actions.  e.g.:
 
+#### `ignore_phases`
+Call `ignore_phases` to disable TPhases within the block passed
+
 ```ruby
 class BarsController < ApplicationController
 

data/lib/tphases/modes/helpers/transactional_violations_helper.rb

@@ -23,17 +23,19 @@ module TPhases
           def define_phase_methods!
             %w{read write no_transactions}.each do |phase_type|
               define_singleton_method(:"#{phase_type}_phase") do |&block|
+
+                if @phase_stack.last.try(:ignored?)
+                  return block.call
+                end
+
                 phase = Phase.new
                 @phase_stack << phase
                 begin
                   subscriber = ActiveSupport::Notifications.subscribe("sql.active_record") do |name, date, date2, sha, args|
                     next unless @phase_stack.last == phase
-                    if send(:"#{phase_type}_violation?", args[:sql])
-                      send(:"#{phase_type}_violation_action", args[:sql], caller)
-                    end
-
+                    send(:"#{phase_type}_violation_action", args[:sql], caller) if send(:"#{phase_type}_violation?", args[:sql])
                   end
-                  block.call
+                  return block.call
                 ensure
                   ActiveSupport::Notifications.unsubscribe(subscriber)
                   @phase_stack.pop
@@ -42,6 +44,13 @@ module TPhases
             end
           end
 
+          def ignore_phases
+            @phase_stack << Phase.new(ignore: true)
+            yield
+          ensure
+            @phase_stack.pop
+          end
+
           private
           READ_QUERIES            = %w{show select describe}
           WRITE_QUERIES           = %w{update commit insert delete}
@@ -79,6 +88,13 @@ module TPhases
 
         # simple class to represent a phase on the stack of phases.  Used to determine which phase is active
         class Phase;
+          def initialize(opts={ ignore: false })
+            @ignore = opts[:ignore]
+          end
+
+          def ignored?
+            @ignore
+          end
         end
 
       end

data/lib/tphases/modes/pass_through_mode.rb

@@ -17,6 +17,10 @@ module TPhases
           yield
         end
 
+        def ignore_phases
+          yield
+        end
+
         private
         def add_rails_methods!
           require 'tphases/rails/no_transactions_in_controller_pass_through'

data/lib/tphases/version.rb

@@ -1,3 +1,3 @@
 module Tphases
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

data/spec/lib/tphases/modes/exceptions_mode_spec.rb

@@ -98,5 +98,29 @@ describe TPhases::Modes::ExceptionsMode do
       end
       subject.instance_variable_get("@phase_stack").should be_empty
     end
+
+    context "ignore_phases inside of a no_transactions_phase" do
+      it "should allow all transactions" do
+        subject.no_transactions_phase do
+          expect { ActiveRecord::Base.connection.select_all(read_sql) }.to raise_error
+          subject.ignore_phases do
+            expect { ActiveRecord::Base.connection.select_all(read_sql) }.to_not raise_error
+          end
+          expect { ActiveRecord::Base.connection.select_all(read_sql) }.to raise_error
+        end
+      end
+    end
+
+    context "no_transactions_phase inside of a ignore_phases" do
+      it "should allow all transactions" do
+        subject.ignore_phases do
+          expect { ActiveRecord::Base.connection.select_all(read_sql) }.to_not raise_error
+          subject.no_transactions_phase do
+            expect { ActiveRecord::Base.connection.select_all(read_sql) }.to_not raise_error
+          end
+          expect { ActiveRecord::Base.connection.select_all(read_sql) }.to_not raise_error
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tphases
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2012-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport