pretty_diff 0.5.0 → 0.6.0

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/lib/pretty_diff/chunk.rb

@@ -2,9 +2,10 @@
 # Represent a single piece of a diff.
 # 
 class PrettyDiff::Chunk #:nodoc:
-  attr_reader :meta_info, :input, :lines
+  attr_reader :diff, :meta_info, :input, :lines
   
-  def initialize(meta_info, input)
+  def initialize(diff, meta_info, input)
+    @diff = diff
     @meta_info = meta_info
     @input = input
   end
@@ -22,7 +23,7 @@ class PrettyDiff::Chunk #:nodoc:
   # IMPORTANT! Before calling this method it's essential to call "find_lines!" first,
   # otherwise the array will be empty.
   def line_numbers
-    @_line_numbers ||= PrettyDiff::LineNumbers.new(meta_info)
+    @_line_numbers ||= PrettyDiff::LineNumbers.new(diff, meta_info)
   end
   
 private
@@ -36,7 +37,7 @@ private
   def find_lines!
     returning(@lines = []) do
       input.split(/\r?\n/).each do |line_str|
-        line = PrettyDiff::Line.new(line_str)
+        line = PrettyDiff::Line.new(diff, line_str)
         next if line.ignore?
         @lines << line
         line_numbers.act_on_line(line)

data/lib/pretty_diff/diff.rb

@@ -14,11 +14,15 @@ require 'cgi'
 class PrettyDiff::Diff
   CHUNK_REGEXP = /@@ .+ @@\n/
 
-  attr_reader :input
+  attr_reader :input, :options
 
-  # Create new Diff object. Accept a String in unified diff format.
-  def initialize(unified_diff)
+  # Create new Diff object.
+  # Accept a String in unified diff format and options hash.
+  # Currrent options:
+  # * wrap_lines -- wrap each line in code block with <div> element.
+  def initialize(unified_diff, options={})
     @input = escape_html(unified_diff)
+    @options = options
   end
 
   # Generate HTML presentation. Return a string.
@@ -45,7 +49,7 @@ private
       split = text.split(CHUNK_REGEXP)
       split.shift
       split.each_with_index do |lines, idx|        
-        chunks << PrettyDiff::Chunk.new(meta_info[idx], lines)
+        chunks << PrettyDiff::Chunk.new(self, meta_info[idx], lines)
       end
     end
   end

data/lib/pretty_diff/html_generators/line_generator.rb

@@ -23,9 +23,11 @@ private
   end
   
   def wrapper_html
-    %Q[<div>] +
-    yield +
-    %Q[</div>]
+    if line.diff.options[:wrap_lines]
+      "<div> #{yield} </div>"
+    else
+      yield
+    end
   end
 
   def added_html(text)

data/lib/pretty_diff/html_generators/line_numbers_generator.rb

@@ -21,7 +21,7 @@ private
   end
   
   def column_html(text)
-    %Q[<td class="linenos"><pre>
+    %Q[<td width="2%" class="linenos"><pre>
 #{text}</pre></td>]
   end
   

data/lib/pretty_diff/line.rb

@@ -3,9 +3,10 @@
 #
 class PrettyDiff::Line #:nodoc:
   
-  attr_reader :input
+  attr_reader :diff, :input
   
-  def initialize(input)
+  def initialize(diff, input)
+    @diff = diff
     @input = input
   end
   

data/lib/pretty_diff/line_numbers.rb

@@ -4,9 +4,10 @@
 #
 class PrettyDiff::LineNumbers #:nodoc:
   
-  attr_reader :meta_info
+  attr_reader :diff, :meta_info
   
-  def initialize(meta)
+  def initialize(diff, meta)
+    @diff = diff
     @meta_info = meta
   end
   

data/pretty_diff.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pretty_diff}
-  s.version = "0.5.0"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ilya Sabanin"]
-  s.date = %q{2010-01-24}
+  s.date = %q{2010-03-03}
   s.description = %q{PrettyDiff is a highly customizable library for creating fully featured HTML
                        listings out of unified diff format strings.
                        Include copy/paste-safe line numbers and built-in syntax highlighting.}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pretty_diff
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Ilya Sabanin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-24 00:00:00 +07:00
+date: 2010-03-03 00:00:00 +07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency