isomorfeus-iodine 0.7.49 → 0.7.50

data/ext/{iodine → iodine_ext}/iodine.c

@@ -1325,7 +1325,7 @@ Ruby loads the library and invokes the Init_<lib_name> function...
 Here we connect all the C code to the Ruby interface, completing the bridge
 between Lib-Server and Ruby.
 ***************************************************************************** */
-void Init_iodine(void) {
+void Init_iodine_ext(void) {
   /* common Symbol objects in use by Iodine */
 #define IODINE_MAKE_SYM(name)                                                  \
   do {                                                                         \

data/ext/{iodine → iodine_ext}/iodine_connection.h

@@ -1,55 +1,55 @@
-#ifndef H_IODINE_CONNECTION_H
-#define H_IODINE_CONNECTION_H
-
-#include "iodine.h"
-
-typedef enum {
-  IODINE_CONNECTION_RAW,
-  IODINE_CONNECTION_WEBSOCKET,
-  IODINE_CONNECTION_SSE
-} iodine_connection_type_e;
-
-typedef struct {
-  iodine_connection_type_e type;
-  intptr_t uuid;
-  void *arg; /* holds the connection pointer (ws_s / sse_s) */
-  VALUE handler;
-  VALUE env;
-} iodine_connection_s;
-
-/**
- * Creates a new connection object.
- */
-VALUE iodine_connection_new(iodine_connection_s args);
-#define iodine_connection_new(...)                                             \
-  iodine_connection_new((iodine_connection_s){__VA_ARGS__})
-
-typedef enum {
-  IODINE_CONNECTION_ON_OPEN,
-  IODINE_CONNECTION_ON_MESSAGE,
-  IODINE_CONNECTION_ON_DRAINED,
-  IODINE_CONNECTION_PING,
-  IODINE_CONNECTION_ON_SHUTDOWN,
-  IODINE_CONNECTION_ON_CLOSE
-} iodine_connection_event_type_e;
-
-/**
- * Fires a connection object's event. `data` is only for the on_message event.
- */
-void iodine_connection_fire_event(VALUE connection,
-                                  iodine_connection_event_type_e ev,
-                                  VALUE data);
-
-/** Initializes the Connection Ruby class. */
-void iodine_connection_init(void);
-
-extern const rb_data_type_t iodine_connection_data_type;
-
-static inline iodine_connection_s *iodine_connection_CData(VALUE self) {
-  iodine_connection_s *c = NULL;
-  TypedData_Get_Struct(self, iodine_connection_s, &iodine_connection_data_type,
-                       c);
-  return c;
-}
-
-#endif
+#ifndef H_IODINE_CONNECTION_H
+#define H_IODINE_CONNECTION_H
+
+#include "iodine.h"
+
+typedef enum {
+  IODINE_CONNECTION_RAW,
+  IODINE_CONNECTION_WEBSOCKET,
+  IODINE_CONNECTION_SSE
+} iodine_connection_type_e;
+
+typedef struct {
+  iodine_connection_type_e type;
+  intptr_t uuid;
+  void *arg; /* holds the connection pointer (ws_s / sse_s) */
+  VALUE handler;
+  VALUE env;
+} iodine_connection_s;
+
+/**
+ * Creates a new connection object.
+ */
+VALUE iodine_connection_new(iodine_connection_s args);
+#define iodine_connection_new(...)                                             \
+  iodine_connection_new((iodine_connection_s){__VA_ARGS__})
+
+typedef enum {
+  IODINE_CONNECTION_ON_OPEN,
+  IODINE_CONNECTION_ON_MESSAGE,
+  IODINE_CONNECTION_ON_DRAINED,
+  IODINE_CONNECTION_PING,
+  IODINE_CONNECTION_ON_SHUTDOWN,
+  IODINE_CONNECTION_ON_CLOSE
+} iodine_connection_event_type_e;
+
+/**
+ * Fires a connection object's event. `data` is only for the on_message event.
+ */
+void iodine_connection_fire_event(VALUE connection,
+                                  iodine_connection_event_type_e ev,
+                                  VALUE data);
+
+/** Initializes the Connection Ruby class. */
+void iodine_connection_init(void);
+
+extern const rb_data_type_t iodine_connection_data_type;
+
+static inline iodine_connection_s *iodine_connection_CData(VALUE self) {
+  iodine_connection_s *c = NULL;
+  TypedData_Get_Struct(self, iodine_connection_s, &iodine_connection_data_type,
+                       c);
+  return c;
+}
+
+#endif

data/ext/{iodine → iodine_ext}/iodine_defer.h

@@ -1,6 +1,6 @@
-#ifndef H_IODINE_DEFER_H
-#define H_IODINE_DEFER_H
-
-void iodine_defer_initialize(void);
-
-#endif
+#ifndef H_IODINE_DEFER_H
+#define H_IODINE_DEFER_H
+
+void iodine_defer_initialize(void);
+
+#endif

data/ext/{iodine → iodine_ext}/iodine_fiobj2rb.h

@@ -1,120 +1,120 @@
-#ifndef H_RB_FIOBJ2RUBY_H
-/*
-Copyright: Boaz segev, 2016-2017
-License: MIT
-
-Feel free to copy, use and enjoy according to the license provided.
-*/
-#define H_RB_FIOBJ2RUBY_H
-#include <fiobj.h>
-#include <ruby.h>
-
-#include "iodine_store.h"
-
-typedef struct {
-  FIOBJ stack;
-  uintptr_t count;
-  VALUE rb;
-  uint8_t str2sym;
-} fiobj2rb_s;
-
-typedef struct {
-  uint8_t str2sym;
-} fiobj2rb_settings_s;
-
-static inline VALUE fiobj2rb(FIOBJ o, uint8_t str2sym) {
-  VALUE rb;
-  if (!o)
-    return Qnil;
-  switch (FIOBJ_TYPE(o)) {
-  case FIOBJ_T_NUMBER:
-    rb = LONG2FIX(fiobj_obj2num(o));
-    break;
-  case FIOBJ_T_TRUE:
-    rb = Qtrue;
-    break;
-  case FIOBJ_T_FALSE:
-    rb = Qfalse;
-    break;
-  case FIOBJ_T_FLOAT:
-    rb = rb_float_new(fiobj_obj2float(o));
-    break;
-  case FIOBJ_T_DATA:    /* fallthrough */
-  case FIOBJ_T_UNKNOWN: /* fallthrough */
-  case FIOBJ_T_STRING: {
-    fio_str_info_s tmp = fiobj_obj2cstr(o);
-    if (str2sym) {
-      rb = rb_intern2(tmp.data, tmp.len);
-      rb = ID2SYM(rb);
-    } else {
-      rb = rb_str_new(tmp.data, tmp.len);
-    }
-
-  } break;
-  case FIOBJ_T_ARRAY:
-    rb = rb_ary_new();
-    break;
-  case FIOBJ_T_HASH:
-    rb = rb_hash_new();
-    break;
-  case FIOBJ_T_NULL: /* fallthrough */
-  default:
-    rb = Qnil;
-    break;
-  };
-  return rb;
-}
-
-static int fiobj2rb_task(FIOBJ o, void *data_) {
-  fiobj2rb_s *data = data_;
-  VALUE rb_tmp;
-  rb_tmp = fiobj2rb(o, 0);
-  IodineStore.add(rb_tmp);
-  if (data->rb) {
-    if (RB_TYPE_P(data->rb, T_HASH)) {
-      rb_hash_aset(data->rb, fiobj2rb(fiobj_hash_key_in_loop(), data->str2sym),
-                   rb_tmp);
-    } else {
-      rb_ary_push(data->rb, rb_tmp);
-    }
-    --(data->count);
-    IodineStore.remove(rb_tmp);
-  } else {
-    data->rb = rb_tmp;
-    // IodineStore.add(rb_tmp);
-  }
-  if (FIOBJ_TYPE_IS(o, FIOBJ_T_ARRAY)) {
-    fiobj_ary_push(data->stack, (FIOBJ)data->count);
-    fiobj_ary_push(data->stack, (FIOBJ)data->rb);
-    data->count = fiobj_ary_count(o);
-    data->rb = rb_tmp;
-  } else if (FIOBJ_TYPE_IS(o, FIOBJ_T_HASH)) {
-    fiobj_ary_push(data->stack, (FIOBJ)data->count);
-    fiobj_ary_push(data->stack, (FIOBJ)data->rb);
-    data->count = fiobj_hash_count(o);
-    data->rb = rb_tmp;
-  }
-  while (data->count == 0 && fiobj_ary_count(data->stack)) {
-    data->rb = fiobj_ary_pop(data->stack);
-    data->count = fiobj_ary_pop(data->stack);
-  }
-  return 0;
-}
-
-static inline VALUE fiobj2rb_deep(FIOBJ obj, uint8_t str2sym) {
-  fiobj2rb_s data = {.stack = fiobj_ary_new2(4), .str2sym = str2sym};
-
-  /* deep copy */
-  fiobj_each2(obj, fiobj2rb_task, &data);
-  /* cleanup (shouldn't happen, but what the hell)... */
-  while (fiobj_ary_pop(data.stack))
-    ;
-  fiobj_free(data.stack);
-  // IodineStore.remove(data.rb); // don't remove data
-  return data.rb;
-}
-
-// require 'iodine'
-// Iodine::JSON.parse "{\"1\":[1,2,3,4]}"
-// Iodine::JSON.parse IO.binread("")
-#endif /* H_RB_FIOBJ2RUBY_H */
+#ifndef H_RB_FIOBJ2RUBY_H
+/*
+Copyright: Boaz segev, 2016-2017
+License: MIT
+
+Feel free to copy, use and enjoy according to the license provided.
+*/
+#define H_RB_FIOBJ2RUBY_H
+#include <fiobj.h>
+#include <ruby.h>
+
+#include "iodine_store.h"
+
+typedef struct {
+  FIOBJ stack;
+  uintptr_t count;
+  VALUE rb;
+  uint8_t str2sym;
+} fiobj2rb_s;
+
+typedef struct {
+  uint8_t str2sym;
+} fiobj2rb_settings_s;
+
+static inline VALUE fiobj2rb(FIOBJ o, uint8_t str2sym) {
+  VALUE rb;
+  if (!o)
+    return Qnil;
+  switch (FIOBJ_TYPE(o)) {
+  case FIOBJ_T_NUMBER:
+    rb = LONG2FIX(fiobj_obj2num(o));
+    break;
+  case FIOBJ_T_TRUE:
+    rb = Qtrue;
+    break;
+  case FIOBJ_T_FALSE:
+    rb = Qfalse;
+    break;
+  case FIOBJ_T_FLOAT:
+    rb = rb_float_new(fiobj_obj2float(o));
+    break;
+  case FIOBJ_T_DATA:    /* fallthrough */
+  case FIOBJ_T_UNKNOWN: /* fallthrough */
+  case FIOBJ_T_STRING: {
+    fio_str_info_s tmp = fiobj_obj2cstr(o);
+    if (str2sym) {
+      rb = rb_intern2(tmp.data, tmp.len);
+      rb = ID2SYM(rb);
+    } else {
+      rb = rb_str_new(tmp.data, tmp.len);
+    }
+
+  } break;
+  case FIOBJ_T_ARRAY:
+    rb = rb_ary_new();
+    break;
+  case FIOBJ_T_HASH:
+    rb = rb_hash_new();
+    break;
+  case FIOBJ_T_NULL: /* fallthrough */
+  default:
+    rb = Qnil;
+    break;
+  };
+  return rb;
+}
+
+static int fiobj2rb_task(FIOBJ o, void *data_) {
+  fiobj2rb_s *data = data_;
+  VALUE rb_tmp;
+  rb_tmp = fiobj2rb(o, 0);
+  IodineStore.add(rb_tmp);
+  if (data->rb) {
+    if (RB_TYPE_P(data->rb, T_HASH)) {
+      rb_hash_aset(data->rb, fiobj2rb(fiobj_hash_key_in_loop(), data->str2sym),
+                   rb_tmp);
+    } else {
+      rb_ary_push(data->rb, rb_tmp);
+    }
+    --(data->count);
+    IodineStore.remove(rb_tmp);
+  } else {
+    data->rb = rb_tmp;
+    // IodineStore.add(rb_tmp);
+  }
+  if (FIOBJ_TYPE_IS(o, FIOBJ_T_ARRAY)) {
+    fiobj_ary_push(data->stack, (FIOBJ)data->count);
+    fiobj_ary_push(data->stack, (FIOBJ)data->rb);
+    data->count = fiobj_ary_count(o);
+    data->rb = rb_tmp;
+  } else if (FIOBJ_TYPE_IS(o, FIOBJ_T_HASH)) {
+    fiobj_ary_push(data->stack, (FIOBJ)data->count);
+    fiobj_ary_push(data->stack, (FIOBJ)data->rb);
+    data->count = fiobj_hash_count(o);
+    data->rb = rb_tmp;
+  }
+  while (data->count == 0 && fiobj_ary_count(data->stack)) {
+    data->rb = fiobj_ary_pop(data->stack);
+    data->count = fiobj_ary_pop(data->stack);
+  }
+  return 0;
+}
+
+static inline VALUE fiobj2rb_deep(FIOBJ obj, uint8_t str2sym) {
+  fiobj2rb_s data = {.stack = fiobj_ary_new2(4), .str2sym = str2sym};
+
+  /* deep copy */
+  fiobj_each2(obj, fiobj2rb_task, &data);
+  /* cleanup (shouldn't happen, but what the hell)... */
+  while (fiobj_ary_pop(data.stack))
+    ;
+  fiobj_free(data.stack);
+  // IodineStore.remove(data.rb); // don't remove data
+  return data.rb;
+}
+
+// require 'iodine'
+// Iodine::JSON.parse "{\"1\":[1,2,3,4]}"
+// Iodine::JSON.parse IO.binread("")
+#endif /* H_RB_FIOBJ2RUBY_H */

data/ext/{iodine → iodine_ext}/iodine_helpers.h

@@ -1,12 +1,12 @@
-#ifndef H_IODINE_HELPERS_H
-#define H_IODINE_HELPERS_H
-/*
-Copyright: Boaz segev, 2016-2018
-License: MIT
-
-Feel free to copy, use and enjoy according to the license provided.
-*/
-
-void iodine_init_helpers(void);
-
-#endif
+#ifndef H_IODINE_HELPERS_H
+#define H_IODINE_HELPERS_H
+/*
+Copyright: Boaz segev, 2016-2018
+License: MIT
+
+Feel free to copy, use and enjoy according to the license provided.
+*/
+
+void iodine_init_helpers(void);
+
+#endif

data/ext/{iodine → iodine_ext}/iodine_http.c

@@ -369,7 +369,6 @@ static inline VALUE copy2env(iodine_http_request_handle_s *handle) {
   if (*pos == 0) {
     rb_hash_aset(env, SERVER_NAME,
                  rb_enc_str_new(tmp.data, tmp.len, IodineBinaryEncoding));
-    rb_hash_aset(env, SERVER_PORT, QUERY_ESTRING);
   } else {
     rb_hash_aset(
         env, SERVER_NAME,
@@ -870,7 +869,6 @@ static void initialize_env_template(void) {
   rb_hash_aset(env_template_no_upgrade, REMOTE_ADDR, QUERY_STRING);
   rb_hash_aset(env_template_no_upgrade, REQUEST_METHOD, QUERY_STRING);
   rb_hash_aset(env_template_no_upgrade, SERVER_NAME, QUERY_STRING);
-  rb_hash_aset(env_template_no_upgrade, SERVER_PORT, QUERY_ESTRING);
   rb_hash_aset(env_template_no_upgrade, SERVER_PROTOCOL, QUERY_STRING);
 
   /* WebSocket upgrade support */

data/ext/{iodine → iodine_ext}/iodine_http.h

@@ -1,23 +1,23 @@
-#ifndef H_IODINE_HTTP_H
-#define H_IODINE_HTTP_H
-/*
-Copyright: Boaz segev, 2016-2018
-License: MIT
-
-Feel free to copy, use and enjoy according to the license provided.
-*/
-#include "iodine.h"
-
-/* these three are used also by rb-rack-io.c */
-extern VALUE IODINE_R_INPUT;
-extern VALUE IODINE_R_INPUT_DEFAULT;
-extern VALUE IODINE_R_HIJACK;
-extern VALUE IODINE_R_HIJACK_IO;
-extern VALUE IODINE_R_HIJACK_CB;
-void iodine_init_http(void);
-
-intptr_t iodine_http_listen(iodine_connection_args_s args);
-// intptr_t iodine_http_connect(iodine_connection_args_s args); // not yet...
-intptr_t iodine_ws_connect(iodine_connection_args_s args);
-
-#endif
+#ifndef H_IODINE_HTTP_H
+#define H_IODINE_HTTP_H
+/*
+Copyright: Boaz segev, 2016-2018
+License: MIT
+
+Feel free to copy, use and enjoy according to the license provided.
+*/
+#include "iodine.h"
+
+/* these three are used also by rb-rack-io.c */
+extern VALUE IODINE_R_INPUT;
+extern VALUE IODINE_R_INPUT_DEFAULT;
+extern VALUE IODINE_R_HIJACK;
+extern VALUE IODINE_R_HIJACK_IO;
+extern VALUE IODINE_R_HIJACK_CB;
+void iodine_init_http(void);
+
+intptr_t iodine_http_listen(iodine_connection_args_s args);
+// intptr_t iodine_http_connect(iodine_connection_args_s args); // not yet...
+intptr_t iodine_ws_connect(iodine_connection_args_s args);
+
+#endif