skates 0.5.0 → 0.5.3

data/lib/skates/base/view.rb

@@ -40,7 +40,7 @@ module Skates
       def evaluate 
         return if @view_template == ""
         raise ViewFileNotFound, "No such file #{@view_template}" unless Skates.views[@view_template] 
-        builder = Nokogiri::XML::Builder.new 
+        builder = Nokogiri::XML::Builder.new(:encoding => 'UTF-8')
         builder.stream do |xml|
           eval(Skates.views[@view_template], binding, @view_template, 1)
         end

data/lib/skates/client_connection.rb

@@ -98,7 +98,7 @@ module Skates
       stream["version"] = "1.0"
       paste_content_here = Nokogiri::XML::Node.new("paste_content_here", doc)
       stream.add_child(paste_content_here)
-      doc.to_xml.split('<paste_content_here/>').first
+      doc.to_xml(:encoding => "UTF-8").split('<paste_content_here/>').first
     end
 
     ##

data/lib/skates/component_connection.rb

@@ -30,7 +30,7 @@ module Skates
       doc.add_child(stream)
       paste_content_here= Nokogiri::XML::Node.new("paste_content_here", doc)
       stream.add_child(paste_content_here)
-      start, stop = doc.to_xml.split('<paste_content_here/>')
+      start, stop = doc.to_xml(:encoding => "UTF-8").split('<paste_content_here/>')
       send_xml(start)
     end
 

data/lib/skates/xmpp_connection.rb

@@ -122,7 +122,7 @@ module Skates
     # Called when a full stanza has been received and returns it to the central router to be sent to the corresponding controller.
     def receive_stanza(stanza)
       Skates.logger.debug {
-        "PARSED : #{stanza.to_xml}"
+        "PARSED : #{stanza.to_xml(:encoding => "UTF-8")}"
       }
       # If not handled by subclass (for authentication)
       case stanza.name
@@ -152,8 +152,10 @@ module Skates
       begin
         if xml.is_a? Nokogiri::XML::NodeSet
           xml.each do |element|
-            send_chunk(element.to_s)
+            send_chunk(element.to_xml(:encoding => "UTF-8"))
           end
+        elsif xml.is_a? Nokogiri::XML::Node
+          send_chunk(xml.to_xml(:encoding => "UTF-8"))
         else
           send_chunk(xml.to_s)
         end

data/lib/skates/xmpp_parser.rb

@@ -41,7 +41,7 @@ module Skates
     # 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 = [])
       clear_characters_buffer
-      @doc ||= Nokogiri::XML::Document.new
+      @doc  ||= Nokogiri::XML::Document.new
       @elem ||= @doc # If we have no current element, then, we take the doc
       @parent = @elem
       
@@ -129,7 +129,7 @@ module Skates
     end
     
     def set_attribute(key, value)
-      @elem.set_attribute key, Skates.decode_xml(value)
+      @elem.set_attribute(key, Skates.decode_xml(value))
     end
     
     def set_namespace(key, value)

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: skates
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 13
+  prerelease: 
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - julien Genestoux
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-21 00:00:00 -05:00
+date: 2011-06-23 00:00:00 +02:00
 default_executable: skates
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 59
         segments: 
         - 0
         - 12
@@ -40,6 +42,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -53,6 +56,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 4
@@ -68,6 +72,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -113,22 +118,6 @@ files:
 - templates/skates/log/test.log
 - templates/skates/script/component
 - templates/skates/tmp/pids/README
-- spec/bin/skates_spec.rb
-- spec/em_mock.rb
-- spec/lib/skates/base/controller_spec.rb
-- spec/lib/skates/base/stanza_spec.rb
-- spec/lib/skates/base/view_spec.rb
-- spec/lib/skates/client_connection_spec.rb
-- spec/lib/skates/component_connection_spec.rb
-- spec/lib/skates/generator_spec.rb
-- spec/lib/skates/router/dsl_spec.rb
-- spec/lib/skates/router_spec.rb
-- spec/lib/skates/runner_spec.rb
-- spec/lib/skates/xmpp_connection_spec.rb
-- spec/lib/skates/xmpp_parser_spec.rb
-- spec/spec_helper.rb
-- test/skates_test.rb
-- test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/julien51/skates
 licenses: []
@@ -143,6 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -151,6 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -167,24 +158,9 @@ requirements:
 - resolv
 - utf8cleaner
 rubyforge_project: skates
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Skates is a framework to create EventMachine based XMPP External Components in Ruby.
-test_files: 
-- spec/bin/skates_spec.rb
-- spec/em_mock.rb
-- spec/lib/skates/base/controller_spec.rb
-- spec/lib/skates/base/stanza_spec.rb
-- spec/lib/skates/base/view_spec.rb
-- spec/lib/skates/client_connection_spec.rb
-- spec/lib/skates/component_connection_spec.rb
-- spec/lib/skates/generator_spec.rb
-- spec/lib/skates/router/dsl_spec.rb
-- spec/lib/skates/router_spec.rb
-- spec/lib/skates/runner_spec.rb
-- spec/lib/skates/xmpp_connection_spec.rb
-- spec/lib/skates/xmpp_parser_spec.rb
-- spec/spec_helper.rb
-- test/skates_test.rb
-- test/test_helper.rb
+test_files: []
+

data/spec/em_mock.rb

@@ -1,42 +0,0 @@
-## 
-# Mock for EventMachine
-module EventMachine
-
-  def self.mock?
-    true
-  end
-
-  ##
-  # Mock for the Connection Class
-  class Connection
-    def self.new(*args)
-      allocate.instance_eval do
-        # Call a superclass's #initialize if it has one
-        initialize(*args)
-        # Store signature and run #post_init
-        post_init
-        self
-      end
-    end
-  end
-
-  ##
-  # Stub for run
-  def self.run(proc)
-    proc.call
-  end
-
-  ##
-  # Stub for epoll
-  def self.epoll; end
-
-  ##
-  # Stub! to stop the event loop.
-  def self.stop_event_loop; end
-
-  ##
-  # Stub for connect (should return a connection object)
-  def self.connect(host, port, handler, params)
-    handler.new(params)
-  end
-end

data/spec/lib/skates/base/controller_spec.rb

@@ -1,205 +0,0 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-
-describe Skates::Base::Controller do
-  
-  before(:each) do
-    Skates.views.stub!(:[]).and_return("") # Stubbing read for view
-  end
-  
-  describe ".initialize" do
-    before(:each) do
-      @params = {:a => "a", :b => 1, :c => {:key => "value"}, :stanza => "<hello>world</hello>"}    
-    end
-    
-    it "should have a stanza instance" do
-      stanza = mock(Object)
-      c = Skates::Base::Controller.new(stanza)
-      
-      c.instance_variables.should be_include :"@stanza"
-      c.instance_variable_get(:"@stanza").should == stanza
-    end
-    
-    it "should not be rendered yet" do
-      c = Skates::Base::Controller.new(@params)
-      c.rendered.should_not be_true
-    end
-  end
-  
-  describe ".perform" do
-    before(:each) do
-      @action = :subscribe
-      params = {:stanza => "<hello>world</hello>"}
-      @controller = Skates::Base::Controller.new(params)
-      @controller.class.send(:define_method, @action) do # Defining the action method
-        # Do something
-      end
-    end
-    
-    it "should setup the action to the param" do
-      @controller.perform(@action) do
-        # Do something
-      end
-      @controller.instance_variable_get("@action_name").should == @action
-    end
-    
-    it "should call the action" do
-      @controller.should_receive(:send).with(@action).and_return()
-      @controller.perform(@action) do
-        # Do something
-      end
-    end
-    
-    it "should write an error to the log in case of failure of the action" do
-      @controller.stub!(:send).with(@action).and_raise(StandardError)
-      Skates.logger.should_receive(:error)
-      @controller.perform(@action) do
-        # Do something
-      end
-    end
-    
-    it "should call render" do
-      @controller.should_receive(:render)
-      @controller.perform(@action) do
-        # Do something
-      end
-    end
-  end
-  
-  describe ".render" do
-    before(:each) do
-      @controller = Skates::Base::Controller.new({})
-      @controller.action_name = :subscribe
-    end
-    
-    it "should assign a value to view" do
-      @controller.render
-      @controller.instance_variable_get("@view").should_not be_nil
-    end
-    
-    describe "with :nothing option" do
-      it "should not render any file" do
-        @controller.should_not_receive(:render_for_file)
-        @controller.render :nothing => true
-      end
-    end
-    
-    describe "with no option" do
-      it "should call render with default_file_name if no option is provided" do
-        @controller.should_receive(:default_template_name)
-        @controller.render      
-      end
-    end
-    
-    describe "with an :action option" do
-      it "should call render with the file name corresponding to the action given as option" do
-        action = :unsubscribe
-        @controller.should_receive(:default_template_name).with("#{action}")
-        @controller.render(:action => action)
-      end
-    end
-    
-    describe "with a file option" do
-      it "should call render_for_file with the correct path if an option file is provided" do
-        file = "myfile"
-        @controller.should_receive(:render_for_file)
-        @controller.render(:file => file)
-      end
-    end
-    
-    it "should not render twice when called twice" do
-      @controller.render
-      @controller.should_not_receive(:render_for_file)
-      @controller.render      
-    end
-  end
-  
-  describe ".assigns" do
-    
-    before(:each) do
-      @stanza = mock(Skates::Base::Stanza)
-      @controller = Skates::Base::Controller.new(@stanza)
-    end
-    
-    it "should be a hash" do
-      @controller.assigns.should be_an_instance_of(Hash)
-    end
-    
-    it "should only contain the @stanza if the action hasn't been called yet" do
-      @controller.assigns.should_not be_empty
-      @controller.assigns["stanza"].should == @stanza
-    end
-    
-    it "should return an hash containing all instance variables defined in the action" do
-      vars = {"a" => 1, "b" => "b", "c" => { "d" => 4}}
-      class MyController < Skates::Base::Controller
-        def do_something
-          @a = 1
-          @b = "b"
-          @c = { "d" => 4 }
-        end
-      end
-      @controller = MyController.new(@stanza)
-      @controller.do_something
-      @controller.assigns.should == vars.merge("stanza" => @stanza, "view" => nil)
-    end
-  end
-  
-  describe ".evaluate" do
-    before(:each) do
-      @controller = Skates::Base::Controller.new()
-    end
-    
-    it "should evaluate the view" do
-      view = mock(Skates::Base::View)
-      response = "hello"
-      @controller.instance_variable_set("@view", view)
-      view.should_receive(:evaluate).and_return(response)
-      @controller.evaluate.should == response
-    end
-  end
-  
-  describe ".view_path" do
-    it "should return complete file path to the file given in param" do
-      @controller = Skates::Base::Controller.new()
-      file_name = "myfile"
-      @controller.__send__(:view_path, file_name).should == File.join("app/views", "#{"Skates::Base::Controller".gsub("Controller","").downcase}", file_name)
-    end
-  end
-  
-  describe ".default_template_name" do
-    before(:each) do
-      @controller = Skates::Base::Controller.new()
-    end
-    
-    it "should return the view file name if a file is given in param" do
-      @controller.__send__(:default_template_name, "myaction").should == "myaction.xml.builder"
-    end
-    
-    it "should return the view file name based on the action_name if no file has been given" do
-      @controller.action_name = "a_great_action"
-      @controller.__send__(:default_template_name).should == "a_great_action.xml.builder"
-    end
-  end
-  
-  describe ".render_for_file" do
-    
-    before(:each) do
-      @controller = Skates::Base::Controller.new()
-      @block = Proc.new {
-        # Do something
-      }
-      @controller.class.send(:define_method, "action") do # Defining the action method
-        # Do something
-      end
-      @controller.perform(:action, &@block) 
-      @view = Skates::Base::View.new("path_to_a_file", {})
-    end
-    
-    it "should instantiate a new view, with the file provided and the hashed_variables" do
-      Skates::Base::View.should_receive(:new).with("path_to_a_file",an_instance_of(Hash)).and_return(@view)
-      @controller.__send__(:render_for_file, "path_to_a_file")
-    end
-    
-  end
-
-end

