diffed 0.0.8 → 0.0.9

data/lib/diffed.rb

@@ -12,97 +12,16 @@ module Diffed
   end
   
   class Diff
+    include Html
     attr_accessor :sections
     
     def initialize(lines)
       parse(lines)      
     end
     
-    def as_html_table(use_inline_styles = true)
-      html = make_table_tag(use_inline_styles)
-      
-      @sections.each do |section|
-        html << format_section_header_row(section.header, use_inline_styles)        
-        section.lines.each_with_index do |line, i|
-          html << format_code_line(line, use_inline_styles)
-        end
-      end
-
-      html << "</table>"
-    end
-    
-    private
-    def format_code_line(line, use_inline_styles)
-      row = OutputRow.new(:code_line =>line)
-      
-      if use_inline_styles
-        format_styled_row code_line_style(line), '#000', row
-      else
-        format_classed_row line.type.to_s, row
-      end
-    end
-      
-    def code_line_style(line)
-      case line.type
-      when :left
-        '#FDD'
-      when :right
-        '#DFD'
-      when :both
-        nil
-      end
-    end
-        
-    def format_section_header_row(header, use_inline_styles)
-      row = OutputRow.new(:left => "...", :right => "...", :text => header)
-
-      if use_inline_styles
-        format_styled_row '#F0F0FF', '#888', row
-      else
-        format_classed_row 'section', row
-      end
-    end
-    
-    def make_table_tag(inline_styles)
-      if inline_styles
-        table_attributes = %Q{cellpadding="5" style="border-collapse: collapse; border: 1px solid \#CCC; font-family: Consolas, courier, monospace; font-size: 13px; color: #888"}
-      else
-        table_attributes = %Q{class="coloured-diff"}
-      end
-      
-      %Q{<table #{table_attributes}>\n}
-    end
-    
-    def format_styled_row(bg_color, text_color, row)
-      row_style = bg_color.nil? ? "" : %Q{ style="background-color: #{bg_color}"}
-      text_color = text_color
-      
-      %Q{<tr#{row_style}><td style="border-left: 1px solid \#CCC">#{row.left}</td><td style="border-left: 1px solid \#CCC">#{row.right}</td><td style="border-left: 1px solid \#CCC; border-right: 1px solid \#CCC; color: #{text_color}"><pre>#{row.text}</pre></td></tr>\n}
-    end
-    
-    def format_classed_row(css_class, row)
-      %Q{<tr class="#{css_class}"><td>#{row.left}</td><td>#{row.left}</td><td><pre>#{row.text}</pre></td></tr>\n}
-    end
-    
+    private    
     def parse(lines)
       @sections = UnifiedDiffParser.new(lines).parse!.sections
     end
-    
-    class OutputRow
-      attr_reader :left, :right
-      
-      def initialize(params = {})
-        if params[:code_line].nil?
-          @left, @right, @text = params[:left], params[:right], params[:text]
-        else
-          line = params[:code_line]
-          @left, @right, @text = line.left_line_num, line.right_line_num, line.text
-        end
-      end
-      
-      def text
-        EscapeUtils.escape_html(@text, false)
-      end
-    end
   end
 end

data/lib/diffed/version.rb

@@ -1,3 +1,3 @@
 module Diffed
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/formatters/html.rb

@@ -0,0 +1,52 @@
+module Diffed
+  module Html
+    def as_html_table(use_inline_styles=true)
+      html = make_table_tag(use_inline_styles)
+      
+      sections.each do |section|
+        html << section.as_html_rows(use_inline_styles)
+      end
+
+      html << "</table>"
+    end
+    
+    private     
+    def format_styled_row(bg_color, text_color, row)
+      row_style = bg_color.nil? ? "" : %Q{ style="background-color: #{bg_color}"}
+      text_color = text_color
+
+      %Q{<tr#{row_style}><td style="border-left: 1px solid \#CCC">#{row.left}</td><td style="border-left: 1px solid \#CCC">#{row.right}</td><td style="border-left: 1px solid \#CCC; border-right: 1px solid \#CCC; color: #{text_color}"><pre>#{row.text}</pre></td></tr>\n}
+    end
+    
+    def format_classed_row(css_class, row)
+      %Q{<tr class="#{css_class}"><td>#{row.left}</td><td>#{row.left}</td><td><pre>#{row.text}</pre></td></tr>\n}
+    end
+
+    def make_table_tag(inline_styles)
+      if inline_styles
+        table_attributes = %Q{cellpadding="5" style="border-collapse: collapse; border: 1px solid \#CCC; font-family: Consolas, courier, monospace; font-size: 13px; color: #888"}
+      else
+        table_attributes = %Q{class="coloured-diff"}
+      end
+      
+      %Q{<table #{table_attributes}>\n}
+    end
+    
+    class OutputRow
+      attr_reader :left, :right
+      
+      def initialize(params = {})
+        if params[:code_line].nil?
+          @left, @right, @text = params[:left], params[:right], params[:text]
+        else
+          line = params[:code_line]
+          @left, @right, @text = line.left_line_num, line.right_line_num, line.text
+        end
+      end
+      
+      def text
+        EscapeUtils.escape_html(@text, false)
+      end
+    end
+  end
+end

data/lib/models/file.rb

@@ -1,5 +1,8 @@
+require 'formatters/html'
+
 module Diffed
   class DiffedFile
+    include html
     attr_reader :file_desc, :sections
     
     def initialize(file_desc, sections)

data/lib/models/line.rb

@@ -1,5 +1,8 @@
+require 'formatters/html'
+
 module Diffed
   class Line
+    include Html
     attr_reader :type, :text, :left_line_num, :right_line_num, :no_newline
   
     def initialize(type, text, left_line_num, right_line_num)
@@ -17,6 +20,32 @@ module Diffed
     def no_newline= bool
       # mutability like this kind of sucks, but this one's a pain to avoid.
       @no_newline = bool
-    end         
-  end  
+    end 
+    
+    def as_html_row(use_inline_styles)
+      format_code_line(use_inline_styles)
+    end  
+    
+    private
+    def format_code_line(use_inline_styles)
+      row = OutputRow.new(:code_line => self)
+      
+      if use_inline_styles
+        format_styled_row code_line_style, '#000', row
+      else
+        format_classed_row type.to_s, row
+      end
+    end
+      
+    def code_line_style
+      case type
+      when :left
+        '#FDD'
+      when :right
+        '#DFD'
+      when :both
+        nil
+      end
+    end
+  end
 end

data/lib/models/section.rb

@@ -1,9 +1,33 @@
+require 'formatters/html'
+
 module Diffed
   class Section
+    include Html
     attr_reader :header, :lines
   
     def initialize(header, lines)
       @header, @lines = header, lines
-    end    
+    end
+    
+    def as_html_rows(use_inline_styles)
+      html = format_section_header_row(use_inline_styles)
+      lines.each { |line| html << line.as_html_row(use_inline_styles) }
+      html
+    end
+    
+    private
+    def format_section_header_row(use_inline_styles)
+      row = OutputRow.new(:left => "...", :right => "...", :text => header)
+
+      if use_inline_styles
+        format_styled_row '#F0F0FF', '#888', row
+      else
+        format_classed_row 'section', row
+      end
+    end
+    
+    def sections
+      [self]
+    end
   end  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diffed
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-08-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
-  requirement: &2168652500 !ruby/object:Gem::Requirement
+  requirement: &2164278420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168652500
+  version_requirements: *2164278420
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2168652080 !ruby/object:Gem::Requirement
+  requirement: &2164278000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168652080
+  version_requirements: *2164278000
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2168651660 !ruby/object:Gem::Requirement
+  requirement: &2164277580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168651660
+  version_requirements: *2164277580
 description: ! 'This is a library for creating HTML from a unified diff string, built
   specifically for the diff section output by "perforce describe -du" or "git show
   [commit SHA]", but with an eye towards solving a more general problem.  It supports
@@ -65,6 +65,7 @@ files:
 - diffed.gemspec
 - lib/diffed.rb
 - lib/diffed/version.rb
+- lib/formatters/html.rb
 - lib/models/file.rb
 - lib/models/line.rb
 - lib/models/section.rb