julien51-babylon 0.0.12 → 0.0.13

data/README.rdoc

@@ -85,7 +85,7 @@ Babylon's edge versions are located at Github : http://github.com/julien51/babyl
 
 == REQUIREMENTS :
 
-Gems : Eventmachine, nokogiri, YAML, log4r, sax-machine
+Gems : Eventmachine, nokogiri, YAML, log4r, sax-machine, templater, daemons
 
 == LICENSE:
 

data/Rakefile

@@ -9,7 +9,7 @@ begin
     gem.email = "julien.genestoux@gmail.com"
     gem.homepage = "http://github.com/julien51/babylon"
     gem.authors = ["julien Genestoux"]
-    gem.requirements = ["eventmachine", "yaml", "fileutils", "log4r", "nokogiri", "sax-machine"]
+    gem.requirements = ["eventmachine", "yaml", "fileutils", "log4r", "nokogiri", "sax-machine", "templater", "daemons"]
     gem.executables = "babylon"
     gem.files = [ "bin/babylon", 
                   "lib/babylon.rb", 
@@ -35,7 +35,11 @@ begin
                   "templates/babylon/config/config.yaml", 
                   "templates/babylon/config/dependencies.rb", 
                   "templates/babylon/config/routes.rb", 
-                  "templates/babylon/script/component"
+                  "templates/babylon/script/component",
+                  "templates/babylon/tmp/log/test.log",
+                  "templates/babylon/tmp/log/development.log",
+                  "templates/babylon/tmp/log/production.log",
+                  "templates/babylon/tmp/pid/README"
                   ]
     gem.rubyforge_project = 'babylon'
   end

data/lib/babylon.rb

@@ -60,7 +60,7 @@ module Babylon
   def self.logger
     unless self.class_variable_defined?("@@logger")
       @@logger = Log4r::Logger.new("BABYLON")
-      @@logger.add(Log4r::Outputter.stderr)
+      @@logger.add(Log4r::Outputter.stdout) if Babylon.environment == "development"
     end
     @@logger
   end

data/lib/babylon/base/controller.rb

@@ -9,10 +9,8 @@ module Babylon
       
       ##
       # Creates a new controller (you should not override this class) and assigns the stanza as well as any other value of the hash to instances named after the keys of the hash.
-      def initialize(params = {})
-        params.each do |key, value|
-          instance_variable_set("@#{key}", value)
-        end
+      def initialize(stanza = nil)
+        @stanza = stanza
         @rendered = false
       end
       
@@ -29,8 +27,24 @@ module Babylon
         self.render
       end
       
+      ##
+      # Returns the list of variables assigned during the action.
+      def assigns
+        vars = Hash.new
+         instance_variables.each do |var|
+           if !["@rendered", "@action_name", "@block"].include? var
+             vars[var[1..-1]] = instance_variable_get(var)
+           end
+        end
+        return vars
+      end
+      
       ##
       # Called by default after each action to "build" a XMPP stanza. By default, it will use the /controller_name/action.xml.builder
+      # You can use the following options :
+      #   - :file : render a specific file (can be in a different controller)
+      #   - :action : render another action of the current controller
+      #   - :nothing : doesn't render anything
       def render(options = nil)
         return if @rendered # Avoid double rendering
         
@@ -45,6 +59,8 @@ module Babylon
           end
         elsif action_name = options[:action]
           render(:file => default_template_name(action_name.to_s))
+        elsif options[:nothing]
+          # Then we don't do anything.
         end
         
         # And finally, we set up rendered to be true 
@@ -52,15 +68,6 @@ module Babylon
       end
       
       protected
-
-      # Used to transfer the assigned variables from the controller to the views
-      def hashed_variables
-        vars = Hash.new
-         instance_variables.each do |var|
-          vars[var[1..-1]] = instance_variable_get(var)
-        end
-        return vars
-      end
       
       def view_path(file_name)
         File.join("app/views", "#{self.class.name.gsub("Controller","").downcase}", file_name)
@@ -73,7 +80,7 @@ module Babylon
       
       # Creates the view and "evaluates" it to build the XML for the stanza
       def render_for_file(file)
