mspack_rb 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2af809ce2eac8fe9b2d7564c9814b1cf29caae58
-  data.tar.gz: 69413e2b6f3313e74396996ef99431043667b383
+  metadata.gz: 1568ae7d72717343ee02824b749cd95d4f753d52
+  data.tar.gz: 2eb7e0c19332a52dc5fbee34041806319009ee45
 SHA512:
-  metadata.gz: 29b156e4229b22437e6e6ffa5e0f2511cddf023ec5c1cc122c6dff5cb1c418304bae541f15569dca5d0229d279208a13ad5d9bd815b681af3c8795d895ce10d0
-  data.tar.gz: 1a4efa8a8ecaab3e863c7c7ee45b014da080d2a81ee1e7a1b89de3300db69bad9da04502b93d0f770588670c1a4eba2ab6cb48a4b6f351ec04bdd5d068d0da8d
+  metadata.gz: 23ad79da53211a12bedd97e9ced8516c2b39f795b9e417f0221871060164f7e62446953ddfebba690626f68d27d83169d0cfd4026633625f72f2b89aeeac88ac
+  data.tar.gz: e4752a1bf9ff5e68a521fe5bcf858f71324b5fde7aedc8eb3dd963b095946904721be5c8a7cd0b4faa94b09b893d9afeb0855523e1403cabdfbf2b67db2ab980

data/README.md

@@ -2,7 +2,7 @@
 
 ### A simple Ruby native extension gem wrapper for [libmspack](https://www.cabextract.org.uk/libmspack/)
 
-Requires libmspack to be installed, and currently, only (very) basic CHM 
+Requires libmspack to be installed, and currently, only basic CHM 
 extraction has been implemented.
 
 The gem is available over at [https://rubygems.org/gems/mspack_rb](https://rubygems.org/gems/mspack_rb).
@@ -10,13 +10,14 @@ 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')
-    file = header.files
-    out_dir = 'some/output/directory'
 
-    while !file.nil?
-      out_path = "#{out_dir}/#{file.filename}"
+    header.each_file do |file|
+      out_path = "#{OUT_DIR}/#{file.filename}"
       dcom.extract(file, out_path)
-      file = file.next
     end
+
+    dcom.close(header)

data/ext/mspack_native/chm_decompressor.c

@@ -0,0 +1,104 @@
+#include "chm_decompressor.h"
+
+#include <mspack.h>
+
+VALUE ChmDecom = Qnil;
+VALUE ChmDHeader = Qnil;
+VALUE ChmDFile = Qnil;
+
+void chmd_deallocate(void *decom) {
+  mspack_destroy_chm_decompressor(decom);
+}
+
+VALUE chmd_allocate(VALUE self) {
+  struct mschm_decompressor *decom = mspack_create_chm_decompressor(NULL);
+  return Data_Wrap_Struct(self, NULL, chmd_deallocate, decom);
+}
+
+VALUE chmd_open(VALUE self, VALUE path) {
+  struct mschm_decompressor *decom;
+  Data_Get_Struct(self, struct mschm_decompressor, decom);
+  struct mschmd_header *header = decom->open(decom, StringValueCStr(path));
+
+  if (!header) {
+    return Qnil;
+  }
+
+  VALUE headerObj = rb_obj_alloc(ChmDHeader);
+  rb_obj_call_init(headerObj, 0, NULL);
+  return Data_Wrap_Struct(ChmDHeader, NULL, NULL, header);
+}
+
+VALUE chmd_close(VALUE self, VALUE header) {
+  struct mschm_decompressor *decom;
+  Data_Get_Struct(self, struct mschm_decompressor, decom);
+
+  struct mschmd_header *headerPtr;
+  Data_Get_Struct(header, struct mschmd_header, headerPtr);
+
+  decom->close(decom, headerPtr);
+  return Qnil;
+}
+
+VALUE chmd_extract_to_path(VALUE self, VALUE file, VALUE outputPath) {
+  struct mschm_decompressor *decom;
+  Data_Get_Struct(self, struct mschm_decompressor, decom);
+
+  struct mschmd_file *filePtr;
+  Data_Get_Struct(file, struct mschmd_file, filePtr);
+
+  const char *pathStr = StringValueCStr(outputPath);
+  return decom->extract(decom, filePtr, pathStr) == MSPACK_ERR_OK ? 
+    Qtrue : Qfalse;
+}
+
+VALUE chmd_header_filename(VALUE self) {
+  struct mschmd_header *header;
+  Data_Get_Struct(self, struct mschmd_header, header);
+  return rb_str_new2(header->filename);
+}
+
+VALUE chmd_header_files(VALUE self) {
+  struct mschmd_header *header;
+  Data_Get_Struct(self, struct mschmd_header, header);
+  
+  VALUE fileObj = rb_obj_alloc(ChmDFile);
+  rb_obj_call_init(fileObj, 0, NULL);
+  return Data_Wrap_Struct(ChmDFile, NULL, NULL, header->files);
+}
+
+VALUE chmd_file_filename(VALUE self) {
+  struct mschmd_file *file;
+  Data_Get_Struct(self, struct mschmd_file, file);
+  return rb_str_new2(file->filename);
+}
+
+VALUE chmd_file_next(VALUE self) {
+  struct mschmd_file *file;
+  Data_Get_Struct(self, struct mschmd_file, file);  
+  struct mschmd_file *next = file->next;
+
+  if (next == NULL) {
+    return Qnil;
+  }
+
+  VALUE nextObj = rb_obj_alloc(ChmDFile);
+  rb_obj_call_init(nextObj, 0, NULL);
+  return Data_Wrap_Struct(ChmDFile, NULL, NULL, next);
+}
+
+void Init_chm_decompressor() {
+  ChmDecom = rb_define_class_under(Mspack, "ChmDecompressor", rb_cObject);
+  rb_define_alloc_func(ChmDecom, chmd_allocate);
+  rb_define_method(ChmDecom, "open", chmd_open, 1);
+  rb_define_method(ChmDecom, "close", chmd_close, 1);
+  rb_define_method(ChmDecom, "extract_to_path", chmd_extract_to_path, 2);
+
+  ChmDHeader = rb_define_class_under(ChmDecom, "Header", rb_cObject);
+  rb_define_method(ChmDHeader, "filename", chmd_header_filename, 0);
+  rb_define_method(ChmDHeader, "files", chmd_header_files, 0);
+
+  ChmDFile = rb_define_class_under(ChmDecom, "File", rb_cObject);
+  rb_define_method(ChmDFile, "filename", chmd_file_filename, 0);
+  rb_define_method(ChmDFile, "next", chmd_file_next, 0);
+}

data/ext/mspack_native/chm_decompressor.h

@@ -0,0 +1,12 @@
+#ifndef CHM_DECOMPRESSOR_H
+#define CHM_DECOMPRESSOR_H
+
+#include "mspack_native.h"
+
+extern VALUE ChmDecom;
+extern VALUE ChmDHeader;
+extern VALUE ChmDFile;
+
+void Init_chm_decompressor();
+
+#endif

data/ext/mspack_native/mspack_native.c

@@ -1,10 +1,9 @@
+#include "mspack_native.h"
+#include "chm_decompressor.h"
+
 #include <mspack.h>
-#include <ruby.h>
 
 VALUE Mspack = Qnil;
-VALUE ChmDecom = Qnil;
-VALUE ChmDHeader = Qnil;
-VALUE ChmDFile = Qnil;
 
 VALUE mspack_test() {
   int result;
@@ -12,102 +11,9 @@ VALUE mspack_test() {
   return result == MSPACK_ERR_OK ? Qtrue : Qfalse;
 }
 
-void chmd_deallocate(void *decom) {
-  mspack_destroy_chm_decompressor(decom);
-}
-
-static VALUE chmd_allocate(VALUE self) {
-  struct mschm_decompressor *decom = mspack_create_chm_decompressor(NULL);
-  return Data_Wrap_Struct(self, NULL, chmd_deallocate, decom);
-}
-
-static VALUE chmd_open(VALUE self, VALUE path) {
-  struct mschm_decompressor *decom;
-  Data_Get_Struct(self, struct mschm_decompressor, decom);
-  struct mschmd_header *header = decom->open(decom, StringValueCStr(path));
-
-  if (!header) {
-    return Qnil;
-  }
-
-  VALUE headerObj = rb_obj_alloc(ChmDHeader);
-  rb_obj_call_init(headerObj, 0, NULL);
-  return Data_Wrap_Struct(ChmDHeader, NULL, NULL, header);
-}
-
-static VALUE chmd_close(VALUE self, VALUE header) {
-  struct mschm_decompressor *decom;
-  Data_Get_Struct(self, struct mschm_decompressor, decom);
-
-  struct mschmd_header *headerPtr;
-  Data_Get_Struct(header, struct mschmd_header, headerPtr);
-
-  decom->close(decom, headerPtr);
-  return Qnil;
-}
-
-static VALUE chmd_extract(VALUE self, VALUE file, VALUE outputPath) {
-  struct mschm_decompressor *decom;
-  Data_Get_Struct(self, struct mschm_decompressor, decom);
-
-  struct mschmd_file *filePtr;
-  Data_Get_Struct(file, struct mschmd_file, filePtr);
-
-  const char *pathStr = StringValueCStr(outputPath);
-  return decom->extract(decom, filePtr, pathStr) == MSPACK_ERR_OK ? 
-    Qtrue : Qfalse;
-}
-
-static VALUE chmd_header_filename(VALUE self) {
-  struct mschmd_header *header;
-  Data_Get_Struct(self, struct mschmd_header, header);
-  return rb_str_new2(header->filename);
-}
-
-static VALUE chmd_header_files(VALUE self) {
-  struct mschmd_header *header;
-  Data_Get_Struct(self, struct mschmd_header, header);
-  
-  VALUE fileObj = rb_obj_alloc(ChmDFile);
-  rb_obj_call_init(fileObj, 0, NULL);
-  return Data_Wrap_Struct(ChmDFile, NULL, NULL, header->files);
-}
-
-static VALUE chmd_file_filename(VALUE self) {
-  struct mschmd_file *file;
-  Data_Get_Struct(self, struct mschmd_file, file);
-  return rb_str_new2(file->filename);
-}
-
-static VALUE chmd_file_next(VALUE self) {
-  struct mschmd_file *file;
-  Data_Get_Struct(self, struct mschmd_file, file);  
-  struct mschmd_file *next = file->next;
-
-  if (next == NULL) {
-    return Qnil;
-  }
-
-  VALUE nextObj = rb_obj_alloc(ChmDFile);
-  rb_obj_call_init(nextObj, 0, NULL);
-  return Data_Wrap_Struct(ChmDFile, NULL, NULL, next);
-}
-
 void Init_mspack_native() {
   Mspack = rb_define_module("Mspack");
   rb_define_singleton_method(Mspack, "test", mspack_test, 0);
 
-  ChmDecom = rb_define_class_under(Mspack, "ChmDecompressor", rb_cObject);
-  rb_define_alloc_func(ChmDecom, chmd_allocate);
-  rb_define_method(ChmDecom, "open", chmd_open, 1);
-  rb_define_method(ChmDecom, "close", chmd_close, 1);
-  rb_define_method(ChmDecom, "extract", chmd_extract, 2);
-
-  ChmDHeader = rb_define_class_under(ChmDecom, "Header", rb_cObject);
-  rb_define_method(ChmDHeader, "filename", chmd_header_filename, 0);
-  rb_define_method(ChmDHeader, "files", chmd_header_files, 0);
-
-  ChmDFile = rb_define_class_under(ChmDecom, "File", rb_cObject);
-  rb_define_method(ChmDFile, "filename", chmd_file_filename, 0);
-  rb_define_method(ChmDFile, "next", chmd_file_next, 0);
+  Init_chm_decompressor();
 }

data/ext/mspack_native/mspack_native.h

@@ -0,0 +1,8 @@
+#ifndef MSPACK_NATIVE_H
+#define MSPACK_NATIVE_H
+
+#include <ruby.h>
+
+extern VALUE Mspack;
+
+#endif

data/lib/mspack/chm_decompressor.rb

@@ -1,5 +1,12 @@
 module Mspack
   class ChmDecompressor
+
+
+    def extract(file, dir)
+
+    end
+
+
     class Header
 
       # Convenience method for iterating over files.
@@ -26,6 +33,7 @@ module Mspack
 
     end
 
+
     class File
     end
   end

data/lib/mspack/version.rb

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

data/lib/mspack.rb

@@ -1,3 +1,4 @@
 require "mspack_native"
+
 require "mspack/chm_decompressor"
 require "mspack/version"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mspack_rb
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Ben Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-02 00:00:00.000000000 Z
+date: 2017-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,8 +97,11 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- ext/mspack_native/chm_decompressor.c
+- ext/mspack_native/chm_decompressor.h
 - ext/mspack_native/extconf.rb
 - ext/mspack_native/mspack_native.c
+- ext/mspack_native/mspack_native.h
 - lib/mspack.rb
 - lib/mspack/chm_decompressor.rb
 - lib/mspack/version.rb