once-ler 0.0.9 → 0.0.10

data/lib/onceler/recordable.rb

@@ -3,7 +3,7 @@ module Onceler
     def self.extended(instance)
       instance.instance_eval do
         @__retvals = {}
-        @__retvals_recorded = {} # we might override an inherited one, so we need to differentiate
+        @__inherited_retvals = {}
         @__ignore_ivars = instance_variables
       end
     end
@@ -11,10 +11,9 @@ module Onceler
     def __prepare_recording(recording)
       method = recording.name
       define_singleton_method(method) do
-        if @__retvals_recorded[method]
+        if @__retvals.key?(method)
           @__retvals[method]
         else
-          @__retvals_recorded[method] = true
           @__retvals[method] = __record(recording)
         end
       end
@@ -24,39 +23,51 @@ module Onceler
       instance_eval(&recording.block)
     end
 
-    def __retvals
-      @__retvals.slice(*@__retvals_recorded.keys)
+    def __retvals(inherit = false)
+      retvals = @__inherited_retvals.merge(@__retvals)
+      retvals.inject({}) do |hash, (key, val)|
+        hash[key] = val if __mutated?(key, val) || inherit
+        hash
+      end
     end
 
-    def __ivars
+    def __ivars(inherit = false)
       ivars = instance_variables - @__ignore_ivars
       ivars.inject({}) do |hash, key|
         if key.to_s !~ /\A@__/
           val = instance_variable_get(key)
-          hash[key] = val unless __inherited_ivar?(key, val)
+          hash[key] = val if __mutated?(key, val) || inherit
         end
         hash
       end
     end
 
-    def __inherited_ivar?(key, val)
-      return false unless @__inherited_ivar_cache
+    # we don't include inherited stuff in __data, because we might need to
+    # interleave things from an intermediate before(:each) at run time
+    def __mutated?(key, val)
+      return true unless @__inherited_cache
       # need to do both types of comparison, i.e. it's the same object in
-      # memory, and nothing about it has been changed
-      @__inherited_ivar_cache[key] == val && @__inherited_ivars.equal?(val)
+      # memory (not reassigned), and nothing about it has been changed
+      return false if @__inherited_values.equal?(val)
+      return false if @__inherited_cache[key] == val
+      true
     end
 
-    def __data
-      @__data ||= Marshal.dump([__ivars, __retvals])
+    def __data(inherit = false)
+      @__data ||= {}
+      @__data[inherit] ||= Marshal.dump([__ivars(inherit), __retvals(inherit)])
     end
 
     def copy_from(other)
-      @__inherited_ivar_cache = Marshal.load(other.__data).first
-      @__inherited_ivars, @__retvals = Marshal.load(other.__data)
-      @__inherited_ivars.each do |key, value|
+      # need two copies of things for __mutated? checks (see above)
+      @__inherited_cache = Marshal.load(other.__data(:inherit)).inject(&:merge)
+      ivars, retvals = Marshal.load(other.__data(:inherit))
+      @__inherited_retvals = retvals
+      @__inherited_values = ivars.merge(retvals)
+      ivars.each do |key, value|
         instance_variable_set(key, value)
       end
-      @__retvals.each do |key, value|
+      retvals.each do |key, value|
         define_singleton_method(key) { value }
       end
     end

metadata

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