diffed 0.0.5 → 0.0.7

data/lib/diffed/version.rb

@@ -1,3 +1,3 @@
 module Diffed
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end

data/lib/diffed.rb

@@ -3,9 +3,17 @@ require 'parsers/unified'
 require 'escape_utils'
 
 module Diffed
+  def self.from_lines(lines)
+    Diff.new(lines)
+  end
+  
+  def self.from_text(text)
+    Diff.new(text.split /\n/)
+  end
+  
   class Diff
-    def initialize(raw_diff)
-      parse(raw_diff.split(/\n/))      
+    def initialize(lines)
+      parse(lines)      
     end
     
     def as_html_table(use_inline_styles = true)

data/lib/models/file.rb

@@ -0,0 +1,9 @@
+module Diffed
+  class DiffedFile
+    attr_reader :file_desc, :sections
+    
+    def initialize(file_desc, sections)
+      @file_desc, @sections = file_desc, sections
+    end
+  end
+end

data/lib/parsers/unified.rb

@@ -13,33 +13,18 @@ module Diffed
       
       @lines.each do |line|
         if HeaderLineParser.is_header?(line)
-          unless @curr_header.nil?
-            raise "Found a header while still processing a section!  #{line}"
-          end
-          
           @curr_header, @curr_lines = HeaderLineParser.new(line), []
         elsif @curr_header.nil?
           # Do nothing.  We haven't started yet.
           # puts "Ignoring line: #{line}"
         elsif line =~ /\/
-          if @curr_lines.empty?
-            @sections.last.lines.last.no_newline = true
-          else
-            @curr_lines.last.no_newline = true
-          end
+          handle_missing_newline
         else
-          line_parser = LineParser.new(line)          
-          @left_counter, @right_counter = line_parser.increment(@left_counter, @right_counter)          
-          @curr_lines << line_parser.line(@left_counter, @right_counter)
-          
-          if @curr_header.section_complete? @left_counter, @right_counter
-            @sections << Section.new(@curr_header.line, @curr_lines)
-            reset_section!
-          end
+          parse_code_line line
         end
       end      
       
-      self
+      self # evidence that I'm a Java developer at heart?
     end
     
     def sections
@@ -48,6 +33,25 @@ module Diffed
     end
     
     private
+    def handle_missing_newline
+      if @curr_lines.empty?
+        @sections.last.lines.last.no_newline = true
+      else
+        @curr_lines.last.no_newline = true
+      end      
+    end
+    
+    def parse_code_line(line)
+      line_parser = LineParser.new(line)          
+      @left_counter, @right_counter = line_parser.increment(@left_counter, @right_counter)          
+      @curr_lines << line_parser.line(@left_counter, @right_counter)
+      
+      if @curr_header.section_complete? @left_counter, @right_counter
+        @sections << Section.new(@curr_header.line, @curr_lines)
+        reset_section!
+      end      
+    end
+    
     def reset_section!
       @curr_header, @curr_lines, @left_counter, @right_counter = nil, [], 0, 0
     end 

data/spec/diffed_spec.rb

@@ -2,25 +2,25 @@ require 'spec_helper'
 
 describe "Diffed::Diff.as_html_table" do
   it "produces an html table representation of a diff, with CSS styles inline" do
-    diff = Diffed::Diff.new(File.read("testdata/diff1.diff"))
+    diff = Diffed.from_text(File.read("testdata/diff1.diff"))
     output = diff.as_html_table
     output.strip == File.read("testdata/diff1.styled.html").strip
   end
   
   it "produces an html table representation of the diff portions of the output of 'git show', with CSS styles inline" do
-    diff = Diffed::Diff.new(File.read("testdata/git-show.output"))
+    diff = Diffed.from_text(File.read("testdata/git-show.output"))
     output = diff.as_html_table
     output.strip == File.read("testdata/git-show.styled.html").strip
   end
   
   it "produces an html table representation of the diff portions of the output of 'p4 describe -du', with CSS styles inline" do
-    diff = Diffed::Diff.new(File.read("testdata/p4-describe.output"))
+    diff = Diffed.from_text(File.read("testdata/p4-describe.output"))
     output = diff.as_html_table
     output.strip == File.read("testdata/p4-describe.styled.html").strip
   end
   
   it "produces an html table representation of a diff, with CSS classes" do
-    diff = Diffed::Diff.new(File.read("testdata/diff1.diff"))
+    diff = Diffed.from_text(File.read("testdata/diff1.diff"))
     output = diff.as_html_table(false)
     output.strip == File.read("testdata/diff1.classed.html").strip
   end  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diffed
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-22 00:00:00.000000000Z
+date: 2013-08-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
-  requirement: &2157409940 !ruby/object:Gem::Requirement
+  requirement: &2152434200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157409940
+  version_requirements: *2152434200
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2157409520 !ruby/object:Gem::Requirement
+  requirement: &2152433780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157409520
+  version_requirements: *2152433780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157409100 !ruby/object:Gem::Requirement
+  requirement: &2152433360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157409100
+  version_requirements: *2152433360
 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/models/file.rb
 - lib/models/line.rb
 - lib/models/section.rb
 - lib/parsers/unified.rb