aristotle 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08566772bb5f4c2458e5eff1058c23f87601805c
-  data.tar.gz: 804ce18d078fc5ab280fce17d39dec1994f33dea
+  metadata.gz: 7000dc8a548a5d2a5343d9dfd99e6820ff5fd97e
+  data.tar.gz: a1e9ae1f39ae50bd138ecb8046c0ab39eeea1121
 SHA512:
-  metadata.gz: c4199a7fd2511951eaf4ba159e6b8bceb86293e1d1d81676858064e3209d7eb492b2b7d99651f0905e0956edcf65996c77695c2d74d134c5e708681838a41492
-  data.tar.gz: c2c2413a36d7d18b92b6aa9e659b55951e3c18a9b84fa8d268a505811e5b1bd5b304d2d075be9a4d3c5ccbc5937997b62a83999d161c328f4b72e7b707a90bc3
+  metadata.gz: 8d5ab3d22b63e0fbe495885c8934af0c8b8d38de71ac710dfacf6ce1d233203efc0b1c65cd3c682bb3151d728f7134138abd73026d169d99f857132c4c74b856
+  data.tar.gz: e4c1124a661d822dbfb02678abf039488fd1a7bb4c9aee00b7c972f7d32e08a9310a9a52227d9cad3341c3b3f6d8feff1522044ffffa717b3dddb3de2a22175b

data/lib/aristotle/command.rb

@@ -3,18 +3,30 @@ module Aristotle
     attr_reader :action, :condition
 
     def initialize(line, conditions, actions)
-      # TODO: make this properly work with regexps
       @action, @condition = line.split(' if ', 2).map(&:strip)
 
       raise 'Badly formatted line' if @action == '' || @condition == ''
 
-      @condition_proc = conditions[Regexp.new(@condition)]
-      @action_proc = actions[Regexp.new(@action)]
+      conditions.each do |condition_regexp, condition_proc|
+        match_data = condition_regexp.match(@condition)
+        if match_data
+          @condition_proc = condition_proc
+          @condition_attributes = match_data.to_a[1..-1]
+        end
+      end
+
+      actions.each do |action_regexp, action_proc|
+        match_data = action_regexp.match(@action)
+        if match_data
+          @action_proc = action_proc
+          @action_attributes = match_data.to_a[1..-1]
+        end
+      end
     end
 
     def do_action_with(object)
       if @action_proc
-        @action_proc.call(object)
+        @action_proc.call(object, *@action_attributes)
       else
         raise "Action not found: #{@action}"
       end
@@ -22,7 +34,7 @@ module Aristotle
 
     def condition_passes_with?(object)
       if @condition_proc
-        @condition_proc.call(object)
+        @condition_proc.call(object, *@condition_attributes)
       else
         raise "Condition not found: #{@condition}"
       end

data/lib/aristotle/logic.rb

@@ -47,11 +47,7 @@ module Aristotle
           raise "#{filename} is broken!" if command.nil?
 
           @@commands[command] ||= []
-          # begin
           @@commands[command] << Aristotle::Command.new(line.strip, @@conditions, @@actions)
-          # rescue => e
-          #   raise e.message + ' in ' + filename
-          # end
         else
           command = line
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aristotle
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Marius Andra