adaptation 0.0.8 → 0.0.9

data/CHANGELOG

@@ -7,8 +7,16 @@
 * 0.0.6
     - forced to use ROXML version 1.2
 * 0.0.7
-    - Documentation update + Message class clean up
+    - documentation update + Message class clean up
 * 0.0.8
-    - Activerecord 2.2.2 broke our tests, because it has some new methods not present in Adaptation::Message class.
-      Three class methods have been added in Validateable module to fix that.
-    - Removed comment when starting console.
+    - activerecord 2.2.2 broke our tests, because it has some new methods not present in Adaptation::Message class.
+      Three class methods have been added in Validateable module to fix that
+    - removed comment when starting console
+* 0.0.9
+    - publish method in Adaptor class uses oappublish command configured in settings.yml
+    - added method get_message_from_fixture in tests
+    - in tests, the 'message' method gets from the message itself the adaptor that must 
+      process it, not from the test class (so def setup @adaptor=... end; is no longer mandatory) 
+    - 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

data/helpers/test.rb

@@ -0,0 +1,11 @@
+require 'test/unit'
+
+#require all unit tests
+Dir["test/unit/*.rb"].each do |f|
+  require f
+end
+
+#require all functional tests
+Dir["test/functional/*.rb"].each do |f|
+  require f
+end

data/lib/adaptation/adaptor.rb

@@ -9,6 +9,10 @@ module Adaptation
 #  script/generate adaptor hello
 # 
   class Adaptor
+
+    def logger
+      Adaptation::Base.logger
+    end
     
     def publish *options
       message_object = nil
@@ -22,7 +26,7 @@ module Adaptation
       end
       
       xml = message_object.to_xml
-      unless system("oappublish '#{$config["application"]}' '#{xml}'")
+      unless system("#{$config["oappublish"]} '#{$config["application"]}' '#{xml}'")
         puts "Problem publishing: #{xml}"
       end
     end

data/lib/adaptation/base.rb

@@ -1,10 +1,16 @@
 module Adaptation
 
-  class Base
+  class Initializer
+
+    def self.run
+       
+      unless defined? $environment
+        $environment = "development"
+      end
 
-    def initialize
-      $environment = "development"
-      $config = YAML::load(File.open("#{ADAPTOR_ROOT}/config/settings.yml"))[$environment]
+      if File.exists?("config/settings.yml")
+        $config = YAML::load(File.open("#{ADAPTOR_ROOT}/config/settings.yml"))[$environment]
+      end
 
       # require all adaptors
       Dir["#{ADAPTOR_ROOT}/app/adaptors/*.rb"].each do |f|
@@ -21,15 +27,37 @@ module Adaptation
         require f
       end
 
+    end
+
+  end
+
+
+  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")
-        development_configurations = YAML::load(File.open("#{ADAPTOR_ROOT}/config/database.yml"))[$environment]
-        ActiveRecord::Base.configurations.update("development" => development_configurations)
+        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
+      
+    end
+
+    def self.logger
+      @@logger
     end
 
     def process(xml_message)
+
       # dirty method to discover the message type
       message_type = xml_message[1..(xml_message.index(/(>| |\/)/) - 1)]
       
@@ -48,21 +76,11 @@ module Adaptation
         puts "WARNING:Message doesn't validate!" 
         return
       end
-      
+     
       adaptor.process message
     end
 
     def get_class_object(searched_class)
-      #class_object = nil
-      #ObjectSpace.each_object(Class){|aClass|
-      #  class_object = aClass if aClass.to_s == searched_class
-      #}
-      #if class_object.nil?
-      #  #puts "Unknown class #{searched_class}."
-      #  raise Exception.new("Unknown class #{searched_class}.")
-      #else
-      #  return class_object
-      #end
       Object.const_get searched_class
     end
 

data/lib/adaptation/message.rb

@@ -101,7 +101,9 @@ module Adaptation
 #
 #
   class Message
-    
+   
+    attr_reader :id # avoid id method deprecation warnings
+ 
     @@classes_with_brothers = []
     cattr_reader :classes_with_brothers
     cattr_reader :objects

data/lib/adaptation/test/test_help.rb

@@ -1,37 +1,13 @@
 #set environment
 $environment = "test"
-if File.exists?("config/settings.yml")
-  $config = YAML::load(File.open("config/settings.yml"))[$environment]
-end
+
+Adaptation::Initializer.run
 
 # for adaptations that require models from a rails application, sometimes 
 # rails needs to load the environment.rb from the rails app. When this happens
 # the following variable must be set.
 ENV['RAILS_ENV'] = "test"
 
