diff_parser 0.0.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YTQwOTNiZThmMzU2M2Q1MTIyM2IzMDIyZDIxOGU4N2M5ODVkZWQzNA==
+  data.tar.gz: !binary |-
+    ZmQwY2VkZmNmYTYxZWJkZTY1MDBjZGIxMDQ5MzJmZDEwZjU4MmUzOQ==
+SHA512:
+  metadata.gz: !binary |-
+    NzQ5ODU5MGZlY2E0Y2U1NzRiOWQ4MDNiMjEzY2ViOGZkZDhkYzgzODUxNjI3
+    NjEyNGY3NGNlZjMxOWI1NDJiNjMwYTBhOTg0YmZiYzY1NzQ1MzYyYjJiNGU2
+    ZjgzMWZmZDdhYjQ1MDdkODIzM2ExZmViYzRlNWNjMjQ1NGRiN2Q=
+  data.tar.gz: !binary |-
+    OTRjYmE3ODBiZWZhNTE5MTlkZjA5ZDY5OGVhMjIwMzJhYjllN2ViZDBmM2E2
+    NGVlNzYwNDk0MWNiYTE2MTQ3NDg5OGQ3OTc5ZjQ5NDdhYzU1YjZlZmU5MGQ3
+    ZDhlM2NkZTgzZmFmYTFlMWRhNjMyZTY5NDU0ODE3MWFjNDA5MTE=

data/lib/diff_parser/inline_diff.rb

@@ -0,0 +1,76 @@
+class DiffParser::InlineDiff
+  class << self
+
+    START = "#!idiff-start!#"
+    FINISH = "#!idiff-finish!#"
+
+    def processing diff_arr
+      indexes = _indexes_of_changed_lines diff_arr
+
+      indexes.each do |index|
+        first_line = diff_arr[index+1]
+        second_line = diff_arr[index+2]
+        max_length = [first_line.size, second_line.size].max
+
+        # Skip inline diff if empty line was replaced with content
+        next if first_line == "-\n"
+
+        first_the_same_symbols = 0
+        (0..max_length + 1).each do |i|
+          first_the_same_symbols = i - 1
+          if first_line[i] != second_line[i] && i > 0
+            break
+          end
+        end
+
+        first_token = first_line[0..first_the_same_symbols][1..-1]
+        start = first_token + START
+
+        if first_token.empty?
+          # In case if we remove string of spaces in commit
+          diff_arr[index+1].sub!("-", "-" => "-#{START}")
+          diff_arr[index+2].sub!("+", "+" => "+#{START}")
+        else
+          diff_arr[index+1].sub!(first_token, first_token => start)
+          diff_arr[index+2].sub!(first_token, first_token => start)
+        end
+
+        last_the_same_symbols = 0
+        (1..max_length + 1).each do |i|
+          last_the_same_symbols = -i
+          shortest_line = second_line.size > first_line.size ? first_line : second_line
+          if (first_line[-i] != second_line[-i]) || "#{first_token}#{START}".size == shortest_line[1..-i].size
+            break
+          end
+        end
+        last_the_same_symbols += 1
+        last_token = first_line[last_the_same_symbols..-1]
+        diff_arr[index+1].sub!(/#{Regexp.escape(last_token)}$/, FINISH + last_token)
+        diff_arr[index+2].sub!(/#{Regexp.escape(last_token)}$/, FINISH + last_token)
+      end
+      diff_arr
+    end
+
+    def _indexes_of_changed_lines diff_arr
+      chain_of_first_symbols = ""
+      diff_arr.each_with_index do |line, i|
+        chain_of_first_symbols += line[0]
+      end
+      chain_of_first_symbols.gsub!(/[^\-\+]/, "#")
+
+      offset = 0
+      indexes = []
+      while index = chain_of_first_symbols.index("#-+#", offset)
+        indexes << index
+        offset = index + 1
+      end
+      indexes
+    end
+
+    def replace_markers line
+      line.gsub!(START, "<span class='idiff'>")
+      line.gsub!(FINISH, "</span>")
+      line
+    end
+  end
+end

data/lib/diff_parser/parser.rb

@@ -0,0 +1,101 @@
+class DiffParser::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(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(full_line, type, line_code, line_new, line_old, raw_line)
+      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

data/lib/diff_parser/regex.rb

@@ -0,0 +1,48 @@
+module DiffParser::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

data/lib/diff_parser/version.rb

@@ -0,0 +1,3 @@
+module DiffParser
+  VERSION = "0.0.1"
+end

data/lib/diff_parser.rb

@@ -0,0 +1,3 @@
+require 'diff_parser/inline_diff'
+require 'diff_parser/regex'
+require 'diff_parser/parser'

metadata

@@ -0,0 +1,49 @@
+--- !ruby/object:Gem::Specification
+name: diff_parser
+version: !ruby/object:Gem::Version
+  version: 0.0.1
+platform: ruby
+authors:
+- stevo
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2013-12-05 00:00:00.000000000 Z
+dependencies: []
+description: Allows parsing diffs for presentation purposes - extracted from marvelous
+  GitLab project
+email:
+- blazejek@gmail.com
+executables: []
+extensions: []
+extra_rdoc_files: []
+files:
+- lib/diff_parser.rb
+- lib/diff_parser/inline_diff.rb
+- lib/diff_parser/parser.rb
+- lib/diff_parser/regex.rb
+- lib/diff_parser/version.rb
+homepage: https://github.com/Selleo/diff_parser
+licenses: []
+metadata: {}
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubyforge_project: ! '[none]'
+rubygems_version: 2.1.10
+signing_key: 
+specification_version: 4
+summary: GitLab Diff Parser
+test_files: []