once-ler 0.0.16 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 951a2d0bc2021d055676679c236ee9f6979c7a6a
-  data.tar.gz: e2eecf83edbb67e80610d15c59e5465510b2c2a8
+  metadata.gz: ed16df6da817425b161a3d9b887c094ca5eac560
+  data.tar.gz: acb176d0ec4def0482486a1da7cf1dd9189f5dfa
 SHA512:
-  metadata.gz: deec33b613d9fb1b2f140473e4c10daa37f312a0b75c9a36e87dc66d209d0ab4873447cc38cf4141f2784b10422f6347e2ef6f7630961653c1cc1b9829f15c61
-  data.tar.gz: fb0391864d777e3c91dd4996a86bbcd4c3f0f5d61cca71471ce67deffb43d11393b98964798faa2b009ef901b071c28121619772cbc841f109671664267b8c66
+  metadata.gz: 90ddd7d85c492c37b65fb5bfe5a01c1fd6e6a74013eec09a0e92cc9098d0348ef161ff1c7d6065e382c931bdc089d67a0088b39fbbb0ac345402ef5823f52376
+  data.tar.gz: 498383c10083fd113abb5df9843517ef3f633689604c2dc01af8793832b1d3724353ec7765036e29f1031178dc77eb4c6452948dcf8692380e4c50eb0361ed45

data/lib/onceler/extensions/active_record.rb

@@ -2,10 +2,6 @@ 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"
+  require "onceler/extensions/active_record_4_0"
 end

data/lib/onceler/recordable.rb

@@ -1,3 +1,5 @@
+require "set"
+
 module Onceler
   module Recordable
     def self.extended(instance)
@@ -70,8 +72,8 @@ module Onceler
     # if a nested once block updates an inherited object's associations,
     # we want to know about it
     def __associations_equal?(obj1, obj2)
-      cache1 = obj1.association_cache
-      cache2 = obj2.association_cache
+      cache1 = obj1.instance_variable_get(:@association_cache)
+      cache2 = obj2.instance_variable_get(:@association_cache)
       cache1.size == cache2.size &&
       cache1.all? { |k, v| cache2.key?(k) && __values_equal?(v.target, cache2[k].target) }
     end
@@ -86,19 +88,53 @@ module Onceler
         rescue TypeError
           data.each do |hash|
             hash.each do |key, val|
-              begin
-                Marshal.dump(val)
-              rescue TypeError
-                raise TypeError.new("Unable to dump #{key} in #{self.class.metadata[:location]}: #{$!}")
-              end
+              find_dump_error(key, val)
             end
           end
+          raise # find_dump_error should have re-raised, but just in case...
+        ensure
+          __visited_dump_vars.clear
         end
         @__comparison_cache = nil
         data
       end
     end
 
+    def __visited_dump_vars
+      @__visited_dump_vars ||= Set.new
+    end
+
+    def find_dump_error(key, val, prefix = "")
+      return if __visited_dump_vars.include?(val)
+      __visited_dump_vars << val
+
+      Marshal.dump(val)
+    rescue TypeError
+
+      # see if anything inside val can't be dumped...
+      sub_prefix = "#{prefix}#{key} (#<#{val.class}>) => "
+
+      # instance var?
+      val.instance_variables.each do |k|
+        v = val.instance_variable_get(k)
+        find_dump_error(k, v, sub_prefix)
+      end
+
+      # hash key/value?
+      val.each_pair do |k, v|
+        find_dump_error("hash key #{k}", k, sub_prefix)
+        find_dump_error("[#{k.inspect}]", v, sub_prefix)
+      end if val.respond_to?(:each_pair)
+
+      # array element?
+      val.each_with_index do |v, i|
+        find_dump_error("[#{i}]", v, sub_prefix)
+      end if val.respond_to?(:each_with_index)
+
+      # guess it's val proper
+      raise TypeError.new("Unable to dump #{prefix}#{key} (#<#{val.class}>) in #{self.class.metadata[:location]}: #{$!}")
+    end
+
     def copy_from(other)
       # need two copies of things for __mutated? checks (see above)
       @__inherited_cache = Marshal.load(other.__data(:inherit)).inject(&:merge)

data/lib/onceler/transactions.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: once-ler
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.1.0
 platform: ruby
 authors:
 - Jon Jensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2017-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
 description: once-ler supercharges your let's and before's with the performance of
   before(:all)
 email: jon@instructure.com
@@ -52,15 +52,12 @@ files:
 - lib/onceler/basic_helpers.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/extensions/database_cleaner.rb
 - lib/onceler/recordable.rb
 - lib/onceler/recorder.rb
 - lib/onceler/transactions.rb
-- lib/onceler/transactions/active_record_3.rb
 - lib/onceler/transactions/active_record_4.rb
 homepage: http://github.com/instructure/onceler
 licenses: []
@@ -81,9 +78,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: rspec supercharger
 test_files: []
-has_rdoc: 

data/lib/onceler/extensions/active_record_3_0.rb

@@ -1,53 +0,0 @@
-require "onceler/transactions"
-
-# monkey-patch these to 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
-    ActiveRecord::Base.clear_active_connections!
-  end
-end

data/lib/onceler/extensions/active_record_3_2.rb

@@ -1,63 +0,0 @@
-require "onceler/transactions"
-
-# monkey-patch these to 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
-    ActiveRecord::Base.clear_active_connections!
-  end
-end
-

data/lib/onceler/transactions/active_record_3.rb

@@ -1,23 +0,0 @@
-module Onceler
-  module Transactions
-    def begin_transaction(conn)
-      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
-      else
-        conn.rollback_to_savepoint
-      end
-    end
-  end
-end
-