chupa-text 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a248b3b82aeb4ce65bd7b498dc2aab9ad6e43e6d5ea70a304163362c3e723e7
-  data.tar.gz: 82f3f02b63235924cab8608f1fde8d4ecbe4cb0e1aa92f12bf9ecff1debab21d
+  metadata.gz: a8e70028837d0c6abebb4d01432f3467e8c5dd42129b9dffa3dd16a939594894
+  data.tar.gz: 4a445af645995552c82e8339f1fd2d5f71dd8a47be669ee674ede6e635585c4f
 SHA512:
-  metadata.gz: f2c3acee194db640b3b3e01a913cfc00727ed7b8e0e4b353f5fbb2d1723f689846164d44f2ffcf1874b2948ec3f3b578dacd49d27934693ad71f24b9901373a2
-  data.tar.gz: 12bd3c5ed94f85bad888e56a62ef478a606e8ce5fe8f376f7c2418924ef91094b1a6c150c60fd80278a7541bb5e177b7d9cb4b7ec5b67a482b8ff74c67953ba2
+  metadata.gz: 1052a2c7148c1bc184633b1ed365f422584bcdb4bc1952534e24f2ebf1445a0f286cdf4d47241a7aeefcfce80e4bdfb7c5bf6e9e74fba30a5a1f8d333fde62b3
+  data.tar.gz: c2b355f73f09004214037069ffbdeafddd4e786c2e2498a905c9b651947f7508d1fc268052404e37297d2e816b7e115fa35ef959e98f22369f1e355220138b91

data/doc/text/news.md

@@ -1,5 +1,13 @@
 # News
 
+## 1.1.7: 2019-03-01
+
+### Improvements
+
+  * Reduced memory usage.
+
+  * Reduced IO.
+
 ## 1.1.6: 2019-03-01
 
 ### Improvements

data/lib/chupa-text/data.rb

@@ -140,6 +140,10 @@ module ChupaText
       yield(StringIO.new(body))
     end
 
+    def peek_body(size)
+      body[0, size]
+    end
+
     def [](name)
       @attributes[name]
     end
@@ -216,10 +220,11 @@ module ChupaText
 
     def guess_mime_type_from_body
       mime_type = nil
-      change_encoding(body, "UTF-8") do |utf8_body|
-        return nil unless utf8_body.valid_encoding?
-        n_null_characters = utf8_body.count("\u0000")
-        return nil if n_null_characters > (utf8_body.bytesize * 0.01)
+      chunk = peek_body(1024)
+      change_encoding(chunk, "UTF-8") do |utf8_chunk|
+        return nil unless utf8_chunk.valid_encoding?
+        n_null_characters = utf8_chunk.count("\u0000")
+        return nil if n_null_characters > (utf8_chunk.bytesize * 0.01)
         mime_type = "text/plain"
       end
       mime_type

data/lib/chupa-text/decomposers/gzip.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2019  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -14,7 +14,6 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-require "stringio"
 require "zlib"
 
 module ChupaText
@@ -34,16 +33,18 @@ module ChupaText
       end
 
       def decompose(data)
-        reader = Zlib::GzipReader.new(StringIO.new(data.body))
-        uri = nil
-        case data.extension
-        when "gz"
+        data.open do |input|
+          reader = Zlib::GzipReader.new(input)
+          uri = nil
+          case data.extension
+          when "gz"
           uri = data.uri.to_s.gsub(/\.gz\z/i, "")
-        when "tgz"
-          uri = data.uri.to_s.gsub(/\.tgz\z/i, ".tar")
+          when "tgz"
+            uri = data.uri.to_s.gsub(/\.tgz\z/i, ".tar")
+          end
+          extracted = VirtualFileData.new(uri, reader, :source_data => data)
+          yield(extracted)
         end
-        extracted = VirtualFileData.new(uri, reader, :source_data => data)
-        yield(extracted)
       end
     end
   end

data/lib/chupa-text/decomposers/tar.rb

@@ -14,7 +14,6 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-require "stringio"
 require "rubygems/package"
 
 require "chupa-text/path-converter"
@@ -41,10 +40,19 @@ module ChupaText
               path_converter = PathConverter.new(entry.full_name,
                                                  uri_escape: true)
               entry_uri.path = "#{base_path}/#{path_converter.convert}"
-              extracted = VirtualFileData.new(entry_uri,
-                                              entry,
-                                              :source_data => data)
-              yield(extracted)
+              size = entry.header.size
+              if size < (32 * 1024)
+                entry_data = Data.new(source_data: data)
+                entry_data.uri = entry_uri
+                body = entry.read || ""
+                entry_data.body = body
+                entry_data.size = body.bytesize
+              else
+                entry_data = VirtualFileData.new(entry_uri,
+                                                 entry,
+                                                 :source_data => data)
+              end
+              yield(entry_data)
             end
           end
         end

data/lib/chupa-text/decomposers/zip.rb

@@ -14,8 +14,6 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-require "stringio"
-
 require "archive/zip"
 
 require "chupa-text/path-converter"
@@ -52,9 +50,18 @@ module ChupaText
                                                encoding: base_path.encoding,
                                                uri_escape: true)
             entry_uri.path = "#{base_path}/#{path_converter.convert}"
-            entry_data = VirtualFileData.new(entry_uri,
-                                             entry.file_data,
-                                             source_data: data)
+            size = entry.raw_data.window_size
+            if size < (8 * 1024)
+              entry_data = Data.new(source_data: data)
+              entry_data.uri = entry_uri
+              body = entry.file_data.read
+              entry_data.body = body
+              entry_data.size = body.bytesize
+            else
+              entry_data = VirtualFileData.new(entry_uri,
+                                               entry.file_data,
+                                               source_data: data)
+            end
             yield(entry_data)
           end
         end
@@ -63,8 +70,10 @@ module ChupaText
       private
       def open_zip(data)
         begin
-          Archive::Zip.open(StringIO.new(data.body)) do |zip|
-            yield(zip)
+          data.open do |input|
+            Archive::Zip.open(input) do |zip|
+              yield(zip)
+            end
           end
         rescue Archive::Zip::Error => zip_error
           error do

data/lib/chupa-text/file-content.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2019  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -29,7 +29,15 @@ module ChupaText
     end
 
     def body
-      @body ||= open {|file| file.read}
+      open do |file|
+        file.read
+      end
+    end
+
+    def peek_body(size)
+      open do |file|
+        file.read(size)
+      end
     end
   end
 end

data/lib/chupa-text/version.rb

@@ -15,5 +15,5 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module ChupaText
-  VERSION = "1.1.6"
+  VERSION = "1.1.7"
 end

data/lib/chupa-text/virtual-content.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2019  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -34,7 +34,6 @@ module ChupaText
         end
       end
       @original_path = original_path
-      @body = nil
       setup_file do |file|
         @size = IO.copy_stream(input, file)
       end
@@ -45,7 +44,15 @@ module ChupaText
     end
 
     def body
-      @body ||= open {|file| file.read}
+      open do |file|
+        file.read
+      end
+    end
+
+    def peek_body(size)
+      open do |file|
+        file.read(size)
+      end
     end
 
     def path

data/lib/chupa-text/virtual-file-data.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2017  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2019  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -27,6 +27,10 @@ module ChupaText
       @content.body
     end
 
+    def peek_body(size)
+      @content.peek_body(size)
+    end
+
     def size
       @content.size
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chupa-text
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Kouhei Sutou