-        @block.call(Babylon::Base::View.new(file, hashed_variables).evaluate) if @block
+        @block.call(Babylon::Base::View.new(file, assigns).evaluate) if @block
         Babylon.logger.info("RENDERED : #{file}")
       end
     end

data/lib/babylon/client_connection.rb

@@ -68,7 +68,7 @@ module Babylon
       end
       @outstream = builder.doc
       start_stream, stop_stream = builder.to_xml.split('<paste_content_here/>')
-      send(start_stream)
+      send_xml(start_stream)
     end
 
     ##
@@ -91,7 +91,7 @@ module Babylon
             if stanza.at("starttls") # we shall start tls
               starttls = Nokogiri::XML::Node.new("starttls", @outstream)
               starttls["xmlns"] = "urn:ietf:params:xml:ns:xmpp-tls"
-              send(starttls)
+              send_xml(starttls)
               @state = :wait_for_proceed
             elsif stanza.at("mechanisms") # tls is ok
               if stanza.at("mechanisms/[contains(mechanism,'PLAIN')]")
@@ -100,7 +100,7 @@ module Babylon
                 auth['mechanism'] = "PLAIN"
                 auth['xmlns'] = "urn:ietf:params:xml:ns:xmpp-sasl"
                 auth.content = Base64::encode64([jid, jid.split("@").first, @password].join("\000")).gsub(/\s/, '')
-                send(auth)
+                send_xml(auth)
                 @state = :wait_for_success
               end
             end
@@ -111,7 +111,7 @@ module Babylon
             @success = true
             @state = :wait_for_stream
             @parser.reset
-            send @outstream.root.to_xml.split('<paste_content_here/>').first
+            send_xml @outstream.root.to_xml.split('<paste_content_here/>').first
           elsif stanza.name == "failure"
             if stanza.at("bad-auth") || stanza.at("not-authorized")
               raise AuthenticationError
@@ -138,7 +138,7 @@ module Babylon
                 end
               end
               iq = @outstream.add_child(builder.doc.root)
-              send(iq)
+              send_xml(iq)
               @state = :wait_for_confirmed_binding
             end
           end
@@ -157,14 +157,14 @@ module Babylon
             end
           end
           iq = @outstream.add_child(builder.doc.root)
-          send(iq)
+          send_xml(iq)
           @state = :wait_for_confirmed_session
 
         when :wait_for_confirmed_session
           if stanza.name == "iq" && stanza["type"] == "result" && Integer(stanza["id"]) ==  @session_iq_id && stanza.at("session")
             # And now, send a presence!
             presence = Nokogiri::XML::Node.new("presence", @outstream)
-            send(presence)
+            send_xml(presence)
             begin
               @handler.on_connected(self) if @handler and @handler.respond_to?("on_connected")
             rescue
@@ -177,7 +177,7 @@ module Babylon
           start_tls() # starting TLS
           @state = :wait_for_stream
           @parser.reset
-          send @outstream.root.to_xml.split('<paste_content_here/>').first
+          send_xml @outstream.root.to_xml.split('<paste_content_here/>').first
         end
       rescue
         Babylon.logger.error("#{$!}:\n#{$!.backtrace.join("\n")}")

data/lib/babylon/component_connection.rb

@@ -24,7 +24,7 @@ module Babylon
         end
       end
       start, stop = builder.to_xml.split('<paste_content_here/>')
-      send(start)
+      send_xml(start)
     end
 
     ##
@@ -39,7 +39,7 @@ module Babylon
         if stanza.name == "stream:stream" && stanza.attributes['id']
           # This means the XMPP session started!
           # We must send the handshake now.
-          send(handshake(stanza))
+          send_xml(handshake(stanza))
           @state = :wait_for_handshake
         else
           raise

data/lib/babylon/generator.rb

@@ -40,7 +40,16 @@ module Babylon
       empty_directory :initializers_directory do |d|
         d.destination = "#{application_name}/config/initializers"
       end
