durable_rules 0.34.36 → 0.34.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47e6483313e3fe7047cb09fea58da4f5bf3c0c25
-  data.tar.gz: fcc1f99df7b9cb4b932af7bb9eb749265c82dfa4
+  metadata.gz: 56d810027b258d2443a8a637b1c58ac7a61cd63f
+  data.tar.gz: 7c6779331a8090a952d942c7120d7d93a3e08e23
 SHA512:
-  metadata.gz: 32bbe82822555390ca0a164945fb9a1ec6017f14a8f492e2fe5b9e1d6830ae7bc6a5c31e0b9e47017839c9f85cea0b6201875d9c43363acc4e9e845598243783
-  data.tar.gz: 1214ab05cdd4ebc38344378394fb7f4cb979b9921a8975701c4389aefc0f6df3d8a7c4b89ef2bbe6e6b3f4909426f2b53c06d10951c1abc8f63fb7a770a5a994
+  metadata.gz: aeb2094be7c3a54626e973919693491fa007004ea2e3199ff45ced2100918b47df7ff8d9007b4f71f330dbbd83d01c152a151b56b7b411ca16147061f35d967c
+  data.tar.gz: c5e54f6bf1e9b99fed474f72c2bd2bf0ac6f544780d55f21dcc3bb45ad576b61ec66ddba4dbc81002988e5d724ef4f4691fc38c02e70564d5013a0ecde435950

data/librb/engine.rb

@@ -435,7 +435,6 @@ module Engine
         end
       end
 
-      puts JSON.generate(ruleset_definition)
       @handle = Rules.create_ruleset name, JSON.generate(ruleset_definition), state_cache_size
       @definition = ruleset_definition
     end
@@ -1321,7 +1320,7 @@ module Engine
 
   class Queue
 
-    def initialize(ruleset_name, database = {:host => 'localhost', :port => 6379, :password => nil, :db => 0}, state_cache_size = 1024)
+    def initialize(ruleset_name, database = {:host => "localhost", :port => 6379, :password => nil, :db => 0}, state_cache_size = 1024)
       @_ruleset_name = ruleset_name.to_s
       @handle = Rules.create_client @_ruleset_name, state_cache_size
       if database.kind_of? String
@@ -1331,23 +1330,42 @@ module Engine
       end
     end
 
+    def isClosed()
+      @handle == 0
+    end
+
     def post(message)
+      if @handle == 0
+        raise "Queue has already been closed"
+      end
+
       sid = (message.key? :sid) ? message[:sid]: message['sid']
       Rules.queue_assert_event @handle, sid.to_s, @_ruleset_name, JSON.generate(message)
     end
 
     def assert(message)
+      if @handle == 0
+        raise "Queue has already been closed"
+      end
+
       sid = (message.key? :sid) ? message[:sid]: message['sid']
       Rules.queue_assert_fact @handle, sid.to_s, @_ruleset_name, JSON.generate(message)
     end
 
     def retract(message)
+      if @handle == 0
+        raise "Queue has already been closed"
+      end
+
       sid = (message.key? :sid) ? message[:sid]: message['sid']
       Rules.queue_retract_fact @handle, sid.to_s, @_ruleset_name, JSON.generate(message)
     end
 
     def close()
-      Rules.delete_client @handle
+      if @handle != 0
+        Rules.delete_client @handle
+        @handle = 0
+      end
     end
   end
 

data/src/rules/events.c

@@ -1049,7 +1049,7 @@ static unsigned int isArrayMatch(ruleset *tree,
                 }
             }
 
-            if(currentAlpha->betaListOffset && currentAlpha != arrayAlpha) {
+            if ((currentAlpha->betaListOffset || !currentAlpha->nextOffset) && currentAlpha != arrayAlpha) {
                 *propertyMatch = 1;
                 break;
             }

data/src/rules/json.c

@@ -403,8 +403,9 @@ static unsigned int getStringAndHash(char *start, char **first, char **last, uns
                     state = ST_STRING_PARSE;
                     delimiter = start[0];
                     *first = start + 1;
-                }
-                else if (!IS_WHITESPACE(start[0])) {
+                } else if (start[0] == '}') {
+                    return PARSE_END;
+                } else if (!IS_WHITESPACE(start[0])) {
                     return ERR_PARSE_STRING;
                 }
                 break;

data/src/rules/net.c

@@ -1179,8 +1179,10 @@ static unsigned int loadPeekActionCommand(ruleset *tree, binding *rulesBinding)
 "                until not next\n"
 "                if value == \"$null\" then\n"
 "                    sub_message[name] = cjson.null\n"
-"                else\n"
-"                   sub_message[name] = value\n"
+"                elseif name ~= \"id\" or type(value) ~= \"string\" or string.sub(value, 1, 1) ~= \"$\" then\n"
+"                   if name ~= \"$f\" then \n"
+"                       sub_message[name] = value\n"
+"                   end\n"
 "                end\n"
 "            end\n"
 "        end\n"

data/src/rules/state.c

@@ -228,9 +228,9 @@ static void calculateId(jsonObject *jo) {
     }
 
 #ifdef _WIN32
-    sprintf_s(jo->idBuffer, sizeof(char) * 21, "%020llu", hash); 
+    sprintf_s(jo->idBuffer, sizeof(char) * ID_BUFFER_LENGTH, "$%020llu", hash); 
 #else
-    snprintf(jo->idBuffer, sizeof(char) * 21, "%020llu", hash);
+    snprintf(jo->idBuffer, sizeof(char) * ID_BUFFER_LENGTH, "$%020llu", hash);
 #endif
     jo->properties[jo->idIndex].valueLength = 20;
 }

data/src/rules/state.h

@@ -4,7 +4,7 @@
 #define UNDEFINED_INDEX 0xFFFFFFFF
 #define MAX_NAME_LENGTH 256
 #define SID_BUFFER_LENGTH 2
-#define ID_BUFFER_LENGTH 21
+#define ID_BUFFER_LENGTH 22
 #define UNDEFINED_HASH_OFFSET 0xFFFFFFFF
 
 #define JSON_OBJECT_SEQUENCED 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: durable_rules
 version: !ruby/object:Gem::Version
-  version: 0.34.36
+  version: 0.34.37
 platform: ruby
 authors:
 - Jesus Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-19 00:00:00.000000000 Z
+date: 2017-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake