Merged master

tj · May 4, 2009 · 2e30a01 · 2e30a01
1 parent fb736ba
commit 2e30a01
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/lib/commander/user_interaction.rb b/lib/commander/user_interaction.rb
@@ -114,8 +114,8 @@ def method_missing meth, *args, &block
     ##
     # Substitute _hash_'s keys with their associated values in _str_.
 
-    def self.replace_tokens str, hash
-      hash.inject(str) { |str, (key, value)| str.gsub ":#{key}", value.to_s }
+    def self.replace_tokens str, hash #:nodoc:
+      hash.inject(str.dup) { |str, (key, value)| str.gsub! ":#{key}", value.to_s }
     end
 
     ##

diff --git a/spec/ui_spec.rb b/spec/ui_spec.rb
@@ -3,16 +3,9 @@
 
   describe ".replace_tokens" do
     it "should replace tokens within a string, with hash values" do
-      result = Commander::UI.replace_tokens 'Welcome :name, enjoy your :object', :name => 'TJ', :object => 'cookie'
+      result = Commander::UI.replace_tokens 'Welcome :name, enjoy your :object'.freeze, :name => 'TJ', :object => 'cookie'
       result.should == 'Welcome TJ, enjoy your cookie'
     end
-
-    it "should not mutate the string passed" do
-      string = 'Oh I will enjoy my :object'
-      result = Commander::UI.replace_tokens string, :object => 'cookies'
-      result.should == 'Oh I will enjoy my cookies'
-      string.should == 'Oh I will enjoy my :object'
-    end
   end
 
 end