skates 0.5.8 → 0.5.9

data/lib/skates/xmpp_parser.rb

@@ -3,9 +3,9 @@ module Skates
   ##
   # This is the XML SAX Parser that accepts "pushed" content
   class XmppParser < Nokogiri::XML::SAX::Document
-    
+
     attr_accessor :elem, :doc, :parser
-    
+
     ##
     # Initialize the parser and adds the callback that will be called upon stanza completion
     def initialize(callback)
@@ -14,27 +14,27 @@ module Skates
       super()
       reset
     end
-    
-    ## 
+
+    ##
     # Resets the Pushed SAX Parser.
     def reset
       @parser = Nokogiri::XML::SAX::PushParser.new(self, "UTF-8")
       @elem = @doc = 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
-    
+
     ##
     # Adds characters to the current element (being parsed)
     def characters(string)
       @buffer ||= ""
-      @buffer << string 
+      @buffer << 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).
@@ -44,33 +44,36 @@ module Skates
       @doc  ||= Nokogiri::XML::Document.new
       @elem ||= @doc # If we have no current element, then, we take the doc
       @parent = @elem
-      
+
       # First thing first : identify namespaces, and attributes
       namespaces, attributes = identify_namespaces_and_attributes(attributes)
-      
+      @parent.namespaces.each do |p, u|
+        namespaces[p.split(":")[1]] ||= u
+      end
+
       # Now, we may need to add a namespace!
       namespace, qname = qname.split(":") if qname.match(/.*:.*/)
-      
+
       @elem = Nokogiri::XML::Element.new(qname, @doc)
       # Let's now add all namespaces
       namespaces.each do |prefix, uri|
         set_namespace(prefix, uri)
       end
-      
+
       # And all attributes
       attributes.each do |name, value|
         set_attribute(name, value)
       end
-      
+
       # And now addback the namespace if applicable
-      if prefix = ["xmlns", namespace].join(":") and uri = @parent.namespaces[prefix] 
-        @elem.namespace = @parent.namespace_definitions.select() {|ns|
-          ns.href == uri
+      if namespace
+        @elem.namespace = @elem.namespace_definitions.select() {|ns|
+          ns.prefix == namespace
         }.first
       end
-      
+
       @parent.add_child(@elem) # Finally, add the element
-      
+
       if @elem.name == "stream"
         # We activate the callback since this element  will never end.
         @callback.call(@elem)
@@ -78,7 +81,7 @@ module Skates
         # And then, we start a new Sax Push Parser
       end
     end
-    
+
     ##
     # Clears the characters buffer
     def clear_characters_buffer
@@ -96,17 +99,17 @@ module Skates
       if @elem
         if @elem.parent == @doc
           # If we're actually finishing the stanza (a stanza is always a document's root)
-          @callback.call(@elem) 
+          @callback.call(@elem)
           # We delete the current element and the doc (1 doc per stanza policy)
-          @elem = @doc = nil 
+          @elem = @doc = nil
         else
-          @elem = @elem.parent 
-        end 
-      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 
-    
+      end
+    end
+
     ##
     # Idenitifies namespaces and attributes
     # Nokogiri passes them as a array of [[ns_name, ns_url], [ns_name, ns_url]..., key, value, key, value]...
@@ -127,13 +130,13 @@ module Skates
       end
       [namespaces, attributes]
     end
-    
+
     def set_attribute(key, value)
       @elem.set_attribute(key, Skates.decode_xml(value))
     end
-    
+
     def set_namespace(key, value)
       @elem.add_namespace(key, value)
     end
-  end 
-end 
+  end
+end

metadata

@@ -1,93 +1,69 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: skates
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.5.9
   prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 8
-  version: 0.5.8
 platform: ruby
-authors: 
+authors:
 - julien Genestoux
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-14 00:00:00 -05:00
-default_executable: skates
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-10 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: eventmachine
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2166149040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 12
-        - 10
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.12.10
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: log4r
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2166149040
+- !ruby/object:Gem::Dependency
+  name: log4r
+  requirement: &2166148480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2166148480
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &2166147960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 4
-        - 4
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.4.4
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: utf8cleaner
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2166147960
+- !ruby/object:Gem::Dependency
+  name: utf8cleaner
+  requirement: &2166147400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *2166147400
 description: 
 email: julien.genestoux@gmail.com
-executables: 
+executables:
 - skates
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -118,34 +94,25 @@ files:
 - templates/skates/log/test.log
 - templates/skates/script/component
 - templates/skates/tmp/pids/README
-has_rdoc: true
 homepage: http://github.com/julien51/skates
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-requirements: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - bundler
 - eventmachine
 - yaml
@@ -158,9 +125,9 @@ requirements:
 - resolv
 - utf8cleaner
 rubyforge_project: skates
-rubygems_version: 1.4.2
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
-summary: Skates is a framework to create EventMachine based XMPP External Components in Ruby.
+summary: Skates is a framework to create EventMachine based XMPP External Components
+  in Ruby.
 test_files: []
-