julien51-babylon 0.1.7 → 0.1.8

data/Rakefile

@@ -17,7 +17,7 @@ begin
     gem.add_dependency('julien51-sax-machine')
     gem.add_dependency('templater')
     gem.add_dependency('daemons')
-    gem.requirements = ["eventmachine", "yaml", "fileutils", "log4r", "nokogiri", "sax-machine", "templater", "daemons", "optparse", "digest/sha1", "base64", "resolv"]
+    gem.requirements = ["eventmachine", "yaml", "fileutils", "log4r", "nokogiri", "sax-machine", "templater", "daemons", "optparse", "digest/sha1", "base64", "resolv", "activesupport"]
     gem.executables = "babylon"
     gem.files = [ "bin/babylon", 
                   "lib/babylon.rb", 

data/lib/babylon.rb

@@ -3,6 +3,7 @@ $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname
 
 require 'eventmachine'
 require 'log4r'
+require 'activesupport'
 require 'nokogiri'
 require 'yaml'
 require 'fileutils'
@@ -10,8 +11,8 @@ require 'sax-machine'
 require 'digest/sha1'
 require 'base64'
 require 'resolv'
-require "templater"
-
+require 'templater'
+require 'cgi'
 
 require 'babylon/xmpp_connection'
 require 'babylon/xmpp_parser'
@@ -20,7 +21,7 @@ require 'babylon/client_connection'
 require 'babylon/router'
 require 'babylon/runner'
 require 'babylon/generator'
-require "babylon/xpath_helper"
+require 'babylon/xpath_helper'
 require 'babylon/base/controller'
 require 'babylon/base/view'
 require 'babylon/base/stanza'
@@ -100,17 +101,7 @@ module Babylon
   ##
   # Decodes XML special characters.
   def self.decode_xml(str)
-    entities = {
-      'lt'    => '<',
-      'gt'    => '>',
-      '#38'   => '&',
-      'amp'   => '&',
-      'quot'  => '"',
-      '#13'   => "\r",
-    } 
-    entities.keys.inject(str) { |string, key|
-      string.gsub(/&#{key};/, entities[key])
-    } 
+    CGI.unescapeHTML(str)
   end
   
 end

data/lib/babylon/base/view.rb

@@ -16,7 +16,7 @@ module Babylon
       def render(xml, options = {})
         # First, we need to identify the partial file path, based on the @view_template path.
         partial_path = (@view_template.split("/")[0..-2] + options[:partial].split("/")).join("/").gsub(".xml.builder", "") + ".xml.builder"
-        raise ViewFileNotFound unless Babylon.views[partial_path] 
+        raise ViewFileNotFound, "No such file #{partial_path}" unless Babylon.views[partial_path] 
         eval(Babylon.views[partial_path], binding, partial_path, 1)
       end
       
@@ -34,7 +34,7 @@ module Babylon
       # "Loads" the view file, and uses the Nokogiri Builder to build the XML stanzas that will be sent. 
       def evaluate 
         return if @view_template == ""
-        raise ViewFileNotFound unless Babylon.views[@view_template] 
+        raise ViewFileNotFound, "No such file #{@view_template}" unless Babylon.views[@view_template] 
         builder = Nokogiri::XML::Builder.new 
         builder.stream do |xml|
           eval(Babylon.views[@view_template], binding, @view_template, 1)

data/lib/babylon/xmpp_connection.rb

@@ -157,9 +157,9 @@ module Babylon
     # receive_data is called when data is received. It is then passed to the parser. 
     def receive_data(data)
       begin
-        # Babylon.logger.debug {
-        #   "RECEIVED : #{data}"
-        # }
+        Babylon.logger.debug {
+          "RECEIVED : #{data}"
+        }
         @parser.push(data) 
       rescue
         Babylon.logger.error {

data/lib/babylon/xmpp_parser.rb

@@ -44,6 +44,7 @@ module Babylon
       @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 @elem.name == "stream:stream"
@@ -85,21 +86,32 @@ module Babylon
     private
     
     ##
-    # Adds namespaces and attributes. Nokogiri passes them as a array of [name, value, name, value]...
+    # Adds namespaces and attributes. Nokogiri passes them as a array of [[ns_name, ns_url], [ns_name, ns_url]..., key, value, key, value]...
     def add_namespaces_and_attributes_to_current_node(attrs) 
-      (attrs.size / 2).times do |i|
-        name, value = attrs[2 * i], attrs[2 * i + 1]
-        # TODO : FIX namespaces :they give a lot of problems with Nokogiri
-        # if name == "xmlns"
-        #   @elem.add_namespace(nil, value)
-        # elsif name =~ /\Axmlns:/
-        #   @elem.add_namespace(name.gsub("xmlns:", ""), value)
-        # else
+      # Namespaces
+      attrs.select {|k| k.is_a? Array}.each do |pair|
+        # set_namespace(pair[0], pair[1])
+        set_normal_attribute(pair[0], pair[1])
+      end
+      # Attributes
+      attrs.select {|k| k.is_a? String}.in_groups_of(2) do |pair|
+        set_normal_attribute(pair[0], pair[1])
+      end
+    end
         
-        #
-          @elem.set_attribute name, Babylon.decode_xml(value)
-        # end
+    def set_normal_attribute(key, value)
+      @elem.set_attribute key, Babylon.decode_xml(value)
+    end
+    
+    def set_namespace(key, value)
+      if key.include? ':'
+        @elem.add_namespace(key.split(':').last, value)
+      else
+        @elem.add_namespace(nil, value)
       end
     end
+    
+    
+    
   end 
 end 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: julien51-babylon
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - julien Genestoux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-16 00:00:00 -07:00
+date: 2009-07-31 00:00:00 -07:00
 default_executable: babylon
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -123,6 +123,7 @@ files:
 - templates/babylon/tmp/pids/README
 has_rdoc: true
 homepage: http://github.com/julien51/babylon
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -153,8 +154,9 @@ requirements:
 - digest/sha1
 - base64
 - resolv
+- activesupport
 rubyforge_project: babylon
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Babylon is a framework to create EventMachine based XMPP External Components in Ruby.