diffed 0.0.9 → 0.0.10

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diffed
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   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: &2164278420 !ruby/object:Gem::Requirement
+  requirement: &2156407380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164278420
+  version_requirements: *2156407380
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2164278000 !ruby/object:Gem::Requirement
+  requirement: &2156405120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164278000
+  version_requirements: *2156405120
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2164277580 !ruby/object:Gem::Requirement
+  requirement: &2156402280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164277580
+  version_requirements: *2156402280
 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,7 +65,7 @@ files:
 - diffed.gemspec
 - lib/diffed.rb
 - lib/diffed/version.rb
-- lib/formatters/html.rb
+- lib/formatters/diff_html.rb
 - lib/models/file.rb
 - lib/models/line.rb
 - lib/models/section.rb
@@ -75,6 +75,9 @@ files:
 - testdata/diff1.classed.html
 - testdata/diff1.diff
 - testdata/diff1.styled.html
+- testdata/diff2.classed.html
+- testdata/diff2.diff
+- testdata/diff2.styled.html
 - testdata/git-show.output
 - testdata/git-show.styled.html
 - testdata/p4-describe.output
@@ -91,12 +94,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3517251613537232967
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3517251613537232967
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.5

data/lib/formatters/html.rb

@@ -1,52 +0,0 @@
-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