diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2015-08-12 12:14:26 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2015-09-08 15:31:30 -0700 |
| commit | 08970de3296198c55ea0a953864b088942f6d34c (patch) | |
| tree | ba7da97ebebefaf07f4b84676be70a74e988e3f7 | |
| parent | 59e2eeeb67c8a340babe5b7d965c6dbaba0de234 (diff) | |
| download | chef-08970de3296198c55ea0a953864b088942f6d34c.tar.gz | |
remove need to include ConvertValue
| -rw-r--r-- | lib/chef/node/attribute.rb | 1 | ||||
| -rw-r--r-- | lib/chef/node/attribute_trait/autovivify.rb | 3 | ||||
| -rw-r--r-- | lib/chef/node/attribute_trait/symbol_convert.rb | 1 | ||||
| -rw-r--r-- | lib/chef/node/mash.rb | 1 | ||||
| -rw-r--r-- | lib/chef/node/vivid_mash.rb | 1 |
5 files changed, 3 insertions, 4 deletions
diff --git a/lib/chef/node/attribute.rb b/lib/chef/node/attribute.rb index 270c9551e6..080987893a 100644 --- a/lib/chef/node/attribute.rb +++ b/lib/chef/node/attribute.rb @@ -8,7 +8,6 @@ class Chef class Node class Attribute include AttributeTrait::Decorator - include AttributeTrait::ConvertValue include AttributeTrait::SymbolConvert include AttributeTrait::MethodMissing include AttributeTrait::Immutable diff --git a/lib/chef/node/attribute_trait/autovivify.rb b/lib/chef/node/attribute_trait/autovivify.rb index cba0b92776..6e43988a7e 100644 --- a/lib/chef/node/attribute_trait/autovivify.rb +++ b/lib/chef/node/attribute_trait/autovivify.rb @@ -2,8 +2,9 @@ class Chef class Node class AttributeTrait module Autovivify - def initialize(wrapped_object: {}, **args) + def initialize(wrapped_object: nil, **args) super + @wrapped_object = {} if @wrapped_object.nil? end def [](key) diff --git a/lib/chef/node/attribute_trait/symbol_convert.rb b/lib/chef/node/attribute_trait/symbol_convert.rb index 3cb0d242c8..bfc6645481 100644 --- a/lib/chef/node/attribute_trait/symbol_convert.rb +++ b/lib/chef/node/attribute_trait/symbol_convert.rb @@ -2,6 +2,7 @@ class Chef class Node class AttributeTrait module SymbolConvert + include ConvertValue private diff --git a/lib/chef/node/mash.rb b/lib/chef/node/mash.rb index ce9f140d28..7df4596b5b 100644 --- a/lib/chef/node/mash.rb +++ b/lib/chef/node/mash.rb @@ -4,7 +4,6 @@ class Chef class Node class Mash include AttributeTrait::Decorator - include AttributeTrait::ConvertValue include AttributeTrait::SymbolConvert end end diff --git a/lib/chef/node/vivid_mash.rb b/lib/chef/node/vivid_mash.rb index 43917a1c38..04cd1dce3f 100644 --- a/lib/chef/node/vivid_mash.rb +++ b/lib/chef/node/vivid_mash.rb @@ -4,7 +4,6 @@ class Chef class Node class VividMash include AttributeTrait::Decorator - include AttributeTrait::ConvertValue include AttributeTrait::Autovivify include AttributeTrait::SymbolConvert include AttributeTrait::MethodMissing |