diff_parser 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDMwNjc1OWI5NGI5YWZjMjlhMDNmZWM0NTMzZmEzYWI3ZGUyOGM5MA==
+    ZDIyMjRiMGEwNTJhMWFjN2ZjZDM3OTQzYzdkY2QxN2Y2MTYzNTQyZA==
   data.tar.gz: !binary |-
-    Y2ZhNDcyOWY3NWQ1ZDc3MDUyNzU3MGUwNGI4OWQ3MDg5N2RhZjU5ZA==
+    YTAwZjQyNDM0ZGNjNGM3Y2FlOTE4MTcwNDYzZWM1NjhiYjlmYzg5ZA==
 SHA512:
   metadata.gz: !binary |-
-    ZjQ4ZWE2ZjY3NWU2YTAzZDJhYmNjM2YzZDU3ZTI5ZDRkZGNkNzU1YmE1Y2Rl
-    MmMwYTIyODc5NTA2MTZkZTM3ODVjYmE1YTU0ZGNmYjAzMTA4NDMwZjFhMmMw
-    MmZjN2MxOWUwZGI2ODBlOWRiZGY4ZWZiYTVjMzk1NDk5N2M5ZDM=
+    MjgxY2M2MjI4YzE4MzYxOWQ0OTQzMTVhMWE1ZWMwNzZhMzk4ODA4MGIwN2Ji
+    NDEwNDk5NjkyOTFlYjcxN2JkYzI3NTJkOGI5MmQxZWE5MjRjMzE1MWNkY2U5
+    NWE3YWU4NDgyNDQyMWRkOTY5ZjM2OTRmZmYxNTlhNWExZWJlNzQ=
   data.tar.gz: !binary |-
-    MTFlZjNkYjFjYTFmYmU5ODI0NmYwNDcwY2M3Mzc4MTY5YWJhMWYzMWJhMTkx
-    YzY4YzJmODBjMzdmZTE0ZDdlZWJiZTU0ZjVkYzE1NDRiODk5OWU3NTU4ZmVl
-    MDgwNDk2Y2ZiOTQzYTYwMTk3NzA1NTAxNzUxN2I2OTRiZDliZjk=
+    ZDY5MzI1MDlmNTk0MjlmZDg2OWFjZmVkNmFhNTkwMDI0MmI3NzliOWJiYjYw
+    MWU5NmY5MDlhZjg0YjAzMDk4YjA2MjM3NTc4ZTNmZmY3ZDEwYzQ1NzIxM2Vl
+    NmI0Nzk3NDQzZGYzZjg5MGY2ZmY2YTQxZTY5OTUzYmQ2NDBiNzg=

data/lib/diff_parser/inline_diff.rb

@@ -1,76 +1,78 @@
-class DiffParser::InlineDiff
-  class << self
+module DiffParser
+  module InlineDiff
+    class << self
 
-    START = "#!idiff-start!#"
-    FINISH = "#!idiff-finish!#"
+      START = "#!idiff-start!#"
+      FINISH = "#!idiff-finish!#"
 
-    def processing diff_arr
-      indexes = _indexes_of_changed_lines diff_arr
+      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
+        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"
+          # 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
+          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
-        end
 
-        first_token = first_line[0..first_the_same_symbols][1..-1]
-        start = first_token + START
+          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
+          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
+          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
-        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)
+        diff_arr
       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!(/[^\-\+]/, "#")
+      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
+        offset = 0
+        indexes = []
+        while index = chain_of_first_symbols.index("#-+#", offset)
+          indexes << index
+          offset = index + 1
+        end
+        indexes
       end
-      indexes
-    end
 
-    def replace_markers line
-      line.gsub!(START, "<span class='idiff'>")
-      line.gsub!(FINISH, "</span>")
-      line
+      def replace_markers line
+        line.gsub!(START, "<span class='idiff'>")
+        line.gsub!(FINISH, "</span>")
+        line
+      end
     end
   end
 end

data/lib/diff_parser/parser.rb

@@ -1,101 +1,103 @@
-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
+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
 
-        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)
+    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
 
-
-      if line[0] == "+"
-        line_new += 1
-      elsif line[0] == "-"
-        line_old += 1
+    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
-        line_new += 1
-        line_old += 1
+        "default"
       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"
+    def generate_line_code(path, line_new, line_old, type, idx)
+      "#{@commit_id}_#{line_old}_#{line_new}_#{type}_#{idx}"
     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)
+    def html_escape str
+      replacements = {'&' => '&amp;', '>' => '&gt;', '<' => '&lt;', '"' => '&quot;', "'" => '&#39;'}
+      str.gsub(/[&"'><]/, replacements)
+    end
   end
 end

data/lib/diff_parser/regex.rb

@@ -1,27 +1,28 @@
-module DiffParser::Regex
-  extend self
+module DiffParser
+  module Regex
+    extend self
 
-  def username_regex
-    default_regex
-  end
+    def username_regex
+      default_regex
+    end
 
-  def project_name_regex
-    /\A[a-zA-Z0-9][a-zA-Z0-9_\-\. ]*\z/
-  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 name_regex
+      /\A[a-zA-Z0-9_\-\. ]*\z/
+    end
 
-  def path_regex
-    default_regex
-  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
+    def git_reference_regex
+      # Valid git ref regex, see:
+      # https://www.kernel.org/pub/software/scm/git/docs/git-check-ref-format.html
 
-    %r{
+      %r{
         (?!
            # doesn't begins with
            \/|                    # (rule #6)
@@ -38,11 +39,12 @@ module DiffParser::Regex
         (?<!\.lock)               # (rule #1)
         (?<![\/.])                # (rule #6-7)
       }x
-  end
+    end
 
-  protected
+    protected
 
-  def default_regex
-    /\A[a-zA-Z0-9][a-zA-Z0-9_\-\.]*(?<!\.git)\z/
+    def default_regex
+      /\A[a-zA-Z0-9][a-zA-Z0-9_\-\.]*(?<!\.git)\z/
+    end
   end
 end

data/lib/diff_parser/version.rb

@@ -1,3 +1,3 @@
 module DiffParser
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/diff_parser.rb

@@ -1,6 +1,3 @@
 require 'diff_parser/inline_diff'
 require 'diff_parser/regex'
 require 'diff_parser/parser'
-
-module DiffParser
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diff_parser
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - stevo