data/spec/lib/skates/base/stanza_spec.rb

@@ -1,120 +0,0 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-
-describe Skates::Base::Stanza do
-
-  describe "initialize" do
-
-    context "when the stanza is an IQ" do
-
-      before(:each) do
-        xml = <<-EOXML 
-        <iq type='get'
-        from='romeo@montague.net/orchard'
-        to='plays.shakespeare.lit'
-        id='info1'>
-        <query xmlns='http://jabber.org/protocol/disco#configuration'/>
-        </iq>
-        EOXML
-        xml = Nokogiri::XML(xml)
-        @stanza = Skates::Base::Stanza.new(xml.root)
-      end
-
-      it "should have the right from" do
-        @stanza.from.should == "romeo@montague.net/orchard"
-      end
-
-      it "should have the right id" do
-        @stanza.id.should == "info1"
-      end
-
-      it "should have the right to" do
-        @stanza.to.should == "plays.shakespeare.lit"
-      end
-
-      it "should have the right type" do
-        @stanza.type.should == "get"
-      end
-
-      it "should have the right name" do
-        @stanza.name.should == "iq"
-      end
-      
-    end
-    
-    
-    
-    context "when the stanza is a presence" do
-
-      before(:each) do
-        xml = <<-EOXML 
-        <presence from='firehoser-test.superfeedr.com' to='testparsr@superfeedr.com/skates_client_7008465' type='error' />
-        EOXML
-        xml = Nokogiri::XML(xml)
-        @stanza = Skates::Base::Stanza.new(xml.root)
-      end
-
-      it "should have the right from" do
-        @stanza.from.should == "firehoser-test.superfeedr.com"
-      end
-
-      it "should have the right id" do
-        @stanza.id.should be_nil
-      end
-
-      it "should have the right to" do
-        @stanza.to.should == "testparsr@superfeedr.com/skates_client_7008465"
-      end
-
-      it "should have the right type" do
-        @stanza.type.should == "error"
-      end
-
-      it "should have the right name" do
-        @stanza.name.should == "presence"
-      end
-      
-    end
-    
-    context "when the stanza is a message" do
-
-      before(:each) do
-        xml = <<-EOXML 
-        <message to="monitor@superfeedr.com" from="test-firehoser.superfeedr.com">
-          <event xmlns="http://jabber.org/protocol/pubsub#event">
-            <status xmlns="http://superfeedr.com/xmpp-pubsub-ext" feed="http://domain.tld/feed.xml">
-              <http code="200">All went very fine. Thanks for asking!</http>
-              <next_fetch>2010-02-03T01:32:58+01:00</next_fetch>
-              <title></title>
-            </status>
-          </event>
-        </message>
-        EOXML
-        xml = Nokogiri::XML(xml)
-        @stanza = Skates::Base::Stanza.new(xml.root)
-      end
-
-      it "should have the right from" do
-        @stanza.from.should == "test-firehoser.superfeedr.com"
-      end
-
-      it "should have the right id" do
-        @stanza.id.should be_nil
-      end
-
-      it "should have the right to" do
-        @stanza.to.should == "monitor@superfeedr.com"
-      end
-
-      it "should have the right type" do
-        @stanza.type.should be_nil
-      end
-
-      it "should have the right name" do
-        @stanza.name.should == "message"
-      end
-      
-    end
-    
-  end
-
-end