aristotle 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d09d3fa7f7ad06b7385cffa538e967e0a73532ba
-  data.tar.gz: 4a4e1bc5182bf831b61e406bf858ad11b7314795
+  metadata.gz: 08566772bb5f4c2458e5eff1058c23f87601805c
+  data.tar.gz: 804ce18d078fc5ab280fce17d39dec1994f33dea
 SHA512:
-  metadata.gz: f4e54a0f4b9205be5b8c1e9eb77c77d426e737bf824d582290d410fd77b240555d987196bc1150dbd0736546b359f165a924ddd85d53fd97d9c43e6c86c0a793
-  data.tar.gz: 2fd5bcd7be4d76d7cde56c85237b73f3801b4c2b68d214e0cee206dba614b835400c2520faf1d32114c6ed0ec697998866d338f72e998b957ae4ca1a750149b5
+  metadata.gz: c4199a7fd2511951eaf4ba159e6b8bceb86293e1d1d81676858064e3209d7eb492b2b7d99651f0905e0956edcf65996c77695c2d74d134c5e708681838a41492
+  data.tar.gz: c2c2413a36d7d18b92b6aa9e659b55951e3c18a9b84fa8d268a505811e5b1bd5b304d2d075be9a4d3c5ccbc5937997b62a83999d161c328f4b72e7b707a90bc3

data/lib/aristotle.rb

@@ -1,2 +1,4 @@
 require 'aristotle/logic'
 require 'aristotle/utility'
+require 'aristotle/command'
+require 'aristotle/presenter'

data/lib/aristotle/command.rb

@@ -0,0 +1,39 @@
+module Aristotle
+  class Command
+    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)]
+    end
+
+    def do_action_with(object)
+      if @action_proc
+        @action_proc.call(object)
+      else
+        raise "Action not found: #{@action}"
+      end
+    end
+
+    def condition_passes_with?(object)
+      if @condition_proc
+        @condition_proc.call(object)
+      else
+        raise "Condition not found: #{@condition}"
+      end
+    end
+
+    def has_action?
+      !@action_proc.nil?
+    end
+
+    def has_condition?
+      !@condition_proc.nil?
+    end
+  end
+end

data/lib/aristotle/logic.rb

@@ -4,14 +4,31 @@ module Aristotle
       @object = object
     end
 
+    def process(logic_method)
+      self.class.commands(logic_method).each do |command|
+        next unless command.condition_passes_with?(@object)
+
+        return command.do_action_with(@object)
+      end
+
+      nil
+    end
+
+    def self.commands(logic_method = nil)
+      load_commands
+      logic_method.nil? ? @@commands : (@@commands[logic_method] || [])
+    end
+
+    # called when class is loaded
     def self.condition(expression, &block)
       @@conditions ||= {}
-      @@conditions[expression.source] = block
+      @@conditions[expression] = block
     end
 
+    # called when class is loaded
     def self.action(expression, &block)
       @@actions ||= {}
-      @@actions[expression.source] = block
+      @@actions[expression] = block
     end
 
     def self.load_commands
@@ -19,115 +36,34 @@ module Aristotle
 
       return if @@commands != {}
 
-      #{Rails.root}/
       filename = "app/logic/#{logic_name}.logic"
       logic_data = File.read(filename)
 
-      found_lines = []
-      command = ''
+      command = nil
 
-      lines = logic_data.split("\n").map(&:rstrip).select { |l| l != '' }
+      lines = logic_data.split("\n").map(&:rstrip).select { |l| l != '' && !l.strip.start_with?('#') }
       lines.each do |line|
-        next if line.strip.start_with? '#'
-
-        if !line.start_with?('  ')
-          if command != '' && found_lines.length > 0
-            @@commands[command] = found_lines
-            found_lines = []
-          end
+        if line.start_with? '  '
+          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
-        elsif line.start_with?('  ')
-          found_lines << line.strip
         end
       end
-      @@commands[command] = found_lines if command != '' && found_lines.length > 0
     end
 
     def self.html_rules
-      load_commands
-      @@commands.map do |command, lines|
-        "<strong>#{command}</strong><ul>#{lines.map{|l| "<li>- #{l.gsub(' if ', ' <strong style="color:blue">IF</strong> ').gsub(/'([^']+)'/, '<strong>\1</strong>')}</li>"}.join}</ul>"
-      end.join('<br>').html_safe
-    end
-
-    def process_condition(condition)
-      if @@conditions.has_key? condition
-        @@conditions[condition].call(@object)
-      else
-        raise "Condition not found: #{condition}"
-      end
-    end
-
-    def do_action(action)
-      if @@actions.has_key? action
-        @@actions[action].call(@object)
-      else
-        raise "Action not found: #{action}"
-      end
-    end
-
-    def commands(logic_method)
-      self.class.load_commands
-      @@commands[logic_method] || []
-    end
-
-    def process(logic_method)
-      commands(logic_method).each do |command|
-        action, condition = command.split(' if ', 2)
-
-        if process_condition(condition)
-          # puts "Condition matched: #{condition}"
-          # puts "Doing action: #{action}"
-          return do_action(action)
-        end
-      end
-
-      nil
-    end
-
-    def self.is_everything_covered?
-      load_commands
-      not_covered = {}
-      @@commands.each do |logic_method, command|
-        command.each do |line|
-          action, condition = line.split(' if ', 2)
-
-          unless @@actions.has_key?(action)
-            not_covered[logic_method] ||= {actions: [], conditions: []}
-            not_covered[logic_method][:actions] << action
-          end
-          unless @@conditions.has_key?(condition)
-            not_covered[logic_method] ||= {actions: [], conditions: []}
-            not_covered[logic_method][:conditions] << condition
-          end
-        end
-      end
-
-      if not_covered != {}
-        not_covered.each do |request_method, data|
-          puts "\nclass #{self.to_s} < Aristotle::Logic"
-          puts "  # #{request_method}:\n"
-          data[:actions].each do |action|
-            puts "  action /#{action}/ do |#{logic_name}|\n\n  end\n\n"
-          end
-          data[:conditions].each do |condition|
-            puts "  condition /#{condition}/ do |#{logic_name}|\n\n  end\n\n"
-          end
-          puts "end"
-        end
-      else
-        puts '-> Everything is covered!'
-      end
-
-      not_covered == {}
+      Aristotle::Presenter.new(self).html_rules
     end
 
     def self.logic_name
       self.to_s.gsub(/Logic$/, '').gsub(/([a-z])([A-Z])/, '\1_\2').downcase
     end
-
-    def self.descendants
-      ObjectSpace.each_object(Class).select { |klass| klass < self }
-    end
   end
 end

data/lib/aristotle/presenter.rb

@@ -0,0 +1,22 @@
+module Aristotle
+  class Presenter
+    def initialize(klass)
+      @klass = klass
+    end
+
+    def html_rules
+      @klass.commands.map do |command, lines|
+        "<strong>#{command}</strong>"+
+            "<ul>"+
+            lines.map do |line|
+              "<li>- "+
+                  line.action.gsub(/'([^']+)'/, '<strong>\1</strong>')+
+                  " <strong style='color:blue'>IF</strong> "+
+                  line.condition.gsub(/'([^']+)'/, '<strong>\1</strong>')+
+                  "</li>"
+            end.join +
+            "</ul>"
+      end.join('<br>').html_safe
+    end
+  end
+end

data/lib/aristotle/utility.rb

@@ -1,15 +1,62 @@
 module Aristotle
   class Utility
     def self.check_all
+      logic_objects.each_with_index do |logic_class, i|
+        puts "Checking #{logic_class}"
+        is_everything_covered_for? logic_class
+        puts if i > 0
+      end
+    end
+
+    protected
+
+    def self.logic_objects
+      init_logic_objects unless @logic_objects_initialized
+
+      ObjectSpace.each_object(Class).select { |klass| klass < Aristotle::Logic }
+    end
+
+    def self.init_logic_objects
       Dir[%w(app logic *.rb).join(File::SEPARATOR)].each do |file|
         require Dir.pwd + File::SEPARATOR + file
       end
+      @logic_objects_initialized = true
+    end
 
-      Aristotle::Logic.descendants.each_with_index do |logic_class, i|
-        puts "Checking #{logic_class}"
-        logic_class.is_everything_covered?
-        puts if i > 0
+    def self.is_everything_covered_for?(logic_class)
+      not_covered = {}
+      logic_class.commands.each do |logic_method, commands|
+        commands.each do |command|
+          unless command.has_action?
+            not_covered[logic_method] ||= {actions: [], conditions: []}
+            not_covered[logic_method][:actions] << command.action
+          end
+          unless command.has_condition?
+            not_covered[logic_method] ||= {actions: [], conditions: []}
+            not_covered[logic_method][:conditions] << command.condition
+          end
+        end
+      end
+
+      if not_covered != {}
+        not_covered.each do |request_method, data|
+          puts "\nclass #{self.to_s} < Aristotle::Logic"
+          puts "  # #{request_method}:\n"
+          data[:actions].each do |action|
+            puts "  action /#{action}/ do |#{logic_class.logic_name}|\n\n  end\n\n"
+          end
+          data[:conditions].each do |condition|
+            puts "  condition /#{condition}/ do |#{logic_class.logic_name}|\n\n  end\n\n"
+          end
+          puts "end"
+        end
+      else
+        puts '-> Everything is covered!'
       end
+
+      not_covered == {}
     end
+
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aristotle
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Marius Andra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2014-11-22 00:00:00.000000000 Z
 dependencies: []
 description: Ruby business logic engine, inspired by Cucumber
 email: marius@apprentus.com
@@ -19,7 +19,9 @@ extra_rdoc_files: []
 files:
 - bin/aristotle
 - lib/aristotle.rb
+- lib/aristotle/command.rb
 - lib/aristotle/logic.rb
+- lib/aristotle/presenter.rb
 - lib/aristotle/utility.rb
 homepage: https://github.com/apprentus/aristotle
 licenses: