ydiffy 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebdabe7fec38695e1803b5d909e2c022de065545fe277f291897484e9393db0a
-  data.tar.gz: a6d4c054837d86ebf9728699b9d7758fa40ddd76e527aaddcd3e74cf7ea1b1b4
+  metadata.gz: d994d61475609e251b44c01ecccfc8c7aeea9b0c47d8decc45e308ca4a278bb2
+  data.tar.gz: 26a3dd8b29f94967659bc87d7f70c44027cfe901ed8cac8872dddd91e990dbeb
 SHA512:
-  metadata.gz: b283c2a765a052b9e4737bbca15f554bd31795463d3823409c88af2248f8952c82b509486d1ab8ff146b4b3674ce54743d2ccc7782b1cb2d6df5348274e30935
-  data.tar.gz: fb54cf453e43fe74eab822d84544f39ed399d44acb9efc6ae41ce58af3610fce917ea9cef8133eaae81225b0c2def1e59ecfbf4a1d5aed3f3d12aa7b204c0cea
+  metadata.gz: d4ff3bfc2ede99c36b3ae68c682a18e2faa81ecca492203d45d7508bf0ec2cd4854f17fc8c2adf802d3521530404147d35d2012366cfcc904295be441812287a
+  data.tar.gz: 1bd4f7de09b75c1ff5d5b1dda208f7394dc527fdb93ff8b1f38e18e7c25f7fcda6a0dfe1e763520170fede72ec3884f060e424bd2106341cfd2569a1d4d73bc9

data/README.md

@@ -30,7 +30,7 @@ Installation
 ------------
 
 ### on Unix
-
+    gem build
     gem install diffy
 
 ### on Windows:

data/lib/diffy/css.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Diffy
   CSS = <<-STYLE
 .diff{overflow:auto;}

data/lib/diffy/diff.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Diffy
   class Diff
     ORIGINAL_DEFAULT_OPTIONS = {
@@ -37,7 +38,7 @@ module Diffy
       if ! ['strings', 'files'].include?(@options[:source])
         raise ArgumentError, "Invalid :source option #{@options[:source].inspect}. Supported options are 'strings' and 'files'."
       end
-      @string1, @string2 = to_utf8(string1), to_utf8(string2)
+      @string1, @string2 = string1, string2
     end
 
     def diff
@@ -141,16 +142,6 @@ module Diffy
     end
     private
 
-    def to_utf8(line)
-      return unless line
-      return line if line.encoding.to_s.eql?('UTF-8')
-      if /ISO-8859-1/.match(line.encoding.to_s)
-        line.encode!('UTF-8')
-      else
-        line.force_encoding('UTF-8')
-      end
-    end
-
     @@bin = nil
     def diff_bin
       return @@bin if @@bin

data/lib/diffy/format.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Diffy
   module Format
     # ANSI color output suitable for terminal output

data/lib/diffy/html_formatter.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Diffy
   class HtmlFormatter
 
@@ -16,7 +17,7 @@ module Diffy
 
     private
     def wrap_line(line)
-      cleaned = clean_line(line)
+      cleaned = to_utf8(clean_line(line))
       case line
       when /^(---|\+\+\+|\\\\)/
         '    <li class="diff-comment"><span>' + line.chomp + '</span></li>'
@@ -41,10 +42,12 @@ module Diffy
     end
 
     def wrap_lines(lines)
+      encoded = lines.collect{ |s| to_utf8(s) }
+      joined = encoded.join("\n")
       if lines.empty?
         %'<div class="diff"></div>'
       else
-        %'<div class="diff">\n  <ul>\n#{lines.join("\n")}\n  </ul>\n</div>\n'
+        %'<div class="diff">\n  <ul>\n#{joined}\n  </ul>\n</div>\n'
       end
     end
 
@@ -131,5 +134,15 @@ module Diffy
           # spanning block elements which get added later.
           gsub('<LINE_BOUNDARY>',"</strong>\n<strong>") + "</strong>"
     end
+
+    def to_utf8(line)
+      return unless line
+      return line if line.encoding.to_s.eql?('UTF-8')
+      begin
+        line.encode!('UTF-8')
+      rescue
+        line.force_encoding('UTF-8')
+      end
+    end
   end
 end

data/lib/diffy/split_diff.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Diffy
   class SplitDiff
     def initialize(left, right, options = {})

data/lib/diffy/version.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Diffy
-  VERSION = '0.0.3'
+  VERSION = '0.0.5'
 end

data/lib/diffy.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'tempfile'
 require 'erb'
 require 'rbconfig'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ydiffy
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Sam Goldstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-15 00:00:00.000000000 Z
+date: 2023-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake