iodine 0.7.14 → 0.7.15

data/ext/iodine/iodine_mustache.c

@@ -50,71 +50,6 @@ static VALUE iodine_mustache_data_alloc_c(VALUE self) {
 Parser Callbacks
 ***************************************************************************** */
 
-/** HTML ecape table, created using the following Ruby Script:
-
-a = (0..255).to_a.map {|i| i.chr }
-# 100.times {|i| a[i] = "&\#x#{ i < 16 ? "0#{i.to_s(16)}" : i.to_s(16)};"}
-100.times {|i| a[i] = "&\##{i.to_s(10)};"}
-('a'.ord..'z'.ord).each {|i| a[i] = i.chr }
-('A'.ord..'Z'.ord).each {|i| a[i] = i.chr }
-('0'.ord..'9'.ord).each {|i| a[i] = i.chr }
-a['<'.ord] = "&lt;"
-a['>'.ord] = "&gt;"
-a['&'.ord] = "&amp;"
-a['"'.ord] = "&quot;"
-a["\'".ord] = "&apos;"
-a['|'.ord] = "&\##{'|'.ord.to_s(10)};"
-
-b = a.map {|s| s.length }
-puts "static char *html_escape_strs[] = {", a.to_s.slice(1..-2) ,"};",
-     "static uint8_t html_escape_len[] = {", b.to_s.slice(1..-2),"};"
-*/
-static char *html_escape_strs[] = {
-    "&#0;",  "&#1;",  "&#2;",   "&#3;",  "&#4;",   "&#5;",  "&#6;",  "&#7;",
-    "&#8;",  "&#9;",  "&#10;",  "&#11;", "&#12;",  "&#13;", "&#14;", "&#15;",
-    "&#16;", "&#17;", "&#18;",  "&#19;", "&#20;",  "&#21;", "&#22;", "&#23;",
-    "&#24;", "&#25;", "&#26;",  "&#27;", "&#28;",  "&#29;", "&#30;", "&#31;",
-    "&#32;", "&#33;", "&quot;", "&#35;", "&#36;",  "&#37;", "&amp;", "&apos;",
-    "&#40;", "&#41;", "&#42;",  "&#43;", "&#44;",  "&#45;", "&#46;", "&#47;",
-    "0",     "1",     "2",      "3",     "4",      "5",     "6",     "7",
-    "8",     "9",     "&#58;",  "&#59;", "&lt;",   "&#61;", "&gt;",  "&#63;",
-    "&#64;", "A",     "B",      "C",     "D",      "E",     "F",     "G",
-    "H",     "I",     "J",      "K",     "L",      "M",     "N",     "O",
-    "P",     "Q",     "R",      "S",     "T",      "U",     "V",     "W",
-    "X",     "Y",     "Z",      "&#91;", "&#92;",  "&#93;", "&#94;", "&#95;",
-    "&#96;", "a",     "b",      "c",     "d",      "e",     "f",     "g",
-    "h",     "i",     "j",      "k",     "l",      "m",     "n",     "o",
-    "p",     "q",     "r",      "s",     "t",      "u",     "v",     "w",
-    "x",     "y",     "z",      "{",     "&#124;", "}",     "~",     "\x7F",
-    "\x80",  "\x81",  "\x82",   "\x83",  "\x84",   "\x85",  "\x86",  "\x87",
-    "\x88",  "\x89",  "\x8A",   "\x8B",  "\x8C",   "\x8D",  "\x8E",  "\x8F",
-    "\x90",  "\x91",  "\x92",   "\x93",  "\x94",   "\x95",  "\x96",  "\x97",
-    "\x98",  "\x99",  "\x9A",   "\x9B",  "\x9C",   "\x9D",  "\x9E",  "\x9F",
-    "\xA0",  "\xA1",  "\xA2",   "\xA3",  "\xA4",   "\xA5",  "\xA6",  "\xA7",
-    "\xA8",  "\xA9",  "\xAA",   "\xAB",  "\xAC",   "\xAD",  "\xAE",  "\xAF",
-    "\xB0",  "\xB1",  "\xB2",   "\xB3",  "\xB4",   "\xB5",  "\xB6",  "\xB7",
-    "\xB8",  "\xB9",  "\xBA",   "\xBB",  "\xBC",   "\xBD",  "\xBE",  "\xBF",
-    "\xC0",  "\xC1",  "\xC2",   "\xC3",  "\xC4",   "\xC5",  "\xC6",  "\xC7",
-    "\xC8",  "\xC9",  "\xCA",   "\xCB",  "\xCC",   "\xCD",  "\xCE",  "\xCF",
-    "\xD0",  "\xD1",  "\xD2",   "\xD3",  "\xD4",   "\xD5",  "\xD6",  "\xD7",
-    "\xD8",  "\xD9",  "\xDA",   "\xDB",  "\xDC",   "\xDD",  "\xDE",  "\xDF",
-    "\xE0",  "\xE1",  "\xE2",   "\xE3",  "\xE4",   "\xE5",  "\xE6",  "\xE7",
-    "\xE8",  "\xE9",  "\xEA",   "\xEB",  "\xEC",   "\xED",  "\xEE",  "\xEF",
-    "\xF0",  "\xF1",  "\xF2",   "\xF3",  "\xF4",   "\xF5",  "\xF6",  "\xF7",
-    "\xF8",  "\xF9",  "\xFA",   "\xFB",  "\xFC",   "\xFD",  "\xFE",  "\xFF"};
-static uint8_t html_escape_len[] = {
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 5, 5, 5, 5, 6, 5, 5, 5, 5, 5, 5, 5, 5,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 5, 4, 5, 4, 5, 5, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 5, 5, 5, 5,
-    5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
-
 static inline VALUE fiobj_mustache_find_obj_absolute(VALUE udata,
                                                      const char *name,
                                                      uint32_t name_len) {

data/ext/iodine/iodine_pubsub.c

@@ -524,7 +524,6 @@ void iodine_pubsub_init(void) {
   rb_define_module_function(PubSubModule, "default", iodine_pubsub_default_get,
                             0);
   rb_define_module_function(PubSubModule, "attach", iodine_pubsub_attach, 1);
-  rb_define_module_function(PubSubModule, "dettach", iodine_pubsub_detach, 1);
   rb_define_module_function(PubSubModule, "detach", iodine_pubsub_detach, 1);
   rb_define_module_function(PubSubModule, "reset", iodine_pubsub_reset, 1);
 

data/ext/iodine/mustache_parser.h

@@ -28,11 +28,6 @@ Feel free to copy, use and enjoy according to the license provided.
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#if !defined(MUSTACHE_NESTING_LIMIT) || !MUSTACHE_NESTING_LIMIT
-#undef MUSTACHE_NESTING_LIMIT
-#define MUSTACHE_NESTING_LIMIT 82
-#endif
-
 #if !defined(__GNUC__) && !defined(__clang__) && !defined(FIO_GNUC_BYPASS)
 #define __attribute__(...)
 #define __has_include(...) 0
@@ -47,6 +42,23 @@ Feel free to copy, use and enjoy according to the license provided.
 #define MUSTACHE_FUNC static __attribute__((unused))
 #endif
 
+/* *****************************************************************************
+Compile Time Behavior Flags
+***************************************************************************** */
+
+#ifndef MUSTACHE_USE_DYNAMIC_PADDING
+#define MUSTACHE_USE_DYNAMIC_PADDING 1
+#endif
+
+#ifndef MUSTACHE_FAIL_ON_MISSING_TEMPLATE
+#define MUSTACHE_FAIL_ON_MISSING_TEMPLATE 1
+#endif
+
+#if !defined(MUSTACHE_NESTING_LIMIT) || !MUSTACHE_NESTING_LIMIT
+#undef MUSTACHE_NESTING_LIMIT
+#define MUSTACHE_NESTING_LIMIT 82
+#endif
+
 /* *****************************************************************************
 Mustache API Argument types
 ***************************************************************************** */
@@ -54,7 +66,7 @@ Mustache API Argument types
 /** an opaque type for mustache template data (when caching). */
 typedef struct mustache_s mustache_s;
 
-/** Error reporting (in case of errors). */
+/** Error reporting type. */
 typedef enum mustache_error_en {
   MUSTACHE_OK,
   MUSTACHE_ERR_TOO_DEEP,
@@ -70,7 +82,7 @@ typedef enum mustache_error_en {
   MUSTACHE_ERR_USER_ERROR,
 } mustache_error_en;
 
-/** Arguments for the `mustache_load` function. */
+/** Arguments for the `mustache_load` function, used by the mustache parser. */
 typedef struct {
   /** The root template's file name. */
   char const *filename;
@@ -94,10 +106,6 @@ REQUIRED: Define INCLUDE_MUSTACHE_IMPLEMENTATION only in the implementation file
  *
  * Before including the header within an implementation faile, define
  * INCLUDE_MUSTACHE_IMPLEMENTATION as 1.
- *
- * When unset (or zero), this will expose the return error reporting and
- * function argument types, allowing them to be exposed in a public facing API.
- * exposure to the function return and argument types.
  */
 #if INCLUDE_MUSTACHE_IMPLEMENTATION
 
@@ -214,6 +222,8 @@ Client Callbacks - MUST be implemented by the including file
  * A conforming implementation will output the named argument's value (either
  * HTML escaped or not, depending on the `escape` flag) as a string.
  *
+ * A conforming implementation will test for dot notation in the name.
+ *
  * NOTE: the `name` data is **not** NUL terminated. Use the `name_len` data to
  * determine the actual string length.
  */
@@ -252,6 +262,8 @@ static int mustache_on_text(mustache_section_s *section, const char *data,
  *
  * NOTE: the `name` data is **not** NUL terminated. Use the `name_len` data to
  * determine the actual string length.
+ *
+ * A conforming implementation will test for dot notation in the name.
  */
 static int32_t mustache_on_section_test(mustache_section_s *section,
                                         const char *name, uint32_t name_len,
@@ -271,6 +283,8 @@ static int32_t mustache_on_section_test(mustache_section_s *section,
  *
  * NOTE: the `name` data is **not** NUL terminated. Use the `name_len` data to
  * determine the actual string length.
+ *
+ * A conforming implementation will test for dot notation in the name.
  */
 static int mustache_on_section_start(mustache_section_s *section,
                                      char const *name, uint32_t name_len,
@@ -553,7 +567,7 @@ static int mustache__write_escaped(mustache__builder_stack_s *s, char *text,
   size_t pos = 0;
   const char *end = text + len;
   while (text < end) {
-    if (*text == '\n' && s->padding) {
+    if (MUSTACHE_USE_DYNAMIC_PADDING && *text == '\n' && s->padding) {
       buffer[pos++] = '\n';
       buffer[pos] = 0;
       if (mustache_on_text(&s->stack[s->index].sec, buffer, pos) == -1)
@@ -591,7 +605,8 @@ static inline int mustache_write_text(mustache_section_s *section, char *text,
   mustache__builder_stack_s *s = mustache___section2stack(section);
   if (escape)
     return mustache__write_escaped(s, text, len);
-  /* TODO */
+    /* TODO */
+#if MUSTACHE_USE_DYNAMIC_PADDING
   char *end = memchr(text, '\n', len);
   while (len && end) {
     ++end;
@@ -606,6 +621,11 @@ static inline int mustache_write_text(mustache_section_s *section, char *text,
   }
   if (len && mustache_on_text(&s->stack[s->index].sec, text, len) == -1)
     return -1;
+#else
+  if (mustache_on_text(&s->stack[s->index].sec, text, len) == -1)
+    return -1;
+
+#endif
   return 0;
 }
 
@@ -629,7 +649,7 @@ typedef struct {
   uint16_t path_len;     /* if the file is in a folder, this marks the '/' */
 } mustache__data_segment_s;
 
-/* writes the data to dest, returns the number of bytes written. */
+/* data segment serialization, returns the number of bytes written. */
 static inline size_t
 mustache__data_segment_write(uint8_t *dest, mustache__data_segment_s data) {
   dest[0] = 0xFF & data.inst_start;
@@ -653,6 +673,8 @@ mustache__data_segment_write(uint8_t *dest, mustache__data_segment_s data) {
 static inline size_t mustache__data_segment_length(size_t filename_len) {
   return 13 + filename_len;
 }
+
+/* data segment serialization, reads data from raw stream. */
 static inline mustache__data_segment_s
 mustache__data_segment_read(uint8_t *data) {
   mustache__data_segment_s s = {
@@ -907,8 +929,12 @@ static inline ssize_t mustache__load_file(mustache__loader_stack_s *s,
     }
   }
 
+#if MUSTACHE_FAIL_ON_MISSING_TEMPLATE
   *s->err = MUSTACHE_ERR_FILE_NOT_FOUND;
   return -1;
+#else
+  return 0;
+#endif
 
 file_found:
   if (f_data.st_size >= INT32_MAX) {

data/lib/iodine.rb

@@ -1,4 +1,4 @@
-require 'socket'
+require 'socket' # TCPSocket is used internally for Hijack support
 
 require 'iodine/version'
 require 'iodine/iodine'
@@ -65,12 +65,12 @@ module Iodine
     def self.patch_rack
       begin
         require 'rack'
-      rescue LoadError => e
+      rescue LoadError
       end
-    ::Rack::Utils.class_eval do
-      Iodine::Base::MonkeyPatch::RackUtils.methods(false).each do |m|
-        ::Rack::Utils.define_singleton_method(m,
-              Iodine::Base::MonkeyPatch::RackUtils.instance_method(m) )
+      ::Rack::Utils.class_eval do
+        Iodine::Base::MonkeyPatch::RackUtils.methods(false).each do |m|
+          ::Rack::Utils.define_singleton_method(m,
+                Iodine::Base::MonkeyPatch::RackUtils.instance_method(m) )
         end
       end
     end
@@ -114,12 +114,20 @@ module Iodine
       Iodine.on_state(:on_finish, &block)
     end
 
+    module PubSub
+      # @deprecated use {Iodine::PubSub.detach}.
+      def self.dettach(engine)
+        warn "Iodine::PubSub.dettach is deprecated (was a typo), use Iodine::PubSub.detach(engine)."
+        Iodine::PubSub.detach(engine)
+      end
+    end
+
 end
 
 require 'rack/handler/iodine' unless defined? ::Iodine::Rack::IODINE_RACK_LOADED
 
 
-### Automatic ActiveRecord and Sequel fix
+### Automatic ActiveRecord and Sequel support for forking (preventing connection sharing)
 Iodine.on_state(:before_fork)  do
   if defined?(ActiveRecord) && defined?(ActiveRecord::Base) && ActiveRecord::Base.respond_to?(:connection)
     begin
@@ -144,7 +152,7 @@ Iodine.on_state(:after_fork)  do
 end
 
 ### Parse CLI for default HTTP settings
-Iodine::Base::CLI.parse("Iodine's HTTP/WebSocket server version #{Iodine::VERSION}\r\n\r\nUse:\r\n    iodine <options> <filename>\r\n\r\nBoth <options> and <filename> are optional. i.e.,:\r\n    iodine -p 0 -b /tmp/my_unix_sock\r\n    iodine -p 8080 path/to/app/conf.ru\r\n    iodine -p 8080 -w 4 -t 16\r\n    iodine -w -1 -t 4 -r redis://usr:pass@localhost:6379/\r\n")
+Iodine::Base::CLI.parse
 
 ### Initialize Redis if set in CLI
 Iodine::PubSub.default = Iodine::PubSub::Redis.new(Iodine::DEFAULT_HTTP_ARGS[:redis_], ping: Iodine::DEFAULT_HTTP_ARGS[:redis_ping_]) if Iodine::DEFAULT_HTTP_ARGS[:redis_]

data/lib/iodine/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iodine
 version: !ruby/object:Gem::Version
-  version: 0.7.14
+  version: 0.7.15
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-12 00:00:00.000000000 Z
+date: 2018-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,6 +125,7 @@ files:
 - examples/pubsub_engine.ru
 - examples/redis.ru
 - examples/shootout.ru
+- examples/sub-protocols.ru
 - exe/iodine
 - ext/iodine/extconf.rb
 - ext/iodine/fio.c
@@ -210,7 +211,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 'Thank you for installing Iodine 0.7.14.
+post_install_message: 'Thank you for installing Iodine 0.7.15.
 
 '
 rdoc_options: []