once-ler 0.0.3 → 0.0.4

data/lib/onceler/basic_helpers.rb

@@ -101,7 +101,8 @@ module Onceler
       end
 
       def add_onceler_hooks!
-        prepend_before(:all) do |group|
+        before(:all) do |group|
+          Onceler.configuration.run_callbacks(:record, :before)
           group.onceler.record!
         end
 

data/lib/onceler/blank_tape.rb

@@ -32,7 +32,7 @@ module Onceler
     end
 
     def __data
-      [__ivars, @__retvals]
+      @__data ||= Marshal.dump([__ivars, @__retvals])
     end
 
     def copy(mixins)
@@ -42,7 +42,7 @@ module Onceler
     end
 
     def copy_from(other)
-      ivars, @__retvals = Marshal.load(Marshal.dump(other.__data))
+      ivars, @__retvals = Marshal.load(other.__data)
       ivars.each do |key, value|
         instance_variable_set(key, value)
       end

data/lib/onceler/configuration.rb

@@ -15,5 +15,21 @@ module Onceler
     def include(mod)
       modules << mod
     end
+
+    def before(scope, &block)
+      callbacks[scope][:before] << block
+    end
+
+    def callbacks
+      @callbacks ||= Hash.new do |scopes, scope|
+        scopes[scope] = Hash.new do |timings, timing|
+          timings[timing] = []
+        end
+      end
+    end
+
+    def run_callbacks(scope, timing)
+      callbacks[scope][timing].each(&:call)
+    end
   end
 end

data/lib/onceler/extensions/active_record.rb

@@ -1,3 +1,11 @@
-module ActiveRecord::TestFixtures
-  def teardown_fixtures; end # we manage it ourselves
+require "active_record"
+
+if ActiveRecord::VERSION::STRING >= "4.1."
+  require "onceler/extensions/active_record_4_1"
+elsif ActiveRecord::VERSION::STRING >= "4.0."
+  require "onceler/extensions/active_record_4_0"
+elsif ActiveRecord::VERSION::STRING >= "3.2."
+  require "onceler/extensions/active_record_3_2"
+else
+  require "onceler/extensions/active_record_3_0"
 end

data/lib/onceler/extensions/active_record_3_0.rb

@@ -0,0 +1,55 @@
+require "onceler/transactions"
+
+# monkey-patch these to:
+# 1. not clear connections so that we don't lose our transactions
+# 2. use savepoints (if necessary)
+
+module ActiveRecord::TestFixtures
+  include Onceler::Transactions
+
+  def setup_fixtures
+    return unless defined?(ActiveRecord) && !ActiveRecord::Base.configurations.blank?
+
+    if pre_loaded_fixtures && !use_transactional_fixtures
+      raise RuntimeError, 'pre_loaded_fixtures requires use_transactional_fixtures'
+    end
+
+    @fixture_cache = {}
+    @@already_loaded_fixtures ||= {}
+
+    # Load fixtures once and begin transaction.
+    if run_in_transaction?
+      if @@already_loaded_fixtures[self.class]
+        @loaded_fixtures = @@already_loaded_fixtures[self.class]
+      else
+        load_fixtures
+        @@already_loaded_fixtures[self.class] = @loaded_fixtures
+      end
+      ### ONCELER'd
+      begin_transaction(ActiveRecord::Base.connection)
+    # Load fixtures for every test.
+    else
+      Fixtures.reset_cache
+      @@already_loaded_fixtures[self.class] = nil
+      load_fixtures
+    end
+
+    # Instantiate fixtures for every test if requested.
+    instantiate_fixtures if use_instantiated_fixtures
+  end
+
+  def teardown_fixtures
+    return unless defined?(ActiveRecord) && !ActiveRecord::Base.configurations.blank?
+
+    unless run_in_transaction?
+      ActiveRecord::Fixtures.reset_cache
+    end
+
+    # Rollback changes if a transaction is active.
+    if run_in_transaction? && ActiveRecord::Base.connection.open_transactions != 0
+      ### ONCELER'd
+      rollback_transaction(ActiveRecord::Base.connection)
+    end
+    ### ONCELER'd
+  end
+end

data/lib/onceler/extensions/active_record_3_2.rb

@@ -0,0 +1,65 @@
+require "onceler/transactions"
+
+# monkey-patch these to:
+# 1. not clear connections so that we don't lose our transactions
+# 2. use savepoints (if necessary)
+
+module ActiveRecord::TestFixtures
+  include ::Onceler::Transactions
+
+  def setup_fixtures
+    return unless !ActiveRecord::Base.configurations.blank?
+
+    if pre_loaded_fixtures && !use_transactional_fixtures
+      raise RuntimeError, 'pre_loaded_fixtures requires use_transactional_fixtures'
+    end
+
+    @fixture_cache = {}
+    @fixture_connections = []
+    @@already_loaded_fixtures ||= {}
+
+    # Load fixtures once and begin transaction.
+    if run_in_transaction?
+      if @@already_loaded_fixtures[self.class]
+        @loaded_fixtures = @@already_loaded_fixtures[self.class]
+      else
+        @loaded_fixtures = load_fixtures
+        @@already_loaded_fixtures[self.class] = @loaded_fixtures
+      end
+      @fixture_connections = enlist_fixture_connections
+      @fixture_connections.each do |connection|
+        ### ONCELER'd
+        begin_transaction(connection)
+      end
+    # Load fixtures for every test.
+    else
+      ActiveRecord::Fixtures.reset_cache
+      @@already_loaded_fixtures[self.class] = nil
+      @loaded_fixtures = load_fixtures
+    end
+
+    # Instantiate fixtures for every test if requested.
+    instantiate_fixtures if use_instantiated_fixtures
+  end
+
+  def teardown_fixtures
+    return unless defined?(ActiveRecord) && !ActiveRecord::Base.configurations.blank?
+
+    unless run_in_transaction?
+      ActiveRecord::Fixtures.reset_cache
+    end
+
+    # Rollback changes if a transaction is active.
+    if run_in_transaction?
+      @fixture_connections.each do |connection|
+        if connection.open_transactions != 0
+          ### ONCELER'd
+          rollback_transaction(connection)
+        end
+      end
+      @fixture_connections.clear
+    end
+    ### ONCELER'd
+  end
+end
+

