super_stack 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ee62f30bb0b8ce359573f8d0c8de39392a866c3
-  data.tar.gz: 186733047be8988e51c76c09801d6ac93844b634
+  metadata.gz: 091053766ee781aa79aec23344855617d62b8f15
+  data.tar.gz: 6150e5f5a8ba4610d60c7e800de1e8e58a76c97b
 SHA512:
-  metadata.gz: 43db4607abd8d83241a3fb2645ec2969d3ba2e067016e31046d0ef339081fc564d99df14354d6fba6191f294d91dc45f5b4b9e2388b426086ea53dc1fe80728f
-  data.tar.gz: 67c73bd1935eccaa33ff4dbe0c634ae2339eeb0cfc9a7798330bfd541974f71419be0dd1b518d9e9dc59bfd31549bbd26f83b96c0eeea9806dca2fadb1b80040
+  metadata.gz: b6304ed0df60f35bd30d1f3dbb62a509245a1a3387d6ae83dd60f0e47a8012f5b80e8a7e8af089c81c4b88a558ba961b0faceb1749d4508750e7a16c2dcbd029
+  data.tar.gz: df871c2bd0b6165fff4bb242df69852bdba761b52a2628726671764cc3acc51084afc6b70367fa5d6dd4ce153e05e2bc231e326839c5161412ea9fdeec269d0a

data/README.md

@@ -57,13 +57,13 @@ puts manager.layers.class # =>  Hash
 :warning: Versions prior to `1.0.0` were trying to give an indifferent access to the merged hash for strings
 and symbols, ie `manager[:an_entry]` was giving the same result as `manager['an_entry']`.
 
-This is clearly wrong and not consistent everywhere.
+This is clearly wrong and not consistent everywhere (only valid for the 'root' nodes).
 __Starting with version `1.0.0` this is no more the case__. Nevertheless a compatibility mode is provided for 
 applications relying on the legacy mechanism, you just need to do:
 
 ```ruby
 require 'super_stack'
-SuperStack.set_compatibility_mode
+SuperStack.compatibility_mode = true
 ```
 or alternatively, you can do:
 

data/lib/super_stack/compatibility/layer_wrapper.rb

@@ -3,7 +3,6 @@ module SuperStack
 
     module LayerWrapper
 
-      private
 
       def load_from_yaml(file_name)
         begin

data/lib/super_stack/compatibility/manager.rb

@@ -25,7 +25,7 @@ module SuperStack
         if filter.nil?
           res.to_hash
         else
-          res[filter]
+          res[filter.to_s]
         end
       end
 

data/lib/super_stack/compatibility/switch.rb

@@ -0,0 +1,11 @@
+module SuperStack
+
+  def self.compatibility_mode=(mode)
+    @compatibility_mode = mode
+  end
+
+  def self.compatibility_mode
+    @compatibility_mode
+  end
+
+end

data/lib/super_stack/layer.rb

@@ -1,7 +1,11 @@
 module SuperStack
   class Layer < Hash
 
-    include LayerWrapper
+    include SuperStack::LayerWrapper
 
+    def initialize(*args)
+      super(*args)
+      SuperStack::LayerWrapper.from_hash self
+    end
   end
 end

data/lib/super_stack/layer_wrapper.rb

@@ -71,7 +71,10 @@ module SuperStack
     end
 
     def self.from_hash(hash)
-      hash.extend self
+      class << hash; include SuperStack::LayerWrapper; end
+      if SuperStack.compatibility_mode
+        class << hash; include SuperStack::Compatibility::LayerWrapper; end
+      end
     end
 
     def to_hash

data/lib/super_stack/manager.rb

@@ -11,6 +11,7 @@ module SuperStack
     attr_reader :layers, :write_layer
 
     def initialize
+      self.extend SuperStack::Compatibility::Manager if SuperStack.compatibility_mode
       @layers = {}
       self.default_merge_policy = DEFAULT_MERGE_POLICY
     end

data/lib/super_stack/old.rb

@@ -1,3 +1,3 @@
 require 'super_stack'
 
