skates 0.2.17 → 0.3.0

data/README.rdoc

@@ -85,7 +85,7 @@ Skates's edge versions are located at Github : http://github.com/julien51/skates
 
 == REQUIREMENTS :
 
-Gems : Eventmachine, nokogiri, YAML, log4r, sax-machine, templater
+Gems : Eventmachine, nokogiri, YAML, log4r, templater
 
 == LICENSE:
 

data/Rakefile

@@ -13,10 +13,9 @@ begin
     gem.add_dependency('eventmachine', ">= 0.12.10")
     gem.add_dependency('log4r')
     gem.add_dependency('nokogiri', ">= 1.4.1")
-    gem.add_dependency('superfeedr-sax-machine', ">= 0.0.23")
     gem.add_dependency('templater')
     gem.add_dependency('utf8cleaner')
-    gem.requirements = ["eventmachine", "yaml", "fileutils", "log4r", "nokogiri", "superfeedr-sax-machine", "templater", "optparse", "digest/sha1", "base64", "resolv", "utf8cleaner"]
+    gem.requirements = ["eventmachine", "yaml", "fileutils", "log4r", "nokogiri", "templater", "optparse", "digest/sha1", "base64", "resolv", "utf8cleaner"]
     gem.executables = "skates"
     gem.files = [ "bin/skates", 
                   "lib/skates.rb", 

data/lib/skates/base/stanza.rb

@@ -3,8 +3,9 @@ module Skates
     ##
     # Class used to Parse a Stanza on the XMPP stream.
     # You should have a Stanza subsclass for each of your controller actions, as they allow you to define which stanzas and which information is passed to yoru controllers.
-    #
-    # You can define your own macthing pretty easily with the element and elements methods, as explained in the SaxMachine Documentation: http://github.com/pauldix/sax-machine/tree/master
+    # These classes extend the Nokogiri::XML::Node
+    # You can define your own accessors to access the content uou need, using XPath.
+    
     # if your stanza is a message stanza, you can match the following for example:
     # element :message, :value => :to, :as => :to 
     # element :message, :value => :from, :as => :from 
@@ -12,14 +13,32 @@ module Skates
     # element :message, :value => :type, :as => :stanza_type 
     # element :message, :value => :"xml:lang", :as => :lang 
     #
-    class Stanza
-      include SAXMachine
-      attr_reader :xml
+    class Stanza 
+      
+      def initialize(node)
+        @node = node
+      end
+      
+      def from
+        @node.at_xpath(".")["from"]
+      end
+      
+      def to
+        @node.at_xpath(".")["to"]
+      end
+      
+      def id
+        @node.at_xpath(".")["id"]
+      end
       
-      def initialize(xml = nil)
-        @xml = xml
-        parse(xml.to_xml)
+      def type
+        @node.at_xpath(".")["type"]
       end
+      
+      def name
+        @node.at_xpath(".").name
+      end
+      
     end
   end
 end

data/lib/skates/runner.rb

@@ -4,6 +4,8 @@ module Skates
   # Runner is in charge of running the application.
   class Runner
     
+    PHI = ((1+Math.sqrt(5))/2.0)
+    
     ## 
     # Prepares the Application to run.
     def self.prepare(env)
@@ -27,6 +29,9 @@ module Skates
       # Caching views
       Skates.cache_views
       
+      #Setting failed connection attemts
+      @failed_connections = 0
+      
     end
     
     ##
@@ -93,6 +98,9 @@ module Skates
       connection_observers.each do |observer|
         Skates.router.execute_route(observer, "on_connected")
       end
+      
+      # Connected so reset failed connection attempts
+      @failed_connections = 0
     end
     
     ##
@@ -103,7 +111,20 @@ module Skates
         observer = conn_obs.new
         observer.on_disconnected if observer.respond_to?("on_disconnected")
       end
-      EventMachine.stop_event_loop
+      
+      if Skates.config["auto-reconnect"]
+        # Increment failed connection attempts and calculate time to next re-connect
+        @failed_connections += 1
+        reconnect_in = fib(@failed_connections)
+      
+        EventMachine.add_timer( reconnect_in ) {reconnect} if EM.reactor_running?
+      
+        Skates.logger.error {
+          "Disconnected - trying to reconnect in #{reconnect_in} seconds."
+        }
+      else
+        EM.stop_event_loop
+      end
     end
     
     ##
@@ -123,5 +144,22 @@ module Skates
       end
     end
     
+    ##
+    # Tries to reconnect
+    def self.reconnect
+      #Try to reconnect
+      case Skates.config["application_type"] 
+      when "client"
+        Skates::ClientConnection.connect(Skates.config, self) 
+      else # By default, we assume it's a component
+        Skates::ComponentConnection.connect(Skates.config, self) 
+      end
+    end
+    
+    ##
+    # Helper to calculate the fibonnacci number.
+    def self.fib(n)
+      (Skates::Runner::PHI**n).round
+    end
   end
 end

data/lib/skates/xmpp_connection.rb

@@ -149,13 +149,19 @@ module Skates
     ## 
     # Sends the Nokogiri::XML data (after converting to string) on the stream. Eventually it displays this data for debugging purposes.
     def send_xml(xml)
-      if xml.is_a? Nokogiri::XML::NodeSet
-        xml.each do |element|
-          send_chunk(element.to_s)
-        end
-      else
-        send_chunk(xml.to_s)
-      end
+    	begin
+		  if xml.is_a? Nokogiri::XML::NodeSet
+		    xml.each do |element|
+		      send_chunk(element.to_s)
+		    end
+		  else
+		    send_chunk(xml.to_s)
+		  end
+		rescue
+			Skates.logger.error {
+            	"SENDING FAILED: #{$!}"
+          	}
+		end
     end
 
     private

data/lib/skates.rb

@@ -6,7 +6,6 @@ require 'log4r'
 require 'nokogiri'
 require 'yaml'
 require 'fileutils'
-require 'sax-machine'
 require 'digest/sha1'
 require 'base64'
 require 'resolv'

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

@@ -1,15 +1,120 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe Skates::Base::Stanza do
-  
+
   describe "initialize" do
-    before(:each) do
-      @stanza_string = "<presence />"
-      @stanza = Skates::Base::Stanza.new(@stanza_string)
+
+    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
     
-    it "should call parse with the string passed to the builder" 
+    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

data/spec/lib/skates/runner_spec.rb

@@ -2,13 +2,11 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 require File.dirname(__FILE__) + '/../../em_mock'
 
 describe Skates::Runner do 
-
   before(:all) do
     FileUtils.chdir("#{FileUtils.pwd}/templates/skates")  unless ("#{FileUtils.pwd}" =~ /\/templates\/skates/ )
   end
-
+  
   describe ".prepare" do
-
     before(:each) do
       @stub_config_file = File.open("config/config.yaml")
       @stub_config_content = File.read("config/config.yaml")
@@ -86,7 +84,6 @@ describe Skates::Runner do
   end
 
   describe ".run" do
-
     before(:each) do
       Skates::ClientConnection.stub!(:connect).and_return(true)
       Skates::ComponentConnection.stub!(:connect).and_return(true)
@@ -182,23 +179,48 @@ describe Skates::Runner do
   end
 
   describe ".on_disconnected" do
-    it "should stop the event loop" do
-      connection = mock(Object)
-      EventMachine.should_receive(:stop_event_loop)
-      Skates::Runner.on_disconnected()
-    end
-
     it "should call on_disconnected on the various observers" do
-      class MyObserver < Skates::Base::Controller
-        def on_disconnected
-        end
-      end
+      class MyObserver < Skates::Base::Controller; def on_disconnected; end; end
       my_observer = MyObserver.new
       Skates::Runner.add_connection_observer(MyObserver)
       MyObserver.should_receive(:new).and_return(my_observer)
       my_observer.should_receive(:on_disconnected)
       Skates::Runner.on_disconnected
     end
+    
+    context "when the application should auto-reconnect" do
+      before(:each) do
+        Skates.config["auto-reconnect"] = true
+        EventMachine.stub!(:reactor_running?).and_return(false)
+        EventMachine.stub!(:add_timer).and_yield()
+        @delay = 15
+        Skates::Runner.stub!(:fib).and_return(@delay)
+      end
+      
+      it "should determine when is the best time to reconnect with fibonacci" do
+        Skates::Runner.should_receive(:fib).and_return(@delay)
+        Skates::Runner.on_disconnected()
+      end
+      
+      it "should try to reconnect at the determined time" do
+        EventMachine.stub!(:reactor_running?).and_return(true)
+        Skates::Runner.should_receive(:reconnect)
+        EventMachine.should_receive(:add_timer).with(@delay).and_yield()
+        Skates::Runner.on_disconnected()
+      end
+    end
+    
+    context "when the application should not auto-reconnect" do
+      before(:each) do
+        Skates.config["auto-reconnect"] = false
+      end
+      
+      it "should stop the event loop" do
+        connection = mock(Object)
+        EventMachine.should_receive(:stop_event_loop)
+        Skates::Runner.on_disconnected()
+      end
+    end
   end
 
   describe ".on_stanza" do

data/templates/skates/config/config.yaml

@@ -10,15 +10,18 @@ development:
     jid: user@server.com
     password: password
     application_type: client
+    auto-reconnect: true
 
 test:
     jid: component.server.com
     password: password
     host: localhost
     port: 5278
+    auto-reconnect: true
         
 production:
     jid: component.server.com
     password: password
     host: localhost
     port: 5278
+    auto-reconnect: true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: skates
 version: !ruby/object:Gem::Version 
-  version: 0.2.17
+  version: 0.3.0
 platform: ruby
 authors: 
 - julien Genestoux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-16 00:00:00 +01:00
+date: 2010-03-10 00:00:00 -06:00
 default_executable: skates
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,16 +42,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.4.1
     version: 
-- !ruby/object:Gem::Dependency 
-  name: superfeedr-sax-machine
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.0.23
-    version: 
 - !ruby/object:Gem::Dependency 
   name: templater
   type: :runtime
@@ -138,7 +128,6 @@ requirements:
 - fileutils
 - log4r
 - nokogiri
-- superfeedr-sax-machine
 - templater
 - optparse
 - digest/sha1