once-ler 0.0.12 → 0.0.13

data/README.md

@@ -58,9 +58,9 @@ once-ler adds two new `before`/`after` scopes, `:record` and `:reset`, in
 case you need to implement additional logic. `:record` runs in
 conjunction with once-ler's recording phase (the implicit `before :all`).
 `:reset` runs in conjunction with its cleanup phase (database rollback,
-implicit `after :all`). As oppose to `:all`/`:context` hooks, these ones
+implicit `after :all`). As opposed to `:all`/`:context` hooks, these ones
 are inherited down, and will run before/after any nested once-ler setup/
-teardown.`
+teardown.
 
 They can be used globally, or in a particular group. For example:
 

data/lib/onceler/basic_helpers.rb

@@ -98,6 +98,21 @@ module Onceler
         superclass.onceler
       end
 
+      # Set this if you have multiple (or different) conns you will be
+      # once-ler'ing. Can either be an enumerable, or a proc that returns
+      # one. Note that if given a proc, it will only be called once (the
+      # first time it's needed) and cached after that.
+      #
+      # context "Foo" do
+      #   self.onceler_connections = -> { [Foo.connection] }
+      #   ...
+      attr_writer :onceler_connections
+      def onceler_connections
+        @onceler_connections ||= [ActiveRecord::Base.connection]
+        @onceler_connections = instance_eval(&@onceler_connections) if @onceler_connections.respond_to?(:call)
+        @onceler_connections
+      end
+
       private
 
       def add_onceler_hooks!

data/lib/onceler/recordable.rb

@@ -70,9 +70,10 @@ 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.instance_variable_get(:@association_cache)
-      cache2 = obj2.instance_variable_get(:@association_cache)
-      cache1.all? { |k, v| __values_equal?(v.target, cache2[k].target) }
+      cache1 = obj1.association_cache
+      cache2 = obj2.association_cache
+      cache1.size == cache2.size &&
+      cache1.all? { |k, v| cache2.key?(k) && __values_equal?(v.target, cache2[k].target) }
     end
 
     def __data(inherit = false)

data/lib/onceler/recorder.rb

@@ -116,22 +116,20 @@ module Onceler
       end
     end
 
-    # TODO: configurable transaction fu (say, if you have multiple
-    # conns)
-    def transaction_classes
-      [ActiveRecord::Base]
+    def transactional_connections
+      @group_class.onceler_connections
     end
 
     def begin_transactions!
       Onceler.open_transactions += 1
-      transaction_classes.each do |klass|
-        begin_transaction(klass.connection)
+      transactional_connections.each do |connection|
+        begin_transaction(connection)
       end
     end
 
     def rollback_transactions!
-      transaction_classes.each do |klass|
-        rollback_transaction(klass.connection)
+      transactional_connections.each do |connection|
+        rollback_transaction(connection)
       end
     ensure
       Onceler.open_transactions -= 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: once-ler
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-04 00:00:00.000000000 Z
+date: 2014-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord