riffdiff 1.0.19 → 1.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab9270780987e9731750adac81951e66b7e0cf74
-  data.tar.gz: ae9e29dd801bf4502dcb651581ce99573946410b
+  metadata.gz: ee5b9e6b9b78557a80e5b991f48673b90eeda880
+  data.tar.gz: 6a27e2bc22a0d7e47d9b414c1c9c1dbd7e2f0c62
 SHA512:
-  metadata.gz: eee0b5d29449d2fe3bb8201a6c8b68f8ee96b835518b8b18e6659b8657403387ae04dbe3ae767c1951dd42acaf68c2b31cb154e49e151a3700d77cb74690633b
-  data.tar.gz: 827c93ab1f9ea4217083d43823815390fb01397280370571e14fbd6e0f7a97daae94c9b8fb2b6f52c376b714617906c739088d80662d8f6f0ed6455991caaaa4
+  metadata.gz: b340f654f8ad84c341fb462da5dcbada725f4b64dadbce12cf38ee916d8a410df8ebe02b91db1d52e30ef0aad0e7c1a652721408d9b028f164a22398310870c4
+  data.tar.gz: e57adfa78061e38b062909dd49d976debe48fa2b0b286652113ba5c92db2a797711d5df8dce0187eecd9cef6def40e1711718271c8aac1c324173bd4c8d972ae

data/lib/refiner.rb

@@ -115,16 +115,20 @@ class Refiner
   #
   # Returns false if the preconditions for using this method aren't fulfilled
   def create_one_to_many_refinements(old, new, old_highlights, new_highlights)
-    if old_highlights.count > 0
-      return false
-    end
-    if old.lines.count != 1
-      return false
-    end
+    # If things have been removed from the first line, the specialized
+    # highlighting won't work
+    return false if old_highlights.count > 0
+
+    # If the first line was replaced rather than updated, the specialized
+    # highlighting won't work
+    return false if new_highlights.count == 0
+
+    # Specialized highlighting requires exactly one old line
+    return false if old.lines.count != 1
+
     lines = new.lines
-    if lines.count < 2
-      return false
-    end
+    # Specialized highlighting requires two or more new lines
+    return false if lines.count < 2
 
     @refined_old = ''
 

data/spec/refiner_spec.rb

@@ -148,6 +148,23 @@ RSpec.describe Refiner, '#new' do
     end
   end
 
+  # From https://github.com/walles/riff/issues/5
+  context %(with one line being replaced with many, real world case) do
+    refiner = Refiner.new("THROTTLE_SECONDS = 51\n",
+                          "\n" \
+                          "Monkey\n" \
+                          "THROTTLE_SECONDS = None\n")
+
+    it %(just colors the lines) do
+      expect(refiner.refined_old).to eq(
+        %(#{RED}-THROTTLE_SECONDS = 51#{RESET}\n))
+      expect(refiner.refined_new).to eq(
+        %(#{GREEN}+\n) +
+        %(#{GREEN}+Monkey\n) +
+        %(#{GREEN}+THROTTLE_SECONDS = None#{RESET}\n))
+    end
+  end
+
   context %(with many lines turning into one) do
     refiner = Refiner.new("abcde,\n" \
                           "fffff,\n" \

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riffdiff
 version: !ruby/object:Gem::Version
-  version: 1.0.19
+  version: 1.0.20
 platform: ruby
 authors:
 - Johan Walles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec