diff_parser 0.1.0 → 1.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDdjZTY3MTBhOGIzNDdiMzc2MjI4YzdiOTQ3ZmFkMjEwMGI3ZWIxOQ==
+    ZjkxM2Q3NjAzODMyYmEwYzI2MGVhZTBjZmY1MTc1YTViN2E0ZGE0Yw==
   data.tar.gz: !binary |-
-    MDI0MDUxNDhmMDBmN2U1YjE1OTcxMzJhZTJkNWE4NzQ5MTlhZWFkZg==
+    N2VhNzliYzNkYmFkZThlNGM4ZDQ2OWE1ODdlNjZmZTliNGIxMDI5NA==
 SHA512:
   metadata.gz: !binary |-
-    ODVlM2Y3NDMwNWRmODMxNjM4MTJmNGZlNjE3MGVmODhmMGU1N2EwYzBhMzNk
-    YTlmYTFmODJjMTViYWQ0YmU5NmRmM2JhYTg0N2FjNzQwYWRhYjlhMjU2MjQ2
-    N2YxMmEwMjAzNWExZDE4MThlMTk2Yzg5NTA1ZTNiMjI4N2Y2OGQ=
+    NWFkMjQzNTU1NTJkMTEwYjE2MjU4OGZlNzk2ZWNiMjk0MjdkODVlMzBkMTFh
+    YzE2YmFlNGU3ZDY3MWMxMDZiNzRlZDk0Y2I0YTdkNTlhN2E0NDY4Y2I3ODNi
+    MjhiNmU3NzAzNTRjZjUwNmU0ZmZjZmMwNWMyYmIwODkzMmE2ZTU=
   data.tar.gz: !binary |-
-    YjkyMTBlNjI0NmE3Yzk0NDgxMjI2YTljMTU2Nzg1YzAyNWUyMjFmNWQ0NTM4
-    YTQ2MjBmYzEwMTRhMGVkODE5NWE1YjUwYjQ3NDFmZmE5YmFmNDRlYmRlMGE4
-    MThkNTE3YmJhYzM4N2UyYTVmMjBlMWM5NzZjMTljNTc2Njg1MGI=
+    MmIxMTdmNDRiMmZkMzgwNTQ2NTA0NTllZDRlMmM0NDc3MzMzYzRkYzNlZDQ4
+    ODM5M2Y5N2NmYjNiYjQzYjI5YTc0NjFhNTU4MzM3NTdjNzhkYzU0YmJhYmM3
+    NzhhOTI5ZWYwMzVhMjVhMTAwOWUzYTJmODIzMWMyYTkxZTllNjY=

data/lib/diff_parser/commit.rb

@@ -0,0 +1,25 @@
+module DiffParser
+  class Commit
+    attr_reader :github, :repo, :sha
+
+    def initialize(github, repo, sha)
+      @github = github
+      @repo = repo
+      @sha = sha
+    end
+
+    def diff
+      DiffParser::Diff.new(raw, info)
+    end
+
+    private
+
+    def info
+      @info ||= github.commit(repo, sha)
+    end
+
+    def raw
+      @raw ||= github.commit(repo, sha, accept: 'application/vnd.github.VERSION.diff')
+    end
+  end
+end

data/lib/diff_parser/diff.rb

@@ -0,0 +1,14 @@
+module DiffParser
+  class Diff
+    attr_reader :raw_diff, :diff_info
+
+    def initialize(raw_diff, diff_info)
+      @raw_diff = raw_diff
+      @diff_info = diff_info
+    end
+
+    def files
+      DiffParser::DiffFilesCollection.new(raw_diff, diff_info)
+    end
+  end
+end

data/lib/diff_parser/diff_files_collection.rb

