adaptation 0.1.1 → 0.1.2

data/CHANGELOG

@@ -31,3 +31,9 @@
     - added method 'maps_xml' to Adaptation::Message (and 'mapped_xml')
     - removed 'check' method from Adaptation::Message (using valid? instead)
     - removed breakpoint.rb library
+* 0.1.2
+    - messages publish with publish method in Adaptor::Adaptor need quotation marks
+    - adaptors without ApplicationAdaptor complained, so if ApplicationAdapotr doesn't 
+      exist return an Adaptation::Adaptor in base.rb
+    - embedded mom publish method changed. Subscribrers publish, and a separated mom loop
+      will send messages to other subscribers.

data/dispatches/publish.rb

@@ -1,3 +1,5 @@
+#!/usr/bin/ruby
+
 unless defined? ADAPTOR_ROOT
   ADAPTOR_ROOT = File.expand_path(File.dirname(__FILE__) + '/..')
 end

data/lib/adaptation/adaptor.rb

@@ -10,6 +10,9 @@ module Adaptation
 # 
   class Adaptor
 
+    def process message
+    end
+
     def logger
       Adaptation::Base.logger
     end
@@ -21,11 +24,11 @@ module Adaptation
       elsif options.first.is_a?(String)
         xml_message = options.first
         message_type = xml_message[1..(xml_message.index(/(>| )/) - 1)]
-        message_class = get_class_object(message_type.capitalize)
+        message_class = Adaptation::Message.get_class_object(message_type.capitalize)
         message_object = message_class.to_object(xml_message)
       end
       
-      xml = message_object.to_xml
+      xml = message_object.to_xml.to_s.gsub("'", "\"")
       unless system("#{$config["oappublish"]} '#{$config["application"]}' '#{xml}'")
         puts "Problem publishing: #{xml}"
       end

data/lib/adaptation/base.rb

@@ -69,7 +69,7 @@ module Adaptation
       # without implementation for this type of message
         
       adaptor_class = Adaptation::Adaptor.get_class_object("#{message_type.capitalize}Adaptor")    
-      adaptor = adaptor_class.nil? ? ApplicationAdaptor.new : adaptor_class.new
+      adaptor = adaptor_class.nil? ? ApplicationAdaptor.new : adaptor_class.new rescue Adaptation::Adaptor.new
 
       unless message.is_a?(String) # TODO: remove when feature explained in line 67 implemented
         unless message.valid?

data/lib/adaptation/mom.rb

@@ -9,6 +9,7 @@ module Adaptation
 
       def initialize mom_uri
         @mom_uri = mom_uri
+        @messages = []
       end
 
       def subscribe drb_uri
@@ -26,17 +27,31 @@ module Adaptation
         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
+        @messages << [message, topic]
       end
 
       def start
         DRb.start_service(@mom_uri, self)
         puts "MOM started. Listening at #{@mom_uri}"
+      
+        loop do
+          unless @messages.empty?
+            @messages.each do |message|
+              get_subscribers.each do |uri|
+                begin
+                  puts "Calling #{uri}"
+                  DRb.start_service
+                  oapdaemon = DRbObject.new(nil, uri)
+                  oapdaemon.process message[0], message[1]
+                rescue
+                  puts "Couldn't send message to subscriber: #{uri}"
+                end
+              end
+              @messages.delete message
+            end
+          end
+        end
+
         DRb.thread.join # Don't exit just yet
       end
 

data/lib/rails_generator/generators/components/adaptor/templates/functional_test.rb

@@ -1,5 +1,4 @@
 require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../test_helper'
-require '<%= file_path %>_adaptor'
 
 class <%= class_name %>AdaptorTest < Test::Unit::TestCase
 

data/lib/rails_generator/generators/components/message/templates/unit_test.rb

@@ -7,17 +7,17 @@ class <%= class_name %>Test < Test::Unit::TestCase
     assert true
   end
 
-  # assert messages with unexpected parts are detected
+  # assert the message is defined correctly comparing the initial xml
+  # from the fixture with the xml obtained from the Adaptation::Message
+  # object created with that fixture
   #def test_not_parsed
   #  assert_parsed :<%= file_name %>
-  #  assert_not_parsed :<%= file_name %>_with_unknown_element
-  #  assert_not_parsed :<%= file_name %>_with_unknown_attribute
   #end
 
   # assert message passes our validations
   #def test_validates
   #  assert_validates :<%= file_name %>
-  #  assert_not_validates :<%= file_name %>_without_gid
+  #  assert_not_validates :<%= file_name %>_incorrect
   #end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: adaptation
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Xavi Vila Morell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-08 00:00:00 +01:00
+date: 2009-01-14 00:00:00 +01:00
 default_executable: adaptation
 dependencies: 
 - !ruby/object:Gem::Dependency