julien51-babylon 0.0.10 → 0.0.11

data/Rakefile

@@ -12,6 +12,7 @@ begin
     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/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.rubyforge_project = 'babylon' # This line would be new
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 rescue LoadError
@@ -34,18 +35,18 @@ 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 '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'
@@ -53,26 +54,57 @@ begin
   Spec::Rake::SpecTask.new('spec') do |spec|
     spec.spec_files = FileList['spec/**/*.rb']
     spec.verbose = true
+    spec.warning = true
+    spec.rcov = true
+    spec.rcov_opts = []
+    spec.rcov_opts = ['--exclude', 'spec']
   end
 rescue LoadError
-  task :rcov do
+  task :spec 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 << 'spec'
-    test.pattern = 'spec/**/*_spec.rb'
-    test.verbose = true
+  require 'spec/rake/verify_rcov'
+
+  RCov::VerifyTask.new(:verify_rcov => 'spec') do |t|
+    t.threshold = 100.0
+    t.index_html = 'coverage/index.html'
   end
 rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+  task :spec do
+    abort "Rcov is not available. In order to run rcov, you must: sudo gem install rcov"
   end
 end
 
+# These are Rubyforge tasks
+begin
+  require 'rake/contrib/sshpublisher'
+  namespace :rubyforge do
+
+    desc "Release gem and RDoc documentation to RubyForge"
+    task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
+
+    namespace :release do
+      desc "Publish RDoc to RubyForge."
+      task :docs => [:rdoc] do
+        config = YAML.load(
+            File.read(File.expand_path('~/.rubyforge/user-config.yml'))
+        )
+
+        host = "#{config['username']}@rubyforge.org"
+        remote_dir = "/var/www/gforge-projects/babylon"
+        local_dir = 'rdoc'
+
+        Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
+      end
+    end
+  end
+rescue LoadError
+  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
+end
+
 
 task :install => :build
 

data/lib/babylon/client_connection.rb

@@ -49,7 +49,7 @@ module Babylon
             end
           }
         rescue NameError
-          Babylon.logger.debug "Resolv::DNS does not support SRV records. Please upgrade to ruby-1.8.3 or later! \n #{$!} : #{$!.inspect}"
+          Babylon.logger.debug "Resolv::DNS does not support SRV records. Please upgrade to ruby-1.8.3 or later! \n#{$!} : #{$!.backtrace.join("\n")}"
         end
       end
     end
@@ -165,7 +165,11 @@ module Babylon
             # And now, send a presence!
             presence = Nokogiri::XML::Node.new("presence", @outstream)
             send(presence)
-            @handler.on_connected(self) if @handler
+            begin
+              @handler.on_connected(self) if @handler and @handler.respond_to?("on_connected")
+            rescue
+              Babylon.logger.error("on_connected failed : #{$!}\n#{$!.backtrace.join("\n")}")
+            end
             @state = :connected
           end
 

data/lib/babylon/component_connection.rb

@@ -47,7 +47,11 @@ module Babylon
 
       when :wait_for_handshake
         if stanza.name == "handshake"
-          @handler.on_connected(self) if @handler
+          begin
+            @handler.on_connected(self) if @handler and @handler.respond_to?("on_connected")
+          rescue
+            Babylon.logger.error("on_connected failed : #{$!}\n#{$!.backtrace.join("\n")}")
+          end
           @state = :connected
         elsif stanza.name == "stream:error"
           raise AuthenticationError

data/lib/babylon/runner.rb

@@ -51,20 +51,20 @@ module Babylon
     
     ## 
     # Will be called by the connection class once it is connected to the server.
-    def on_connected(connection)
-      Babylon::CentralRouter.method(:connected)
+    def self.on_connected(connection)
+      Babylon::CentralRouter.connected(connection)
     end
     
     ##
     # Will be called by the connection class upon disconnection.
-    def on_disconnected()
+    def self.on_disconnected()
       EventMachine.stop_event_loop
     end
     
     ##
     # Will be called by the connection class when it receives and parses a stanza.
-    def on_stanza(stanza)
-      Babylon::CentralRouter.method(:route)
+    def self.on_stanza(stanza)
+      Babylon::CentralRouter.route(stanza)
     end
     
   end

data/lib/babylon/xmpp_connection.rb

@@ -7,17 +7,17 @@ module Babylon
   ## 
   # xml-not-well-formed Exception
   class XmlNotWellFormed < Exception; end
-  
+
   ##
   # Authentication Error (wrong password/jid combination). Used for Clients and Components
   class AuthenticationError < Exception; end
-  
+
   ##
   # This class is in charge of handling the network connection to the XMPP server.
   class XmppConnection < EventMachine::Connection
-    
+
     attr_accessor :jid, :host, :port
-    
+
     ##
     # Connects the XmppConnection to the right host with the right port. I
     # It passes itself (as handler) and the configuration
@@ -26,22 +26,29 @@ module Babylon
       Babylon.logger.debug("CONNECTING TO #{params["host"]}:#{params["port"]}") # Very low level Logging
       EventMachine.connect(params["host"], params["port"], self, params.merge({"handler" => handler}))
     end
-    
+
     def connection_completed
+      @connected = true
       Babylon.logger.debug("CONNECTED") # Very low level Logging
     end
 
     ##
     # Called when the connection is terminated and stops the event loop
     def unbind()
+      @connected = false
       Babylon.logger.debug("DISCONNECTED") # Very low level Logging
-      @handler.on_disconnected(self) if @handler
+      begin
+        @handler.on_disconnected() if @handler and @handler.respond_to?("on_disconnected")
+      rescue
+        Babylon.logger.error("on_disconnected failed : #{$!}\n#{$!.backtrace.join("\n")}")
+      end
     end
 
     ## 
     # Instantiate the Handler (called internally by EventMachine) and attaches a new XmppParser
     def initialize(params)
       super()
+      @connected = false
       @jid = params["jid"]
       @password = params["password"]
       @host = params["host"]
@@ -65,14 +72,19 @@ module Babylon
         # In any case, we need to close the connection.
         close_connection
       else
-        @handler.on_stanza(stanza) if @handler
+        begin
+          @handler.on_stanza(stanza) if @handler and @handler.respond_to?("on_stanza")
+        rescue
+          Babylon.logger.error("on_stanza failed : #{$!}\n#{$!.backtrace.join("\n")}")
+        end
       end 
     end 
-    
+
     ## 
     # 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)
+      raise NotConnected unless @connected
       if xml.is_a? Nokogiri::XML::NodeSet
         xml.each do |node|
           send_node(node)
@@ -93,19 +105,27 @@ module Babylon
       node["from"] ||= jid if node["to"]
       send_string(node.to_xml)
     end
-    
+
     ## 
     # Sends a string on the line
     def send_string(string)
-      Babylon.logger.debug("SENDING : #{string}")
-      send_data("#{string}") 
+      begin
+        Babylon.logger.debug("SENDING : #{string}")
+        send_data("#{string}") 
+      rescue
+        Babylon.logger.error("#{$!}\n#{$!.backtrace.join("\n")}")
+      end
     end
 
     ## 
     # receive_data is called when data is received. It is then passed to the parser. 
     def receive_data(data)
-      Babylon.logger.debug("RECEIVED : #{data}")
-      @parser.push(data)
+      begin
+        Babylon.logger.debug("RECEIVED : #{data}")
+        @parser.push(data)
+      rescue
+        Babylon.logger.error("#{$!}\n#{$!.backtrace.join("\n")}")
+      end
     end
   end
 

data/lib/babylon/xmpp_parser.rb

@@ -58,13 +58,13 @@ module Babylon
         # 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
+        @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 = @doc.root.add_child(e))
+        @elem = @elem ? @elem.add_child(e) : (@top = @root.add_child(e))
       end
     end
 
@@ -75,7 +75,7 @@ module Babylon
         if @elem == @top
           @callback.call(@elem) 
           # Remove the element from its content, since we're done with it!
-          @elem.unlink
+          @elem.unlink if @elem
           # And the current elem is the next sibling or the root
           @elem = @top = nil
         else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: julien51-babylon
 version: !ruby/object:Gem::Version 
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors: 
 - julien Genestoux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-25 00:00:00 -07:00
+date: 2009-03-26 00:00:00 -07:00
 default_executable: babylon
 dependencies: []
 
@@ -72,7 +72,7 @@ requirements:
 - fileutils
 - log4r
 - nokogiri
-rubyforge_project: 
+rubyforge_project: babylon
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2