renaming to defrule and adding multipkg support

src/gelfino/drools/dsl.clj

@@ -77,7 +77,7 @@ end"
      :else ""
     ))
 
-(defmacro def-rulestream [sname [_ n _when then]]
+(defmacro defrule [sname [_ n _when then]]
   `(do 
      ~(register-action sname then)
      (def ~sname 

src/gelfino/drools/straping.clj

@@ -35,12 +35,13 @@
 (defn- add-actions [session]
   (.setGlobal session "actions" actions) session)
 
-(defn drools-session [&{:keys [pkg path clock] :or {clock "realtime"}}] 
+(defn drools-session [&{:keys [pkgs path clock] :or {clock "realtime"}}] 
   (set-non-strict)
-  (if (nil? pkg)
+  (if (nil? pkgs)
     (.add builder (ResourceFactory/newFileResource path) ResourceType/DRL)
-    (.add builder (ResourceFactory/newDescrResource pkg) ResourceType/DESCR))
+    (doseq [p pkgs]
+      (.add builder (ResourceFactory/newDescrResource p) ResourceType/DESCR)))
   (validate "Unable to compile.")
-  (if (nil? pkg)
+  (if (nil? pkgs)
     (build-session clock) 
     (add-actions (build-session clock))))

test/gelfino/test/drools/dsl.clj

@@ -7,15 +7,15 @@
 
 (def result (ref {:infos false :four-errors false}))
 
-(def-rulestream infos
+(defrule infos
   (rule info-messages
      (when $message :> Message (== level "INFO" ) 
        :from (entry-point "event-stream"))
      (then 
        (dosync 
          (alter result assoc :infos true)))))
 
-(def-rulestream four-errors
+(defrule four-errors
   (rule info-messages
      (when Number (> intValue 3) :from 
        (accumulate $message :> Message (== level "ERROR") :over (window :time 1 m)
@@ -43,28 +43,33 @@
     (is (= "actions.deref().get(\"infos\").invoke();\n" consequence))
     (is (not (nil? action )))))
 
+(def session (drools-session :pkgs [infos four-errors] :clock "pseudo"))
+
+(def now (.getTime (java.util.Date.)))
+
+
 (deftest infos-session-run 
-  (let [session (drools-session :pkg infos) 
+  (let [clock (.getSessionClock session) 
         entry (.getWorkingMemoryEntryPoint session "event-stream")]
-    (.insert entry (Message. "INFO" 123))
-    (.insert entry (Message. "bla" 124))
-    (.fireAllRules session))
-  (is (= (@result :infos) true)))
+    (.insert entry (Message. "INFO" now))
+    (.insert entry (Message. "bla" (+ 1000 now)))
+    (.advanceTime clock 1 TimeUnit/SECONDS)
+    (.fireAllRules session)
+    (is (= (@result :infos) true))))
 
-(deftest infos-session-run 
-  (let [session (drools-session :pkg four-errors :clock "pseudo" ) 
-        clock (.getSessionClock session) 
-        now (.getTime (java.util.Date.))
+
+(deftest four-in-a-row
+  (let [clock (.getSessionClock session) 
         entry (.getWorkingMemoryEntryPoint session "event-stream")]
-    ;(.insert entry (Message. "INFO" now ))
-    (.insert entry (Message. "ERROR" now))
+    (.insert entry (Message. "ERROR" (+ 3000 now)))
     (.insert entry (Message. "ERROR" (+ 4000 now)))
     (.insert entry (Message. "INFO" (+ 5000 now)))
     (.insert entry (Message. "ERROR" (+ 6000 now)))
     (.insert entry (Message. "ERROR" (+ 7000 now)))
     (.advanceTime clock 10 TimeUnit/SECONDS)
-    (.fireAllRules session))
-  (is (= (@result :four-errors) true)))
+    (.fireAllRules session)
+    (is (= (@result :four-errors) true))))
+
 
 (deftest level-lhs
   (let [{{[{constraint :constraint {entry :entryId} :source}] :descrs} :lhs} rules-map