Updating String#encode usage to prevent silly type errors with its params

Author: robertodecurnex

lib/git/diff.rb

@@ -1,12 +1,12 @@
 module Git
-  
+
   # object that holds the last X commits on given branch
   class Diff
     include Enumerable
-    
+
     def initialize(base, from = nil, to = nil)
       @base = base
-      @from = from && from.to_s 
+      @from = from && from.to_s
       @to = to && to.to_s
 
       @path = nil
@@ -15,60 +15,60 @@ def initialize(base, from = nil, to = nil)
       @stats = nil
     end
     attr_reader :from, :to
-    
+
     def path(path)
       @path = path
       return self
     end
-    
+
     def size
       cache_stats
       @stats[:total][:files]
     end
-    
+
     def lines
       cache_stats
       @stats[:total][:lines]
     end
-    
+
     def deletions
       cache_stats
       @stats[:total][:deletions]
     end
-    
+
     def insertions
       cache_stats
       @stats[:total][:insertions]
     end
-    
+
     def stats
       cache_stats
       @stats
     end
-    
+
     # if file is provided and is writable, it will write the patch into the file
     def patch(file = nil)
       cache_full
       @full_diff
     end
     alias_method :to_s, :patch
-    
+
     # enumerable methods
-    
+
     def [](key)
       process_full
       @full_diff_files.assoc(key)[1]
     end
-    
+
     def each(&block) # :yields: each Git::DiffFile in turn
       process_full
       @full_diff_files.map { |file| file[1] }.each(&block)
     end
-    
+
     class DiffFile
       attr_accessor :patch, :path, :mode, :src, :dst, :type
       @base = nil
-      
+
       def initialize(base, hash)
         @base = base
         @patch = hash[:patch]
@@ -83,7 +83,7 @@ def initialize(base, hash)
       def binary?
         !!@binary
       end
-      
+
       def blob(type = :dst)
         if type == :src
           @base.object(@src) if @src != '0000000'
@@ -92,28 +92,28 @@ def blob(type = :dst)
         end
       end
     end
-    
+
     private
-    
+
       def cache_full
         unless @full_diff
           @full_diff = @base.lib.diff_full(@from, @to, {:path_limiter => @path})
         end
       end
-      
+
       def process_full
         unless @full_diff_files
           cache_full
           @full_diff_files = process_full_diff
         end
       end
-      
+
       def cache_stats
         unless @stats
           @stats = @base.lib.diff_stats(@from, @to, {:path_limiter => @path})
         end
       end
-      
+
       # break up @diff_full
       def process_full_diff
         defaults = {
@@ -124,7 +124,10 @@ def process_full_diff
         }
         final = {}
         current_file = nil
-        full_diff_utf8_encoded = @full_diff.encode("UTF-8", "binary", :invalid => "replace", :undef => "replace")
+        full_diff_utf8_encoded = @full_diff.encode("UTF-8", "binary", {
+			:invalid => :replace,
+			:undef => :replace
+		})
         full_diff_utf8_encoded.split("\n").each do |line|
           if m = /^diff --git a\/(.*?) b\/(.*?)/.match(line)
             current_file = m[1]
@@ -142,11 +145,11 @@ def process_full_diff
             if m = /^Binary files /.match(line)
               final[current_file][:binary] = true
             end
-            final[current_file][:patch] << "\n" + line 
+            final[current_file][:patch] << "\n" + line
           end
         end
         final.map { |e| [e[0], DiffFile.new(@base, e[1])] }
       end
-      
+
   end
 end