No more 'attribute', just 'normal'

Author: adamhjk

chef/lib/chef/node.rb

@@ -214,7 +214,7 @@ def store(attrib, value)
 # might be missing
 defset
 attrs=Chef::Node::Attribute.new(@normal_attrs,@default_attrs,@override_attrs)
-attrs.set_type=:attribute
+attrs.set_type=:normal
 attrs.auto_vivifiy_on_read=true
 attrs
 end
@@ -225,7 +225,7 @@ def set
 # missing, but if the final value already exists, don't set it
 defset_unless
 attrs=Chef::Node::Attribute.new(@normal_attrs,@default_attrs,@override_attrs)
-attrs.set_type=:attribute
+attrs.set_type=:normal
 attrs.auto_vivifiy_on_read=true
 attrs.set_unless_value_present=true
 attrs
@@ -342,9 +342,9 @@ def to_hash
 index_hash=Hash.new
 index_hash["chef_type"]="node"
 index_hash["name"]=@name
-index_hash["attributes"]=@normal_attrs
-index_hash["defaults"]=@default_attrs
-index_hash["overrides"]=@override_attrs
+index_hash["normal"]=@normal_attrs
+index_hash["default"]=@default_attrs
+index_hash["override"]=@override_attrs
 index_hash["recipe"]=@run_list.recipesif@run_list.recipes.length > 0
 index_hash["role"]=@run_list.rolesif@run_list.roles.length > 0
 index_hash["run_list"]=@run_list.run_listif@run_list.run_list.length > 0

chef/lib/chef/node/attribute.rb

@@ -23,11 +23,11 @@
 classChef
 classNode
 classAttribute
-attr_accessor:attribute,
+attr_accessor:normal,
 :default,
 :override,
 :state,
-:current_attribute,
+:current_normal,
 :current_default,
 :current_override,
 :auto_vivifiy_on_read,
@@ -38,24 +38,32 @@ class Attribute
 
 includeEnumerable
 
-definitialize(attribute,default,override,state=[])
-@attribute=attribute
-@current_attribute=attribute
+definitialize(normal,default,override,state=[])
+@normal=normal
+@current_normal=normal
 @default=default
 @current_default=default
 @override=override
 @current_override=override
 @state=state
 @auto_vivifiy_on_read=false
 @set_unless_value_present=false
-@set_type=:attribute
+@set_type=:normal
 @has_been_read=false
 end
 
+defattribute
+normal
+end
+
+defattribute=(value)
+normal=value
+end
+
 defset_type
 case@set_type
-when:attribute
-@attribute
+when:normal
+@normal
 when:override
 @override
 when:default
@@ -65,7 +73,7 @@ def set_type
 
 # Reset our internal state to the top of every tree
 defreset
-@current_attribute=@attribute
+@current_normal=@normal
 @current_default=@default
 @current_override=@override
 @has_been_read=false
@@ -80,15 +88,15 @@ def [](key)
 @has_been_read=true
 
 o_value=value_or_descend(current_override,key,auto_vivifiy_on_read)
-a_value=value_or_descend(current_attribute,key,auto_vivifiy_on_read)
+a_value=value_or_descend(current_normal,key,auto_vivifiy_on_read)
 d_value=value_or_descend(current_default,key,auto_vivifiy_on_read)
 
 determine_value(o_value,a_value,d_value)
 end
 
 defattribute?(key)
 returntrueifget_value(override,key)
-returntrueifget_value(attribute,key)
+returntrueifget_value(normal,key)
 returntrueifget_value(default,key)
 false
 end
@@ -105,7 +113,7 @@ def each(&block)
 get_keys.eachdo |key|
 value=determine_value(
 get_value(override,key),
-get_value(attribute,key),
+get_value(normal,key),
 get_value(default,key)
 )
 block.call([key,value])
@@ -116,7 +124,7 @@ def each_pair(&block)
 get_keys.eachdo |key|
 value=determine_value(
 get_value(override,key),
-get_value(attribute,key),
+get_value(normal,key),
 get_value(default,key)
 )
 block.call(key,value)
@@ -127,7 +135,7 @@ def each_attribute(&block)
 get_keys.eachdo |key|
 value=determine_value(
 get_value(override,key),
-get_value(attribute,key),
+get_value(normal,key),
 get_value(default,key)
 )
 block.call(key,value)
@@ -144,7 +152,7 @@ def each_value(&block)
 get_keys.eachdo |key|
 value=determine_value(
 get_value(override,key),
-get_value(attribute,key),
+get_value(normal,key),
 get_value(default,key)
 )
 block.call(value)
@@ -159,7 +167,7 @@ def fetch(key, default_value=nil, &block)
 ifget_keys.include?key
 determine_value(
 get_value(override,key),
-get_value(attribute,key),
+get_value(normal,key),
 get_value(default,key)
 )
 elsifdefault_value
@@ -219,8 +227,8 @@ def keys
 ifcurrent_override
 tkeys=current_override.keys
 end
-ifcurrent_attribute
-current_attribute.keys.eachdo |key|
+ifcurrent_normal
+current_normal.keys.eachdo |key|
 tkeys << keyunlesstkeys.include?(key)
 end
 end
@@ -352,8 +360,8 @@ def value_or_descend(data_hash, key, auto_vivifiy=false)
 
 ifauto_vivifiy
 data_hash=auto_vivifiy(data_hash,key)
-unlesscurrent_attribute.has_key?(key)
-current_attribute[key]=data_hash[key]
+unlesscurrent_normal.has_key?(key)
+current_normal[key]=data_hash[key]
 end
 unlesscurrent_default.has_key?(key)
 current_default[key]=data_hash[key]
@@ -367,8 +375,8 @@ def value_or_descend(data_hash, key, auto_vivifiy=false)
 end
 
 ifdata_hash[key].respond_to?(:has_key?)
-cna=Chef::Node::Attribute.new(@attribute,@default,@override,@state)
-cna.current_attribute=current_attribute.nil? ? Mash.new : current_attribute[key]
+cna=Chef::Node::Attribute.new(@normal,@default,@override,@state)
+cna.current_normal=current_normal.nil? ? Mash.new : current_normal[key]
 cna.current_default=current_default.nil? ? Mash.new : current_default[key]
 cna.current_override=current_override.nil? ? Mash.new : current_override[key]
 cna.auto_vivifiy_on_read=auto_vivifiy_on_read
@@ -404,7 +412,7 @@ def method_missing(symbol, *args)
 end
 
 defto_hash
-result=determine_value(current_override,current_attribute,current_default)
+result=determine_value(current_override,current_normal,current_default)
 ifresult.class == Hash
 result
 else

chef/spec/unit/node_spec.rb

@@ -327,9 +327,9 @@
 @node.run_list << "role[leninist]"
 @node.run_list << "recipe[stalinist]"
 h=@node.to_hash
-h["defaults"].should == @node.default_attrs
-h["overrides"].should == @node.override_attrs
-h["attributes"].should == @node.normal_attrs
+h["default"].should == @node.default_attrs
+h["override"].should == @node.override_attrs
+h["normal"].should == @node.normal_attrs
 h["role"].shouldbe_include("marxist")
 h["role"].shouldbe_include("leninist")
 h["run_list"].shouldbe_include("role[marxist]")