-# connect to test database
-require 'active_record'
-
-if File.exists?("config/database.yml") 
-  test_configurations = YAML::load(File.open("config/database.yml"))[$environment]
-  ActiveRecord::Base.configurations.update("test" => test_configurations)
-  ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations[$environment])
-end
-
-if File.exists?("log")
-  ActiveRecord::Base.logger = Logger.new("#{ADAPTOR_ROOT}/log/test.log")
-end
-
-# load messages
-Dir["#{ADAPTOR_ROOT}/app/messages/*.rb"].reject{|f| f =~ /\/_/}.each do |f|
-  require f
-end
-
-# load models
-Dir["#{ADAPTOR_ROOT}/app/models/*.rb"].each do |f|
-  require f
-end
-
 if File.exists?("config/database.yml")
   begin
     require 'active_record/fixtures'
@@ -60,7 +36,6 @@ class Test::Unit::TestCase
             parsed_data.to_s, 
             message_object.to_xml.to_s
     assert_block error do
-      #message_object.to_xml.to_s == parsed_data.to_s
       compare_xml_elements parsed_data.root, message_object.to_xml
     end
   end
@@ -82,7 +57,6 @@ class Test::Unit::TestCase
             parsed_data.to_s, 
             message_object.to_xml.to_s
     assert_block error do
-      #message_object.to_xml.to_s != parsed_data.to_s
       !compare_xml_elements parsed_data.root, message_object.to_xml
     end
   end
@@ -116,28 +90,41 @@ class Test::Unit::TestCase
 
   # Asserts that a message[link:/classes/Adaptation/Message.html] has been
   # published in test environment. This means that the
-  # message[link:/classes/Adaptation/Message.html] will be searched where
-  # the mock object <em>test/mocks/test/publish.rb</em> left it.
+  # message[link:/classes/Adaptation/Message.html] will be searched in the
+  # file where the mock object <em>test/mocks/test/publish.rb</em> left it.
+  # The file that fakes the mom is deleted every time <em>message<em> method
+  # is called.
   def assert_message_published xml_message
-    # build Message object with xml_data
-    message_type = xml_message[1..(xml_message.index(/(>| )/) - 1)]
-    message_class = get_class_object(message_type.capitalize)
-    message_object = message_class.to_object(xml_message)
+    message_object = xml_message
+
+    if message_object.is_a?(String)
+      # build Message object with xml_data
+      message_type = xml_message[1..(xml_message.index(/(>| )/) - 1)]
+      message_class = get_class_object(message_type.capitalize)
+      message_object = message_class.to_object(xml_message)
+    end
 
     # check for all messages "published" in the mom (that's file /tmp/mom.txt),
     # if any line corresponds to the message passed as a parameter.
     message_found = false
