diffy 3.0.3 → 3.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c5716dc0b3aaa576d3508caa867fda44afa56805
+  data.tar.gz: c2fdc0cb2057feaeb1c397348824e533d7ee8e3d
+SHA512:
+  metadata.gz: 6e1b38543c84b1bafb3a2374af78bde66b448a5c775a00f702db17a0edb74573c8ca480c652205c34ec25fbaaf654f0d1af9b876c04d0667f059764f33bfe2b7
+  data.tar.gz: 044a96352f2556c5314e89b196ad3eb6002602dd9d19200abec2760d597fb999a998f85189cf3739a9dc435645d45b60ff29de500c90408d1f3b97fe270a2e7a

data/CHANGELOG

@@ -1,3 +1,10 @@
+== 3.0.4 ==
+handle windows vs. unix line breaks consistently in html output
+
+== 3.0.3 ==
+explicitly unlink tempfiles to avoid occasional file handle leaks
+
+== 3.0.0 ==
 allow_empty_diff is true by default
 
 == 2.1.0 ==

data/lib/diffy/html_formatter.rb

@@ -88,7 +88,10 @@ module Diffy
 
     def split_characters(chunk)
       chunk.gsub(/^./, '').each_line.map do |line|
-        (line.chomp.split('') + ['\n']).map{|chr| ERB::Util.h(chr) }
+        chars = line.sub(/([\r\n]$)/, '').split('')
+        # add escaped newlines
+        chars << '\n'
+        chars.map{|chr| ERB::Util.h(chr) }
       end.flatten.join("\n") + "\n"
     end
 

data/lib/diffy/version.rb

@@ -1,3 +1,3 @@
 module Diffy
-  VERSION = '3.0.3'
+  VERSION = '3.0.4'
 end

data/spec/diffy_spec.rb

@@ -486,6 +486,23 @@ baz
         @diff.to_s(:html).should ==  html
       end
 
+      it "should treat unix vs windows newlines as differences" do
+        @diff = Diffy::Diff.new("one\ntwo\nthree\n", "one\r\ntwo\r\nthree\r\n")
+        html = <<-HTML
+<div class="diff">
+  <ul>
+    <li class="del"><del>one</del></li>
+    <li class="del"><del>two</del></li>
+    <li class="del"><del>three</del></li>
+    <li class="ins"><ins>one<strong></strong></ins></li>
+    <li class="ins"><ins>two<strong></strong></ins></li>
+    <li class="ins"><ins>three<strong></strong></ins></li>
+  </ul>
+</div>
+        HTML
+        @diff.to_s(:html).should ==  html
+      end
+
       describe 'with lines that include \n' do
         before do
           string1 = 'a\nb'"\n"

metadata

@@ -1,64 +1,53 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: diffy
-version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: 
-  segments: 
-  - 3
-  - 0
-  - 3
-  version: 3.0.3
+version: !ruby/object:Gem::Version
+  version: 3.0.4
 platform: ruby
-authors: 
+authors:
 - Sam Goldstein
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-03-16 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-04-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: Convenient diffing in ruby
-email: 
+email:
 - sgrock@gmail.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
-- .rspec
-- .travis.yml
+files:
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG
 - CONTRIBUTORS
 - Gemfile
@@ -75,38 +64,29 @@ files:
 - spec/demo_app.rb
 - spec/diffy_spec.rb
 homepage: http://github.com/samg/diffy
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A convenient way to diff string in ruby
-test_files: 
+test_files:
 - spec/demo_app.rb
 - spec/diffy_spec.rb