once-ler 0.0.8 → 0.0.9

data/lib/onceler/basic_helpers.rb

@@ -96,11 +96,9 @@ module Onceler
           group.onceler.reset!
         end
 
-        # only the outer-most group needs to do this
-        unless parent_onceler
-          before :each do
-            onceler.replay_into!(self)
-          end
+        group_class = self
+        prepend_before(:each) do
+          group_class.onceler.replay_into!(self)
         end
       end
 

data/lib/onceler/recordable.rb

@@ -24,24 +24,36 @@ module Onceler
       instance_eval(&recording.block)
     end
 
+    def __retvals
+      @__retvals.slice(*@__retvals_recorded.keys)
+    end
+
     def __ivars
       ivars = instance_variables - @__ignore_ivars
       ivars.inject({}) do |hash, key|
         if key.to_s !~ /\A@__/
           val = instance_variable_get(key)
-          hash[key] = val
+          hash[key] = val unless __inherited_ivar?(key, val)
         end
         hash
       end
     end
 
+    def __inherited_ivar?(key, val)
+      return false unless @__inherited_ivar_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)
+    end
+
     def __data
-      @__data ||= Marshal.dump([__ivars, @__retvals])
+      @__data ||= Marshal.dump([__ivars, __retvals])
     end
 
     def copy_from(other)
-      ivars, @__retvals = Marshal.load(other.__data)
-      ivars.each do |key, value|
+      @__inherited_ivar_cache = Marshal.load(other.__data).first
+      @__inherited_ivars, @__retvals = Marshal.load(other.__data)
+      @__inherited_ivars.each do |key, value|
         instance_variable_set(key, value)
       end
       @__retvals.each do |key, value|

data/lib/onceler/recorder.rb

@@ -39,7 +39,11 @@ module Onceler
     end
 
     def [](name)
-      @retvals[name]
+      if @retvals && @retvals.key?(name)
+        @retvals[name]
+      elsif parent
+        parent[name]
+      end
     end
 
     def record!
@@ -85,11 +89,16 @@ module Onceler
       end
     end
 
+    def parent
+      @group_class.parent_onceler
+    end
+
     def replay_into!(instance)
       reconsitute_data!
       @ivars.each do |key, value|
         instance.instance_variable_set(key, value)
       end
+      @retvals
     end
 
     # TODO: configurable transaction fu (say, if you have multiple

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: once-ler
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors: