skates 0.2.11 → 0.2.13

data/Rakefile

@@ -31,7 +31,6 @@ begin
                   "lib/skates/generator.rb", 
                   "lib/skates/xmpp_connection.rb", 
                   "lib/skates/xmpp_parser.rb", 
-                  "lib/skates/xpath_helper.rb", 
                   "LICENSE", 
                   "Rakefile", 
                   "README.rdoc", 

data/lib/skates/router/dsl.rb

@@ -13,8 +13,8 @@ module Skates
       end
 
       # Match an xpath.
-      def xpath(path)
-        @routes << {"xpath" => path}
+      def xpath(path, namespaces = {})
+        @routes << {"xpath" => [path, namespaces]}
         self
       end
 
@@ -26,16 +26,6 @@ module Skates
         self
       end
 
-      # Match a disco_info query.
-      def disco_info(node = nil)
-        disco_for(:info, node)
-      end
-
-      # Match a disco_items query.
-      def disco_items(node = nil)
-        disco_for(:items, node)
-      end
-
       # Map a route to a specific controller and action.
       def to(params)
         last = @routes.pop

data/lib/skates/router.rb

@@ -93,7 +93,7 @@ module Skates
     ##
     # Checks that the route matches the stanzas and calls the the action on the controller.
     def accepts?(stanza)
-      stanza.xpath(@xpath, XpathHelper.new).empty? ? false : self
+      stanza.xpath(*@xpath).empty? ? false : self
     end
     
   end

data/lib/skates/xmpp_parser.rb

@@ -90,8 +90,8 @@ module Skates
     def add_namespaces_and_attributes_to_current_node(attrs) 
       # Namespaces
       attrs.select {|k| k.is_a? Array}.each do |pair|
-        # set_namespace(pair[0], pair[1])
-        set_normal_attribute(pair[0], pair[1])
+        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|

data/lib/skates.rb

@@ -21,7 +21,6 @@ require 'skates/client_connection'
 require 'skates/router'
 require 'skates/runner'
 require 'skates/generator'
-require 'skates/xpath_helper'
 require 'skates/base/controller'
 require 'skates/base/view'
 require 'skates/base/stanza'

data/spec/lib/skates/router/dsl_spec.rb

@@ -34,39 +34,13 @@ describe Skates::Router::DSL do
     routes.length.should == 1
   end
   
-  describe :disco_info do
-    it "matches the root disco#info namespace" do
-      Skates.router.draw do
-        disco_info.to(:controller => "controller", :action => "action")
-      end
-      route = Skates.router.instance_variable_get("@routes").last
-      route.xpath.should == "//iq[@type='get']/*[namespace(., 'query', 'http://jabber.org/protocol/disco#info')]"
-    end
-
-    it "matches the disco#info namespace for the specified node" do
-      Skates.router.draw do
-        disco_info("test").to(:controller => "controller", :action => "action")
-      end
-      route = Skates.router.instance_variable_get("@routes").last
-      route.xpath.should == "//iq[@type='get']/*[namespace(., 'query', 'http://jabber.org/protocol/disco#info') and @node = 'test']"
-    end
-  end
-
-  describe :disco_items do
-    it "matches the root disco#items namespace" do
-      Skates.router.draw do
-        disco_items.to(:controller => "controller", :action => "action")
-      end
-      route = Skates.router.instance_variable_get("@routes").last
-      route.xpath.should == "//iq[@type='get']/*[namespace(., 'query', 'http://jabber.org/protocol/disco#items')]"
-    end
-
-    it "matches the disco#items namespace for the specified node" do
-      Skates.router.draw do
-        disco_items("test").to(:controller => "controller", :action => "action")
-      end
-      route = Skates.router.instance_variable_get("@routes").last
-      route.xpath.should == "//iq[@type='get']/*[namespace(., 'query', 'http://jabber.org/protocol/disco#items') and @node = 'test']"
+  it "should create routes with the right namespace" do
+    Skates.router.draw do
+      xpath("//ns:test", {"ns" => "http://my.namespace.uri"}
+      ).to(:controller => "controller", :action => "action").priority(5)
     end
+    route = Skates.router.instance_variable_get("@routes").first
+    route.xpath.should == ["//ns:test", {"ns"=>"http://my.namespace.uri"}]
   end
+  
 end

data/spec/lib/skates/router_spec.rb

@@ -23,8 +23,8 @@ describe Skates::Route do
   describe ".accepts?" do
     it "should check the stanza with Xpath" do
       mock_stanza = mock(Object)
-      route = Skates::Route.new("controller" => "bar", "action" => "bar", "xpath" => "//message")
-      mock_stanza.should_receive(:xpath).with(route.xpath, instance_of(Skates::XpathHelper)).and_return([])
+      route = Skates::Route.new("controller" => "bar", "action" => "bar", "xpath" => ["//message", {}])
+      mock_stanza.should_receive(:xpath).with("//message", {}).and_return([])
       route.accepts?(mock_stanza)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: skates
 version: !ruby/object:Gem::Version 
-  version: 0.2.11
+  version: 0.2.13
 platform: ruby
 authors: 
 - julien Genestoux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-27 00:00:00 +01:00
+date: 2010-02-05 00:00:00 +01:00
 default_executable: skates
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,7 +89,6 @@ files:
 - lib/skates/runner.rb
 - lib/skates/xmpp_connection.rb
 - lib/skates/xmpp_parser.rb
-- lib/skates/xpath_helper.rb
 - templates/skates/app/controllers/controller.rb
 - templates/skates/app/stanzas/stanza.rb
 - templates/skates/app/views/view.rb
@@ -154,7 +153,6 @@ test_files:
 - spec/lib/skates/runner_spec.rb
 - spec/lib/skates/xmpp_connection_spec.rb
 - spec/lib/skates/xmpp_parser_spec.rb
-- spec/lib/skates/xpath_helper_spec.rb
 - spec/spec_helper.rb
 - test/skates_test.rb
 - test/test_helper.rb

data/lib/skates/xpath_helper.rb

@@ -1,13 +0,0 @@
-module Skates
-
-  # Custom XPath functions for stanza-routing.
-  class XpathHelper
-
-    # Match nodes of the given name with the given namespace URI.
-    def namespace(set, name, nsuri)
-      set.find_all do |n|
-        n.name == name && n.namespaces.values.include?(nsuri)
-      end
-    end
-  end
-end

data/spec/lib/skates/xpath_helper_spec.rb

@@ -1,25 +0,0 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-
-describe Skates::XpathHelper do
-  describe "namespace method" do
-    before do
-      @doc = Nokogiri::XML(<<-eoxml)
-        <iq from='me@my.jid/Eee' to='component.my.jid'
-        xml:lang='en' type='get' id='43'><query
-        xmlns='http://jabber.org/protocol/disco#info'/></iq>
-      eoxml
-    end
-
-    it "matches nodes of the given name with the given namespace URI" do
-      @doc.xpath("//iq/*[namespace(., 'query', 'http://jabber.org/protocol/disco#info')]", Skates::XpathHelper.new).length.should == 1
-    end
-
-    it "does not match a namespace URI if the node names differ" do
-      @doc.xpath("//iq/*[namespace(., 'que', 'http://jabber.org/protocol/disco#info')]", Skates::XpathHelper.new).length.should == 0
-    end
-
-    it "does not match a node if the namespace URIs differ" do
-      @doc.xpath("//iq/*[namespace(., 'query', 'http://jabber.org/protocol/disco#inf')]", Skates::XpathHelper.new).length.should == 0
-    end
-  end
-end