julien51-babylon 0.1.3 → 0.1.4

data/lib/babylon/router.rb

@@ -30,12 +30,17 @@ module Babylon
     ##
     # Executes the route for the given xml_stanza, by instantiating the controller_name, calling action_name and sending 
     # the result to the connection
-    def execute_route(controller_name, action_name, xml_stanza = nil)
-      Babylon.logger.info {
-        "ROUTING TO #{controller_name}::#{action_name}"
-      }
-      stanza = nil
-      stanza = Kernel.const_get(action_name.capitalize).new(xml_stanza) if xml_stanza
+    def execute_route(controller_name, action_name, stanza = nil)
+      begin
+        stanza = Kernel.const_get(action_name.capitalize).new(stanza) if stanza
+        Babylon.logger.info {
+          "ROUTING TO #{controller_name}::#{action_name} with #{stanza.class}"
+        }
+      rescue NameError
+        Babylon.logger.info {
+          "ROUTING TO #{controller_name}::#{action_name} with #{stanza.class}"
+        }
+      end
       controller = controller_name.new(stanza) 
       controller.perform(action_name) 
       connection.send_xml(controller.evaluate)

data/spec/lib/babylon/router_spec.rb

@@ -101,15 +101,25 @@ describe Babylon::StanzaRouter do
       @mock_controller.stub!(:perform).with(@action)
     end
 
-    it "should instantiate the route's stanza" do
-      Kernel.should_receive(:const_get).with(@action.capitalize).and_return(Babylon::Base::Stanza) 
-      Babylon::Base::Stanza.should_receive(:new).with(@xml).and_return(@mock_stanza)
-      @router.execute_route(@controller, @action, @xml)
+    describe "when the Stanza class exists" do
+      it "should instantiate the route's stanza " do
+        Kernel.should_receive(:const_get).with(@action.capitalize).and_return(Babylon::Base::Stanza) 
+        Babylon::Base::Stanza.should_receive(:new).with(@xml).and_return(@mock_stanza)
+        @router.execute_route(@controller, @action, @xml)
+      end
+      
+      it "should instantiate the route's controller" do
+        @controller.should_receive(:new).with(@mock_stanza).and_return(@mock_controller)
+        @router.execute_route(@controller, @action, @xml)
+      end
     end
-
-    it "should instantiate the route's controller" do
-      @controller.should_receive(:new).and_return(@mock_controller)
-      @router.execute_route(@controller, @action, @xml)
+    
+    describe "when the stanza class doesn't exist" do
+      it "should instantiate the route's controller with the xml" do
+        Kernel.should_receive(:const_get).with(@action.capitalize).and_raise(NameError) 
+        @controller.should_receive(:new).with(@xml).and_return(@mock_controller)
+        @router.execute_route(@controller, @action, @xml)
+      end
     end
 
     it "should call perform on the controller with the action's name" do

data/templates/babylon/script/component

@@ -4,11 +4,9 @@ require 'daemons'
 require 'optparse'
 
 # default options
-OPTIONS = {
-  :command          => "run",
-  :environment      => "development",
-  :name             => "#{Dir.pwd.split("/").last}",
-}
+command          = "run"
+environment      = "development"
+name             = "#{Dir.pwd.split("/").last}"
 
 ARGV.options do |o|
   script_name = File.basename($0)
@@ -21,13 +19,13 @@ ARGV.options do |o|
   
   o.on("-c", "--command=[run|start|stop|restart]", String,
        "The command you'd like to execute",
-       "Default: #{OPTIONS[:command]}")   { |OPTIONS[:command]| }
+       "Default: #{command}")   { |command| }
   o.on("-e", "--environment=env", String,
        "The environment to run the application (you should have defined the argument into config/config.yaml)",
-       "Default: #{OPTIONS[:environment]}") { |OPTIONS[:environment]| }
+       "Default: #{environment}") { |environment| }
   o.on("-n", "--name=app_name", String,
        "Name of your application. The pid_file will be name after this.",
-       "Default: #{OPTIONS[:name]}") { |OPTIONS[:name]| }
+       "Default: #{name}") { |name| }
   
   o.separator ""
 
@@ -38,10 +36,11 @@ end
 
 
 options = {
-  :ARGV       => [OPTIONS[:command], '--', OPTIONS[:environment]],
-  :app_name   => OPTIONS[:name],
+  :ARGV       => [command, '--', environment],
+  :app_name   => name,
   :dir        => "../tmp/pids/",
   :multiple   => false,
   :backtrace  => true
 }
+$app_name = options[:app_name]
 Daemons.run(File.dirname(__FILE__) + '/../config/boot.rb', options)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: julien51-babylon
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - julien Genestoux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-23 00:00:00 -07:00
+date: 2009-05-31 00:00:00 -07:00
 default_executable: babylon
 dependencies: []