-    File.open('/tmp/mom.txt', 'r').each{ |line|
+    expected = published = ""
+    File.open(ADAPTOR_ROOT + '/test/mocks/test/mom.txt', 'r').each{ |line|
       mom_message = REXML::Document.new line
-      if mom_message.to_s.chomp == message_object.to_xml.to_s
+      published   =  line.chop
+      expected    =  message_object.to_xml.to_s
+      if compare_xml_elements mom_message.root, message_object.to_xml
         message_found = true
         break 
       end
     }
  
-    error = build_message error,
-            "? message not published",
-            message_type
+    error = build_message(error,
+      "? message not published:\n \
+  Expected : ?\n \
+  Published: ?\n",
+      message_object.class,
+      expected,
+      published)
     assert_block error do
       message_found
     end
@@ -165,7 +152,6 @@ class Test::Unit::TestCase
     begin
       connection = ActiveRecord::Base.connection
     rescue Exception => e
-      puts "Database error message: #{e}"
       database_exists = false
     end
 
@@ -201,7 +187,6 @@ class Test::Unit::TestCase
     begin
       connection = ActiveRecord::Base.connection
     rescue Exception => e
-      puts "Database says: #{e} (not necessarily bad)"
       database_exists = false
     end
 
@@ -246,14 +231,19 @@ class Test::Unit::TestCase
     end 
 
     # clean mom (delete mom.txt file)
-    mom_mock_file = 'test/mocks/test/mom.txt'
+    mom_mock_file = ADAPTOR_ROOT + '/test/mocks/test/mom.txt'
     if File.exists? mom_mock_file
       File.delete mom_mock_file
     end
 
-    # process message
-    @adaptor.process message_object
+    Adaptation::Base.new.process message_xml
+
+  end
 
+  # Retuns a message[link:/classes/Adaptation/Message.html] object
+  # from a fixture, without processing it
+  def get_message_from_fixture message_symbol
+    load_message_fixture(message_symbol)[1]
   end
   
   private
@@ -271,8 +261,7 @@ class Test::Unit::TestCase
 
   def load_message_fixture fixture_symbol #:nodoc:
     data = get_message_fixture(fixture_symbol.to_s)
-    class_name = self.class.to_s.gsub("Test", "")
-    class_name = class_name.gsub("Adaptor", "")
+    class_name =  data[1..(data.index(/(>| )/) - 1)].capitalize
     message_class = get_class_object(class_name)
     message_object = message_class.to_object(data)
     [data, message_object]

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

@@ -72,6 +72,10 @@ class AppGenerator < Rails::Generator::Base
       %w(server production development test).each { |file|
         m.file "configs/empty.log", "log/#{file}.log", :chmod => 0666
       }
+
+      # Tests script
+      m.file "helpers/test.rb", "test.rb"
+
     end
   end
 

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

@@ -6,7 +6,6 @@ class <%= class_name %>AdaptorTest < Test::Unit::TestCase
   #fixtures :your_table_name_here
 
   def setup
-    @adaptor = <%= class_name %>Adaptor.new
   end
 
   # Replace this with your real tests.

data/lib/rails_generator/lookup.rb

@@ -195,7 +195,8 @@ module Rails
 
       # Yield latest versions of generator gems.
       def each
-        Gem::cache.search(/_generator$/).inject({}) { |latest, gem|
+        dependency = Gem::Dependency.new(/_generator$/, Gem::Requirement.default)
+        Gem::cache.search(dependency).inject({}) { |latest, gem|
           hem = latest[gem.name]
           latest[gem.name] = gem if hem.nil? or gem.version > hem.version
           latest

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: adaptation
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - Xavi Vila Morell
-autorequire: adaptation
+autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-12-12 00:00:00 +01:00
+date: 2008-12-23 00:00:00 +01:00
 default_executable: adaptation
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,94 +42,95 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
-- bin/subscribe
-- bin/destroy
-- bin/breakpointer
-- bin/about
-- bin/adaptation
 - bin/generate
+- bin/about
+- bin/breakpointer
 - bin/console
+- bin/adaptation
 - 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/adaptation
-- 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/rails_generator.rb
 - lib/commands.rb
-- lib/rails_generator
-- lib/rails_generator/options.rb
-- lib/rails_generator/simple_logger.rb
+- lib/adaptation.rb
+- lib/commands
+- lib/adaptation
+- lib/rails_generator/scripts
+- lib/rails_generator/manifest.rb
 - lib/rails_generator/base.rb
+- lib/rails_generator/simple_logger.rb
+- lib/rails_generator/generators
 - lib/rails_generator/commands.rb
 - lib/rails_generator/lookup.rb
-- lib/rails_generator/manifest.rb
-- lib/rails_generator/generated_attribute.rb
 - lib/rails_generator/scripts.rb
-- lib/rails_generator/scripts
+- lib/rails_generator/generated_attribute.rb
+- lib/rails_generator/options.rb
+- lib/rails_generator/spec.rb
 - lib/rails_generator/scripts/update.rb
 - lib/rails_generator/scripts/destroy.rb
 - lib/rails_generator/scripts/generate.rb
-- lib/rails_generator/spec.rb
-- lib/rails_generator/generators
-- lib/rails_generator/generators/applications
-- 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/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/applications
 - lib/rails_generator/generators/components/message
-- lib/rails_generator/generators/components/message/USAGE
+- lib/rails_generator/generators/components/adaptor
+- lib/rails_generator/generators/components/model
 - lib/rails_generator/generators/components/message/templates
-- lib/rails_generator/generators/components/message/templates/unit_test.rb
+- lib/rails_generator/generators/components/message/USAGE
+- lib/rails_generator/generators/components/message/message_generator.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/message_generator.rb
-- lib/rails_generator/generators/components/adaptor
-- lib/rails_generator/generators/components/adaptor/USAGE
+- 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/adaptor/templates/adaptor.rb
+- lib/rails_generator/generators/components/adaptor/USAGE
 - 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/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/commands/breakpointer.rb
-- lib/commands/console.rb
+- lib/commands/destroy.rb
 - lib/commands/about.rb
 - lib/commands/adaptor_path.rb
-- lib/commands/subscribe.rb
-- lib/commands/destroy.rb
 - lib/commands/generate.rb
-- lib/breakpoint_client.rb
-- helpers/publish.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
+- helpers/test.rb
 - doc/README_FOR_APP
-- configs/databases
-- configs/databases/mysql.yml
 - configs/mom.yml
-- configs/settings.yml
 - configs/empty.log
+- configs/settings.yml
+- configs/databases
 - configs/boot.rb
-- dispatches/dispatch.rb
+- configs/databases/mysql.yml
 - dispatches/publish.rb
+- dispatches/dispatch.rb
 - README
 - CHANGELOG
 - fresh_rakefile