scheherazade 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d624c9331ac258bae8c1cad405214505c3295cc3
-  data.tar.gz: d2c0f723ce6c5bf83bd92eacbb8623edc880bf23
+  metadata.gz: 1e64766948d3f9ebcce55c189ae83e8ed4a03dd0
+  data.tar.gz: 639cee4cc9df6a85c476367a480fd1ccf078f890
 SHA512:
-  metadata.gz: caa91c5084c99072d4c8cc0ecf6cdbec4a980d36767979ff3481f73a7585b6e6176d09fcbcaf037669e9eda9ba7a394ecf64e967f7b38175d71960a8a9ff6867
-  data.tar.gz: 3e46fff4918ed4eb9a77c58be70bcbf54025113be08a085806a4852a2c73000caa941278e8fbeab48245fed4e9b193048bfe0deb8d66040718babe27256e5731
+  metadata.gz: 24f11fccef514fa2ce5db387bc0e3e8cfdcf65c0d4c254dc7851fef220b2a9beae14102168c70ee15feb3ad6fd5d5bbaf559afbcbc20affc7c78629b21e1487c
+  data.tar.gz: 9382d464cebedb64bd10bbdacf75026f32e19208d4bfbcc898b4e640f8f9bad60b7c789e73d30862cbaad51bd3db77d4e5a8faea8f07841d14979a10dd7c51e2

data/lib/scheherazade/bare.rb

@@ -1,3 +1,5 @@
-%w[current_hash log story character_builder extension].each do |lib|
+require 'active_record'
+
+%w[log story character_builder extension].each do |lib|
   require_relative lib
 end

data/lib/scheherazade/story.rb

@@ -61,8 +61,16 @@ module Scheherazade
 
     def initialize(parent = self.class.current)
       super(){|h, k| parent[k] if parent }
+      @borrowed = []
       @parent = parent
-      @current = CurrentHash.new(self)
+      @current = Hash.new do |h, k|
+        if (char = to_character!(k))
+          h[char]
+        else
+          h[k] = borrow(parent.current[k]) if parent
+        end
+      end
+
       @fill_attributes = Hash.new{|h, k| parent.fill_attributes[k] if parent }
       @characters = Hash.new {|h, k| parent.characters[k] if parent }
       @counter = parent ? parent.counter.dup : Hash.new(0)
@@ -175,9 +183,14 @@ module Scheherazade
       end
     end
 
+    def borrow(ar_instance)
+      @borrowed << ar_instance if ar_instance
+      ar_instance
+    end
+
     def rollback(hard)
-      current.restore
       @built.each(&:destroy) if hard
+      @borrowed.each(&:reload)
     end
 
     def building(ar)

data/lib/scheherazade/version.rb

@@ -1,3 +1,3 @@
 module Scheherazade
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scheherazade
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Marc-André Lafortune
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-19 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,7 +66,6 @@ files:
 - lib/scheherazade.rb
 - lib/scheherazade/bare.rb
 - lib/scheherazade/character_builder.rb
-- lib/scheherazade/current_hash.rb
 - lib/scheherazade/extension.rb
 - lib/scheherazade/log.rb
 - lib/scheherazade/story.rb

data/lib/scheherazade/current_hash.rb

@@ -1,55 +0,0 @@
-module Scheherazade
-
-  # A subclass of Hash, with automatic lookup up
-  # the story chain and ability to restore the characters
-  #
-  class CurrentHash < Hash
-    def initialize(story)
-      @restore = []
-      super() do |h, k|
-        if (char = story.to_character!(k))
-          h[char]
-        else
-          if up = story.parent
-            h[k] = remember(up.current[k])
-          end
-        end
-      end
-    end
-
-    # restore all characters borrowed to parent stories
-    # to their original state.
-    #
-    def restore
-      @restore.each_slice(3) do |obj, instance_variable_names, values|
-        instance_variable_names.zip(values) do |iv, val|
-          obj.instance_variable_set(iv, val)
-        end
-      end
-      self
-    end
-
-    protected
-
-    # Implementation note: the reason why we remember the object
-    # and then reset it, instead of attempting to clone it is
-    # that active record doesn't implement a meaningful clone
-    # and dup creates a different object altogether.
-    #
-    # Attempting to clone an AR object, including it's loaded relations
-    # would require playing too close to the metal and would be too brittle
-    #
-    def remember(object)
-      return object unless object
-      ivs = object.instance_variables
-      @restore << object << ivs << ivs.map do |iv|
-        v = object.instance_variable_get(iv)
-        v = v.clone if v.duplicable?
-        v
-      end
-      object
-    end
-
-  end
-
-end