@@ -0,0 +1,34 @@
+module DiffParser
+  class DiffFilesCollection
+    include Enumerable
+
+    attr_reader :raw_diff, :diff_info
+
+    def initialize(raw_diff, diff_info)
+      @raw_diff = raw_diff
+      @diff_info = diff_info
+    end
+
+    def raw_lines
+      preprocessed_lines = DiffParser::InlineDiff.processing(raw_diff.lines)
+      preprocessed_lines.map { |line| RawLine.new(line) }
+    end
+
+    def each
+      current_file = nil
+
+      raw_lines.each_with_index do |raw_line, idx|
+        next if raw_line.skip_line?
+
+        if raw_line.info?
+          yield current_file if current_file
+          current_file = DiffParser::File.new(raw_line.full_line, diff_info)
+        else
+          current_file.push_line(raw_line, idx)
+        end
+      end
+
+      yield current_file
+    end
+  end
+end

data/lib/diff_parser/diff_line.rb

@@ -2,29 +2,23 @@ module DiffParser
   class DiffLine
     CODE_TYPES = %w(old new default match)
 
-    attr_reader :raw_line, :type, :line_code, :line_new, :line_old
+    attr_reader :raw_line, :type, :line_new, :line_old, :idx
 
-    def initialize(raw_line, type, line_code, line_new, line_old)
-      @raw_line = if type.to_s == 'info'
-                    raw_line.split(' ').last.tap do |_raw_line|
-                      _raw_line[0] = ''
-                    end
-                  else
-                    raw_line
-                  end
-
-      @type = if type == 'old' and raw_line[0] != '-'
-                'default'
-              else
-                type
-              end
-      @line_code = line_code
+    def initialize(raw_line, type, line_new, line_old, idx, sha)
+      @raw_line = raw_line
       @line_new = line_new
       @line_old = line_old
+      @idx = idx
+      @sha = sha
+      @type = type
     end
 
     def line_of_code?
       CODE_TYPES.include?(type)
     end
+
+    def line_code
+      "#{sha}_#{line_old}_#{line_new}_#{type}_#{idx}"
+    end
   end
 end

data/lib/diff_parser/file.rb

@@ -0,0 +1,54 @@
+module DiffParser
+  class File
+    attr_accessor :line_old, :line_new
+    attr_reader :lines, :sha, :path, :file_info
+    delegate :additions, :deletions, to: :file_info
+
+    def initialize(path, diff_info)
+      @path = preprocess_path(path)
+      @lines = []
+      @line_old = 1
+      @line_new = 1
+      @sha = diff_info.sha
+      @file_info = retrieve_file_info(diff_info)
+    end
+
+    def push_line(raw_line, idx)
+      if raw_line.type == 'match'
+        self.line_old = raw_line.line.match(/\-[0-9]*/)[0].to_i.abs rescue 0
+        self.line_new = raw_line.line.match(/\+[0-9]*/)[0].to_i.abs rescue 0
+
+        lines << DiffLine.new(raw_line.full_line, raw_line.type, nil, nil, idx, sha)
+      else
+        unless raw_line.index?
+          lines << DiffLine.new(raw_line.full_line, raw_line.type, line_new, line_old, idx, sha)
+
+          if raw_line.addition?
+            self.line_new += 1
+          elsif raw_line.deletion?
+            self.line_old += 1
+          else
+            self.line_new += 1
+            self.line_old += 1
+          end
+        end
+      end
+    end
+
+    def each_line
+      lines.each do |line|
+        yield line
+      end
+    end
+
+    private
+
+    def preprocess_path(path)
+      path.split(' ').last[2..-1]
+    end
+
+    def retrieve_file_info(diff_info)
+      diff_info.files.find { |f| f.filename == path }
+    end
+  end
+end

data/lib/diff_parser/raw_line.rb

