adaptation 0.0.9 → 0.1.0

data/CHANGELOG

@@ -20,3 +20,10 @@
     - in tests, the 'load_message_from_fixture' method gets from the fixture itself the message class
       to load, not from the test class
     - fixed publish and assert_message_published methods for testing
+* 0.1.0
+    - database connection moved from Adaptation::Base.new to Adaptation::Initializer.run. Without this
+      tests didn't connect to database (in tests Adaptation::Base.new is not always executed)
+    - adaptors extend ApplicationAdaptor instead of Adaptation::Base, so common functionality can be
+      placed in ApplicationAdaptor (app/adaptors/application.rb)
+    - if a message is not implemented in the adaptor, ApplicationAdaptor process method will be called
+      with that message as a parameter (wich will be an instance of Adaptation::Message)

data/helpers/application.rb

@@ -0,0 +1,6 @@
+class ApplicationAdaptor < Adaptation::Adaptor
+  
+  def process message
+  end
+
+end

data/lib/adaptation/base.rb

@@ -12,7 +12,15 @@ module Adaptation
         $config = YAML::load(File.open("#{ADAPTOR_ROOT}/config/settings.yml"))[$environment]
       end
 
+      # connect with database -> this could also be avoided?
+      if File.exists?("#{ADAPTOR_ROOT}/config/database.yml")
+        environment_configurations = YAML::load(File.open("#{ADAPTOR_ROOT}/config/database.yml"))[$environment]
+        ActiveRecord::Base.configurations.update($environment => environment_configurations)
+        ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations[$environment])
+      end
+
       # require all adaptors
+      require "#{ADAPTOR_ROOT}/app/adaptors/application.rb" if File.exist?("#{ADAPTOR_ROOT}/app/adaptors/application.rb")
       Dir["#{ADAPTOR_ROOT}/app/adaptors/*.rb"].each do |f|
         require f
       end
@@ -34,19 +42,10 @@ module Adaptation
 
   class Base
 
-    attr_reader :logger
-
     def initialize 
       
       Initializer.run
 
-      # connect with database -> this could also be avoided?
-      if File.exists?("#{ADAPTOR_ROOT}/config/database.yml")
-        environment_configurations = YAML::load(File.open("#{ADAPTOR_ROOT}/config/database.yml"))[$environment]
-        ActiveRecord::Base.configurations.update($environment => environment_configurations)
-        ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations[$environment])
-      end
-
       @@logger = Logger.new("#{ADAPTOR_ROOT}/log/#{$environment}.log")
       ActiveRecord::Base.logger = @@logger
       
@@ -59,24 +58,37 @@ module Adaptation
     def process(xml_message)
 
       # dirty method to discover the message type
+      # TODO: move to a module
       message_type = xml_message[1..(xml_message.index(/(>| |\/)/) - 1)]
-      
+      adaptor = message = nil
+ 
       begin
         message_class = get_class_object(message_type.capitalize)
         message = message_class.to_object(xml_message)
-     
+      rescue
+        # message class not implemented in this adaptor
+        #
+        # TODO: the xml is returned as a String; in future versions
+        # Adaptation may build a valid Adaptation::Message even
+        # without implementation for this type of message
+        message = xml_message # Adaptation::Message.to_object(xml_message)
+      end
+
+      begin
         adaptor_class = get_class_object("#{message_type.capitalize}Adaptor")    
         adaptor = adaptor_class.new
-      rescue Exception => e
-        # message no implemented in this adaptor
-        return
+      rescue 
+        # adaptor class not implemented in this adaptor
+        adaptor = ApplicationAdaptor.new
       end
- 
-      unless message.check
-        puts "WARNING:Message doesn't validate!" 
-        return
+
+      unless message.is_a?(String) # TODO: remove when feature explained in line 70 implemented
+        unless message.check
+          @@logger.info "WARNING:Message doesn't validate!" 
+          return
+        end
       end
-     
+
       adaptor.process message
     end
 

data/lib/adaptation/test/test_help.rb

@@ -262,12 +262,12 @@ class Test::Unit::TestCase
   def load_message_fixture fixture_symbol #:nodoc:
     data = get_message_fixture(fixture_symbol.to_s)
     class_name =  data[1..(data.index(/(>| )/) - 1)].capitalize
