durable_rules 0.34.07 → 0.34.08

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f801482db85dfb25b213d116aa0d014cdad42084
-  data.tar.gz: 409a2fcaed3552123300f4198d33f4a31fc77cbd
+  metadata.gz: f1e061100199ce15d81d79d7eb1975c492f37e11
+  data.tar.gz: e58844ae64ab2ecc1de3ff65f94c5a58dbc321e0
 SHA512:
-  metadata.gz: 93816e1cd7f9da714223c40f358f25e4cee82863617721b9d1e47c46a6054b1a3057851a34db7706b717f34788da8460dedd1e68006614f087c94e82f3e3f251
-  data.tar.gz: d8dc3652fc040a1b0f4c255858c89b55652e9870547153eb1d9a7e4d8bed4ff952c3dcac6e2689c9d25edcb729fbfdbead94e0b620aff9231c6cdafd71057625
+  metadata.gz: eebe19864a213b180be28a4851217aa785ed186d69a9d6b68716ef3307a1ea54275704291ecb0fe0aff06c372b488df0181c00f4a76209caf7e68284edbd0899
+  data.tar.gz: 0e7dc295427568f9ab95410527633b288eca2e822dd7bfc21dbdf2d30c94f44276135a19cb3398690aa38270f402728901496add972b943268190a354e5a19de

data/librb/durable.rb

@@ -154,7 +154,11 @@ module Durable
     end
 
     def default(name, value=nil)
-      @left = name
+      if @left
+        @left = "#{@left}.#{name}"
+      else
+        @left = name
+      end
       self
     end
 
@@ -262,7 +266,11 @@ module Durable
     private 
 
     def default(name, value=nil)
-      @left = name
+      if @left
+        @left = "#{@left}.#{name}"
+      else
+        @left = name
+      end
       self
     end
 

data/src/rules/events.c

