diffy 2.0.4 → 2.0.5

data/CONTRIBUTORS

@@ -0,0 +1,3 @@
+* Sam Goldstein
+* joelash
+* chaffeqa

data/README.md

@@ -74,6 +74,8 @@ Then try adding this css to your stylesheets:
     .diff del, .diff ins, .diff span{white-space:pre-wrap;font-family:courier;}
     .diff del strong{font-weight:normal;background:#fcc;}
     .diff ins strong{font-weight:normal;background:#9f9;}
+    .diff li.diff-comment { display: none; }
+    .diff li.diff-block-info { background: none repeat scroll 0 0 gray; }
 
 You can also diff files instead of strings
 
@@ -103,6 +105,23 @@ deletions, and unchanged in a diff.
 
 Use `#map`, `#inject`, or any of Enumerable's methods.  Go crazy.
 
+Full Diff Output
+----------------
+
+By default diffy removes the superfluous diff output.  This is because its default is to show the complete diff'ed file (`diff -U 1000` is the default).
+
+Diffy does support full output, just use the `:include_diff_info => true` option when initializing:
+
+    >> Diffy::Diff.new("foo\nbar\n", "foo\nbar\nbaz\n", :include_diff_info => true).to_s(:text)
+    =>--- /Users/chaffeqa/Projects/stiwiki/tmp/diffy20111116-82153-ie27ex	2011-11-16 20:16:41.000000000 -0500
+    +++ /Users/chaffeqa/Projects/stiwiki/tmp/diffy20111116-82153-wzrhw5	2011-11-16 20:16:41.000000000 -0500
+    @@ -1,2 +1,3 @@
+     foo
+     bar
+    +baz
+    
+And even deals a bit with the formatting!
+
 Ruby Version Compatibility
 -------------------------
 

data/VERSION

@@ -1 +1 @@
-2.0.4
+2.0.5

data/lib/diffy/diff.rb

@@ -14,7 +14,7 @@ module Diffy
     # +:source+::  Either _strings_ or _files_.  Determines whether string1
     #              and string2 should be interpreted as strings or file paths.
     def initialize(string1, string2, options = {})
-      @options = {:diff => '-U 10000', :source => 'strings'}.merge(options)
+      @options = {:diff => '-U 10000', :source => 'strings', :include_diff_info => false}.merge(options)
       if ! ['strings', 'files'].include?(@options[:source])
         raise ArgumentError, "Invalid :source option #{@options[:source].inspect}. Supported options are 'strings' and 'files'."
       end
@@ -42,8 +42,10 @@ module Diffy
     end
 
     def each
-      lines = diff.split("\n").reject{|x| x =~ /^(---|\+\+\+|@@|\\\\)/ }.
-        map{|line| line + "\n"}
+      lines = case @options[:include_diff_info]
+      when false then diff.split("\n").reject{|x| x =~ /^(---|\+\+\+|@@|\\\\)/ }.map {|line| line + "\n" }
+      when true then diff.split("\n").map {|line| line + "\n" }
+      end
       if block_given?
         lines.each{|line| yield line}
       else

data/lib/diffy/format.rb

@@ -3,11 +3,15 @@ module Diffy
     # ANSI color output suitable for terminal output
     def color
       map do |line|
-        case line
+        case line          
+        when /^(---|\+\+\+|\\\\)/
+          "\033[90m#{line.chomp}\033[0m"
         when /^\+/
           "\033[32m#{line.chomp}\033[0m"
         when /^-/
           "\033[31m#{line.chomp}\033[0m"
+        when /^@@/
+          "\033[36m#{line.chomp}\033[0m"
         else
           line.chomp
         end

data/lib/diffy/html_formatter.rb

@@ -17,12 +17,16 @@ module Diffy
     def wrap_line(line)
       cleaned = line.gsub(/^./, '').chomp
       case line
+      when /^(---|\+\+\+|\\\\)/
+        '    <li class="diff-comment"><span>' + line.chomp + '</span></li>'
       when /^\+/
         '    <li class="ins"><ins>' + cleaned + '</ins></li>'
       when /^-/
         '    <li class="del"><del>' + cleaned + '</del></li>'
       when /^ /
         '    <li class="unchanged"><span>' + cleaned + '</span></li>'
+      when /^@@/
+        '    <li class="diff-block-info"><span>' + line.chomp + '</span></li>'
       end
     end
 

data/spec/diffy_spec.rb

@@ -55,6 +55,41 @@ describe Diffy::Diff do
     end
 
   end
+  
+  describe "options[:include_diff_info]" do
+    it "defaults to false" do
+      @diffy = Diffy::Diff.new(" foo\nbar\n", "foo\nbar\n")
+      @diffy.options[:include_diff_info].should == false
+    end
+    
+    it "can be set to true" do
+      @diffy = Diffy::Diff.new(" foo\nbar\n", "foo\nbar\n", :include_diff_info => true )
+      @diffy.options[:include_diff_info].should == true
+    end
+    
+    it "includes all diff output" do
+      output = Diffy::Diff.new("foo\nbar\nbang\n", "foo\nbang\n", :include_diff_info => true ).to_s
+      output.to_s.should match( /@@/)
+      output.should match( /---/)
+      output.should match( /\+\+\+/)
+    end
+    
+    describe "formats" do
+      it "works for :color" do
+        output = Diffy::Diff.new("foo\nbar\nbang\n", "foo\nbang\n", :include_diff_info => true ).to_s(:color)
+        output.should match( /\e\[0m\n\e\[36m\@\@/ )
+        output.to_s.should match( /\e\[90m---/)
+        output.to_s.should match( /\e\[0m\n\e\[90m\+\+\+/)
+      end
+  
+      it "works for :html_simple" do
+        output = Diffy::Diff.new("foo\nbar\nbang\n", "foo\nbang\n", :include_diff_info => true ).to_s(:html_simple)
+        output.split("\n").should include( "    <li class=\"diff-block-info\"><span>@@ -1,3 +1,2 @@</span></li>" )
+        output.should include( "<li class=\"diff-comment\"><span>---")
+        output.should include( "<li class=\"diff-comment\"><span>+++")
+      end
+    end
+  end
 
   describe "options[:diff]" do
     it "should accept an option to diff" do
@@ -118,7 +153,8 @@ describe Diffy::Diff do
       end
 
       it "should show one line added" do
-        Diffy::Diff.new(@string2, @string1).to_s.should == <<-DIFF
+        Diffy::Diff.new(@string2, @string1).to_s.
+          should == <<-DIFF
  foo
 +bar
  bang

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: diffy
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 2
   - 0
-  - 4
-  version: 2.0.4
+  - 5
+  version: 2.0.5
 platform: ruby
 authors: 
 - Sam Goldstein
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-11 00:00:00 -07:00
+date: 2011-11-21 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,6 +61,7 @@ extra_rdoc_files:
 files: 
 - .rspec
 - CHANGELOG
+- CONTRIBUTORS
 - Gemfile
 - LICENSE
 - README.md