-      
+      empty_directory :tmp_directory do |d|
+        d.destination = "#{application_name}/tmp"
+      end 
+      empty_directory :log_directory do |d|
+        d.destination = "#{application_name}/tmp/log"
+      end
+      empty_directory :pid_directory do |d|
+        d.destination = "#{application_name}/tmp/pid"
+      end
+           
       # And now add the critical files
       file :boot_file do |f|
         f.source = "#{source_root}/config/boot.rb"
@@ -58,7 +67,7 @@ module Babylon
         f.source = "#{source_root}/config/routes.rb"
         f.destination = "#{application_name}/config/routes.rb"
       end
-      file :component_file do |f|
+      template :component_file do |f|
         f.source = "#{source_root}/script/component"
         f.destination = "#{application_name}/script/component"
       end

data/lib/babylon/router.rb

@@ -53,13 +53,13 @@ module Babylon
           Babylon.logger.info("ROUTING TO #{route.controller}::#{route.action}")
           # Parsing the stanza
           begin
-            controller = route.controller.new({:stanza => Kernel.const_get(route.action.capitalize).new(stanza)})
+            controller = route.controller.new(Kernel.const_get(route.action.capitalize).new(stanza))
           rescue NameError
             raise UndefinedStanza
           end
           controller.perform(route.action) do |response|
             # Response should be a Nokogiri::Nodeset
-            @@connection.send(response)
+            @@connection.send_xml(response)
           end
           return true
         end

data/lib/babylon/runner.rb

@@ -17,6 +17,9 @@ module Babylon
       EventMachine.epoll
       EventMachine.run do
         
+        # Add an outputter to the logger
+        Babylon.logger.add(Log4r::FileOutputter.new("#{Babylon.environment}", :filename => "tmp/log/#{Babylon.environment}.log", :trunc => false))
+        
         # Requiring all models
         Dir.glob('app/models/*.rb').each { |f| require f }
 
@@ -26,7 +29,7 @@ module Babylon
         # Load the controllers
         Dir.glob('app/controllers/*_controller.rb').each {|f| require f }
 
-        #  Evaluate routes defined with the new DSL router.
+        # Evaluate routes defined with the new DSL router.
         CentralRouter.draw do
           eval File.read("config/routes.rb")
         end
@@ -41,27 +44,48 @@ module Babylon
         Babylon.config = YAML.load(config_file)[Babylon.environment] 
         
         case Babylon.config["application_type"] 
-          when "client"
-            Babylon::ClientConnection.connect(Babylon.config, self) 
-          else # By default, we assume it's a component
-            Babylon::ComponentConnection.connect(Babylon.config, self) 
+        when "client"
+          Babylon::ClientConnection.connect(Babylon.config, self) 
+        else # By default, we assume it's a component
+          Babylon::ComponentConnection.connect(Babylon.config, self) 
         end
         
         # And finally, let's allow the application to do all it wants to do after we started the EventMachine!
-        yield if block_given?
+        yield(self) if block_given?
       end
     end
     
+    ##
+    # Returns the list of connection observers
+    def self.connection_observers()
+      @@observers ||= Array.new
+    end
+    
+    ##
+    # Adding a connection observer. These observer will receive on_connected and on_disconnected events.
+    def self.add_connection_observer(object)
+      @@observers ||= Array.new
+      @@observers.push(object)
+    end
+    
     ## 
     # Will be called by the connection class once it is connected to the server.
+    # It "plugs" the router and then calls on_connected on the various observers.
     def self.on_connected(connection)
       Babylon::CentralRouter.connected(connection)
+      connection_observers.each do |conn_obs|
+        conn_obs.on_connected(connection) if conn_obs.respond_to?("on_connected")
+      end
     end
     
     ##
     # Will be called by the connection class upon disconnection.
+    # It stops the event loop and then calls on_disconnected on the various observers.
     def self.on_disconnected()
       EventMachine.stop_event_loop
+      connection_observers.each do |conn_obs|
+        conn_obs.on_disconnected if conn_obs.respond_to?("on_disconnected")
+      end
     end
     
     ##

data/lib/babylon/xmpp_connection.rb

@@ -8,6 +8,10 @@ module Babylon
   # xml-not-well-formed Exception
   class XmlNotWellFormed < Exception; end
 
