mspack_rb 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06da1ce0f18e5111b2bcf727ea5d7170a100b75b
-  data.tar.gz: 8c273f7a6d168312e49148e954941fa371064e8a
+  metadata.gz: 5d95c98f63d77452303839ff28381a303748b7ef
+  data.tar.gz: be1332875b3b16279ef38f24d729afd113221362
 SHA512:
-  metadata.gz: 028b0e36cdbb51dd0b3d3a46171c20b719d57cc5c5f4765db701af46f0b77d1f74408df8311c5a41ec934a74a593d02b40230c3e612dc988cbbca8bff1cdfc37
-  data.tar.gz: 8a4c05e292ab931537c3868c338cb8235c5d849596095ffed2b47556e007438077d6a749e3e7251bd17e22535ce5f6d972658f6738af84769f658027c39374a4
+  metadata.gz: de94dacd83888f31544b2343b091996730ce4326020a200630c37eb651727f12c9c8101cb4a1b3c6c394b3fd2deac4342eefbbcf6996a2990e4a6648d8d02fe8
+  data.tar.gz: e768f570b844cd92a7793ba5d51f8a3e08a1181fa0e0d58a476cfcd57c1b337d3eeb643dbc2da873349c4a333a02b4abad0e5f8d8b82b66018e4fbe59a940c6d

data/ext/mspack_native/chm_decompressor.c

@@ -146,13 +146,10 @@ VALUE chmd_extract_to_path(int argc, VALUE* argv, VALUE self) {
 
   if (argc == 1) {
     rb_need_block();
-
-    VALUE block;
-    block = rb_block_proc();
-
-    VALUE blockName = rb_funcall(block, rb_intern("to_s"), 0);
-    pathStr = StringValueCStr(blockName);
-    add_block(&blockName, &block);
+    VALUE block = rb_block_proc();
+    VALUE block_name = rb_funcall(block, rb_intern("object_id"), 0);
+    VALUE block_name_str = rb_funcall(block_name, rb_intern("to_s"), 0);
+    pathStr = StringValueCStr(block_name_str);
   }
   else {
     Check_Type(outputPath, T_STRING);

data/ext/mspack_native/io_system.c

@@ -1,6 +1,8 @@
 #include "io_system.h"
 #include "chm_decompressor.h"
 
+#include <ruby.h>
+
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
@@ -9,43 +11,21 @@
 
 union io_file_value {
   FILE *file;
-  VALUE *block;
+  VALUE block;
 };
 
 struct io_file {
-  char *name; // only used for block handle
+  int is_block;
   union io_file_value value;
 };
 
-struct io_file *blocks[IO_SYSTEM_MAX_BLOCKS];
-
-inline struct io_file *pop_block(const char *name) {
-  for (int i = 0; i < IO_SYSTEM_MAX_BLOCKS - 1; ++i) {
-    struct io_file *block = blocks[i];
-
-    if (block) {
-      if (strcmp(name, block->name) == 0) {
-        blocks[i] = NULL;
-        return block;
-      }
-    }
-  }
-
-  return NULL;
-}
-
 struct mspack_file *
 io_open(struct mspack_system *self, const char *filename, int mode) {
-  struct io_file *block = NULL;
-
-  if (mode != MSPACK_SYS_OPEN_READ) {
-    block = pop_block(filename);
+  if (strlen(filename) < 1) {
+    return NULL;
   }
 
-  if (block) {
-    return (struct mspack_file *)block;
-  }
-  else {
+  if (filename[0] == '/') {
     const char *modeStr;
 
     switch (mode) {
@@ -67,7 +47,7 @@ io_open(struct mspack_system *self, const char *filename, int mode) {
 
     struct io_file *file = malloc(sizeof(struct io_file));
     file->value.file = fopen(filename, modeStr);
-    file->name = NULL;
+    file->is_block = 0;
 
     if (file->value.file) {
       return (struct mspack_file *)file;
@@ -77,15 +57,29 @@ io_open(struct mspack_system *self, const char *filename, int mode) {
       return NULL;
     }
   }
+
+  else {
+    VALUE block_id_str = rb_str_new_cstr(filename);
+    VALUE block_id = rb_funcall(block_id_str, rb_intern("to_i"), 0);
+    VALUE object_space = rb_const_get(rb_cModule, rb_intern("ObjectSpace"));
+    VALUE block = rb_funcall(object_space, rb_intern("_id2ref"), 1, block_id);
+
+    if (block == Qnil) {
+      return NULL;
+    }
+    else {
+      struct io_file *file = malloc(sizeof(struct io_file));
+      file->value.block = block;
+      file->is_block = 1;
+      return (struct mspack_file *)file;
+    }
+  }
 }
 
 void io_close(struct mspack_file *file) {
-  if (!((struct io_file *)file)->name) {
+  if (!((struct io_file *)file)->is_block) {
     fclose(((struct io_file *)file)->value.file);
   }
-  else {
-    free(((struct io_file *)file)->name);
-  }
 
   free(file);
 }
@@ -95,15 +89,13 @@ int io_read(struct mspack_file *file, void *buffer, int bytes) {
 }
 
 int io_write(struct mspack_file *file, void *buffer, int bytes) {
-  if (!((struct io_file *)file)->name) {
+  if (!((struct io_file *)file)->is_block) {
     return (int)fwrite(buffer, 1, bytes, ((struct io_file *)file)->value.file);
   }
   else {
     VALUE data = rb_str_new((char *)buffer, bytes);
-
-    VALUE *block;
-    block = ((struct io_file *)file)->value.block;
-    rb_funcall(*block, rb_intern("yield"), 1, data);
+    VALUE block = ((struct io_file *)file)->value.block;
+    rb_funcall(block, rb_intern("yield"), 1, data);
     return bytes;
   }
 }
@@ -150,20 +142,3 @@ struct mspack_system *io_system() {
   system->null_ptr = NULL;
   return system;
 }
-
-// TODO: chuck an error if we're full
-void add_block(VALUE *name, VALUE *block) {
-  for (int i = 0; i < IO_SYSTEM_MAX_BLOCKS - 1; ++i) {
-
-    if (!blocks[i]) {
-      struct io_file *file = malloc(sizeof(struct io_file));
-      file->value.block = block;
-
-      const char *nameStr = StringValueCStr(*name);
-      file->name = malloc(sizeof(char) * strlen(nameStr) + 1);
-      strcpy(file->name, nameStr);
-
-      blocks[i] = file;
-    }
-  }
-}

data/ext/mspack_native/io_system.h

@@ -2,7 +2,6 @@
 #define IO_SYSTEM_H
 
 #include <mspack.h>
-#include <ruby.h>
 
 struct mspack_file *
 io_open(struct mspack_system *self, const char *filename, int mode);
@@ -25,9 +24,6 @@ void io_free(void *ptr);
 
 void io_copy(void *src, void *dest, size_t bytes);
 
-
 struct mspack_system *io_system();
 
-void add_block(VALUE *name, VALUE *block);
-
 #endif

data/lib/mspack/version.rb

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

metadata

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