durable_rules 0.33.03 → 0.33.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67d767da0de1ddf442ccd642a9b89c36661d1fab
-  data.tar.gz: e5267ba218b1529137254f9e85175b1b2ebe0631
+  metadata.gz: 14164e8dd6116391e91df6a34c18dadc3ff24a0f
+  data.tar.gz: 556e9724071ab335c72228114c8c5168b497cfa6
 SHA512:
-  metadata.gz: 3956e01a1b382556b665029f005aa826b0ab861fb2d02e80420f8168758873bb73e919f65983c1d0920c5552de8b732d94fea2304e4072a006008459c0060f63
-  data.tar.gz: 7e785e277678cf99a8025677c53ec3e2ecfd07e0379f70e126fa923ac1968881160f4dbf9921eaa2e0e08f8af3270ed35f70138392e2ebf6686aeb46fe0a07e2
+  metadata.gz: 9df7fe66c5ee833b6866922883031e114661cd1085c254156fea8754c4d2e489c46998822283db472316c6ca2c2414976272b47173a3397bf0f6e1dd3bc9b204
+  data.tar.gz: 3920871e93fa6bf162207352d7f05e170ceec0c7f4fe8c93f3a7a7069678baa2dbe2e30848610f1aa8dd703b24b2d0b1f1e08d7627eee54404ef9e00d7d425a7

data/src/rules/Makefile

@@ -1,27 +1,17 @@
 OBJ=events.o json.o net.o rete.o state.o
-LIBNAME=rules
+LIBNAME=librules
 
 # Fallback to gcc when $CC is not in $PATH.
 CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
 OPTIMIZATION?=-O3
 WARNINGS=-Wall
 DEBUG?= -g -ggdb
-REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG) $(ARCH)
-REAL_LDFLAGS=$(LDFLAGS) $(ARCH)
-
-REAL_CFLAGS+= -I../../deps/hiredis
-REAL_LDFLAGS+= ../deps/hiredis/libhiredis.a
+REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG) $(ARCH) -I../../deps/hiredis -D_GNU_SOURCE
 
 STLIBSUFFIX=a
 STLIBNAME=$(LIBNAME).$(STLIBSUFFIX)
-STLIB_MAKE_CMD=ar rcs $(STLIBNAME)
-
-# Platform-specific overrides
-uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
-ifeq ($(uname_S),SunOS)
-  REAL_LDFLAGS+= -ldl -lnsl -lsocket
-  INSTALL= cp -r
-endif
+STLIB_MAKE_CMD=ld $(ARCH) -o $(STLIBNAME) -L../../deps/hiredis/ -lhiredis -r
+#STLIB_MAKE_CMD=ar rcs $(STLIBNAME)
 
 all: $(STLIBNAME)
 
@@ -37,19 +27,10 @@ $(STLIBNAME): $(OBJ)
 
 static: $(STLIBNAME)
 
-rules-%: %.o $(STLIBNAME)
-	$(CC) -o $@ $(REAL_LDFLAGS) $< $(STLIBNAME)
-
 .c.o:
 	$(CC) -std=c99 -c $(REAL_CFLAGS) $<
 
 clean:
-	rm -rf $(STLIBNAME) $(BINS) *.o *.gcda *.gcno *.gcov
-
-gprof:
-	$(MAKE) CFLAGS="-pg" LDFLAGS="-pg"
-
-noopt:
-	$(MAKE) OPTIMIZATION=""
+	rm -rf $(STLIBNAME) $(BINS) *.o 
 
-.PHONY: all clean gprof gcov noopt
+.PHONY: all clean

data/src/rules/events.c

@@ -497,7 +497,10 @@ static unsigned int reduceProperties(unsigned char operator,
     char rightTemp = 0;
     if (leftProperty->type == JSON_STRING || rightProperty->type == JSON_STRING) {
         if (operator != OP_ADD) {
-            asprintf(state, "");
+            *state = (char*)calloc(1, sizeof(char));
+            if (!*state) {
+                return ERR_OUT_OF_MEMORY;
+            }
             return RULES_OK;
         }
 

data/src/rules/net.c

@@ -123,7 +123,8 @@ static unsigned int createTest(ruleset *tree, expression *expr, char **test, cha
     unsigned char setPrimaryKey = 0;
     *primaryKey = NULL;
     *primaryFrameKey = NULL;
-    if (asprintf(test, "") == -1) {
+    *test = (char*)calloc(1, sizeof(char));
+    if (!*test) {
         return ERR_OUT_OF_MEMORY;
     }
     
@@ -284,10 +285,13 @@ static unsigned int createTest(ruleset *tree, expression *expr, char **test, cha
     }
 
     if (*primaryKey == NULL) {
-        if (asprintf(primaryKey, "") == -1) {
+        *primaryKey = (char*)calloc(1, sizeof(char));
+        if (!*primaryKey) {
             return ERR_OUT_OF_MEMORY;
         }
-        if (asprintf(primaryFrameKey, "") == -1) {
+
+        *primaryFrameKey = (char*)calloc(1, sizeof(char));
+        if (!*primaryFrameKey) {
             return ERR_OUT_OF_MEMORY;
         }
     }
@@ -310,15 +314,19 @@ static unsigned int loadCommands(ruleset *tree, binding *rulesBinding) {
     char *peekActionLua = NULL;
     char *addMessageLua = NULL;
     char *oldLua;
-    if (asprintf(&peekActionLua, "")  == -1) {
+    
+    peekActionLua = (char*)calloc(1, sizeof(char));
+    if (!peekActionLua) {
         return ERR_OUT_OF_MEMORY;
     }
 
-    if (asprintf(&lua, "")  == -1) {
+    lua = (char*)calloc(1, sizeof(char));
+    if (!lua) {
         return ERR_OUT_OF_MEMORY;
     }
 
-    if (asprintf(&addMessageLua, "")  == -1) {
+    addMessageLua = (char*)calloc(1, sizeof(char));
+    if (!addMessageLua) {
         return ERR_OUT_OF_MEMORY;
     }
 
@@ -404,7 +412,8 @@ static unsigned int loadCommands(ruleset *tree, binding *rulesBinding) {
                     char *currentKey = &tree->stringPool[expr->nameOffset];
                     char *nextKeyTest;
                     if (iii == (currentJoin->expressionsLength - 1)) {
-                        if (asprintf(&nextKeyTest, "")  == -1) {
+                        nextKeyTest = (char*)calloc(1, sizeof(char));
+                        if (!nextKeyTest) {
                             return ERR_OUT_OF_MEMORY;
                         }
                     } else {
@@ -419,6 +428,10 @@ static unsigned int loadCommands(ruleset *tree, binding *rulesBinding) {
                     
                     if (iii == 0) {
                         oldAddMessageLua = addMessageLua;
+                        if (!addMessageLua) {
+                            addMessageLua = "";
+                        }
+
                         if (asprintf(&addMessageLua, 
 "%sif input_keys[\"%s\"] then\n"
 "    primary_message_keys[\"%s\"] = function(message)\n"
@@ -489,6 +502,10 @@ static unsigned int loadCommands(ruleset *tree, binding *rulesBinding) {
                             free(oldLua);
 
                             oldPeekActionLua = peekActionLua;
+                            if (!peekActionLua) {
+                                peekActionLua = "";
+                            }
+
                             if (asprintf(&peekActionLua, 
 "%skeys[1] = \"%s\"\n"
 "reviewers[1] = function(message, frame, index)\n"
@@ -528,8 +545,6 @@ static unsigned int loadCommands(ruleset *tree, binding *rulesBinding) {
                                 return ERR_OUT_OF_MEMORY;
                             }
 
-
-
                             oldLua = lua;
                             if (asprintf(&lua, 
 "%sif input_keys[\"%s\"] %s then\n"
@@ -1356,6 +1371,7 @@ static unsigned int loadCommands(ruleset *tree, binding *rulesBinding) {
                  lua)  == -1) {
         return ERR_OUT_OF_MEMORY;
     }
+
     free(oldLua);
     redisAppendCommand(reContext, "SCRIPT LOAD %s", lua);
     redisGetReply(reContext, (void**)&reply);

data/src/rulesrb/extconf.rb

@@ -31,7 +31,7 @@ end
 
 # Statically link to hiredis (mkmf can't do this for us)
 $CFLAGS << " -I#{rules_lib} "
-$LDFLAGS << " #{hiredis_lib}/libhiredis.a #{rules_lib}/rules.a"
+$LDFLAGS << " -L#{rules_lib} -L#{hiredis_lib} -lrules -lhiredis"
 
 have_func("rb_thread_fd_select")
 create_makefile('src/rulesrb/rules')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: durable_rules
 version: !ruby/object:Gem::Version
-  version: 0.33.03
+  version: 0.33.13
 platform: ruby
 authors:
 - Jesus Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 10.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 10.4.2
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.9.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.9.5
 - !ruby/object:Gem::Dependency
   name: timers
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.0.1
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.6
 description: A lightweight library for real-time, consistent and scalable coordination
   of events.
 email: jr3791@live.com
@@ -116,5 +130,5 @@ rubyforge_project:
 rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: for real time analytics
+summary: for real time analytics (a Ruby Rules Engine)
 test_files: []