iodine 0.7.15 → 0.7.16

data/ext/iodine/http1_parser.c

@@ -382,8 +382,9 @@ re_eval:
   /* request / response line */
   case 0:
     /* clear out any leadinng white space */
-    while (*start == '\r' || *start == '\n' || *start == ' ' || *start == 0) {
-      start++;
+    while ((start < stop) &&
+           (*start == '\r' || *start == '\n' || *start == ' ' || *start == 0)) {
+      ++start;
     }
     end = start;
     /* make sure the whole line is available*/
@@ -407,7 +408,7 @@ re_eval:
   /* headers */
   case 1:
     do {
-      if (start + 1 >= stop)
+      if (start >= stop)
         return CONSUMED; /* buffer ended on header line */
       if (*start == '\r' || *start == '\n') {
         goto finished_headers; /* empty line, end of headers */

data/ext/iodine/http_internal.h

@@ -7,6 +7,9 @@ Feel free to copy, use and enjoy according to the license provided.
 #ifndef H_HTTP_INTERNAL_H
 #define H_HTTP_INTERNAL_H
 
+#include <fio.h>
+/* subscription lists have a long lifetime */
+#define FIO_FORCE_MALLOC_TMP 1
 #define FIO_INCLUDE_LINKED_LIST
 #include <fio.h>
 

data/ext/iodine/iodine.c

@@ -340,37 +340,36 @@ static VALUE iodine_cli_parse(VALUE self) {
   desc[39 + 263 + RSTRING_LEN(iodine_version)] = 0;
   fio_cli_start(
       argc, (const char **)argv, 0, -1, desc,
-      "Address Binding:", FIO_CLI_TYPE_PRINT_HEADER,
+      FIO_CLI_PRINT_HEADER("Address Binding:"),
       "-bind -b -address address to listen to. defaults to any available.",
-      "-port -p port number to listen to. defaults port 3000", FIO_CLI_TYPE_INT,
-      "\t\t\x1B[4mNote\x1B[0m: to bind to a Unix socket, "
-      "set \x1B[1mport\x1B[0m to 0.",
-      FIO_CLI_TYPE_PRINT, "Concurrency:", FIO_CLI_TYPE_PRINT_HEADER,
-      "-workers -w number of processes to use.", FIO_CLI_TYPE_INT,
-      "-threads -t number of threads per process.", FIO_CLI_TYPE_INT,
-      "HTTP Server:", FIO_CLI_TYPE_PRINT_HEADER,
-      "-public -www public folder, for static file service.",
-      "-log -v HTTP request logging.", FIO_CLI_TYPE_BOOL,
-      "-keep-alive -k -tout HTTP keep-alive timeout in seconds (0..255). "
-      "Default: 40s",
-      FIO_CLI_TYPE_INT, "-ping websocket ping interval (0..255). Default: 40s",
-      FIO_CLI_TYPE_INT,
-      "-max-body -maxbd HTTP upload limit in Mega-Bytes. Default: 50Mb",
-      FIO_CLI_TYPE_INT,
-      "-max-header -maxhd header limit per HTTP request in Kb."
-      " Default: 32Kb.",
-      FIO_CLI_TYPE_INT, "WebSocket Server:", FIO_CLI_TYPE_PRINT_HEADER,
-      "-max-msg -maxms incoming WebSocket message limit in Kb. "
-      "Default: 250Kb",
-      FIO_CLI_TYPE_INT,
-      "Connecting Iodine to Redis:", FIO_CLI_TYPE_PRINT_HEADER,
-      "-redis -r an optional Redis URL server address. Default: none.",
-      "-redis-ping -rp websocket ping interval (0..255). Default: 300s",
-      FIO_CLI_TYPE_INT, "Misc:", FIO_CLI_TYPE_PRINT_HEADER,
-      "-warmup --preload warm up the application. CAREFUL! with workers.",
-      FIO_CLI_TYPE_BOOL,
-      "-verbosity -V 0..5 server verbosity level. Default: 4",
-      FIO_CLI_TYPE_INT);
+      FIO_CLI_INT("-port -p port number to listen to. defaults port 3000"),
+      FIO_CLI_PRINT("\t\t\x1B[4mNote\x1B[0m: to bind to a Unix socket, set "
+                    "\x1B[1mport\x1B[0m to 0."),
+      FIO_CLI_PRINT_HEADER("Concurrency:"),
+      FIO_CLI_INT("-workers -w number of processes to use."),
+      FIO_CLI_INT("-threads -t number of threads per process."),
+      FIO_CLI_PRINT_HEADER("HTTP Settings:"),
+      FIO_CLI_STRING("-public -www public folder, for static file service."),
+      FIO_CLI_BOOL("-log -v HTTP request logging."),
+      FIO_CLI_INT("-keep-alive -k -tout HTTP keep-alive timeout in seconds "
+                  "(0..255). Default: 40s"),
+      FIO_CLI_INT("-ping websocket ping interval (0..255). Default: 40s"),
+      FIO_CLI_INT(
+          "-max-body -maxbd HTTP upload limit in Mega-Bytes. Default: 50Mb"),
+      FIO_CLI_INT("-max-header -maxhd header limit per HTTP request in Kb. "
+                  "Default: 32Kb."),
+      FIO_CLI_PRINT_HEADER("WebSocket Settings:"),
+      FIO_CLI_INT("-max-msg -maxms incoming WebSocket message limit in Kb. "
+                  "Default: 250Kb"),
+      FIO_CLI_PRINT_HEADER("Connecting Iodine to Redis:"),
+      FIO_CLI_STRING(
+          "-redis -r an optional Redis URL server address. Default: none."),
+      FIO_CLI_INT(
+          "-redis-ping -rp websocket ping interval (0..255). Default: 300s"),
+      FIO_CLI_PRINT_HEADER("Misc:"),
+      FIO_CLI_BOOL(
+          "-warmup --preload warm up the application. CAREFUL! with workers."),
+      FIO_CLI_INT("-verbosity -V 0..5 server verbosity level. Default: 4"));
 
   /* copy values from CLI library to iodine */
   if (fio_cli_get("-V")) {
@@ -414,6 +413,9 @@ static VALUE iodine_cli_parse(VALUE self) {
     rb_hash_aset(defaults, ID2SYM(rb_intern("public")),
                  rb_str_new_cstr(fio_cli_get("-www")));
   }
+  if (!fio_cli_get("-redis") && getenv("IODINE_REDIS_URL")) {
+    fio_cli_set("-redis", getenv("IODINE_REDIS_URL"));
+  }
   if (fio_cli_get("-redis")) {
     rb_hash_aset(defaults, ID2SYM(rb_intern("redis_")),
                  rb_str_new_cstr(fio_cli_get("-redis")));

data/ext/iodine/iodine_mustache.c

@@ -64,17 +64,20 @@ static inline VALUE fiobj_mustache_find_obj_absolute(VALUE udata,
     }
     return Qnil;
   }
-  /* search by String */
-  VALUE key = rb_str_new(name, name_len);
-  tmp = rb_hash_aref(udata, key);
-  if (tmp != Qnil)
-    return tmp;
   /* search by Symbol */
   ID name_id = rb_intern2(name, name_len);
-  key = rb_id2sym(name_id);
-  tmp = rb_hash_aref(udata, key);
+  VALUE key = ID2SYM(name_id);
+  tmp = rb_hash_lookup2(udata, key, Qundef);
+  if (tmp != Qundef)
+    return tmp;
+  /* search by String */
+  key = rb_sym2str(key);
+  tmp = rb_hash_lookup2(udata, key, Qundef);
+  if (tmp != Qundef)
+    return tmp;
   /* search by method */
-  if (tmp == Qnil && rb_respond_to(udata, name_id)) {
+  tmp = Qnil;
+  if (rb_respond_to(udata, name_id)) {
     tmp = IodineCaller.call(udata, name_id);
   }
 

data/ext/iodine/iodine_pubsub.c

@@ -390,11 +390,8 @@ static VALUE iodine_pubsub_redis_new(int argc, VALUE *argv, VALUE self) {
   /* parse URL assume redis://redis:password@localhost:6379 */
   http_url_s info = http_url_parse(RSTRING_PTR(url), RSTRING_LEN(url));
 
-  FIO_LOG_INFO(
-      "Initializing Redis engine for address: %s - port: %s -  auth %s\n",
-      info.host.data ? info.host.data : "-",
-      info.port.data ? info.port.data : "-",
-      info.password.data ? info.password.data : "-");
+  FIO_LOG_INFO("Initializing Redis engine for address: %.*s",
+               (int)RSTRING_LEN(url), RSTRING_PTR(url));
   /* create engine */
   e->engine = redis_engine_create(.address = info.host, .port = info.port,
                                   .auth = info.password, .ping_interval = ping);

data/ext/iodine/websockets.c

@@ -4,10 +4,14 @@ license: MIT
 
 Feel free to copy, use and enjoy according to the license provided.
 */
-#define FIO_INCLUDE_LINKED_LIST
 #define FIO_INCLUDE_STR
 #include <fio.h>
 
+/* subscription lists have a long lifetime */
+#define FIO_FORCE_MALLOC_TMP 1
+#define FIO_INCLUDE_LINKED_LIST
+#include <fio.h>
+
 #include <fiobj.h>
 
 #include <http.h>

data/lib/iodine/mustache.rb

@@ -1,7 +1,7 @@
 module Iodine
   # Iodine includes a safe and fast Mustache templating engine.
   #
-  # The engine is also faster and simpler than the official and feature richer Ruby engine.
+  # The engine is simpler and safer to use (and often faster) than the official and feature richer Ruby engine.
   #
   # Note: {Iodine::Mustache} behaves differently than the official Ruby templating engine in a number of ways:
   #
@@ -19,7 +19,7 @@ module Iodine
   #
   # Iodine Mustache's engine was designed to play best with basic data structures, such as results from the {Iodine::JSON} parser.
   #
-  # Hash data is tested for String keys before being tested for Symbol keys and methods. This means that `"key"` has precedence over `:key`.
+  # Hash data is tested for Symbol keys before being tested for String keys and methods. This means that `:key` has precedence over `"key"`.
   #
   # Note: Although using methods as "keys" (or argument names) is supported, no Ruby code is evaluated.
   #

data/lib/iodine/version.rb

@@ -1,3 +1,3 @@
 module Iodine
-  VERSION = '0.7.15'.freeze
+  VERSION = '0.7.16'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iodine
 version: !ruby/object:Gem::Version
-  version: 0.7.15
+  version: 0.7.16
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-24 00:00:00.000000000 Z
+date: 2018-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -211,7 +211,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 'Thank you for installing Iodine 0.7.15.
+post_install_message: 'Thank you for installing Iodine 0.7.16.
 
 '
 rdoc_options: []