julien51-babylon 0.0.14 → 0.1.0

data/lib/babylon/xmpp_parser.rb

@@ -4,12 +4,13 @@ module Babylon
   # This is the XML SAX Parser that accepts "pushed" content
   class XmppParser < Nokogiri::XML::SAX::Document
     
-    attr_accessor :elem, :doc, :parser, :top
+    attr_accessor :elem, :doc, :parser
     
     ##
     # Initialize the parser and adds the callback that will be called upon stanza completion
-    def initialize(&callback)
+    def initialize(callback)
       @callback = callback
+      @buffer = ""
       super()
       reset
     end
@@ -17,9 +18,8 @@ module Babylon
     ## 
     # Resets the Pushed SAX Parser.
     def reset
-      @parser   = Nokogiri::XML::SAX::PushParser.new(self)
-      start_document
-      @elem     = nil
+      @parser = Nokogiri::XML::SAX::PushParser.new(self, "UTF-8")
+      @elem = @doc = nil
     end
     
     ##
@@ -28,79 +28,76 @@ module Babylon
       @parser << data
     end
     
-    ##
-    # Called when the document contains a CData block
-    def cdata_block(string)
-      @elem.add_child(Nokogiri::XML::CDATA.new(@doc, string))
-    end
-
-    ## 
-    # Called when the document received in the stream is started
-    def start_document
-      @doc = Nokogiri::XML::Document.new
-    end
-    
     ##
     # Adds characters to the current element (being parsed)
     def characters(string)
-      @elem.add_child(Nokogiri::XML::Text.new(string, @doc)) if @elem
+      @buffer ||= ""
+      @buffer += string 
     end
-
+    
     ##
-    # Instantiate a new current Element, adds the corresponding attributes and namespaces
+    # Instantiate a new current Element, adds the corresponding attributes and namespaces.
     # The new element is eventually added to a parent element (if present).
-    # If this element is the first element (the root of the document), then instead of adding it to a parent, we add it to the document itself. In this case, the current element will not be terminated, so we activate the callback immediately.
+    # If no element is being parsed, then, we create a new document, to which we add this new element as root. (we create one document per stanza to avoid memory problems)
     def start_element(qname, attributes = [])
-      e = Nokogiri::XML::Element.new(qname, @doc)
-      add_namespaces_and_attributes_to_node(attributes, e)
+      clear_characters_buffer
+      @doc ||= Nokogiri::XML::Document.new
+      @elem ||= @doc # If we have no current element, then, we take the doc
+      @elem = @elem.add_child(Nokogiri::XML::Element.new(qname, @doc))
+      add_namespaces_and_attributes_to_current_node(attributes)
       
-      if e.name == "stream:stream"
-        # Should be called only for stream:stream.
-        # We re-initialize the document and set its root to be the newly created element.
-        start_document
-        @doc.root = @root = e
-        # Also, we activate the callback since this element  will never end.
-        @callback.call(e)
-      else
-        # Adding the newly created element to the @elem that is being parsed, or, if no element is being parsed, then we set the @top and the @elem to be this newly created element.
-        # @top is the "highest" element to (it's parent is the <stream> element)
-        @elem = @elem ? @elem.add_child(e) : (@top = @root.add_child(e))
+      if @elem.name == "stream:stream"
+        # We activate the callback since this element  will never end.
+        @callback.call(@elem)
+        @doc = @elem = nil # Let's prepare for the next stanza
+        # And then, we start a new Sax Push Parser
+      end
+    end
+    
+    ##
+    # Clears the characters buffer
+    def clear_characters_buffer
+      if @buffer && @elem
+        @buffer.strip!
+        @elem.add_child(Nokogiri::XML::Text.new(Babylon.decode_xml(@buffer), @doc)) unless @buffer.empty?
+        @buffer = nil # empty the buffer
       end
     end
 
     ##
     # Terminates the current element and calls the callback
     def end_element(name)
+      clear_characters_buffer
       if @elem
-        if @elem == @top
+        if @elem.parent == @doc
+          # If we're actually finishing the stanza (a stanza is always a document's root)
           @callback.call(@elem) 
-          # Remove the element from its content, since we're done with it!
-          @elem.unlink if @elem
-          # And the current elem is the next sibling or the root
-          @elem = @top = nil
+          # We delete the current element and the doc (1 doc per stanza policy)
+          @elem = @doc = nil 
         else
           @elem = @elem.parent 
-        end
-      else
+        end 
+      else 
         # Not sure what to do since it seems we're not processing any element at this time, so how can one end?
-      end
-    end
+      end 
+    end 
     
     private
     
     ##
     # Adds namespaces and attributes. Nokogiri passes them as a array of [name, value, name, value]...
-    def add_namespaces_and_attributes_to_node(attrs, node) 
+    def add_namespaces_and_attributes_to_current_node(attrs) 
       (attrs.size / 2).times do |i|
         name, value = attrs[2 * i], attrs[2 * i + 1]
-        if name =~ /xmlns/
-          node.add_namespace(name.gsub("xmlns:", "").gsub("xmlns", ""), value)
-        else
-          node.set_attribute name, value
-        end
+        # TODO : FIX namespaces :they give a lot of problems with XPath
+        # if name == "xmlns"
+        #   @elem.add_namespace(nil, value)
+        # elsif name =~ /\Axmlns:/
+        #   @elem.add_namespace(name.gsub("xmlns:", ""), value)
+        # else
+          @elem.set_attribute name, Babylon.decode_xml(value)
+        # end
       end
     end
-    
-  end
-
-end
+  end 
+end 

data/templates/babylon/config/boot.rb

@@ -12,5 +12,5 @@ require File.dirname(__FILE__) + "/dependencies"
 # Start the App
 Babylon::Runner::run(ARGV[0] || "development") do
   # 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 }
+  Dir.glob('config/initializers/*.rb').each { |f| require f }
 end

data/templates/babylon/config/config.yaml

@@ -7,10 +7,8 @@
 #    application_type: client | component (by default it is component and we strongly discourage any client application in production)
 
 development:
-    jid: component.server.com
+    jid: user@server.com
     password: password
-    host: localhost
-    port: 5278
     application_type: client
 
 test:

data/templates/babylon/config/routes.rb

@@ -17,6 +17,6 @@
 # disco_info.to(:controller => "discovery", :action => "services")
 #
 # See lib/babylon/router/dsl.rb for more helpers.
-Babylon::CentralRouter.draw do
+Babylon.router.draw do
   
 end

data/templates/babylon/log/test.log

@@ -0,0 +1,52 @@
+ERROR BABYLON: Observer can only be Babylon::Base::Controller
+ERROR BABYLON: Observer can only be Babylon::Base::Controller
+ERROR BABYLON: Observer can only be Babylon::Base::Controller
+ERROR BABYLON: Observer can only be Babylon::Base::Controller
+ERROR BABYLON: Observer can only be Babylon::Base::Controller
+ERROR BABYLON: Observer can only be Babylon::Base::Controller
+ERROR BABYLON: Observer can only be Babylon::Base::Controller
+ERROR BABYLON: Observer can only be Babylon::Base::Controller
+ERROR BABYLON: Observer can only be Babylon::Base::Controller
+ERROR BABYLON: Observer can only be Babylon::Base::Controller
+ERROR BABYLON: Observer can only be Babylon::Base::Controller
+ERROR BABYLON: Observer can only be Babylon::Base::Controller
+ERROR BABYLON: Observer can only be Babylon::Base::Controller
+ERROR BABYLON: CONNECTION ERROR : RuntimeError => RuntimeError
+ERROR BABYLON: CONNECTION ERROR : RuntimeError => RuntimeError
+ERROR BABYLON: CONNECTION ERROR : RuntimeError => RuntimeError
+ERROR BABYLON: CONNECTION ERROR : RuntimeError => RuntimeError
+ERROR BABYLON: CONNECTION ERROR : RuntimeError => RuntimeError
+ERROR BABYLON: CONNECTION ERROR : RuntimeError => RuntimeError
+ERROR BABYLON: CONNECTION ERROR : RuntimeError => RuntimeError
+ERROR BABYLON: CONNECTION ERROR : RuntimeError => RuntimeError
+ERROR BABYLON: CONNECTION ERROR : RuntimeError => RuntimeError
+ERROR BABYLON: CONNECTION ERROR : RuntimeError => RuntimeError
+ERROR BABYLON: CONNECTION ERROR : RuntimeError => RuntimeError
+ERROR BABYLON: CONNECTION ERROR : RuntimeError => RuntimeError
+ERROR BABYLON: CONNECTION ERROR : RuntimeError => RuntimeError
+ERROR BABYLON: Observer can only be Babylon::Base::Controller
+ERROR BABYLON: Observer can only be Babylon::Base::Controller
+ERROR BABYLON: Observer can only be Babylon::Base::Controller
+ERROR BABYLON: Observer can only be Babylon::Base::Controller
+ERROR BABYLON: Observer can only be Babylon::Base::Controller
+ERROR BABYLON: Observer can only be Babylon::Base::Controller
+ERROR BABYLON: Observer can only be Babylon::Base::Controller
+ERROR BABYLON: Observer can only be Babylon::Base::Controller
+ERROR BABYLON: Observer can only be Babylon::Base::Controller
+ERROR BABYLON: Observer can only be Babylon::Base::Controller
+ERROR BABYLON: Observer can only be Babylon::Base::Controller
+ERROR BABYLON: Observer can only be Babylon::Base::Controller
+ERROR BABYLON: Observer can only be Babylon::Base::Controller
+ERROR BABYLON: CONNECTION ERROR : RuntimeError => RuntimeError
+ERROR BABYLON: CONNECTION ERROR : RuntimeError => RuntimeError
+ERROR BABYLON: CONNECTION ERROR : RuntimeError => RuntimeError
+ERROR BABYLON: CONNECTION ERROR : RuntimeError => RuntimeError
+ERROR BABYLON: CONNECTION ERROR : RuntimeError => RuntimeError
+ERROR BABYLON: CONNECTION ERROR : RuntimeError => RuntimeError
+ERROR BABYLON: CONNECTION ERROR : RuntimeError => RuntimeError
+ERROR BABYLON: CONNECTION ERROR : RuntimeError => RuntimeError
+ERROR BABYLON: CONNECTION ERROR : RuntimeError => RuntimeError
+ERROR BABYLON: CONNECTION ERROR : RuntimeError => RuntimeError
+ERROR BABYLON: CONNECTION ERROR : RuntimeError => RuntimeError
+ERROR BABYLON: CONNECTION ERROR : RuntimeError => RuntimeError
+ERROR BABYLON: CONNECTION ERROR : RuntimeError => RuntimeError

data/templates/babylon/script/component

@@ -1,31 +1,47 @@
 #!/usr/bin/env ruby
-
 require 'rubygems'
 require 'daemons'
+require 'optparse'
+
+# default options
+OPTIONS = {
+  :command          => "run",
+  :environment      => "development",
+  :name             => "#{Dir.pwd.split("/").last}",
+}
+
+ARGV.options do |o|
+  script_name = File.basename($0)
+  
+  o.set_summary_indent('  ')
+  o.banner =    "Usage: script/#{script_name} [OPTIONS]"
+  o.define_head "Runs the Babylon Application."
+  o.separator   ""
+  o.separator   "Arguments :" 
+  
+  o.on("-c", "--command=[run|start|stop|restart]", String,
+       "The command you'd like to execute",
+       "Default: #{OPTIONS[:command]}")   { |OPTIONS[: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]| }
+  o.on("-n", "--name=app_name", String,
+       "Name of your application. The pid_file will be name after this.",
+       "Default: #{OPTIONS[:name]}") { |OPTIONS[:name]| }
+  
+  o.separator ""
 
-if ["run", "start", "stop", "restart"].include? ARGV[0]
-  command   = ARGV[0]
-  env       = ARGV[1] || "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
+  o.on_tail("-h", "--help", "Show this help message.") { puts o; exit }
+  
+  o.parse!
 end
 
+
 options = {
-  :ARGV       => [command, '--', env],
-  :app_name   => "#{Dir.pwd.split("/").last}",
+  :ARGV       => [OPTIONS[:command], '--', OPTIONS[:environment]],
+  :app_name   => OPTIONS[:name],
   :dir        => "../tmp/pids/",
-  :multiple   => true,
+  :multiple   => false,
   :backtrace  => true
 }
-
 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.0.14
+  version: 0.1.0
 platform: ruby
 authors: 
 - julien Genestoux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-16 00:00:00 -07:00
+date: 2009-05-07 00:00:00 -07:00
 default_executable: babylon
 dependencies: []