diff_parser 1.2.0 → 1.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODhkM2ZjNDJhMjJkZjg3N2ZiN2YzYWU0MjA3YTEwMDM3NTVmZDlkYQ==
+    NjAwOWVhZjIzMzExNDMxZDEyM2M2ZDBkYjU4ZWRmNmIwMjBkYTVmOA==
   data.tar.gz: !binary |-
-    ZDA4ZGRiMmYzODM2NTZlNzE2MDNjY2ExYWQ2ZDIxNzBkMDUzM2MwNA==
+    ZDAzNWVkYTIzYjE1YTJlNWRiZTg5M2Y5YjdjOTg1ODQ5ZWQxM2E5Yg==
 SHA512:
   metadata.gz: !binary |-
-    MGNlY2E0YWI2Yzk1N2VjYjcwNjFjN2FkOGM5YzU3NDhlMGVkMjk0OTNmODgz
-    ODFmZjJkYzA0YTY1MzljZTE0MzcyYzhmMDc5YzMxMmVmM2RiMmJjNGNiOGVk
-    MWMyZjUzMjQ1NDRmZTc5Yzc3Yzc3ZGVkOWNhMDk5ZmNiYmE1M2I=
+    NzA0YTQ0YjAzNmJjODBlNjk3ZDgzMjM5NWQ3YTk2ZjBjYmQ2MzQyNTAzZDIz
+    ZjBmMWI0Yzk3ZjUxMzk2ZDFmODRhZTdjM2NiYThhZmY2OWIxYjcyOTg1ZTdi
+    YjM4NjcyMjEwMWFhNzYxOWZiZDQ2M2VlYTVkYjkyNzdkYjgxYzA=
   data.tar.gz: !binary |-
-    NWY5ODI1NjY2OWJlYzFlNTQ2MmIyMjJmYTBkYThhMWEzYjYxNTRjZWYwNmY3
-    ZGVlNDFlNTExMjk4MTEyZWNlZjM2MTIwZDE5MWQxN2NjZmM2MDFlYTA1NGE4
-    OTlhZmI3Y2MyNDRjZjMzMjEzNTgzNTg3MjJkNjdlM2U5OTI4MTY=
+    OTUzOTUyMWIwOGViMjhmY2MzMTllNTZlY2QwNTUxMmJiNTQxNWJmMjM3OWRk
+    YTE4ZmQ0MjRhYWVmMmJiZTM2OWVhYzQwYzhkZjJjY2IwMDgzNTQ0ZjMzYzJk
+    OTg5NGFiNmEyOWRhYmJlYWRjODI5OWY5ZWE3NmE4ZWExOWJlYjY=

data/lib/diff_parser/diff_files_collection.rb

@@ -22,12 +22,29 @@ module DiffParser
         if raw_line.info?
           yield current_file if current_file
           current_file = DiffParser::File.new(raw_line.full_line, diff)
-        elsif options[:full] == current_file.path || options[:full] == true || !current_file.folded?
+        elsif fold_file?(current_file)
+          if options[:full] == current_file.path || options[:full] == true
+            current_file.push_line(raw_line, idx)
+          else
+            current_file.folded!
+            current_file.lines.empty? and (current_file.lines = [DiffLine.new(current_file.path, 'fold', nil, nil, 0, nil)])
+          end
+        else
           current_file.push_line(raw_line, idx)
         end
       end
 
       yield current_file
     end
+
+    private
+
+    def fold_file?(file)
+      file.file_max_changes_exceeded? || diff_size_exceeded?
+    end
+
+    def diff_size_exceeded?
+      diff.raw.bytesize > DiffParser.max_unfolded_diff_size
+    end
   end
 end

data/lib/diff_parser/file.rb

@@ -1,7 +1,7 @@
 module DiffParser
   class File
-    attr_accessor :line_old, :line_new
-    attr_reader :lines, :path, :file_info, :diff
+    attr_accessor :line_old, :line_new, :lines
+    attr_reader :path, :file_info, :diff
     delegate :additions, :deletions, to: :file_info
 
     def initialize(path, diff)
@@ -39,21 +39,20 @@ module DiffParser
       diff.sha
     end
 
-    def folded?
-      @folded ||= if file_max_changes_exceeded?
-                    lines << DiffLine.new(path, 'fold', nil, nil, 0, nil)
-                    true
-                  else
-                    false
-                  end
+    def folded!
+      @folded = true
     end
 
-    private
+    def folded?
+      !!@folded
+    end
 
     def file_max_changes_exceeded?
       !file_info || (file_info.changes > DiffParser.max_changes_to_render)
     end
 
+    private
+
     def preprocess_path(path)
       path.split(' ').last[2..-1]
     end

data/lib/diff_parser/version.rb

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

data/lib/diff_parser.rb

@@ -9,6 +9,9 @@ module DiffParser
   mattr_accessor :max_changes_to_render
   @@max_changes_to_render = 500
 
+  mattr_accessor :max_unfolded_diff_size
+  @@max_unfolded_diff_size = 1.megabyte
+
   def self.setup
     yield self
   end

metadata

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