+  ##
+  # Error when there is no connection to the host and port.
+  class NoConnection < Exception; end
+
   ##
   # Authentication Error (wrong password/jid combination). Used for Clients and Components
   class AuthenticationError < Exception; end
@@ -24,7 +28,11 @@ module Babylon
     # This can very well be overwritten by subclasses.
     def self.connect(params, handler)
       Babylon.logger.debug("CONNECTING TO #{params["host"]}:#{params["port"]}") # Very low level Logging
-      EventMachine.connect(params["host"], params["port"], self, params.merge({"handler" => handler}))
+      begin
+        EventMachine.connect(params["host"], params["port"], self, params.merge({"handler" => handler}))
+      rescue
+        Babylon.logger.error("CONNECTION ERROR : #{$!}") # Very low level Logging
+      end
     end
 
     def connection_completed
@@ -83,7 +91,7 @@ module Babylon
     ## 
     # Sends the Nokogiri::XML data (after converting to string) on the stream. It also appends the right "from" to be the component's JId if none has been mentionned. Eventually it displays this data for debugging purposes.
     # This method also adds a "from" attribute to all stanza if it was ommited (the full jid) only if a "to" attribute is present. if not, we assume that we're speaking to the server and the server doesn't need a "from" to identify where the message is coming from.
-    def send(xml)
+    def send_xml(xml)
       raise NotConnected unless @connected
       if xml.is_a? Nokogiri::XML::NodeSet
         xml.each do |node|

data/templates/babylon/config/boot.rb

@@ -1,9 +1,16 @@
+##
+# This file is run by the dameons, in the apps directory
+
+# Change directory to the app's directory.
+Dir.chdir(File.dirname(__FILE__) + "/../") 
+
 require "rubygems"
 require "babylon"
 require File.dirname(__FILE__) + "/dependencies"
 
+
 # Start the App
 Babylon::Runner::run(ARGV[0] || "development") do
-  # And the initializers, too. This is done here since some initializers might need EventMachine to be started.
-  Dir[File.join(File.dirname(__FILE__), '/initializers/*.rb')].each {|f| require f }
-end
+  # Run the initializers, too. This is done here since some initializers might need EventMachine to be started.
+  Dir.glob('initializers/*.rb').each { |f| require f }
+end

data/templates/babylon/script/component

@@ -1,2 +1,31 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+
+require 'rubygems'
+require 'daemons'
+
+if ["run", "start", "stop", "restart"].include? ARGV[0]
+  command   = ARGV[0]
+  env       = "development"
+else
+  env       = ARGV[0] || "development"
+  case env
+  when "development"
+    command = "run"
+  when "production"
+    command = "start"
+  else
+    # By default, we run in "on-top" mode
+    command = "run"
+  end
+end
+
+options = {
+  :ARGV       => [command, '--', env],
+  :app_name   => "#{Dir.pwd.split("/").last}",
+  :dir        => "../tmp/pid/",
+  :multiple   => true,
+  :backtrace  => true
+}
+
+Daemons.run(File.dirname(__FILE__) + '/../config/boot.rb', options)
+

data/templates/babylon/tmp/pid/README

@@ -0,0 +1,2 @@
+# This is the pid directory. Please do not delete.
+# Also, when your application fails, you will find a .log ile here that shows the last trace

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: julien51-babylon
 version: !ruby/object:Gem::Version 
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors: 
 - julien Genestoux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-31 00:00:00 -07:00
+date: 2009-04-16 00:00:00 -07:00
 default_executable: babylon
 dependencies: []
 
@@ -48,6 +48,10 @@ files:
 - templates/babylon/config/dependencies.rb
 - templates/babylon/config/routes.rb
 - templates/babylon/script/component
+- templates/babylon/tmp/log/test.log
+- templates/babylon/tmp/log/development.log
+- templates/babylon/tmp/log/production.log
+- templates/babylon/tmp/pid/README
 has_rdoc: true
 homepage: http://github.com/julien51/babylon
 post_install_message: 
@@ -75,6 +79,8 @@ requirements:
 - log4r
 - nokogiri
 - sax-machine
+- templater
+- daemons
 rubyforge_project: babylon
 rubygems_version: 1.2.0
 signing_key: