ydiffy 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: da837db923dccfb81fd25331f0e4794515df2923
-  data.tar.gz: 8a26000dde88219122ad677300c2de7fa8ea32cd
+SHA256:
+  metadata.gz: ebdabe7fec38695e1803b5d909e2c022de065545fe277f291897484e9393db0a
+  data.tar.gz: a6d4c054837d86ebf9728699b9d7758fa40ddd76e527aaddcd3e74cf7ea1b1b4
 SHA512:
-  metadata.gz: 3e3b15cd46a23f88c9b07eafcd7ba5499ee98a017e8cc6fafd456969f490aa459c03efa9956a6680e27a81d79f1563c57ee55beba59c61eb03d975e8a0e564d0
-  data.tar.gz: e72a6a7a66f12e601fbf04db1dcd1330f3b5ee4f04eebac703081aa20f65fd31e19b64e14e3b0ddd24d75f2c32e61afe51833bba8270b1d80b21a41cd86c2a80
+  metadata.gz: b283c2a765a052b9e4737bbca15f554bd31795463d3823409c88af2248f8952c82b509486d1ab8ff146b4b3674ce54743d2ccc7782b1cb2d6df5348274e30935
+  data.tar.gz: fb54cf453e43fe74eab822d84544f39ed399d44acb9efc6ae41ce58af3610fce917ea9cef8133eaae81225b0c2def1e59ecfbf4a1d5aed3f3d12aa7b204c0cea

data/lib/diffy/diff.rb

@@ -37,7 +37,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 = string1, string2
+      @string1, @string2 = to_utf8(string1), to_utf8(string2)
     end
 
     def diff
@@ -141,6 +141,16 @@ 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/version.rb

@@ -1,3 +1,3 @@
 module Diffy
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ydiffy
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Sam Goldstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-22 00:00:00.000000000 Z
+date: 2023-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -83,8 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Ydiffy is a fork of diffy to work around a problem in odba