Move update logic from nodes controller to node model object

Author: Seth Falcon

chef-server-api/app/controllers/nodes.rb

@@ -62,13 +62,7 @@ def update
       raise NotFound, "Cannot load node #{params[:id]}"
     end
 
-    updated = params['inflated_object']
-    @node.run_list.reset!(updated.run_list)
-    @node.automatic_attrs = updated.automatic_attrs
-    @node.normal_attrs = updated.normal_attrs
-    @node.override_attrs = updated.override_attrs
-    @node.default_attrs = updated.default_attrs
-    @node.chef_environment(updated.chef_environment)
+    @node.update_from!(params['inflated_object'])
     @node.cdb_save
     @node.couchdb_rev = nil
     display(@node)

chef/lib/chef/node.rb

@@ -471,6 +471,16 @@ def to_json(*a)
       result.to_json(*a)
     end
 
+    def update_from!(o)
+      run_list.reset!(o.run_list)
+      @automatic_attrs = o.automatic_attrs
+      @normal_attrs = o.normal_attrs
+      @override_attrs = o.override_attrs
+      @default_attrs = o.default_attrs
+      chef_environment(o.chef_environment)
+      self
+    end
+
     # Create a Chef::Node from JSON
     def self.json_create(o)
       node = new

chef/spec/unit/node_spec.rb

@@ -491,6 +491,44 @@
     end
   end
 
+  describe "update_from!" do
+    before(:each) do
+      @node.name("orig")
+      @node.chef_environment("dev")
+      @node.default_attrs = { "one" => { "two" => "three", "four" => "five", "eight" => "nine" } }
+      @node.override_attrs = { "one" => { "two" => "three", "four" => "six" } }
+      @node.normal_attrs = { "one" => { "two" => "seven" } }
+      @node.run_list << "role[marxist]"
+      @node.run_list << "role[leninist]"
+      @node.run_list << "recipe[stalinist]"
+
+      @example = Chef::Node.new()
+      @example.name("newname")
+      @example.chef_environment("prod")
+      @example.default_attrs = { "alpha" => { "bravo" => "charlie", "delta" => "echo" } }
+      @example.override_attrs = { "alpha" => { "bravo" => "foxtrot", "delta" => "golf" } }
+      @example.normal_attrs = { "alpha" => { "bravo" => "hotel" } }
+      @example.run_list << "role[comedy]"
+      @example.run_list << "role[drama]"
+      @example.run_list << "recipe[mystery]"
+    end
+
+    it "allows update of everything except name" do
+      @node.update_from!(@example)
+      @node.name.should == "orig"
+      @node.chef_environment.should == @example.chef_environment
+      @node.default_attrs.should == @example.default_attrs
+      @node.override_attrs.should == @example.override_attrs
+      @node.normal_attrs.should == @example.normal_attrs
+      @node.run_list.should == @example.run_list
+    end
+
+    it "should not update the name of the node" do
+      @node.should_not_receive(:name).with(@example.name)
+      @node.update_from!(@example)
+    end
+  end
+
   describe "to_hash" do
     it "should serialize itself as a hash" do
       @node.chef_environment("dev")