mspack_rb 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1568ae7d72717343ee02824b749cd95d4f753d52
-  data.tar.gz: 2eb7e0c19332a52dc5fbee34041806319009ee45
+  metadata.gz: c69d841d0a58a91453d2b8ebd9f3a91030b67c64
+  data.tar.gz: c087616dcf7d380e2c635f9e07d056b77c632c85
 SHA512:
-  metadata.gz: 23ad79da53211a12bedd97e9ced8516c2b39f795b9e417f0221871060164f7e62446953ddfebba690626f68d27d83169d0cfd4026633625f72f2b89aeeac88ac
-  data.tar.gz: e4752a1bf9ff5e68a521fe5bcf858f71324b5fde7aedc8eb3dd963b095946904721be5c8a7cd0b4faa94b09b893d9afeb0855523e1403cabdfbf2b67db2ab980
+  metadata.gz: 86224b683f84c19b88445c65587d9cbca548a20e398b0681f1fb9fecf2d4467f4711abcb410b4c85cc4eec42895f28ba229425a4ff5d8a0052258be199385a03
+  data.tar.gz: 67bba4649f8e0be72c7fbe2791e35c65f3ffcd8321d69564639ef358335e7a31363c0ce71fed9fe98ff1281ff6fbbc23f21b4d166a1bb2839b42b8f54774d7cc

data/README.md

@@ -10,14 +10,6 @@ The gem is available over at [https://rubygems.org/gems/mspack_rb](https://rubyg
 ### Usage:
     require 'mspack'
 
-    OUT_DIR = 'some/output/directory'
-
     dcom = Mspack::ChmDecompressor.new
     header = dcom.open('path/to/a/chm/file')
-
-    header.each_file do |file|
-      out_path = "#{OUT_DIR}/#{file.filename}"
-      dcom.extract(file, out_path)
-    end
-
-    dcom.close(header)
+    header.each_file { |file| dcom.extract(file, out_path) }

data/lib/mspack/chm_decompressor.rb

@@ -1,9 +1,15 @@
+require 'fileutils'
+
 module Mspack
   class ChmDecompressor
 
-
+    # Expects a ChmDecompressor::File and a string.
+    # Calls Mspack.ensure_path and extracts file.
+    # Returns the absolute file path.
     def extract(file, dir)
-
+      path = Mspack.ensure_path(file.filename, dir)
+      extract_to_path(file, path)
+      path
     end
 
 

data/lib/mspack/version.rb

@@ -1,3 +1,3 @@
 module Mspack
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/mspack.rb

@@ -2,3 +2,32 @@ require "mspack_native"
 
 require "mspack/chm_decompressor"
 require "mspack/version"
+
+module Mspack
+
+  # Expects two strings.
+  # Raises an error if dir is not an existing, writable directory.
+  # Expands the dir path, so you can use ~ and . etc.
+  # Creates non-existing parent folders for file.filename.
+  # Raises an error if the final, expanded path is outside of dir.
+  # Returns the expanded file path.
+  def self.ensure_path(filename, dir)
+    raise PathError, "#{dir} is not a directory" unless ::File.directory?(dir)
+    raise PathError, "#{dir} is not writable" unless ::File.writable?(dir)
+
+    expanded_dir = ::File.expand_path(dir)
+    path = ::File.expand_path(::File.join(dir, filename))
+
+    unless path.include?(expanded_dir)
+      raise PathError, 
+        "Expanded path #{path} is not within dir #{expanded_dir}"
+    end
+
+    FileUtils.mkdir_p(File.dirname(path))
+    path
+  end
+
+
+  class PathError < StandardError
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mspack_rb
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Ben Williams