diff_parser 1.1.1 → 1.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjM4OTllYjZjOGY1ZTAyN2M3NDVjZWRlZDA5MjBkZDMxYjQwYThiYg==
+    ODhkM2ZjNDJhMjJkZjg3N2ZiN2YzYWU0MjA3YTEwMDM3NTVmZDlkYQ==
   data.tar.gz: !binary |-
-    N2JjYTUyM2M1OGE1ZmFkMzIyMjI3Zjc1Mzk2YzRkMGVkYjliYWQ5Zg==
+    ZDA4ZGRiMmYzODM2NTZlNzE2MDNjY2ExYWQ2ZDIxNzBkMDUzM2MwNA==
 SHA512:
   metadata.gz: !binary |-
-    YzM5Y2I2ZjA0MmJmNzlmZTZlZmZiN2MwYTcxMWE4NDNmMDJmOTUyNGM0ZWRk
-    YjhkOWE5MTU3YTczNDg4Zjg2YzA4ZjliZjQzMGI3NGI5OWQyNGEyYmU4NTlk
-    M2U4OGQ4NjhlYWViMTlkOTZjNWRhNmY4NmNjMGJhMDJjNzViZGU=
+    MGNlY2E0YWI2Yzk1N2VjYjcwNjFjN2FkOGM5YzU3NDhlMGVkMjk0OTNmODgz
+    ODFmZjJkYzA0YTY1MzljZTE0MzcyYzhmMDc5YzMxMmVmM2RiMmJjNGNiOGVk
+    MWMyZjUzMjQ1NDRmZTc5Yzc3Yzc3ZGVkOWNhMDk5ZmNiYmE1M2I=
   data.tar.gz: !binary |-
-    M2U2ZGE5NmY2YzMxNWQwNzNmODc2ZDM4N2Y5MzNkOTdmMzRjNWIwYTQ5Y2Uz
-    MGRlN2ZjYzk5MmQ5MTZhZmEwN2JiZGY1MmZhNDNhM2JjZGYyYmYxNjZlNTQw
-    MjA3YTRhZGI3NGJjNTUwM2IwZWZmNWE4MDFjODM0N2NlOWQ4Yzc=
+    NWY5ODI1NjY2OWJlYzFlNTQ2MmIyMjJmYTBkYThhMWEzYjYxNTRjZWYwNmY3
+    ZGVlNDFlNTExMjk4MTEyZWNlZjM2MTIwZDE5MWQxN2NjZmM2MDFlYTA1NGE4
+    OTlhZmI3Y2MyNDRjZjMzMjEzNTgzNTg3MjJkNjdlM2U5OTI4MTY=

data/lib/diff_parser.rb

@@ -4,18 +4,11 @@ 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'
 
 module DiffParser
   mattr_accessor :max_changes_to_render
   @@max_changes_to_render = 500
 
-  mattr_accessor :reduced_max_changes_to_render
-  @@reduced_max_changes_to_render = 10
-
-  mattr_accessor :changes_reduction_threshold
-  @@changes_reduction_threshold = 20
-
   def self.setup
     yield self
   end

data/lib/diff_parser/commit.rb

@@ -11,8 +11,8 @@ module DiffParser
       @sha = sha
     end
 
-    def diff
-      DiffParser::Diff.new(self)
+    def diff(options={})
+      DiffParser::Diff.new(self, options)
     end
   end
 end

data/lib/diff_parser/diff.rb

@@ -1,16 +1,24 @@
 module DiffParser
   class Diff
-    attr_reader :raw, :info, :commit
+    attr_reader :raw, :info, :commit, :options
     delegate :github, :repo, :sha, to: :commit
 
-    def initialize(commit)
+    def initialize(commit, options)
       @commit = commit
-      @info = github.commit(commit.repo, sha)
-      @raw = github.commit(repo, sha, accept: 'application/vnd.github.VERSION.diff')
+      @options = options
+      @info = github.commit(repo, sha)
+
+      @raw = Rails.cache.fetch(diff_cache_key) do
+        github.commit(repo, sha, accept: 'application/vnd.github.VERSION.diff')
+      end
+    end
+
+    def diff_cache_key
+      "diff-#{repo}-#{sha}"
     end
 
     def files
-      DiffParser::DiffFilesCollection.new(self)
+      DiffParser::DiffFilesCollection.new(self, options)
     end
   end
 end

