noderb 0.0.2 → 0.0.3

data/README.md

@@ -2,7 +2,7 @@
 
 ## What is it?
 
-NodeJs + Ruby
+NodeJs - JavaScript + Ruby
 
 ## Status
 
@@ -18,7 +18,7 @@ Somehow.
 
 ## Dependencies
 
-You need to have git to fetch libuv sources and GCC to build libuv and Ruby wrapper extension.
+No external dependencies except compiler for native extension.
 
 ## License
 

data/ext/noderb_extension/noderb.c

@@ -7,6 +7,12 @@ VALUE nodeRbProcess;
 
 VALUE nodeRbModules;
 
+int nodeRbNextTickStatus = 0;
+
+typedef struct {
+    
+} nodeRb_next_tick_handle;
+
 typedef struct {
     uv_write_t req;
     uv_buf_t buf;
@@ -23,6 +29,7 @@ typedef struct {
     uv_pipe_t* stderr;
 } nodeRb_process_handle;
 
+
 VALUE nodeRb_register_instance(VALUE self, VALUE instance) {
     rb_ary_push(rb_iv_get(self, "@instances"), instance);
 }
@@ -47,13 +54,18 @@ int nodeRb_handle_error(int e) {
 
 void nodeRb_next_tick(uv_idle_t* handle, int status) {
     uv_idle_stop(handle);
+    free(handle);
+    nodeRbNextTickStatus = 0;
     rb_funcall(nodeRb, rb_intern("next_tick_execute"), 0);
 }
 
 VALUE nodeRb_nextTick(VALUE self) {
-    uv_idle_t next_tick;
-    uv_idle_init(&next_tick);
-    uv_idle_start(&next_tick, nodeRb_next_tick);
+    if(nodeRbNextTickStatus == 0){
+        uv_idle_t* handle = malloc(sizeof(uv_idle_t));
+        uv_idle_init(handle);
+        nodeRbNextTickStatus = 1;
+        uv_idle_start(handle, nodeRb_next_tick);
+    }
 }
 
 VALUE nodeRb_start(VALUE self) {
@@ -85,7 +97,7 @@ VALUE nodeRb_send_data(VALUE self, VALUE data) {
     write_req_t* wr = malloc(sizeof (write_req_t));
     wr->buf.base = rb_string_value_cstr(&data);
     wr->buf.len = RSTRING_LEN(data);
-    VALUE rhandler = rb_iv_get(self, "@_client");
+    VALUE rhandler = rb_iv_get(self, "@_handle");
     uv_stream_t *handle;
     Data_Get_Struct(rhandler, uv_stream_t, handle);
     uv_write(&wr->req, handle, &wr->buf, 1, nodeRb_after_write);
@@ -95,8 +107,8 @@ void nodeRb_on_close(uv_handle_t* client) {
     nodeRb_client *client_data = client->data;
     VALUE object = nodeRb_get_class_from_id(client_data->connection);
     rb_funcall(object, rb_intern("on_close"), 0, 0);
-    rb_funcall(object, rb_intern("noderb_dispose"), 0, 0);
-    rb_iv_set(object, "@_client", Qnil);
+    nodeRb_unregister_instance(nodeRb, object);
+    rb_iv_set(object, "@_handle", Qnil);
     free(client_data);
     free(client);
     client_data = NULL;
@@ -109,7 +121,7 @@ void nodeRb_on_shutdown(uv_shutdown_t* req, int status) {
 
 VALUE nodeRb_close_connection(VALUE self) {
     uv_shutdown_t* req = malloc(sizeof (uv_shutdown_t));
-    VALUE rhandler = rb_iv_get(self, "@_client");
+    VALUE rhandler = rb_iv_get(self, "@_handle");
     uv_stream_t *handle;
     Data_Get_Struct(rhandler, uv_stream_t, handle);
     uv_shutdown(req, handle, nodeRb_on_shutdown);
@@ -121,8 +133,6 @@ void nodeRb_on_read(uv_stream_t* client, ssize_t nread, uv_buf_t buf) {
         if (buf.base) {
             free(buf.base);
         }
-        uv_shutdown_t* req = malloc(sizeof (uv_shutdown_t));
-        uv_shutdown(req, client, nodeRb_on_shutdown);
         return;
     }
 
@@ -149,9 +159,9 @@ void nodeRb_on_server_connect(uv_stream_t* server, int status) {
     if (nodeRb_handle_error(r)) return;
     VALUE clazz = rb_path2class(server->data);
     VALUE obj = rb_funcall(clazz, rb_intern("new"), 0, 0);
-    rb_funcall(obj, rb_intern("noderb_initialize"), 0, 0);
+    nodeRb_register_instance(nodeRb, obj);
     rb_funcall(obj, rb_intern("on_connect"), 0, 0);
-    rb_iv_set(obj, "@_client", Data_Wrap_Struct(nodeRbPointer, 0, NULL, client));
+    rb_iv_set(obj, "@_handle", Data_Wrap_Struct(nodeRbPointer, 0, NULL, client));
     long id = rb_num2long(rb_obj_id(obj));
     client_data->connection = id;
     client->data = client_data;
@@ -173,7 +183,7 @@ VALUE nodeRb_startServer(VALUE self, VALUE address, VALUE port, VALUE clazz) {
 void nodeRb_on_client_connect(uv_connect_t* client, int status) {
     nodeRb_client *client_data = client->handle->data;
     VALUE obj = nodeRb_get_class_from_id(client_data->connection);
-    rb_iv_set(obj, "@_client", Data_Wrap_Struct(nodeRbPointer, 0, NULL, client->handle));
+    rb_iv_set(obj, "@_handle", Data_Wrap_Struct(nodeRbPointer, 0, NULL, client->handle));
     rb_funcall(obj, rb_intern("on_connect"), 0, 0);
     uv_read_start((uv_stream_t*) client->handle, nodeRb_read_alloc, nodeRb_on_read);
 }
@@ -186,7 +196,7 @@ VALUE nodeRb_startClient(VALUE self, VALUE address, VALUE port, VALUE clazz) {
     int r = uv_tcp_connect(connect, handle, socket, nodeRb_on_client_connect);
     if (nodeRb_handle_error(r)) return Qnil;
     nodeRb_client *client_data = malloc(sizeof (nodeRb_client));
-    VALUE obj = rb_funcall(clazz, rb_intern("new"), 0, 0);
+    VALUE obj = clazz;
     long id = rb_num2long(rb_obj_id(obj));
     client_data->connection = id;
     handle->data = client_data;
@@ -261,7 +271,8 @@ VALUE nodeRb_startProcess(VALUE self, VALUE executable, VALUE arguments, VALUE e
     // Executable
     options.file = rb_string_value_cstr(&executable);
     // Arguments
-    long len = RARRAY_LEN(arguments);
+    long len;
+    len = RARRAY_LEN(arguments);
     char* args[len + 2];
     args[0] = rb_string_value_cstr(&executable);
     args[len + 1] = NULL;
@@ -274,8 +285,18 @@ VALUE nodeRb_startProcess(VALUE self, VALUE executable, VALUE arguments, VALUE e
         }
     }
     // Environment
-    //char** env[0][0];
-    //options->env = env;
+    len = RARRAY_LEN(environment);
+    char* env[len+1];
+    options.env = env;
+    options.env[len] = NULL;
+    if (len > 0) {
+        long i;
+        VALUE *arr = RARRAY_PTR(environment);
+        for (i = 0; i < len; i++) {
+            options.env[i] = rb_string_value_cstr(&arr[i]);
+        }
+    }
+
     // Working directory
     options.cwd = rb_string_value_cstr(&directory);
     // NodeRb helpers
@@ -316,15 +337,15 @@ void Init_noderb_extension() {
     // Define module
     nodeRb = rb_define_module("NodeRb");
     nodeRbPointer = rb_define_class_under(nodeRb, "Pointer", rb_cObject);
-    nodeRbConnection = rb_define_class_under(nodeRb, "Connection", rb_cObject);
-    nodeRbProcess = rb_define_class_under(nodeRb, "Process", rb_cObject);
+    nodeRbConnection = rb_define_module_under(nodeRb, "Connection");
+    nodeRbProcess = rb_define_module_under(nodeRb, "Process");
     // Define connection methods
-    rb_define_method(nodeRbConnection, "send_data", nodeRb_send_data, 1);
+    rb_define_method(nodeRbConnection, "write", nodeRb_send_data, 1);
     rb_define_method(nodeRbConnection, "close_connection", nodeRb_close_connection, 0);
     // Define process methods
     rb_define_method(nodeRbProcess, "write", nodeRb_process_write, 1);
     rb_define_method(nodeRbProcess, "kill", nodeRb_process_kill, 1);
-    // Define handling methods
+    // Run code on next tick
     rb_define_singleton_method(nodeRb, "native_next_tick", nodeRb_nextTick, 0);
     // Define starting methods
     rb_define_singleton_method(nodeRb, "start", nodeRb_start, 0);

data/lib/noderb/connection.rb

@@ -1,21 +1,14 @@
 module NodeRb
+  module Connection
 
-    class Connection
+    def on_connect
+    end
         
-        class << self
-            attr_accessor :connections
-        end
-
-        def noderb_initialize
-            Connection.connections << self
-        end
-
-        def noderb_dispose
-            Connection.connections.delete(self)
-        end
-
+    def on_data data
     end
 
-    Connection.connections = []
+    def on_close
+    end
 
+  end
 end

data/lib/noderb/next_tick.rb

@@ -0,0 +1,17 @@
+module NodeRb
+  class << self
+    
+    def next_tick &block
+      ( @next_tick ||= [] ) << block
+      NodeRb.native_next_tick
+    end
+    
+    def next_tick_execute
+      blocks, @next_tick = @next_tick, []
+      blocks.each do |block|
+        block.call
+      end
+    end
+    
+  end
+end

data/lib/noderb/process.rb

@@ -1,5 +1,5 @@
 module NodeRb
-  class Process
+  module Process
     
     def on_start pid
     end

data/lib/noderb/version.rb

@@ -0,0 +1,3 @@
+module NodeRb
+  VERSION = "0.0.3" unless const_defined?(:VERSION)
+end

data/lib/noderb.rb

@@ -1,25 +1,7 @@
+# Native extension
 require "noderb_extension"
-
-module NodeRb
-    
-    VERSION = "0.0.1" unless const_defined?(:VERSION)
-    
-    class << self
-      
-      def next_tick &block
-        ( @next_tick ||= [] ) << block
-        NodeRb.native_next_tick
-      end
-      
-      def next_tick_execute
-        @next_tick.each do |block|
-          block.call
-        end
-      end
-      
-    end
-    
-end
-
+# Ruby extension
+require "noderb/version"
+require "noderb/next_tick"
 require "noderb/connection"
 require "noderb/process"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: noderb
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -21,7 +21,9 @@ extensions:
 extra_rdoc_files: []
 files:
 - lib/noderb/connection.rb
+- lib/noderb/next_tick.rb
 - lib/noderb/process.rb
+- lib/noderb/version.rb
 - lib/noderb.rb
 - ext/noderb_extension/extconf.rb
 - ext/noderb_extension/libuv/AUTHORS