adaptation 0.0.2 → 0.0.3

data/lib/adaptation/message.rb

@@ -37,7 +37,6 @@ module Adaptation
 #   end
 #
 #   class Contact < Adaptation::Message
-#     belongs_to :contacts
 #     has_one :text, :name
 #   end
 #
@@ -45,9 +44,9 @@ module Adaptation
 #
 #   <agenda type="...">
 #     <owner>...</owner>
-#     <contacts>
-#       <contact>...</contact>
-#     </contacts>
+#     <contact>...</contact>
+#     <contact>...</contact>
+#     ...
 #   </agenda>
 #
 #   while the _Contact_ class would map:
@@ -102,16 +101,12 @@ module Adaptation
       :must_be_present => "Must be present"
     }
     @@errors = []
-
+    @@classes_with_brothers = []
+    cattr_reader :classes_with_brothers
+    cattr_reader :validations
+    cattr_reader :objects
+    
     include ROXML
-     
-    def self.belongs_to symbol
-      @belongs_to = symbol
-    end
-
-    def self.parent
-      @belongs_to
-    end
 
     def to_hash
       s = self.to_yaml
@@ -140,18 +135,72 @@ module Adaptation
 
       found
     end
+    
+    def search_paths(symbol)
+        get_paths_from_hash self.to_hash, symbol
+    end
+    
+    def search_objects(symbol)
+      objects = []  
+      paths = search_paths(symbol)
+      paths.each do |path|
+        objects << get_object(path)
+      end
+      objects.flatten
+    end
+    
+    def get_paths_from_hash hash, symbol, root_path = ""
+      paths = []
+      hash.each_pair do |k,v|
+        if (k.to_sym == symbol)  
+          paths << "#{root_path}.#{k}" unless paths.include?("#{root_path}.#{k}")
+        end
+      end
+      
+      hash.each_pair do |k,v|
+        if v.is_a?(Hash)  
+          son_paths = get_paths_from_hash(v, symbol, k)
+          son_paths.each do |sp|
+            paths << "#{root_path}.#{sp}" unless paths.include?("#{root_path}.#{sp}")
+          end  
+        elsif v.is_a?(Array)
+          v.each do |h|
+            son_paths = get_paths_from_hash(h, symbol, k)
+            son_paths.each do |sp|
+              paths << "#{root_path}.#{sp}" unless paths.include?("#{root_path}.#{sp}")
+            end 
+          end    
+        end
+      end
 
-    def self.highest_parent
-      parent_class = self
-      while parent_class != nil
-        begin
-          parent_class = get_class_object(parent_class.parent.to_s.capitalize)
-        rescue Exception => e
-          top_parent_class = parent_class.parent.to_s
-          parent_class = nil
+      paths.map!{|p|
+        if p.first == "."
+          p[1..p.length]
+        else
+          p  
         end
+      }
+      
+      paths
+    end
+    
+    def get_object path
+      subpaths = path.split(".")
+      objects = [self]
+      subpaths.each do |s|
+        array = []  
+        objects.each do |o|
+          if o.is_a?(Array)
+            o.each do |os|  
+              array << os.send(s.to_sym)
+            end  
+          else
+            array << o.send(s.to_sym)
+          end  
+        end
+        objects = array  
       end
-      top_parent_class
+      objects
     end
 
     def self.has_one *symbols
@@ -194,24 +243,46 @@ module Adaptation
         xml_text :text, nil, ROXML::TEXT_CONTENT
       end
     end
+   
+    def self.has_brothers?
+      brothers_containers = []
+      @@classes_with_brothers.each do |cwb|
+        if cwb =~ /^#{self.to_s}:/   
+          brothers_containers << cwb    
+        end
+      end
+      if brothers_containers.empty?
+        return nil
+      else
+        return brothers_containers
+      end
+    end
 
     def self.has_many *options
       configuration = {}
       configuration.update(options.pop) if options.last.is_a?(Hash)
+      
+      class_with_container = nil
+      if configuration[:in]
+        class_with_container =  options[0].to_s.capitalize[0..-2] + ":#{configuration[:in].to_s}"
+      else
+        class_with_container =  options[0].to_s.capitalize[0..-2] + ":#{options[0].to_s}"  
+      end    
+      unless @@classes_with_brothers.include?(class_with_container)
+        @@classes_with_brothers << class_with_container    
+      end 
+      
       @has_many = [] if @has_many.nil?
       unless @has_many.include?(options[0])
         @has_many << options[0]
-        begin
-          klass = get_class_object(options[0].to_s.capitalize[0..-2]) # TODO: singularize seriously
-        rescue Exception => e
-          require "#{ADAPTOR_ROOT}/app/messages/_#{options[0].to_s[0..-2]}.rb"
-          klass = get_class_object(options[0].to_s.capitalize[0..-2])
-        end
-
+        
+        load "#{ADAPTOR_ROOT}/app/messages/_#{options[0].to_s[0..-2]}.rb"
+        klass = get_class_object(options[0].to_s.capitalize[0..-2])
+        
         if configuration[:in]
           xml_object configuration[:in], klass, ROXML::TAG_ARRAY, configuration[:in].to_s
         else
-          xml_object options[0], klass, ROXML::TAG_ARRAY, options[0].to_s 
+          xml_object options[0], klass, ROXML::TAG_ARRAY #, options[0].to_s 
         end
       end
     end
@@ -227,59 +298,155 @@ module Adaptation
         return class_object
       end
     end
-
+    
     def self.get_validations_array
-      validations_array = nil
-      if self.highest_parent.empty?
-        validations_array = self.to_s.downcase.to_sym
-      else
-        validations_array = self.highest_parent.to_sym
+      validations_arrays = self.has_brothers?
+      if validations_arrays.nil?
+        validations_arrays = [self.to_s]  
       end
-
-      @@validations[validations_array] = [] if @@validations[validations_array].nil?
-      @@validations[validations_array]
+      
+      validations_arrays.each do |va|
+        @@validations[va] = [] if @@validations[va].nil?  
+      end
+      
+      validations_arrays
     end
 
     def self.validates_value(*options)
-      belongs_to = @belongs_to
-      get_validations_array << Proc.new {|message|
-        configuration = {:message => @@default_error_messages[:invalid_value] }
-        if belongs_to.nil?
-          unless (message.send(options[0]) == options[1].to_s)
-            @@errors << [options[0], message.send(options[0]), configuration[:message]]
-          end
-        else
-          found = false
-          message.send(belongs_to).each do |son|
-            if son.send(options[0]) == options[1].to_s
-              found = true
-              break
+      get_validations_array.each do |va|
+             
+        validation = Validation.new {|message|
+          configuration = {:message => @@default_error_messages[:invalid_value] }
+          brothers_containers = self.has_brothers?
+          if !brothers_containers
+            unless (message.send(options[0]) == options[1].to_s)
+              @@errors << [options[0], message.send(options[0]), configuration[:message]]
+            end  
+          else
+            brothers_containers.each do |bc|
+              elements = message.search_objects(bc.split(":")[1].to_sym)
+              bad_element = nil
+              elements.each do |e|  
+                if e.send(options[0]) != options[1].to_s
+                  bad_element = e  
+                  break
+                end
+              end      
+              unless bad_element.nil?
+                @@errors << [options[0], bad_element.send(options[0]), configuration[:message]]
+              end   
+                
+              #container = nil  
+              #begin  
+              #  container = message.send(bc.split(":")[1].to_sym)
+              #rescue Exception => e
+              #  container = nil
+              #  next
+              #end
+              #  
+              #if container
+              #  bad_son = nil
+              #  container.each do |son|
+              #    if son.send(options[0]) != options[1].to_s
+              #      bad_son = son
+              #      break
+              #    end
+              #  end
+              #  unless bad_son.nil?
+              #    @@errors << [options[0], bad_son.send(options[0]), configuration[:message]]
+              #  end 
+              #end
             end
+            
           end
-          unless found
-            @@errors << [options[0], message.send(options[0]), configuration[:message]]
-          end
+          
+          #if belongs_to.nil?
+          #  unless (message.send(options[0]) == options[1].to_s)
+          #    @@errors << [options[0], message.send(options[0]), configuration[:message]]
+          #  end
+          #else
+          #  found = false
+          #  message.send(belongs_to).each do |son|
+          #    if son.send(options[0]) == options[1].to_s
+          #      found = true
+          #      break
+          #    end
+          #  end
+          #  unless found
+          #    @@errors << [options[0], message.send(options[0]), configuration[:message]]
+          #  end
+          #end
+        }
+
+        validation.vid = "#{self.to_s} validates_value #{options.map{|o| o.to_s + " "}}"
+        validation_already_present = false
+        @@validations[va].each do |v|
+          if v.vid == validation.vid
+            validation_already_present = true
+            break
+          end    
         end
-      }
+        if !validation_already_present
+          @@validations[va] << validation
+        end
+        
+      end
     end
 
     def self.validates_presence_of *options
-      belongs_to = @belongs_to
-      get_validations_array << Proc.new {|message|
-        configuration = {:message => @@default_error_messages[:must_be_present]}
-        options.each do |o|
-          if belongs_to.nil?
-            if message.send(o).nil?
-              @@errors << [o, message.send(o), configuration[:message]]
-            end
-          else
-            parent = message.send(belongs_to)
-            if parent.send(o).nil? # this throws a warning if o = :id (but it works)
-              @@errors << [o, message.send(o), configuration[:message]]
+      get_validations_array.each do |va|
+          
+        validation = Validation.new {|message|
+          configuration = {:message => @@default_error_messages[:must_be_present]}
+          options.each do |o|
+            brothers_containers = self.has_brothers?
+            if !brothers_containers
+              if message.send(o).nil?
+                @@errors << [o, message.send(o), configuration[:message]]
+              end
+            else
+              brothers_containers.each do |bc|
+                elements = message.search_objects(bc.split(":")[1].to_sym)
+                elements.each do |e|  
+                  if e.send(o).nil?
+                    @@errors << [o, e.send(o), configuration[:message]]
+                  end
+                end  
+                
+                #container = nil  
+                #begin  
+                #  container = message.send(bc.split(":")[1].to_sym)
+                #rescue Exception => e
+                #  container = nil
+                #  next
+                #end
+                #
+                #if container
+                #  container.each do |son|
+                #    if son.send(o).nil?
+                #      @@errors << [o, son.send(o), configuration[:message]]
+                #      break
+                #    end
+                #  end    
+                #end
+                
+              end  
+              
             end
           end
+        }
+        validation.vid = "#{self.to_s} validates_presence_of #{options.map{|o| o.to_s + " "}}"
+        validation_already_present = false
+        @@validations[va].each do |v|
+          if v.vid == validation.vid
+            validation_already_present = true
+            break
+          end    
         end
-      }
+        if !validation_already_present
+          @@validations[va] << validation
+        end
+      end
     end
 
     def self.validates_uniqueness_of(*options)
@@ -291,16 +458,24 @@ module Adaptation
 
     def check
       clear_errors
-
+      
       @@validations.each_key do |k|
-        if self.has_son? k.to_sym
-          @@validations[k.to_sym].each do |v|
-            v.call(self)
+        son = k.split(":")[1]
+        unless son.nil?
+          objects = self.search_objects(son.to_sym)
+          unless objects.empty?
+          #if self.has_son? son.to_sym
+            @@validations[k].each do |v|   
+              v.call(self)
+            end
           end
         end
       end
-      @@validations[self.class.to_s.downcase.to_sym].each do |v|
-        v.call(self)
+      
+      unless @@validations[self.class.to_s].nil?
+        @@validations[self.class.to_s].each do |v|
+          v.call(self)
+        end
       end
 
       unless @@errors.empty?
@@ -309,6 +484,7 @@ module Adaptation
           error << "  #{e[0]}: #{e[2]}\n"
           error << "    #{e[1]}\n" 
         end
+        puts "#{error}"
         return false
       end
 
@@ -324,5 +500,9 @@ module Adaptation
     end
 
   end
+  
+  class Validation < Proc
+    attr_accessor :vid  
+  end
 
 end

data/lib/adaptation/mom.rb

@@ -3,66 +3,70 @@ require 'yaml'
 
 module Adaptation
 
-  class Mom
+  module Mom
 
-    def initialize mom_uri
-      @mom_uri = mom_uri
-    end
+    class Mom
 
-    def subscribe drb_uri
-      unless get_subscribers.include?(drb_uri)
-        add_subscriber drb_uri
-        puts "Added new subscriber: #{drb_uri}"
-        oapdaemon = DRbObject.new(nil, drb_uri)
-        oapdaemon.subscription_result true
+      def initialize mom_uri
+        @mom_uri = mom_uri
       end
-    end
 
-    def publish message, topic
-      # Tell subscribed hosts to execute their adaptors
-      puts "-----------------------------------"
-      puts "Received message in topic: #{topic}"
-      puts "#{message}"
-      puts "-----------------------------------"
-      get_subscribers.each do |uri|
-        puts "Calling #{uri}"
-        DRb.start_service
-        oapdaemon = DRbObject.new(nil, uri)
-        oapdaemon.call_adaptor message, topic
+      def subscribe drb_uri
+        unless get_subscribers.include?(drb_uri)
+          add_subscriber drb_uri
+          puts "Added new subscriber: #{drb_uri}"
+          oapdaemon = DRbObject.new(nil, drb_uri)
+          oapdaemon.subscription_result true
+        end
       end
-    end
 
-    def start
-      DRb.start_service(@mom_uri, self)
-      puts "MOM started. Listening at #{@mom_uri}"
-      DRb.thread.join # Don't exit just yet
-    end
+      def publish message, topic
+        # Tell subscribed hosts to execute their adaptors
+        puts "-----------------------------------"
+        puts "Received message in topic: #{topic}"
+        puts "#{message}"
+        puts "-----------------------------------"
+        get_subscribers.each do |uri|
+          puts "Calling #{uri}"
+          DRb.start_service
+          oapdaemon = DRbObject.new(nil, uri)
+          oapdaemon.process message, topic
+        end
+      end
 
-    def list
-      puts "MOM subscriptions:"
-      get_subscribers.each do |s|
-        puts "  #{s}"
+      def start
+        DRb.start_service(@mom_uri, self)
+        puts "MOM started. Listening at #{@mom_uri}"
+        DRb.thread.join # Don't exit just yet
       end
-      return
-    end
 
-  private
+      def list
+        puts "MOM subscriptions:"
+        get_subscribers.each do |s|
+          puts "  #{s}"
+        end
+        return
+      end
 
-    def add_subscriber drb_uri
-      subscribers = get_subscribers
-      subscribers << drb_uri unless subscribers.include?(drb_uri)
-      sf =  File.new('subscribers.yml', 'w')
-      sf.write(YAML::dump(subscribers))
-      sf.close
-    end
+    private
 
-    def get_subscribers
-      if File.exists?('subscribers.yml')
-        subscribers = YAML::load(File.open('subscribers.yml'))
-      else
-        subscribers = Array.new
+      def add_subscriber drb_uri
+        subscribers = get_subscribers
+        subscribers << drb_uri unless subscribers.include?(drb_uri)
+        sf =  File.new('subscribers.yml', 'w')
+        sf.write(YAML::dump(subscribers))
+        sf.close
       end
-      subscribers
+
+      def get_subscribers
+        if File.exists?('subscribers.yml')
+          subscribers = YAML::load(File.open('subscribers.yml'))
+        else
+          subscribers = Array.new
+        end
+        subscribers
+      end
+
     end
 
   end

data/lib/adaptation/mom.rb~

@@ -0,0 +1,74 @@
+require 'drb'
+require 'yaml'
+
+module Adaptation
+
+  module Mom
+
+    class Mom
+
+      def initialize mom_uri
+        @mom_uri = mom_uri
+      end
+
+      def subscribe drb_uri
+        unless get_subscribers.include?(drb_uri)
+          add_subscriber drb_uri
+          puts "Added new subscriber: #{drb_uri}"
+          oapdaemon = DRbObject.new(nil, drb_uri)
+          oapdaemon.subscription_result true
+        end
+      end
+
+      def publish message, topic
+        # Tell subscribed hosts to execute their adaptors
+        puts "-----------------------------------"
+        puts "Received message in topic: #{topic}"
+        puts "#{message}"
+        puts "-----------------------------------"
+        get_subscribers.each do |uri|
+          puts "Calling #{uri}"
+          DRb.start_service
+          oapdaemon = DRbObject.new(nil, uri)
+          oapdaemon.call_adaptor message, topic
+        end
+      end
+
+      def start
+        DRb.start_service(@mom_uri, self)
+        puts "MOM started. Listening at #{@mom_uri}"
+        DRb.thread.join # Don't exit just yet
+      end
+
+      def list
+        puts "MOM subscriptions:"
+        get_subscribers.each do |s|
+          puts "  #{s}"
+        end
+        return
+      end
+
+    private
+
+      def add_subscriber drb_uri
+        subscribers = get_subscribers
+        subscribers << drb_uri unless subscribers.include?(drb_uri)
+        sf =  File.new('subscribers.yml', 'w')
+        sf.write(YAML::dump(subscribers))
+        sf.close
+      end
+
+      def get_subscribers
+        if File.exists?('subscribers.yml')
+          subscribers = YAML::load(File.open('subscribers.yml'))
+        else
+          subscribers = Array.new
+        end
+        subscribers
+      end
+
+    end
+
+  end
+
+end

data/lib/adaptation/oapdaemon.rb~

@@ -0,0 +1,42 @@
+require 'drb'
+require 'yaml'
+
+module Adaptation
+
+  module Mom
+
+    class druby_subscriber
+
+      def initialize subscriber_uri, mom_uri, topics
+        @subscriber_uri = subscriber_uri
+        @mom_uri = mom_uri
+        @topics = topics
+      end
+
+      def call_adaptor message, topic
+        if ( (@topics.include?(topic)) or (@topics == "all") )
+          system("ruby public/dispatch.rb #{message}") 
+        end
+        puts "#{topic} => #{message}"
+      end
+
+      def subscription_result subscribed
+        if subscribed
+          puts "Subscribed to mom (#{@mom_uri}). Listening at #{@subscriber_uri}"
+        end
+      end
+
+      def start
+        DRb.start_service(@subscriber_uri, self)
+
+        mom = DRbObject.new(nil, @mom_uri)
+        mom.subscribe @subscriber_uri
+
+        DRb.thread.join # Don't exit just yet!
+      end
+
+    end
+
+  end
+
+end

data/lib/adaptation/test/test_help.rb

@@ -103,7 +103,7 @@ class Test::Unit::TestCase
     data, message_object = load_message_fixture message_symbol
     error = build_message error,
             "? message shouldn't validate",
-            message_symbol.to_s
+            message_symbol.to_s           
     assert_block error do
       !message_object.check
     end
@@ -196,7 +196,7 @@ class Test::Unit::TestCase
     begin
       connection = ActiveRecord::Base.connection
     rescue Exception => e
-      puts "Database error message: #{e}"
+      puts "Database says: #{e} (not necessarily bad)"
       database_exists = false
     end
 
@@ -287,7 +287,7 @@ class Test::Unit::TestCase
 
   def compare_xml_elements element1, element2 #:nodoc:
     if element1.has_attributes?
-       if !elements2.has_attributes?
+       if !element2.has_attributes?
          return false
        end
        element1.attributes.to_a.each do |a|

data/lib/adaptation.rb

@@ -1,5 +1,6 @@
 require 'roxml'
 require 'yaml'
+require 'active_record'
 require 'adaptation/message'
 require 'adaptation/adaptor'
 require 'adaptation/base'