data/lib/diff_parser/diff_files_collection.rb

@@ -2,15 +2,15 @@ module DiffParser
   class DiffFilesCollection
     include Enumerable
 
-    attr_reader :diff
+    attr_reader :diff, :options
 
-    def initialize(diff)
+    def initialize(diff, options)
+      @options = options
       @diff = diff
     end
 
     def raw_lines
-      preprocessed_lines = DiffParser::InlineDiff.processing(diff.raw.lines)
-      preprocessed_lines.map { |line| RawLine.new(line) }
+      diff.raw.lines.map { |line| RawLine.new(line) }
     end
 
     def each
@@ -22,7 +22,7 @@ module DiffParser
         if raw_line.info?
           yield current_file if current_file
           current_file = DiffParser::File.new(raw_line.full_line, diff)
-        elsif !current_file.folded?
+        elsif options[:full] == current_file.path || options[:full] == true || !current_file.folded?
           current_file.push_line(raw_line, idx)
         end
       end

data/lib/diff_parser/file.rb

@@ -35,19 +35,13 @@ module DiffParser
       end
     end
 
-    def each_line
-      lines.each do |line|
-        yield line
-      end
-    end
-
     def sha
       diff.sha
     end
 
     def folded?
-      @folded ||= if file_info && file_max_changes_exceeded?
-                    lines << DiffLine.new('Changes not shown', 'info', nil, nil, 0, nil)
+      @folded ||= if file_max_changes_exceeded?
+                    lines << DiffLine.new(path, 'fold', nil, nil, 0, nil)
                     true
                   else
                     false
@@ -56,24 +50,8 @@ module DiffParser
 
     private
 
-    def max_changes_to_render
-      if diff.info.files.count > DiffParser.changes_reduction_threshold
-        DiffParser.reduced_max_changes_to_render
-      else
-        DiffParser.max_changes_to_render
-      end
-    end
-
     def file_max_changes_exceeded?
-      (file_info.additions > max_changes_to_render && added?) || (file_info.deletions > max_changes_to_render && removed?)
-    end
-
-    def added?
-      file_info.status == 'added'
-    end
-
-    def removed?
-      file_info.status == 'removed'
+      !file_info || (file_info.changes > DiffParser.max_changes_to_render)
     end
 
     def preprocess_path(path)

data/lib/diff_parser/raw_line.rb

@@ -1,14 +1,14 @@
 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 = "-"
+    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/,
@@ -22,7 +22,7 @@ module DiffParser
     end
 
     def full_line
-      @full_line ||= DiffParser::InlineDiff.replace_markers(html_escape(line.gsub(/\n/, '')))
+      @full_line ||= html_escape(line.gsub(/\n/, ''))
     end
 
     def summary?
@@ -53,27 +53,27 @@ module DiffParser
 
     def type
       if stripped_line.match(/^@@ -/)
-        "match"
+        'match'
       elsif stripped_line.start_with? GIT_NEW_FILE
-        "file_created"
+        'file_created'
       elsif stripped_line.start_with? GIT_DELETED_FILE
-        "file_removed"
+        'file_removed'
       elsif stripped_line.start_with? GIT_DIFF_START
-        "file_update_created"
+        'file_update_created'
       elsif stripped_line.start_with? GIT_DIFF_FINISH
-        "file_update_removed"
+        'file_update_removed'
       elsif stripped_line.start_with? GIT_INDEX
-        "index"
+        'index'
       elsif stripped_line.start_with? GIT_DIFF
-        "info"
+        'info'
       elsif stripped_line.start_with? GIT_WARN_NEW_LINE
-        "warning"
+        'warning'
       elsif stripped_line.start_with? GIT_CODE_ADDED
-        "new"
+        'new'
       elsif stripped_line[0] == GIT_CODE_REMOVED
-        "old"
+        'old'
       else
-        "default"
+        'default'
       end
     end
 

data/lib/diff_parser/version.rb

@@ -1,3 +1,3 @@
 module DiffParser
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diff_parser
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - stevo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies: []
 description: Allows parsing diffs for presentation purposes - extracted from marvelous
   GitLab project
@@ -24,7 +24,6 @@ files:
 - 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/raw_line.rb
 - lib/diff_parser/version.rb
 homepage: https://github.com/Selleo/diff_parser

data/lib/diff_parser/inline_diff.rb

@@ -1,78 +0,0 @@
-module DiffParser
-  module 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
-end