-    message_class = get_class_object(class_name)
+    message_class = get_class_object(class_name) rescue Adaptation::Message
     message_object = message_class.to_object(data)
     [data, message_object]
   end
   
-  # this method is repeated many times all over the code!
+  # TODO: this method is repeated in different parts of the code... module?
   def get_class_object(searched_class) #:nodoc:
     Object.const_get searched_class
   end

data/lib/rails_generator/generators/applications/app/app_generator.rb

@@ -31,6 +31,7 @@ class AppGenerator < Rails::Generator::Base
       m.file "README", "README"
 
       # Application
+      m.file "helpers/application.rb", "app/adaptors/application.rb"
       m.file "helpers/test_helper.rb", "test/test_helper.rb"
       m.file "helpers/publish.rb", "test/mocks/test/publish.rb"
 

data/lib/rails_generator/generators/components/adaptor/adaptor_generator.rb

@@ -2,7 +2,7 @@ class AdaptorGenerator < Rails::Generator::NamedBase
   def manifest
     record do |m|
       # Check for class naming collisions.
-      m.class_collisions class_path, "#{class_name}Adaptor", "#{class_name}AdaptorTest"
+      m.class_collisions class_path, "ApplicationAdaptor", "#{class_name}Adaptor", "#{class_name}AdaptorTest"
 
       # Adaptors and test directories.
       m.directory File.join('app/adaptors', class_path)

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

@@ -1,4 +1,4 @@
-class <%= class_name %>Adaptor < Adaptation::Adaptor
+class <%= class_name %>Adaptor < ApplicationAdaptor
   
   def process <%= class_name.downcase %>
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: adaptation
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors: 
 - Xavi Vila Morell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-23 00:00:00 +01:00
+date: 2009-01-05 00:00:00 +01:00
 default_executable: adaptation
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,95 +42,96 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
-- bin/generate
-- bin/about
+- bin/subscribe
+- bin/destroy
 - bin/breakpointer
-- bin/console
+- bin/about
 - bin/adaptation
+- bin/generate
+- bin/console
 - bin/mom
-- bin/subscribe
-- bin/destroy
-- lib/rails_generator
-- lib/ruby_version_check.rb
-- lib/breakpoint_client.rb
-- lib/binding_of_caller.rb
 - lib/breakpoint.rb
-- lib/rails_generator.rb
-- lib/commands.rb
-- lib/adaptation.rb
-- lib/commands
 - lib/adaptation
-- lib/rails_generator/scripts
-- lib/rails_generator/manifest.rb
-- lib/rails_generator/base.rb
+- lib/adaptation/base.rb
+- lib/adaptation/console
+- lib/adaptation/console/environment.rb
+- lib/adaptation/version.rb
+- lib/adaptation/mom.rb
+- lib/adaptation/message.rb
+- lib/adaptation/adaptor.rb
+- lib/adaptation/druby_subscriber.rb
+- lib/adaptation/test
+- lib/adaptation/test/fake_fixtures.rb
+- lib/adaptation/test/test_help.rb
+- lib/adaptation/validateable.rb
+- lib/commands.rb
+- lib/rails_generator
+- lib/rails_generator/options.rb
 - lib/rails_generator/simple_logger.rb
-- lib/rails_generator/generators
+- lib/rails_generator/base.rb
 - lib/rails_generator/commands.rb
 - lib/rails_generator/lookup.rb
-- lib/rails_generator/scripts.rb
+- lib/rails_generator/manifest.rb
 - lib/rails_generator/generated_attribute.rb
-- lib/rails_generator/options.rb
-- lib/rails_generator/spec.rb
+- lib/rails_generator/scripts.rb
+- lib/rails_generator/scripts
 - lib/rails_generator/scripts/update.rb
 - lib/rails_generator/scripts/destroy.rb
 - lib/rails_generator/scripts/generate.rb
-- lib/rails_generator/generators/components
+- lib/rails_generator/spec.rb
+- lib/rails_generator/generators
 - lib/rails_generator/generators/applications
-- lib/rails_generator/generators/components/message
-- lib/rails_generator/generators/components/adaptor
+- lib/rails_generator/generators/applications/app
+- lib/rails_generator/generators/applications/app/USAGE
+- lib/rails_generator/generators/applications/app/app_generator.rb
+- lib/rails_generator/generators/components
 - lib/rails_generator/generators/components/model
-- lib/rails_generator/generators/components/message/templates
+- lib/rails_generator/generators/components/model/USAGE
+- lib/rails_generator/generators/components/model/templates
+- lib/rails_generator/generators/components/model/templates/unit_test.rb
+- lib/rails_generator/generators/components/model/templates/fixtures.yml
+- lib/rails_generator/generators/components/model/templates/migration.rb
+- lib/rails_generator/generators/components/model/templates/model.rb
+- lib/rails_generator/generators/components/model/model_generator.rb
+- lib/rails_generator/generators/components/message
 - lib/rails_generator/generators/components/message/USAGE
-- lib/rails_generator/generators/components/message/message_generator.rb
+- lib/rails_generator/generators/components/message/templates
+- lib/rails_generator/generators/components/message/templates/unit_test.rb
 - lib/rails_generator/generators/components/message/templates/message.rb
 - lib/rails_generator/generators/components/message/templates/fixtures.xml
-- lib/rails_generator/generators/components/message/templates/unit_test.rb
-- lib/rails_generator/generators/components/adaptor/adaptor_generator.rb
-- lib/rails_generator/generators/components/adaptor/templates
+- lib/rails_generator/generators/components/message/message_generator.rb
+- lib/rails_generator/generators/components/adaptor
 - lib/rails_generator/generators/components/adaptor/USAGE
-- lib/rails_generator/generators/components/adaptor/templates/functional_test.rb
+- lib/rails_generator/generators/components/adaptor/templates
 - lib/rails_generator/generators/components/adaptor/templates/adaptor.rb
-- lib/rails_generator/generators/components/model/model_generator.rb
-- lib/rails_generator/generators/components/model/templates
-- lib/rails_generator/generators/components/model/USAGE
-- lib/rails_generator/generators/components/model/templates/model.rb
-- lib/rails_generator/generators/components/model/templates/fixtures.yml
-- lib/rails_generator/generators/components/model/templates/unit_test.rb
-- lib/rails_generator/generators/components/model/templates/migration.rb
-- lib/rails_generator/generators/applications/app
-- lib/rails_generator/generators/applications/app/app_generator.rb
-- lib/rails_generator/generators/applications/app/USAGE
-- lib/commands/subscribe.rb
+- lib/rails_generator/generators/components/adaptor/templates/functional_test.rb
+- lib/rails_generator/generators/components/adaptor/adaptor_generator.rb
+- lib/binding_of_caller.rb
+- lib/rails_generator.rb
+- lib/ruby_version_check.rb
+- lib/adaptation.rb
+- lib/commands
 - lib/commands/breakpointer.rb
-- lib/commands/destroy.rb
+- lib/commands/console.rb
 - lib/commands/about.rb
 - lib/commands/adaptor_path.rb
+- lib/commands/subscribe.rb
+- lib/commands/destroy.rb
 - lib/commands/generate.rb
-- lib/commands/console.rb
-- lib/adaptation/version.rb
-- lib/adaptation/test
-- lib/adaptation/validateable.rb
-- lib/adaptation/base.rb
-- lib/adaptation/message.rb
-- lib/adaptation/druby_subscriber.rb
-- lib/adaptation/console
-- lib/adaptation/mom.rb
-- lib/adaptation/adaptor.rb
-- lib/adaptation/test/fake_fixtures.rb
-- lib/adaptation/test/test_help.rb
-- lib/adaptation/console/environment.rb
-- helpers/test_helper.rb
-- helpers/publish.rb
+- lib/breakpoint_client.rb
+- helpers/application.rb
 - helpers/test.rb
+- helpers/publish.rb
+- helpers/test_helper.rb
 - doc/README_FOR_APP
+- configs/databases
+- configs/databases/mysql.yml
 - configs/mom.yml
-- configs/empty.log
 - configs/settings.yml
-- configs/databases
+- configs/empty.log
 - configs/boot.rb
-- configs/databases/mysql.yml
-- dispatches/publish.rb
 - dispatches/dispatch.rb
+- dispatches/publish.rb
 - README
 - CHANGELOG
 - fresh_rakefile