diffy 2.0.1 → 2.0.2

data/Gemfile

@@ -0,0 +1,4 @@
+
+group :test, :development do
+  gem 'rspec', "~>2.0"
+end

data/Rakefile

@@ -23,7 +23,6 @@ begin
 
     s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
     s.authors = ["Sam Goldstein"]
-    s.date = %q{2010-06-28}
     s.description = %q{Convenient diffing in ruby}
     s.email = %q{sgrock@gmail.com}
     s.has_rdoc = true
@@ -34,6 +33,6 @@ begin
 
   end
 rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+  puts "Jeweler not available."
 end
 

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2

data/diffy.gemspec

@@ -1,52 +1,51 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{diffy}
-  s.version = "2.0.1"
+  s.version = "2.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Goldstein"]
-  s.date = %q{2010-12-07}
+  s.date = %q{2011-06-20}
   s.description = %q{Convenient diffing in ruby}
   s.email = %q{sgrock@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.md"
+    "README.md"
   ]
   s.files = [
-    ".gitignore",
-     "CHANGELOG",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "diffy.gemspec",
-     "lib/diffy.rb",
-     "lib/diffy/diff.rb",
-     "lib/diffy/format.rb",
-     "lib/diffy/html_formatter.rb",
-     "spec/diffy_spec.rb"
+    "CHANGELOG",
+    "Gemfile",
+    "LICENSE",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "diffy.gemspec",
+    "lib/diffy.rb",
+    "lib/diffy/diff.rb",
+    "lib/diffy/format.rb",
+    "lib/diffy/html_formatter.rb",
+    "spec/diffy_spec.rb"
   ]
   s.homepage = %q{http://github.com/samg/diffy/tree/master}
   s.rdoc_options = ["--inline-source", "--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.3}
   s.summary = %q{A convenient way to diff string in ruby}
-  s.test_files = [
-    "spec/diffy_spec.rb"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, ["~> 2.0"])
     else
+      s.add_dependency(%q<rspec>, ["~> 2.0"])
     end
   else
+    s.add_dependency(%q<rspec>, ["~> 2.0"])
   end
 end
 

data/lib/diffy/html_formatter.rb

@@ -41,8 +41,6 @@ module Diffy
         if not chunk2
           next ERB::Util.h(chunk1)
         end
-        chunk1 = ERB::Util.h(chunk1)
-        chunk2 = ERB::Util.h(chunk2)
 
         dir1 = chunk1.each_char.first
         dir2 = chunk2.each_char.first
@@ -57,7 +55,7 @@ module Diffy
           processed << (index + 1)
           [hi1, hi2]
         else
-          chunk1
+          ERB::Util.h(chunk1)
         end
       end.flatten
       lines.map{|line| line.each_line.map(&:chomp).to_a if line }.flatten.compact.
@@ -66,7 +64,7 @@ module Diffy
 
     def split_characters(chunk)
       chunk.gsub(/^./, '').each_line.map do |line|
-        line.chomp.split('') + ['\n']
+        (line.chomp.split('') + ['\n']).map{|chr| ERB::Util.h(chr) }
       end.flatten.join("\n") + "\n"
     end
 

data/spec/diffy_spec.rb

@@ -1,4 +1,4 @@
-require 'spec'
+require 'rspec'
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'diffy'))
 
 describe Diffy::Diff do
@@ -245,6 +245,21 @@ baz
         @diff.to_s(:html).should ==  html
       end
 
+      it "should not double escape html in wierd edge cases" do
+        @string1 = "preface = (! title .)+ title &{YYACCEPT}\n"
+        @string2 = "preface = << (! title .)+ title >> &{YYACCEPT}\n"
+        @diff = Diffy::Diff.new @string1, @string2
+        html = <<-HTML
+<div class="diff">
+  <ul>
+    <li class="del"><del>preface = (! title .)+ title &amp;{YYACCEPT}</del></li>
+    <li class="ins"><ins>preface = <strong>&lt;&lt; </strong>(! title .)+ title <strong>&gt;&gt; </strong>&amp;{YYACCEPT}</ins></li>
+  </ul>
+</div>
+        HTML
+        @diff.to_s(:html).should ==  html
+      end
+
       it "should highlight the changes within the line with windows style line breaks" do
         @string1 = "hahaha\r\ntime flies like an arrow\r\nfoo bar\r\nbang baz\n"
         @string2 = "hahaha\r\nfruit flies like a banana\r\nbang baz\n"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: diffy
 version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
+  hash: 11
+  prerelease: 
   segments: 
   - 2
   - 0
-  - 1
-  version: 2.0.1
+  - 2
+  version: 2.0.2
 platform: ruby
 authors: 
 - Sam Goldstein
@@ -15,10 +15,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-07 00:00:00 -08:00
+date: 2011-06-20 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
+  prerelease: false
+  type: :development
+  requirement: *id001
 description: Convenient diffing in ruby
 email: sgrock@gmail.com
 executables: []
@@ -29,8 +43,8 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files: 
-- .gitignore
 - CHANGELOG
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile
@@ -72,9 +86,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: A convenient way to diff string in ruby
-test_files: 
-- spec/diffy_spec.rb
+test_files: []
+

data/.gitignore

@@ -1,2 +0,0 @@
-*.gem
-*.swp