data/lib/onceler/extensions/active_record_4_0.rb

@@ -0,0 +1,19 @@
+# monkey-patch this to not clear connections so that we don't lose our
+# transactions
+
+module ActiveRecord::TestFixtures
+  def teardown_fixtures
+    return if ActiveRecord::Base.configurations.blank?
+
+    # Rollback changes if a transaction is active.
+    if run_in_transaction?
+      @fixture_connections.each do |connection|
+        connection.rollback_transaction if connection.transaction_open?
+      end
+      @fixture_connections.clear
+    else
+      ActiveRecord::FixtureSet.reset_cache
+    end
+    ### ONCELER'd
+  end
+end

data/lib/onceler/extensions/active_record_4_1.rb

@@ -0,0 +1,17 @@
+# monkey-patch this to not clear connections so that we don't lose our
+# transactions
+
+module ActiveRecord::TestFixtures
+  def teardown_fixtures
+    # Rollback changes if a transaction is active.
+    if run_in_transaction?
+      @fixture_connections.each do |connection|
+        connection.rollback_transaction if connection.transaction_open?
+      end
+      @fixture_connections.clear
+    else
+      ActiveRecord::FixtureSet.reset_cache
+    end
+    ### ONCELER'd
+  end
+end

data/lib/onceler/recorder.rb

@@ -1,8 +1,10 @@
 require "onceler/blank_tape"
-require "active_record"
+require "onceler/transactions"
 
 module Onceler
   class Recorder
+    include Transactions
+
     attr_accessor :tape, :helper_proxy
 
     def initialize(parent)
@@ -37,7 +39,7 @@ module Onceler
       @recordings.each do |recording|
         recording.record_onto!(@tape)
       end
-      @data = Marshal.dump(@tape.__data)
+      @data = @tape.__data
     end
 
     def reset!
@@ -116,39 +118,6 @@ module Onceler
         rollback_transaction(klass.connection)
       end
     end
-
-    if ActiveRecord::VERSION::MAJOR >= 4
-      def begin_transaction(conn)
-        conn.begin_transaction requires_new: true
-      end
-
-      def rollback_transaction(conn)
-        conn.rollback_transaction
-      end
-    else
-      def begin_transaction(klass)
-        unless conn.instance_variable_get(:@_current_transaction_records)
-          conn.instance_variable_set(:@_current_transaction_records, [])
-        end
-        if conn.open_transactions == 0
-          conn.begin_db_transaction
-        else
-          conn.create_savepoint
-        end
-        conn.increment_open_transactions
-      end
-
-      def begin_transaction(klass)
-        conn.decrement_open_transactions
-        if conn.open_transactions == 0
-          conn.rollback_db_transaction
-          conn.send :rollback_transaction_records, true
-        else
-          conn.rollback_to_savepoint
-          conn.send :rollback_transaction_records, false
-        end
-      end
-    end
   end
 
   class Recording

data/lib/onceler/transactions.rb

@@ -0,0 +1,7 @@
+require "active_record"
+if ActiveRecord::VERSION::MAJOR >= 4
+  require "onceler/transactions/active_record_4"
+else
+  require "onceler/transactions/active_record_3"
+end
+

data/lib/onceler/transactions/active_record_3.rb

@@ -0,0 +1,28 @@
+module Onceler
+  module Transactions
+    def begin_transaction(conn)
+      unless conn.instance_variable_get(:@_current_transaction_records)
+        conn.instance_variable_set(:@_current_transaction_records, [])
+      end
+      if conn.open_transactions == 0
+        conn.transaction_joinable = false
+        conn.begin_db_transaction
+      else
+        conn.create_savepoint
+      end
+      conn.increment_open_transactions
+    end
+
+    def rollback_transaction(conn)
+      conn.decrement_open_transactions
+      if conn.open_transactions == 0
+        conn.rollback_db_transaction
+        conn.send :rollback_transaction_records, true
+      else
+        conn.rollback_to_savepoint
+        conn.send :rollback_transaction_records, false
+      end
+    end
+  end
+end
+

data/lib/onceler/transactions/active_record_4.rb

@@ -0,0 +1,12 @@
+module Onceler
+  module Transactions
+    def begin_transaction(conn)
+      conn.begin_transaction requires_new: true
+    end
+
+    def rollback_transaction(conn)
+      conn.rollback_transaction
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: once-ler
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2014-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -57,7 +57,14 @@ files:
 - lib/onceler/blank_tape.rb
 - lib/onceler/configuration.rb
 - lib/onceler/extensions/active_record.rb
+- lib/onceler/extensions/active_record_3_0.rb
+- lib/onceler/extensions/active_record_3_2.rb
+- lib/onceler/extensions/active_record_4_0.rb
+- lib/onceler/extensions/active_record_4_1.rb
 - lib/onceler/recorder.rb
+- lib/onceler/transactions/active_record_3.rb
+- lib/onceler/transactions/active_record_4.rb
+- lib/onceler/transactions.rb
 - lib/onceler.rb
 homepage: http://github.com/instructure/onceler
 licenses: []