julien51-babylon 0.0.8 → 0.0.9

data/Rakefile

@@ -11,7 +11,7 @@ begin
     gem.authors = ["julien Genestoux"]
     gem.requirements = ["eventmachine", "yaml", "fileutils", "log4r", "nokogiri"]
     gem.executables = "babylon"
-    gem.files = ["bin/babylon", "lib/babylon.rb", "lib/babylon/base/controller.rb", "lib/babylon/base/view.rb", "lib/babylon/client_connection.rb", "lib/babylon/component_connection.rb", "lib/babylon/router/dsl.rb", "lib/babylon/router.rb", "lib/babylon/runner.rb", "lib/babylon/xmpp_connection.rb", "lib/babylon/xpath_helper.rb", "LICENSE", "Rakefile", "README.rdoc", "templates/babylon/app/controllers/README.rdoc", "templates/babylon/app/models/README.rdoc", "templates/babylon/app/views/README.rdoc", "templates/babylon/config/boot.rb", "templates/babylon/config/config.yaml", "templates/babylon/config/dependencies.rb", "templates/babylon/config/routes.rb", "templates/babylon/config/initializers/README.rdoc"]
+    gem.files = ["bin/babylon", "lib/babylon.rb", "lib/babylon/base/controller.rb", "lib/babylon/base/view.rb", "lib/babylon/client_connection.rb", "lib/babylon/component_connection.rb", "lib/babylon/router/dsl.rb", "lib/babylon/router.rb", "lib/babylon/runner.rb", "lib/babylon/xmpp_connection.rb", "lib/babylon/xmpp_parser.rb", "lib/babylon/xpath_helper.rb", "LICENSE", "Rakefile", "README.rdoc", "templates/babylon/app/controllers/README.rdoc", "templates/babylon/app/models/README.rdoc", "templates/babylon/app/views/README.rdoc", "templates/babylon/config/boot.rb", "templates/babylon/config/config.yaml", "templates/babylon/config/dependencies.rb", "templates/babylon/config/routes.rb", "templates/babylon/config/initializers/README.rdoc"]
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 rescue LoadError
@@ -34,11 +34,37 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = false
 end
 
+# begin
+#   require 'rcov/rcovtask'
+#   Rcov::RcovTask.new do |test|
+#     test.libs << 'test'
+#     test.pattern = 'test/**/*_test.rb'
+#     test.verbose = true
+#   end
+# rescue LoadError
+#   task :rcov do
+#     abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+#   end
+# end
+
+begin
+  require 'spec/rake/spectask'
+  desc "Run all Spec"
+  Spec::Rake::SpecTask.new('spec') do |spec|
+    spec.spec_files = FileList['spec/**/*.rb']
+    spec.verbose = true
+  end
+rescue LoadError
+  task :rcov do
+    abort "Rspec is not available. In order to run rspec, you must: sudo gem install rspec"
+  end
+end
+
 begin
   require 'rcov/rcovtask'
   Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/*_test.rb'
+    test.libs << 'spec'
+    test.pattern = 'spec/**/*_spec.rb'
     test.verbose = true
   end
 rescue LoadError
@@ -47,6 +73,7 @@ rescue LoadError
   end
 end
 
+
 task :install => :build
 
 task :default => :test

data/lib/babylon.rb

@@ -8,6 +8,7 @@ require 'yaml'
 require 'fileutils'
 
 require 'babylon/xmpp_connection'
+require 'babylon/xmpp_parser'
 require 'babylon/component_connection'
 require 'babylon/client_connection'
 require 'babylon/router'

data/lib/babylon/base/controller.rb

@@ -35,11 +35,16 @@ module Babylon
         return if @rendered # Avoid double rendering
         
         if options.nil? # default rendering
-          return render(:file => default_template_name)
+          render(:file => default_template_name)
         elsif options[:file]
-          render_for_file(view_path(options[:file])) 
+          file = options[:file]
+          if file.include?('/')
+            render_for_file("app/views/#{file}.xml.builder")
+          else
+            render_for_file(view_path(file)) 
+          end
         elsif action_name = options[:action]
-          return render(:file => default_template_name(action_name.to_s))
+          render(:file => default_template_name(action_name.to_s))
         end
         
         # And finally, we set up rendered to be true 
@@ -73,4 +78,4 @@ module Babylon
       end
     end
   end
-end
+end

data/lib/babylon/client_connection.rb

@@ -1,5 +1,5 @@
 module Babylon
-  
+
   ##
   # ClientConnection is in charge of the XMPP connection for a Regular XMPP Client.
   # So far, SASL Plain authenticationonly is supported
@@ -8,7 +8,7 @@ module Babylon
     require 'digest/sha1'
     require 'base64'
     require 'resolv'
-    
+
 
     attr_reader :binding_iq_id, :session_iq_id
 
@@ -18,13 +18,13 @@ module Babylon
       super(params)
       @state = :wait_for_stream
     end
-    
+
     ##
     # Connects the ClientConnection based on SRV records for the jid's domain, if no host or port has been specified.
     # In any case, we give priority to the specified host and port.
     def self.connect(params, &block)
       return super(params, &block) if params["host"] && params["port"]
-      
+
       begin
         begin
           srv = []
@@ -79,18 +79,18 @@ module Babylon
       case @state
       when :connected
         super # Can be dispatched
-      
+
       when :wait_for_stream
         if stanza.name == "stream:stream" && stanza.attributes['id']
           @state = :wait_for_auth_mechanisms unless @success
           @state = :wait_for_bind if @success
         end
-        
+
       when :wait_for_auth_mechanisms
         if stanza.name == "stream:features"
           if stanza.at("starttls") # we shall start tls
             starttls = Nokogiri::XML::Node.new("starttls", @outstream)
-            starttls["xmlns"] = stanza.at("starttls").namespaces.first.last
+            starttls["xmlns"] = "urn:ietf:params:xml:ns:xmpp-tls"
             send(starttls)
             @state = :wait_for_proceed
           elsif stanza.at("mechanisms") # tls is ok
@@ -98,14 +98,14 @@ module Babylon
               # auth_text = "#{jid.strip}\x00#{jid.node}\x00#{password}"
               auth = Nokogiri::XML::Node.new("auth", @outstream)
               auth['mechanism'] = "PLAIN"
-              auth['xmlns'] = stanza.at("mechanisms").namespaces.first.last
+              auth['xmlns'] = "urn:ietf:params:xml:ns:xmpp-sasl"
               auth.content = Base64::encode64([jid, jid.split("@").first, @password].join("\000")).gsub(/\s/, '')
               send(auth)
               @state = :wait_for_success
             end
           end
         end
-      
+
       when :wait_for_success
         if stanza.name == "success" # Yay! Success
           @success = true
@@ -120,7 +120,7 @@ module Babylon
         else
           # Hum Failure...
         end
-      
+
       when :wait_for_bind
         if stanza.name == "stream:features"
           if stanza.at("bind")
@@ -142,7 +142,7 @@ module Babylon
             @state = :wait_for_confirmed_binding
           end
         end
-      
+
       when :wait_for_confirmed_binding
         if stanza.name == "iq" && stanza["type"] == "result" && Integer(stanza["id"]) ==  @binding_iq_id
           if stanza.at("jid") 
@@ -159,7 +159,7 @@ module Babylon
         iq = @outstream.add_child(builder.doc.root)
         send(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!
@@ -168,21 +168,23 @@ module Babylon
           @connection_callback.call(self) if @connection_callback
           @state = :connected
         end
-        
+
       when :wait_for_proceed
         start_tls() # starting TLS
         @state = :wait_for_stream
         @parser.reset
         send @outstream.root.to_xml.split('<paste_content_here/>').first
       end
-
-    end
-
-    ##
-    # Namespace of the client
-    def stream_namespace
-      "jabber:client"
+    rescue
+      Babylon.logger.error("#{$!}:\n#{$!.backtrace.join("\n")}")
     end
+  end
 
+  ##
+  # Namespace of the client
+  def stream_namespace
+    "jabber:client"
   end
+
+end
 end

data/lib/babylon/xmpp_connection.rb

@@ -8,7 +8,6 @@ module Babylon
   # xml-not-well-formed Exception
   class XmlNotWellFormed < Exception; end
   
-
   ##
   # This class is in charge of handling the network connection to the XMPP server.
   class XmppConnection < EventMachine::Connection
@@ -113,111 +112,4 @@ module Babylon
     end
   end
 
-  ##
-  # This is the XML SAX Parser that accepts "pushed" content
-  class XmppParser < Nokogiri::XML::SAX::Document
-    
-    attr_accessor :elem, :doc
-    
-    ##
-    # Initialize the parser and adds the callback that will be called upon stanza completion
-    def initialize(&callback)
-      @callback = callback
-      super()
-      reset
-    end
-    
-    ## 
-    # Resets the Pushed SAX Parser.
-    def reset
-      @parser   = Nokogiri::XML::SAX::PushParser.new(self)
-      @doc      = Nokogiri::XML::Document.new
-      @elem     = nil
-    end
-    
-    ##
-    # Pushes the received data to the parser. The parser will then callback the document's methods (start_tag, end_tag... etc)
-    def push(data)
-      @parser << data
-    end
-    
-    ##
-    # Called when the document contains a CData block
-    def cdata_block(string)
-      cdata = Nokogiri::XML::CDATA.new(@doc, string)
-      @elem.add_child(cdata)
-    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)
-      @last_text_elem ||= @elem
-      @last_text = @last_text ? @last_text + string : string
-    end
-
-    ##
-    # 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.
-    def start_element(qname, attributes = [])
-      e = Nokogiri::XML::Element.new(qname, @doc)
-      add_namespaces_and_attributes_to_node(attributes, e)
-
-      # Adding the newly created element to the @elem that is being parsed, or, if no element is being parsed, then we set the @root and the @elem to be this newly created element.
-      @elem = @elem ? @elem.add_child(e) : (@root = e)
-      
-      if @elem.name == "stream:stream"
-        # Should be called only for stream:stream.
-        # We re-initialize the document and set its root to be the doc.
-        # Also, we activate the callback since this element  will never end.
-        @doc = Nokogiri::XML::Document.new
-        @doc.root = @root = @elem
-        @callback.call(@elem)
-      end
-    end
-
-    ##
-    # Terminates the current element and calls the callback
-    def end_element(name)
-      if @last_text_elem
-        @elem.add_child(Nokogiri::XML::Text.new(@last_text, @doc))
-        @last_text_elem = nil
-        @last_text = nil
-      end
-      if @elem
-        if @elem.parent == @root
-          @callback.call(@elem) 
-          # And we also need to remove @elem from its tree
-          @elem.unlink 
-          # And the current elem is the next sibling or the root
-          @elem = @root 
-        else
-          @elem = @elem.parent 
-        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) 
-      (attrs.size / 2).times do |i|
-        name, value = attrs[2 * i], attrs[2 * i + 1]
-        if name =~ /xmlns/
-          node.add_namespace(name, value)
-        else
-          node.set_attribute name, value
-        end
-      end
-    end
-    
-  end
-
 end

data/lib/babylon/xmpp_parser.rb

@@ -0,0 +1,104 @@
+module Babylon
+
+  ##
+  # This is the XML SAX Parser that accepts "pushed" content
+  class XmppParser < Nokogiri::XML::SAX::Document
+    
+    attr_accessor :elem, :doc, :parser, :top
+    
+    ##
+    # Initialize the parser and adds the callback that will be called upon stanza completion
+    def initialize(&callback)
+      @callback = callback
+      super()
+      reset
+    end
+    
+    ## 
+    # Resets the Pushed SAX Parser.
+    def reset
+      @parser   = Nokogiri::XML::SAX::PushParser.new(self)
+      start_document
+      @elem     = nil
+    end
+    
+    ##
+    # Pushes the received data to the parser. The parser will then callback the document's methods (start_tag, end_tag... etc)
+    def push(data)
+      @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
+    end
+
+    ##
+    # 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.
+    def start_element(qname, attributes = [])
+      e = Nokogiri::XML::Element.new(qname, @doc)
+      add_namespaces_and_attributes_to_node(attributes, e)
+      
+      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 = 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.
+        # Room is the "highest" element to (it's parent is the <stream> element)
+        @elem = @elem ? @elem.add_child(e) : (@top = e)
+      end
+    end
+
+    ##
+    # Terminates the current element and calls the callback
+    def end_element(name)
+      if @elem
+        if @elem == @top
+          @callback.call(@elem) 
+          # And the current elem is the next sibling or the root
+          @elem = @top = nil
+        else
+          @elem = @elem.parent 
+        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
+    
+    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) 
+      (attrs.size / 2).times do |i|
+        name, value = attrs[2 * i], attrs[2 * i + 1]
+        if name =~ /xmlns/
+          node.add_namespace(name, value)
+        else
+          node.set_attribute name, value
+        end
+      end
+    end
+    
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: julien51-babylon
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - julien Genestoux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-22 00:00:00 -07:00
+date: 2009-03-23 00:00:00 -07:00
 default_executable: babylon
 dependencies: []
 
@@ -33,6 +33,7 @@ files:
 - lib/babylon/router.rb
 - lib/babylon/runner.rb
 - lib/babylon/xmpp_connection.rb
+- lib/babylon/xmpp_parser.rb
 - lib/babylon/xpath_helper.rb
 - LICENSE
 - Rakefile