@@ -1262,8 +1262,9 @@ static unsigned int handleMessage(ruleset *tree,
     unsigned int midIndex = UNDEFINED_INDEX;
     unsigned int sidIndex = UNDEFINED_INDEX;
     jsonProperty properties[MAX_EVENT_PROPERTIES];
-    int result = constructObject(NULL, 
-                                 message, 
+    int result = constructObject(message,
+                                 NULL, 
+                                 NULL, 
                                  0, 
                                  MAX_EVENT_PROPERTIES,
                                  properties, 
@@ -1274,7 +1275,7 @@ static unsigned int handleMessage(ruleset *tree,
     if (result != RULES_OK) {
         return result;
     }
-
+    
     return handleMessageCore(tree,
                             state, 
                             message, 
@@ -1309,8 +1310,9 @@ static unsigned int handleMessages(void *handle,
         ++first;
     }
 
-    while (constructObject(NULL, 
-                           first, 
+    while (constructObject(first,
+                           NULL, 
+                           NULL, 
                            0,
                            MAX_EVENT_PROPERTIES,
                            properties, 

data/src/rules/net.c

@@ -1082,6 +1082,37 @@ static unsigned int loadPeekActionCommand(ruleset *tree, binding *rulesBinding)
 "    end\n"
 "    return sid, name, frame\n"
 "end\n"
+"local fixup_frame = function(frame)\n"
+"    for message_name, message in pairs(frame) do\n"
+"        if message ~= \"$n\" then\n"
+"            for key, value in pairs(message) do\n"
+"                local start = 1\n"
+"                local sub_message = message\n"
+"                local name = key\n"
+"                local next = nil\n"
+"                repeat\n"
+"                    next = string.find(key, \"%%.\", start)\n"
+"                    if next then\n"
+"                        name = string.sub(key, start, next - 1)\n"
+"                        if sub_message[name] then\n"
+"                            sub_message = sub_message[name]\n"
+"                        else\n"
+"                            local new_sub_message = {}\n"
+"                            sub_message[name] = new_sub_message\n"
+"                            sub_message = new_sub_message\n"
+"                        end\n"
+"                        start = next + 1\n"
+"                    else\n"
+"                        name = string.sub(key, start)\n"
+"                    end\n"
+"                until not next\n"
+"                message[key] = nil\n"
+"                sub_message[name] = value\n"
+"            end\n"
+"        end\n"
+"    end\n"
+"    return frame\n"
+"end\n"
 "get_context = function(action_key)\n"
 "    if context_directory[action_key] then\n"
 "        return context_directory[action_key]\n"
@@ -1099,9 +1130,9 @@ static unsigned int loadPeekActionCommand(ruleset *tree, binding *rulesBinding)
 "    redis.call(\"zadd\", action_key, tonumber(ARGV[1]), new_sid)\n"
 "    if #ARGV == 2 then\n"
 "        local state = redis.call(\"hget\", state_key, new_sid)\n"
-"        return {new_sid, state, cjson.encode({[action_name] = frame})}\n"
+"        return {new_sid, state, cjson.encode({[action_name] = fixup_frame(frame)})}\n"
 "    else\n"
-"        return {new_sid, cjson.encode({[action_name] = frame})}\n"
+"        return {new_sid, cjson.encode({[action_name] = fixup_frame(frame)})}\n"
 "    end\n"
 "end\n",
                 name,
@@ -2339,7 +2370,7 @@ unsigned int formatEvalMessage(void *rulesBinding,
 
     unsigned int offset = 8 + keysLength;
     for (unsigned int i = 0; i < propertiesLength; ++i) {
-        argv[offset + i * 3] = message + allProperties[i].nameOffset;
+        argv[offset + i * 3] = allProperties[i].name;
         argvl[offset + i * 3] = allProperties[i].nameLength;
         argv[offset + i * 3 + 1] = message + allProperties[i].valueOffset;
         if (allProperties[i].type == JSON_STRING) {
@@ -2419,7 +2450,7 @@ unsigned int formatStoreMessage(void *rulesBinding,
 
     unsigned int offset = 6 + keysLength;
     for (unsigned int i = 0; i < propertiesLength; ++i) {
-        argv[offset +  i * 3] = message + allProperties[i].nameOffset;
+        argv[offset +  i * 3] = allProperties[i].name;
         argvl[offset + i * 3] = allProperties[i].nameLength;
         argv[offset + i * 3 + 1] = message + allProperties[i].valueOffset;
         if (allProperties[i].type == JSON_STRING) {

data/src/rules/rete.c

@@ -32,6 +32,7 @@
 #define HASH_DIV 2087879820 // $div
 #define HASH_L 5861205 // $l
 #define HASH_R 5861211 //$r
+#define HASH_FORWARD 1810358942 // $forward
 
 typedef struct path {
     unsigned char operator;
@@ -995,7 +996,7 @@ static unsigned int findAlpha(ruleset *tree,
     if (result != RULES_OK) {
         return result;
     }
-    
+
     newAlpha->nameOffset = stringOffset;
     newAlpha->type = NODE_ALPHA;
     newAlpha->value.a.hash = hash;
@@ -1048,6 +1049,22 @@ static void getSetting(unsigned int settingHash, char *rule, unsigned short *val
     }
 }
 
+static unsigned int createForwardAlpha(ruleset *tree,
+                                       unsigned int *newOffset) {
+    node *newAlpha;
+    unsigned int result = storeAlpha(tree, &newAlpha, newOffset);
+    if (result != RULES_OK) {
+        return result;
+    }
+
+    newAlpha->nameOffset = 0;
+    newAlpha->type = NODE_ALPHA;
+    newAlpha->value.a.hash = HASH_FORWARD;
+    newAlpha->value.a.operator = OP_NEX;
+
+    return RULES_OK;
+}
+
 static unsigned int createAlpha(ruleset *tree, 
                                 char *rule, 
                                 expression *expr,
@@ -1097,27 +1114,51 @@ static unsigned int createAlpha(ruleset *tree,
             unsigned int resultOffset = parentOffset;
             result = readNextArrayValue(first, &first, &last, &type);
             while (result == PARSE_OK) {
-                createAlpha(tree, first, expr, 0, &resultOffset);
+                result = createAlpha(tree, first, expr, 0, &resultOffset);
+                if (result != RULES_OK) {
+                    return result;
+                }
+
                 previousOffset = resultOffset;
                 result = readNextArrayValue(last, &first, &last, &type);   
             }
+            *newOffset = previousOffset;
 
             result = appendTerm(expr, tree->endNodeOffset);
             if (result != RULES_OK) {
                 return result;
             }
-            return linkAlpha(tree, previousOffset, nextOffset);
+
+            if (nextOffset != 0) {
+                return linkAlpha(tree, previousOffset, nextOffset);
+            }
+
+            return RULES_OK;
         case HASH_OR:
             result = appendTerm(expr, tree->orNodeOffset);
             if (result != RULES_OK) {
                 return result;
             }
 
+            result = createForwardAlpha(tree, newOffset);
+            if (result != RULES_OK) {
+                return result;
+            }
+
             readNextValue(last, &first, &last, &type);
             result = readNextArrayValue(first, &first, &last, &type);
             while (result == PARSE_OK) {
                 unsigned int single_offset = parentOffset;
-                createAlpha(tree, first, expr, nextOffset, &single_offset);
+                result = createAlpha(tree, first, expr, 0, &single_offset);
+                if (result != RULES_OK) {
+                    return result;
+                }
+
+                result = linkAlpha(tree, single_offset, *newOffset);
+                if (result != RULES_OK) {
+                    return result;
+                }
+
                 result = readNextArrayValue(last, &first, &last, &type);   
             }
 
@@ -1125,6 +1166,11 @@ static unsigned int createAlpha(ruleset *tree,
             if (result != RULES_OK) {
                 return result;
             }
+
+            if (nextOffset != 0) {
+                return linkAlpha(tree, *newOffset, nextOffset);
+            }
+
             return RULES_OK;
     }
 

data/src/rules/rules.h

@@ -38,6 +38,7 @@
 #define ERR_STATE_NOT_LOADED 403
 #define ERR_STALE_STATE 404
 #define ERR_PROPERTY_NOT_FOUND 405
+#define ERR_MAX_PROPERTY_NAME_LENGTH 406
 
 #define NEXT_BUCKET_LENGTH 512
 #define NEXT_LIST_LENGTH 32

data/src/rules/state.c

@@ -164,7 +164,8 @@ static stateEntry *getEntry(ruleset *tree, char *sid, unsigned int sidHash) {
     return NULL;
 }
 
-unsigned int constructObject(char *parentName, 
+unsigned int constructObject(char *root,
+                             char *parentName, 
                              char *object,
                              char createHashtable,
                              unsigned int maxProperties,
@@ -180,16 +181,61 @@ unsigned int constructObject(char *parentName,
     unsigned char type;
     unsigned int hash;
     int parentNameLength = (parentName ? strlen(parentName): 0);
+    object = (object ? object : root);
     unsigned int result = readNextName(object, &firstName, &lastName, &hash);
     while (result == PARSE_OK) {
         result = readNextValue(lastName, &first, &last, &type);
         if (result != PARSE_OK) {
             return result;
         }
+
+        jsonProperty *property = NULL;
+        if (type != JSON_OBJECT) {
+            if (!createHashtable) {
+                property = &properties[*propertiesLength];
+                if (hash == HASH_ID) {
+                    *midIndex = *propertiesLength;
+                } else if (hash == HASH_SID) {
+                    *sidIndex = *propertiesLength;
+                }
+            } else {
+                unsigned int candidate = hash % maxProperties;
+                while (properties[candidate].type != 0) {
+                    candidate = (candidate + 1) % maxProperties;
+                }
+
+                if (hash == HASH_ID) {
+                    *midIndex = candidate;
+                } else if (hash == HASH_SID) {
+                    *sidIndex = candidate;
+                }
+
+                property = &properties[candidate];
+            } 
+
+            *propertiesLength = *propertiesLength + 1;
+            if (*propertiesLength == maxProperties) {
+                return ERR_EVENT_MAX_PROPERTIES;
+            }
+
+            property->isMaterial = 0;
+            property->valueOffset = first - root;
+            property->valueLength = last - first;
+            property->type = type;
+        }
         
         if (!parentName) {
-            if (type == JSON_OBJECT) {
-                int nameLength = lastName - firstName;
+            int nameLength = lastName - firstName;
+            if (nameLength > MAX_NAME_LENGTH) {
+                return ERR_MAX_PROPERTY_NAME_LENGTH;
+            }
+
+            if (type != JSON_OBJECT) {
+                strncpy(property->name, firstName, nameLength);
+                property->nameLength = nameLength;
+                property->hash = hash;
+            } else {
+                
 #ifdef _WIN32
 				char *newParent = (char *)_alloca(sizeof(char)*(nameLength + 1));
 #else
@@ -197,7 +243,8 @@ unsigned int constructObject(char *parentName,
 #endif
                 strncpy(newParent, firstName, nameLength);
                 newParent[nameLength] = '\0';
-                return constructObject(newParent, 
+                result = constructObject(root,
+                                       newParent, 
                                        first, 
                                        createHashtable, 
                                        maxProperties, 
@@ -206,22 +253,35 @@ unsigned int constructObject(char *parentName,
                                        midIndex, 
                                        sidIndex, 
                                        next);
+                if (result != RULES_OK) {
+                    return result;
+                }
             }
         } else {
             int nameLength = lastName - firstName;
             int fullNameLength = nameLength + parentNameLength + 1;
+            if (fullNameLength > MAX_NAME_LENGTH) {
+                return ERR_MAX_PROPERTY_NAME_LENGTH;
+            }
+
+            if (type != JSON_OBJECT) {
+                strncpy(property->name, parentName, parentNameLength);
+                property->name[parentNameLength] = '.';
+                strncpy(&property->name[parentNameLength + 1], firstName, nameLength);
+                property->nameLength = fullNameLength;
+                property->hash = djbHash(property->name, fullNameLength);
+            } else {
 #ifdef _WIN32
-			char *fullName = (char *)_alloca(sizeof(char)*(fullNameLength + 1));
+                char *fullName = (char *)_alloca(sizeof(char)*(fullNameLength + 1));
 #else
-			char fullName[fullNameLength + 1];
+			    char fullName[fullNameLength + 1];
 #endif
-            strncpy(fullName, firstName, nameLength);
-            fullName[nameLength] = '.';
-            strncpy(&fullName[nameLength + 1], parentName, parentNameLength);
-            fullName[fullNameLength] = '\0';
-            hash = djbHash(fullName, fullNameLength);
-            if (type == JSON_OBJECT) {
-                return constructObject(fullName, 
+                strncpy(fullName, parentName, parentNameLength);
+                fullName[parentNameLength] = '.';
+                strncpy(&fullName[parentNameLength + 1], firstName, nameLength);
+                fullName[fullNameLength] = '\0';
+                result = constructObject(root,
+                                       fullName, 
                                        first, 
                                        createHashtable, 
                                        maxProperties, 
@@ -230,46 +290,12 @@ unsigned int constructObject(char *parentName,
                                        midIndex, 
                                        sidIndex, 
                                        next);
+                if (result != RULES_OK) {
+                    return result;
+                }
             }
         }
-
-        jsonProperty *property = NULL;
-        if (!createHashtable) {
-            property = &properties[*propertiesLength];
-            if (hash == HASH_ID) {
-                *midIndex = *propertiesLength;
-            } else if (hash == HASH_SID) {
-                *sidIndex = *propertiesLength;
-            }
-        } else {
-            unsigned int candidate = hash % maxProperties;
-            while (properties[candidate].type != 0) {
-                candidate = (candidate + 1) % maxProperties;
-            }
-
-            if (hash == HASH_ID) {
-                *midIndex = candidate;
-            } else if (hash == HASH_SID) {
-                *sidIndex = candidate;
-            }
-
-            property = &properties[candidate];
-        } 
-
-        
-
-        *propertiesLength = *propertiesLength + 1;
-        if (*propertiesLength == maxProperties) {
-            return ERR_EVENT_MAX_PROPERTIES;
-        }
         
-        property->isMaterial = 0;
-        property->hash = hash;
-        property->valueOffset = first - object;
-        property->valueLength = last - first;
-        property->nameOffset = firstName - object;
-        property->nameLength = lastName - firstName;
-        property->type = type;
         *next = last;
         result = readNextName(last, &firstName, &lastName, &hash);
     }
@@ -365,8 +391,9 @@ unsigned int refreshState(void *handle,
     char *next;
     unsigned int midIndex = UNDEFINED_INDEX;
     unsigned int sidIndex = UNDEFINED_INDEX;
-    result =  constructObject(NULL, 
-                             entry->state, 
+    result =  constructObject(entry->state,
+                             NULL, 
+                             NULL, 
                              1, 
                              MAX_STATE_PROPERTIES, 
                              entry->properties, 

data/src/rules/state.h

@@ -3,6 +3,7 @@
 #define HASH_SID 193505797
 #define UNDEFINED_INDEX 0xFFFFFFFF
 #define MAX_STATE_PROPERTIES 64
+#define MAX_NAME_LENGTH 256
 #define UNDEFINED_HASH_OFFSET 0xFFFFFFFF
 
 typedef struct jsonProperty {
@@ -11,7 +12,7 @@ typedef struct jsonProperty {
     unsigned char isMaterial;
     unsigned short valueOffset;
     unsigned short valueLength;
-    unsigned short nameOffset;
+    char name[MAX_NAME_LENGTH];
     unsigned short nameLength;
     union {
         long i; 
@@ -36,7 +37,8 @@ typedef struct stateEntry {
 unsigned int djbHash(char *str, unsigned int len);
 void rehydrateProperty(jsonProperty *property, char *state);
 unsigned int refreshState(void *tree, char *sid);
-unsigned int constructObject(char *parentName, 
+unsigned int constructObject(char *root,
+                             char *parentName, 
                              char *object,
                              char createHashtable,
                              unsigned int maxProperties,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: durable_rules
 version: !ruby/object:Gem::Version
-  version: 0.34.07
+  version: 0.34.08
 platform: ruby
 authors:
 - Jesus Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-19 00:00:00.000000000 Z
+date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake