aristotle 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: beb607b0e69afe31331e87b364ebe0596d446b6e
-  data.tar.gz: c1accdb3321d49082eaff261bda5f77995f54f46
+  metadata.gz: 6d2a18bca70211e50817929721c99732312ce148
+  data.tar.gz: 809d4125036f6a5aae4fdb8339767ff2121786ca
 SHA512:
-  metadata.gz: 30cebb52fa456e598a643fae0c691c070b2ad886e703e28e2a8a637926d71bd6a641947b74bb957edf631b920a99eab61bf267fbae20c81a0122fc442406d5d1
-  data.tar.gz: a93c35022426c2e8bd9dcbdeb51d42120ee0520875191760dba25204a49f98166ce2a78e500b099891f1ac67c18a5a8ea844db52def1dfdc3611de4e60a71821
+  metadata.gz: 2aaba2c0571dfee8a2fffbb8b471d19e29b295666ce18da870373b4ef889a5c48c605e442ff664a09b193a9d647e5fb4356bcd8a8f786d8f86c0b0e4955f066e
+  data.tar.gz: 463a7e3e4cb6c7640c9663e247ec23480e7fc1ce17d8f74b71c90f1350c946fb189901a4f0f1831487ce255bca05dc9d99d623e04a9bf099b6ce5f6886c8c6fa

data/lib/aristotle/logic.rb

@@ -16,25 +16,25 @@ module Aristotle
 
     def self.commands(logic_method = nil)
       load_commands
-      logic_method.nil? ? @@commands : (@@commands[logic_method] || [])
+      logic_method.nil? ? @commands : (@commands[logic_method] || [])
     end
 
     # called when class is loaded
     def self.condition(expression, &block)
-      @@conditions ||= {}
-      @@conditions[expression] = block
+      @conditions ||= {}
+      @conditions[expression] = block
     end
 
     # called when class is loaded
     def self.action(expression, &block)
-      @@actions ||= {}
-      @@actions[expression] = block
+      @actions ||= {}
+      @actions[expression] = block
     end
 
     def self.load_commands
-      @@commands ||= {}
+      @commands ||= {}
 
-      return if @@commands != {}
+      return if @commands != {}
 
       filename = "app/logic/#{logic_name}.logic"
       logic_data = File.read(filename)
@@ -46,8 +46,8 @@ module Aristotle
         if line.start_with? '  '
           raise "#{filename} is broken!" if command.nil?
 
-          @@commands[command] ||= []
-          @@commands[command] << Aristotle::Command.new(line.strip, @@conditions, @@actions)
+          @commands[command] ||= []
+          @commands[command] << Aristotle::Command.new(line.strip, @conditions || {}, @actions || {})
         else
           command = line
         end

data/lib/aristotle/utility.rb

@@ -1,29 +1,60 @@
 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
+      logic_objects.each do |logic_object|
+        puts "Checking #{logic_object[:class_name]}"
+        is_everything_covered_for? logic_object
+        puts
       end
     end
 
     protected
 
     def self.logic_objects
-      init_logic_objects unless @logic_objects_initialized
+      init_logic_objects if @logic_objects.nil? || @logic_objects == {}
 
-      ObjectSpace.each_object(Class).select { |klass| klass < Aristotle::Logic }
+      @logic_objects
     end
 
     def self.init_logic_objects
-      Dir[%w(app logic *.rb).join(File::SEPARATOR)].each do |file|
-        require Dir.pwd + File::SEPARATOR + file
+      @logic_objects ||= []
+
+      Dir[%w(app logic *.logic).join(File::SEPARATOR)].each do |file|
+        logic_name = file.split(File::SEPARATOR).last.split('.logic').first
+        folder = %W{#{Dir.pwd} app logic}.join(File::SEPARATOR)
+        class_name = logic_name.split('_').map(&:capitalize).join('') + 'Logic'
+
+        logic_object = {
+            logic_file: folder + File::SEPARATOR + "#{logic_name}.logic",
+            class_file: folder + File::SEPARATOR + "#{logic_name}_logic.rb",
+            relative_class_file: %W(app logic #{logic_name}_logic.rb).join(File::SEPARATOR),
+            class_name: class_name
+        }
+
+        begin
+          require logic_object[:class_file]
+          logic_object[:logic_class] = Object.const_get(class_name)
+        rescue LoadError => e
+          logic_object[:logic_class] = nil
+        rescue
+          logic_object[:logic_class] = nil
+        end
+
+        @logic_objects << logic_object
       end
-      @logic_objects_initialized = true
     end
 
-    def self.is_everything_covered_for?(logic_class)
+    def self.is_everything_covered_for?(logic_object)
+      logic_class = logic_object[:logic_class]
+
+      if logic_class.nil?
+        puts "--> Create file #{logic_object[:relative_class_file]} with the following contents:"
+        puts "class #{logic_object[:class_name]} < Aristotle::Logic"
+        puts '  # ...'
+        puts 'end'
+        return
+      end
+
       not_covered = {}
       logic_class.commands.each do |logic_method, commands|
         commands.each do |command|
@@ -40,7 +71,8 @@ module Aristotle
 
       if not_covered != {}
         not_covered.each do |request_method, data|
-          puts "\nclass #{self.to_s} < Aristotle::Logic"
+          puts "\n# #{logic_object[:relative_class_file]}"
+          puts "class #{logic_object[:class_name]} < Aristotle::Logic"
           puts "  # #{request_method}:\n"
           data[:actions].each do |action|
             puts "  action /#{action}/ do |#{logic_class.logic_name}|\n\n  end\n\n"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aristotle
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Marius Andra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-22 00:00:00.000000000 Z
+date: 2014-11-25 00:00:00.000000000 Z
 dependencies: []
 description: Ruby business logic engine, inspired by Cucumber
 email: marius@apprentus.com