super_stack 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4e580db536cf127c7e92fd2e9644a3940270179
-  data.tar.gz: 6ca39a7b1763c79731f76ec420c074794d334667
+  metadata.gz: 76b2ee5a212a3fc2b009157f49e6ce424f817fb2
+  data.tar.gz: 65f3658c66dde1b9f0337e186b8bdf45047c9ca5
 SHA512:
-  metadata.gz: cc98e8fad596daa02f89e3301a108ccb023e0f89b4c569676e7b410d40f79ee1676dd6b2ea683ef85e0fd809753707ca296555a1dc82cace39ed2a71ada66d39
-  data.tar.gz: cdf6180b1621fc8fc1a169915d1de62cfad89a5a930ac4af0d9a0eba28630a0fd1bb9293a495c015d57bcd18475f95a89dcf17b3c9281057ec305105120d6469
+  metadata.gz: d73177dd7b19273d826856dc01ce0adab2a17c25ec33dbce8c322ed2cc6a95351912e99c78f08106d1bcd858e76802ed88cfe5a2bfbb0cf1fccccfbe2de0287e
+  data.tar.gz: 082635a815bbb2179e980b289f962d6d76a7347fa086694b773e2043d084699ccf4e4a2cc60272fd73df7876b06a892f541bc863c3f3bc7034e1712227be0ba6

data/lib/super_stack/layer_wrapper.rb

@@ -8,7 +8,7 @@ module SuperStack
 
     DEFAULT_LAYER_NAME = 'Unknown layer'
 
-    attr_reader :file_name, :priority
+    attr_reader :file_name, :priority, :manager
 
     def priority=(priority)
       raise 'invalid priority' unless priority.is_a? Numeric

data/lib/super_stack/manager.rb

@@ -58,6 +58,7 @@ module SuperStack
       set_valid_name_for layer if layers.keys.include? layer.name
       layer.priority = get_unused_priority if layer.priority.nil?
       layers[layer.name] = layer
+      layer.instance_variable_set :@manager, self
     end
 
     def <<(layer)

data/lib/super_stack/merge_policies/full_merge_policy.rb

@@ -11,9 +11,19 @@ module SuperStack
       end
 
       def self.merge(h1, h2)
-        deep_cloned_source = Marshal::load(Marshal.dump(h1))
+        if h1.respond_to? :manager
+          saved_manager = h1.manager
+          h1.instance_variable_set :@manager, nil
+        end
+
+        begin
+          deep_cloned_source = Marshal::load(Marshal.dump(h1))
+        ensure
+          h1.instance_variable_set :@manager, saved_manager if h1.respond_to? :manager
+        end
         deep_cloned_source.extend DeepMergeWrapper
         deep_cloned_source.deep_merge! h2
+
       end
 
     end

data/lib/super_stack/version.rb

@@ -1,3 +1,3 @@
 module SuperStack
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/spec/manager_spec.rb

@@ -19,6 +19,11 @@ describe SuperStack::Manager do
     expect( subject.respond_to? :layers).to be_truthy
   end
 
+  it 'should be added as manager to added layers' do
+    subject.add_layer({})
+    expect(subject.layers.values.first.manager == subject).to be_truthy
+  end
+
   it 'should present layers ordered by priority' do
     l1 = SuperStack::Layer.new
     l1.priority = 1
@@ -36,12 +41,9 @@ describe SuperStack::Manager do
     expect(subject.to_a[1] == l2).to be_truthy
   end
 
-  it 'should have a default policy' do
+  it 'should have a default merge policy' do
     expect( subject.respond_to? :default_merge_policy).to be_truthy
     expect( subject.respond_to? :'default_merge_policy=').to be_truthy
-  end
-
-  it 'should have a default merge policy' do
     expect( subject.default_merge_policy == SuperStack::Manager::DEFAULT_MERGE_POLICY).to be_truthy
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: super_stack
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Laurent B.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-15 00:00:00.000000000 Z
+date: 2014-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler