mspack_rb 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d95c98f63d77452303839ff28381a303748b7ef
-  data.tar.gz: be1332875b3b16279ef38f24d729afd113221362
+  metadata.gz: 9daf394641a92e19fb3e05d7d07fc13b98607977
+  data.tar.gz: 2a3461a1586e09e9a779c665986352b545de8598
 SHA512:
-  metadata.gz: de94dacd83888f31544b2343b091996730ce4326020a200630c37eb651727f12c9c8101cb4a1b3c6c394b3fd2deac4342eefbbcf6996a2990e4a6648d8d02fe8
-  data.tar.gz: e768f570b844cd92a7793ba5d51f8a3e08a1181fa0e0d58a476cfcd57c1b337d3eeb643dbc2da873349c4a333a02b4abad0e5f8d8b82b66018e4fbe59a940c6d
+  metadata.gz: 45d9c9d9776f80b19ea98344154759bed54a5929041e62f9dfac6894aa2358a6cf4a16bc20bbfdc7a511b9b203672272ba79deabe62cb6a640045c93d4744c07
+  data.tar.gz: 722d93e39669963796218d09aa47eab15bfe3bb3ef677617d8061119f16c0b87d3a1c9555b1e87bd9481204059f9143bd566fde60e8c0ecc61ea97a44a8810e0

data/Rakefile

@@ -8,4 +8,4 @@ Rake::ExtensionTask.new('mspack_native')
 
 RSpec::Core::RakeTask.new(:spec)
 
-task default: [ :compile, :spec ]
+task default: [ :clean, :compile, :spec ]

data/lib/mspack.rb

@@ -1,7 +1,9 @@
 require "mspack_native"
 
-require "mspack/chm_decompressor"
-require "mspack/version"
+require 'fileutils'
+
+require 'mspack/chm_decompressor'
+require 'mspack/version'
 
 module Mspack
 

data/lib/mspack/chm_decompressor.rb

@@ -2,19 +2,61 @@ require 'fileutils'
 
 module Mspack
   class ChmDecompressor
+    DEFAULT_BUFFER_SIZE = 4096.freeze
+
+    # Expects a ChmDecompressor::File and either a string, or a fixnum if a block
+    # is given.
+    #
+    # If no block is given, it calls Mspack.ensure_path and extracts file,
+    # returning the absolute file path.
+    #
+    # If a block is given, chunks of data are yielded with a maximum size given 
+    # by the dir_or_buffer_size param. Buffer_size must be a multiple of 
+    # DEFAULT_BUFFER_SIZE.
+    def extract(file, dir_or_buffer_size = DEFAULT_BUFFER_SIZE)
 
-    # Expects a ChmDecompressor::File and a string.
-    # Calls Mspack.ensure_path and extracts file.
-    # Returns the absolute file path.
-    def extract(file, dir = nil)
       if block_given?
-        extract_to_path(file) { |data| yield data }
+        buffer_size = dir_or_buffer_size
+
+        if (buffer_size.fdiv(DEFAULT_BUFFER_SIZE).modulo(1) != 0)
+          raise ArgumentError, 
+            'Buffer_size must be a multiple of DEFAULT_BUFFER_SIZE'
+        end
+
+        a = 0
+        b = 0
+        did_yield = false
+        buffer = "\0" * buffer_size
+
+        extract_to_path(file) do |data|
+          did_yield = false
+          b = a + data.length - 1
+          buffer[a..b] = data
+
+          # full buffer - yield and reset
+          if b + 1 == buffer_size 
+            yield buffer[0..b]
+            did_yield = true
+            a = 0
+
+          # last read if it's less than default size
+          elsif data.length > 0 && data.length < DEFAULT_BUFFER_SIZE
+            yield buffer[0..b]
+            did_yield = true
+          
+          else
+            a = b + 1
+          end
+        end
+
+        # last read happened to be default size
+        yield buffer[0..b] if !did_yield && b > 0
+
       else
-        path = Mspack.ensure_path(file.filename, dir)
+        path = Mspack.ensure_path(file.filename, dir_or_buffer_size)
         extract_to_path(file, path)
+        return path
       end
-
-      path
     end
 
 

data/lib/mspack/version.rb

@@ -1,3 +1,3 @@
 module Mspack
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mspack_rb
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Ben Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-26 00:00:00.000000000 Z
+date: 2017-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler