tdl - refactoring export_string to export_as_json

daviddavis · Oct 17, 2011 · 514b8f9 · 514b8f9
1 parent 6ee681f
commit 514b8f9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/app/controllers/api/templates_controller.rb b/src/app/controllers/api/templates_controller.rb
@@ -84,7 +84,7 @@ def import
   end
 
   def export
-    json = @template.string_export
+    json = @template.export_as_json
     render :json => json
   end
 

diff --git a/src/app/models/system_template.rb b/src/app/models/system_template.rb
@@ -87,7 +87,7 @@ def string_import content
     json["parameters"].each_pair {|k,v| self.parameters[k] = v } if json["parameters"]
   end
 
-  def hash_export
+  def export_as_json
     tpl = {
       :name => self.name,
       :revision => self.revision,
@@ -340,7 +340,7 @@ def get_inheritance_chain
   def copy_to_env env
     new_tpl = SystemTemplate.new
     new_tpl.environment = env
-    new_tpl.string_import(self.string_export)
+    new_tpl.string_import(self.export_as_json)
     new_tpl.save!
   end
 

diff --git a/src/spec/controllers/api/templates_controller_spec.rb b/src/spec/controllers/api/templates_controller_spec.rb
@@ -182,7 +182,7 @@
 
   describe "export" do
     it "should call export" do
-      @tpl.should_receive(:string_export)
+      @tpl.should_receive(:export_as_json)
 
       get :export, :id => TEMPLATE_ID
     end

diff --git a/src/spec/models/system_template_spec.rb b/src/spec/models/system_template_spec.rb
@@ -274,7 +274,7 @@
       @export_tpl.stub(:package_groups).and_return [SystemTemplatePackGroup.new({:name => 'xxx'})]
       @export_tpl.stub(:pg_categories).and_return [SystemTemplatePgCategory.new({:name => 'xxx'})]
 
-      str = @export_tpl.string_export
+      str = @export_tpl.export_as_json
       json = ActiveSupport::JSON.decode(str)
       json['products'].size.should == 2
       json['packages'].size.should == 1