rb_import 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cae0ed3b02e393c26df865553f46dbfdddd6640b
-  data.tar.gz: 493283748bf250d7464bc4f85a098d45e16217e0
+  metadata.gz: f1e9c432a8f32cac0839e42bdf6055415b2aea1d
+  data.tar.gz: ed2a36e286c606b83e061c524f76b31331dcb5f4
 SHA512:
-  metadata.gz: e1cbb347253ea12991453dd64f0b61526ff1b3e7c143214b5949639a5688cb9de60b5617376bd394f157ab2be6084e3a910a340472a6b96134c5cbe7483ac570
-  data.tar.gz: 6b8130e2ac1636a1c1c92b4f3c7fcd2e5db8cab65c302eb998c1f594861e3678c94c5a9ee89e2d11b368a5a6c0880e675a78fe3d2fd7e53fe68412b674a8cac6
+  metadata.gz: 442c1ba01a463cdddcf2b99a2702409cc7a3800e2f1880f08b4b84eec57b5bbb5938a2bfddb977782a42d2aa1e0815427cc7423c9e732286ed1bc8486e2aa48f
+  data.tar.gz: e71d49660215101c0cb031ad40e61b25bf578ebe252536256c6643d0a82c5ed1741c9ddfc4d03604469e3434094ecf624917c28da5fbf75c61c2f10ffc21b81c

data/CHANGELOG.md

@@ -1,3 +1,11 @@
-# Unreleased (0.1.0)
+# Unreleased
+
+N/A
+
+# 0.2.0
+
+* Code cleansing
+
+# 0.1.0
 
 * Initial release

data/Rakefile

@@ -26,8 +26,6 @@ end
 def gemspec
   @gemspec ||= begin
                  file = File.expand_path('../rb_import.gemspec', __FILE__)
-                 puts file.inspect
-                 puts '**'*12
                  eval(File.read(file), binding, file)
                end
 end

data/ext/rb_import/rb_import.c

@@ -1,28 +1,5 @@
 #include <ruby.h>
-
-char *load_file_in_str(const char *in) {
-  FILE *f = fopen(in, "r");
-
-  if(!f) {
-    return 0;
-  } else {
-    fseek(f, 0, SEEK_END);
-    long fsize = ftell(f);
-    fseek(f, 0, SEEK_SET);
-
-    char * out = malloc(fsize + 1);
-    int res = fread(out, fsize, 1, f);
-
-    if(res <= 0) {
-      return 0;
-    } else {
-      fclose(f);
-
-      out[fsize] = 0;
-      return out;
-    }
-  }
-}
+#include "rb_import_utils.h"
 
 VALUE rb_import(VALUE self, VALUE file_name) {
   /* try finding the file the same way Ruby's `load`
@@ -31,10 +8,11 @@ VALUE rb_import(VALUE self, VALUE file_name) {
 
   if(RTEST(file_location)) {
     char *file_path     = RSTRING_PTR(file_location);
-    char *file_content  = load_file_in_str(file_path);
+    char *file_content  = rb_import_load_file_in_str(file_path);
     int result;
 
     VALUE obj = rb_eval_string_protect(file_content, &result);
+    free(file_content);
     if (result) {
       rb_raise(rb_eLoadError, "can't eval imported file %s", RSTRING_PTR(file_location));
     } else {

data/ext/rb_import/rb_import_utils.c

@@ -0,0 +1,36 @@
+#include "rb_import_utils.h"
+
+long rb_import_get_file_size(FILE *f) {
+  /* preserve the current position */
+  long current_position = ftell(f);
+
+  fseek(f, 0, SEEK_END);
+  long file_size = ftell(f);
+
+  /* restore the previous position */
+  fseek(f, 0, current_position);
+
+  return file_size;
+}
+
+char *rb_import_read_file(FILE *f) {
+  long file_size      = rb_import_get_file_size(f);
+  char * file_content = malloc(file_size + 1);
+  int res             = fread(file_content, file_size, 1, f);
+
+  fclose(f);
+  file_content[file_size] = 0;
+
+  if(res <= 0) {
+    free(file_content);
+    file_content = 0;
+  }
+
+  return file_content;
+}
+
+char *rb_import_load_file_in_str(const char *in) {
+  FILE *f = fopen(in, "r");
+
+  return f ? rb_import_read_file(f) : 0;
+}

data/ext/rb_import/rb_import_utils.h

@@ -0,0 +1,9 @@
+#ifndef RB_IMPORT_UTILS_H
+#define RB_IMPORT_UTILS_H
+#include <ruby.h>
+
+long rb_import_get_file_size(FILE *);
+char *rb_import_read_file(FILE *);
+char *rb_import_load_file_in_str(const char *);
+
+#endif

data/rb_import.gemspec

@@ -3,7 +3,7 @@ $:<< 'lib'
 
 Gem::Specification.new do |spec|
   spec.name          = "rb_import"
-  spec.version       = "0.1.0"
+  spec.version       = "0.2.0"
   spec.authors       = ["Franck Verrot"]
   spec.email         = ["franck@verrot.fr"]
   spec.summary       = %q{Add an import method to your Ruby VM}

data/test/basic_test.rb

@@ -6,4 +6,16 @@ class BasicTest < Minitest::Test
     f = import("./test/fixtures/foo.rb")
     assert_equal "foo bar", f.new.to_s
   end
+
+  def test_missing_file
+    error_occured = false
+
+    begin
+      import("unknown_file.rb")
+    rescue LoadError => error
+      error_occured = true
+    end
+
+    assert error_occured
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_import
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Franck Verrot
@@ -121,6 +121,8 @@ files:
 - checksums/0.1.0.sha512
 - ext/rb_import/extconf.rb
 - ext/rb_import/rb_import.c
+- ext/rb_import/rb_import_utils.c
+- ext/rb_import/rb_import_utils.h
 - lib/.gitkeep
 - rb_import.gemspec
 - test/basic_test.rb