@@ -0,0 +1,91 @@
+module DiffParser
+  class RawLine
+    GIT_NEW_FILE = "new file"
+    GIT_DELETED_FILE = "deleted file"
+    GIT_DIFF_START = "+#!idiff-start!#++"
+    GIT_DIFF_FINISH = "-#!idiff-start!#--"
+    GIT_INDEX = "index "
+    GIT_DIFF = "diff --git "
+    GIT_WARN_NEW_LINE = " No newline at end of file"
+    GIT_CODE_ADDED = "+"
+    GIT_CODE_REMOVED = "-"
+
+    SUMMARY_REGEXES = [/^\-\-\- \/dev\/null/,
+                       /^\+\+\+ \/dev\/null/,
+                       /^\-\-\- a/,
+                       /^\+\+\+ b/]
+
+    attr_reader :line
+
+    def initialize(line)
+      @line = line
+    end
+
+    def full_line
+      @full_line ||= DiffParser::InlineDiff.replace_markers(html_escape(line.gsub(/\n/, '')))
+    end
+
+    def summary?
+      SUMMARY_REGEXES.any? do |regex|
+        line.match(regex)
+      end
+    end
+
+    def info?
+      type == 'info'
+    end
+
+    def index?
+      type == 'index'
+    end
+
+    def addition?
+      line[0] == '+'
+    end
+
+    def deletion?
+      line[0] == '-'
+    end
+
+    def skip_line?
+      summary? or  %w(file_update_removed file_update_created).include?(type)
+    end
+
+    def type
+      if stripped_line.match(/^@@ -/)
+        "match"
+      elsif stripped_line.start_with? GIT_NEW_FILE
+        "file_created"
+      elsif stripped_line.start_with? GIT_DELETED_FILE
+        "file_removed"
+      elsif stripped_line.start_with? GIT_DIFF_START
+        "file_update_created"
+      elsif stripped_line.start_with? GIT_DIFF_FINISH
+        "file_update_removed"
+      elsif stripped_line.start_with? GIT_INDEX
+        "index"
+      elsif stripped_line.start_with? GIT_DIFF
+        "info"
+      elsif stripped_line.start_with? GIT_WARN_NEW_LINE
+        "warning"
+      elsif stripped_line.start_with? GIT_CODE_ADDED
+        "new"
+      elsif stripped_line[0] == GIT_CODE_REMOVED
+        "old"
+      else
+        "default"
+      end
+    end
+
+    private
+
+    def html_escape str
+      replacements = {'&' => '&amp;', '>' => '&gt;', '<' => '&lt;', '"' => '&quot;', "'" => '&#39;'}
+      str.gsub(/[&"'><]/, replacements)
+    end
+
+    def stripped_line
+      @stripped_line ||= line.strip
+    end
+  end
+end

data/lib/diff_parser/version.rb

@@ -1,3 +1,3 @@
 module DiffParser
-  VERSION = "0.1.0"
+  VERSION = "1.0.0"
 end

data/lib/diff_parser.rb

@@ -1,4 +1,7 @@
+require 'diff_parser/diff'
+require 'diff_parser/commit'
+require 'diff_parser/file'
+require 'diff_parser/diff_files_collection'
+require 'diff_parser/raw_line'
 require 'diff_parser/diff_line'
 require 'diff_parser/inline_diff'
-require 'diff_parser/regex'
-require 'diff_parser/parser'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diff_parser
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - stevo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2014-01-09 00:00:00.000000000 Z
 dependencies: []
 description: Allows parsing diffs for presentation purposes - extracted from marvelous
   GitLab project
@@ -19,10 +19,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/diff_parser.rb
+- lib/diff_parser/commit.rb
+- lib/diff_parser/diff.rb
+- lib/diff_parser/diff_files_collection.rb
 - lib/diff_parser/diff_line.rb
+- lib/diff_parser/file.rb
 - lib/diff_parser/inline_diff.rb
-- lib/diff_parser/parser.rb
-- lib/diff_parser/regex.rb
+- lib/diff_parser/raw_line.rb
 - lib/diff_parser/version.rb
 homepage: https://github.com/Selleo/diff_parser
 licenses: []

data/lib/diff_parser/parser.rb

@@ -1,104 +0,0 @@
-module DiffParser
-  class Parser
-    include Enumerable
-
-    GIT_NEW_FILE = "new file"
-    GIT_DELETED_FILE = "deleted file"
-    GIT_DIFF_START = "+#!idiff-start!#++"
-    GIT_DIFF_FINISH = "-#!idiff-start!#--"
-    GIT_INDEX = "index "
-    GIT_DIFF = "diff --git "
-    GIT_WARN_NEW_LINE = " No newline at end of file"
-    GIT_CODE_ADDED = "+"
-    GIT_CODE_REMOVED = "-"
-
-    attr_reader :lines, :new_path
-
-    def initialize(diff)
-      @commit_id = diff.commit_id
-      @lines = diff.lines.to_a
-      @new_path = ""
-      #@new_path = diff.new_path
-    end
-
-    def each
-      line_old = 1
-      line_new = 1
-
-      lines_arr = DiffParser::InlineDiff.processing lines
-      lines_arr.each_with_index do |line, idx|
-        raw_line = line.dup
-
-        next if line.match(/^\-\-\- \/dev\/null/)
-        next if line.match(/^\+\+\+ \/dev\/null/)
-        next if line.match(/^\-\-\- a/)
-        next if line.match(/^\+\+\+ b/)
-
-        full_line = html_escape(line.gsub(/\n/, ''))
-        full_line = DiffParser::InlineDiff.replace_markers full_line
-
-        if line.match(/^@@ -/)
-          type = "match"
-
-          line_old = line.match(/\-[0-9]*/)[0].to_i.abs rescue 0
-          line_new = line.match(/\+[0-9]*/)[0].to_i.abs rescue 0
-
-          yield(DiffLine.new(full_line, type, nil, nil, nil))
-          next
-        else
-          type = identification_type(line)
-          line_code = generate_line_code(new_path, line_new, line_old, type, idx)
-          next if ["index"].include? type
-
-          yield(DiffLine.new(full_line, type, line_code, line_new, line_old))
-        end
-
-
-        if line[0] == "+"
-          line_new += 1
-        elsif line[0] == "-"
-          line_old += 1
-        else
-          line_new += 1
-          line_old += 1
-        end
-      end
-    end
-
-    private
-
-    def identification_type(line)
-      line = line.strip
-      if line.start_with? GIT_NEW_FILE
-        "file_created"
-      elsif line.start_with? GIT_DELETED_FILE
-        "file_removed"
-      elsif line.start_with? GIT_DIFF_START
-        "file_update_created"
-      elsif line.start_with? GIT_DIFF_FINISH
-        "file_update_removed"
-      elsif line.start_with? GIT_INDEX
-        "index"
-      elsif line.start_with? GIT_DIFF
-        "info"
-      elsif line.start_with? GIT_WARN_NEW_LINE
-        "warning"
-      elsif line.start_with? GIT_CODE_ADDED
-        "new"
-      elsif line.start_with? GIT_CODE_REMOVED
-        "old"
-      else
-        "default"
-      end
-    end
-
-    def generate_line_code(path, line_new, line_old, type, idx)
-      "#{@commit_id}_#{line_old}_#{line_new}_#{type}_#{idx}"
-    end
-
-    def html_escape str
-      replacements = {'&' => '&amp;', '>' => '&gt;', '<' => '&lt;', '"' => '&quot;', "'" => '&#39;'}
-      str.gsub(/[&"'><]/, replacements)
-    end
-  end
-end

data/lib/diff_parser/regex.rb

@@ -1,50 +0,0 @@
-module DiffParser
-  module Regex
-    extend self
-
-    def username_regex
-      default_regex
-    end
-
-    def project_name_regex
-      /\A[a-zA-Z0-9][a-zA-Z0-9_\-\. ]*\z/
-    end
-
-    def name_regex
-      /\A[a-zA-Z0-9_\-\. ]*\z/
-    end
-
-    def path_regex
-      default_regex
-    end
-
-    def git_reference_regex
-      # Valid git ref regex, see:
-      # https://www.kernel.org/pub/software/scm/git/docs/git-check-ref-format.html
-
-      %r{
-        (?!
-           # doesn't begins with
-           \/|                    # (rule #6)
-           # doesn't contain
-           .*(?:
-              [\/.]\.|            # (rule #1,3)
-              \/\/|               # (rule #6)
-              @\{|                # (rule #8)
-              \\                  # (rule #9)
-           )
-        )
-        [^\000-\040\177~^:?*\[]+  # (rule #4-5)
-         # doesn't end with
-        (?<!\.lock)               # (rule #1)
-        (?<![\/.])                # (rule #6-7)
-      }x
-    end
-
-    protected
-
-    def default_regex
-      /\A[a-zA-Z0-9][a-zA-Z0-9_\-\.]*(?<!\.git)\z/
-    end
-  end
-end