-SuperStack.set_compatibility_mode
+SuperStack.compatibility_mode = true

data/lib/super_stack/version.rb

@@ -1,3 +1,3 @@
 module SuperStack
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/lib/super_stack.rb

@@ -1,22 +1,9 @@
 require 'super_stack/version'
+require 'super_stack/compatibility/switch'
 require 'super_stack/merge_policies'
 require 'super_stack/layer_wrapper'
 require 'super_stack/layer'
 require 'super_stack/manager'
+require 'super_stack/compatibility/layer_wrapper'
+require 'super_stack/compatibility/manager'
 
-module SuperStack
-
-  def self.set_compatibility_mode
-    require 'super_stack/compatibility/layer_wrapper'
-    require 'super_stack/compatibility/manager'
-
-    SuperStack::Manager.class_eval do
-      include SuperStack::Compatibility::Manager
-    end
-
-    SuperStack::LayerWrapper.module_eval do
-      include SuperStack::Compatibility::LayerWrapper
-    end
-  end
-
-end

data/spec/layer_spec.rb

@@ -10,7 +10,7 @@ describe SuperStack::Layer do
   end
 
   it 'has a default name' do
-    expect(subject.name == subject.class.const_get('DEFAULT_LAYER_NAME')).to be_truthy
+    expect(subject.name).not_to be_empty
   end
 
   it 'should have an auto-reload flag' do

data/spec/manager_spec.rb

@@ -73,8 +73,8 @@ describe SuperStack::Manager do
     expect {subject.add_layer({}) }.not_to raise_error
     expect {subject.add_layer({}) }.not_to raise_error
     expect(subject.layers.keys.count == 2).to be_truthy
-    expect(subject.layers.keys[0] == SuperStack::Layer::DEFAULT_LAYER_NAME).to be_truthy
-    expect(subject.layers.keys[1] == "#{SuperStack::Layer::DEFAULT_LAYER_NAME} #2").to be_truthy
+    expect(subject.layers.keys[0] == SuperStack::LayerWrapper::DEFAULT_LAYER_NAME).to be_truthy
+    expect(subject.layers.keys[1] == "#{SuperStack::LayerWrapper::DEFAULT_LAYER_NAME} #2").to be_truthy
   end
 
   it 'should provide a dynamic merge' do
@@ -97,6 +97,13 @@ describe SuperStack::Manager do
     expect {subject[:foo] = :bar}.to raise_error
   end
 
+
+  it 'should differentiate symbols from strings' do
+    subject << layer1
+    expect(subject[:layer]).not_to eq subject['layer']
+  end
+
+
   context 'when specifying a write layer' do
 
     it 'should be possible using its name or itself' do
@@ -305,4 +312,31 @@ describe SuperStack::Manager do
 
   end
 
+
+  context 'when using compatibility mode' do
+
+    before(:all) do
+      SuperStack.compatibility_mode = true
+    end
+
+    after(:all) do
+      SuperStack.compatibility_mode = false
+    end
+
+    subject {
+      s = SuperStack::Manager.new
+      s.add_layer layer1
+      s
+    }
+
+    it 'should not differentiate symbols from strings (for root nodes)' do
+      expect(subject[:layer]).to eq subject['layer']
+    end
+
+    it 'should differentiate symbols from strings (for non root nodes)' do
+      expect(subject['to-be-merged'][:name]).not_to eq subject['to-be-merged']['name']
+    end
+
+  end
+
 end

data/spec/spec_helper.rb

@@ -16,7 +16,6 @@
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 
 require 'super_stack'
-SuperStack.set_compatibility_mode
 
 
 def file_from_layer(layer_number)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: super_stack
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Laurent B.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-10 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,6 +112,7 @@ files:
 - lib/super_stack.rb
 - lib/super_stack/compatibility/layer_wrapper.rb
 - lib/super_stack/compatibility/manager.rb
+- lib/super_stack/compatibility/switch.rb
 - lib/super_stack/layer.rb
 - lib/super_stack/layer_wrapper.rb
 - lib/super_stack/manager.rb