diffy 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7d4f4a66634be0ec2d8e97ac84c138449f4db99
-  data.tar.gz: dc22c84c8f59bee43e87ef2a8a2762705b7a31cd
+  metadata.gz: 4c0e0aee65a3f2117cd159a9eb746a1b9c79f880
+  data.tar.gz: 1b80f76baedd405410f97dfeb1eb9ed692e7c458
 SHA512:
-  metadata.gz: b05641f373b4423fdf6f2d1579698be95dc5f09e5d59fe018a77ae0d65c9b06990204baca2df1da4e421d2d011ef160aad31fae52b65885711caa523efb42254
-  data.tar.gz: df73bca729bed4de32b55556d27a058bfc2d103ff130e94ee0c7a7df2bb48b036815ffe0c531e1f12e75afac6ceae78cd1cec5d231edfbc99b4aee6d93b7802e
+  metadata.gz: 491022a9aefc2c9a6b78228b6ba93a53363d7afbc28173d171ee841aaeabbb4eaa4a6d89679ec11e8d34fc7edfaa4a883cfdae2adb9051016f81ebc574d7b1ad
+  data.tar.gz: 59bfeadc59bf5186fe14305aa64a0b89cc35ff3878926635ac4b8414ccf86157a5e27ce193d9c4849f8590c854c4b304764a1c4521b1d47dd72415f634abaa65

data/lib/diffy/diff.rb

@@ -1,22 +1,24 @@
 module Diffy
   class Diff
+    ORIGINAL_DEFAULT_OPTIONS = {
+      :diff => '-U 10000',
+      :source => 'strings',
+      :include_diff_info => false,
+      :include_plus_and_minus_in_html => false,
+      :context => nil,
+      :allow_empty_diff => true,
+    }
+
     class << self
       attr_writer :default_format
       def default_format
         @default_format || :text
       end
 
-      attr_writer :default_options
       # default options passed to new Diff objects
+      attr_writer :default_options
       def default_options
-        @default_options ||= {
-          :diff => '-U 10000',
-          :source => 'strings',
-          :include_diff_info => false,
-          :include_plus_and_minus_in_html => false,
-          :context => nil,
-          :allow_empty_diff => true,
-        }
+        @default_options ||= ORIGINAL_DEFAULT_OPTIONS.dup
       end
 
     end

data/lib/diffy/html_formatter.rb

@@ -1,5 +1,6 @@
 module Diffy
   class HtmlFormatter
+
     def initialize(diff, options = {})
       @diff = diff
       @options = options
@@ -71,7 +72,8 @@ module Diffy
           else
             line_diff = Diffy::Diff.new(
                                         split_characters(chunk1),
-                                        split_characters(chunk2)
+                                        split_characters(chunk2),
+                                        Diffy::Diff::ORIGINAL_DEFAULT_OPTIONS
                                         )
             hi1 = reconstruct_characters(line_diff, '-')
             hi2 = reconstruct_characters(line_diff, '+')

data/lib/diffy/version.rb

@@ -1,3 +1,3 @@
 module Diffy
-  VERSION = '3.0.5'
+  VERSION = '3.0.6'
 end

data/spec/diffy_spec.rb

@@ -537,6 +537,26 @@ baz
 </div>
         DIFF
       end
+
+      it "should correctly do inline hightlighting when default diff options are changed" do
+        original_options = ::Diffy::Diff.default_options
+        begin
+              ::Diffy::Diff.default_options.merge!(:diff => '-U0')
+
+              s1 = "foo\nbar\nbang"
+              s2 = "foo\nbar\nbangleize"
+              expect(Diffy::Diff.new(s1,s2).to_s(:html)).to eq <<-DIFF
+<div class="diff">
+  <ul>
+    <li class="del"><del>bang</del></li>
+    <li class="ins"><ins>bang<strong>leize</strong></ins></li>
+  </ul>
+</div>
+        DIFF
+        ensure
+          ::Diffy::Diff.default_options = original_options
+        end
+      end
     end
 
     it "should escape diffed html in html output" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diffy
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
 platform: ruby
 authors:
 - Sam Goldstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-20 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake