skates 0.3.4 → 0.3.5

data/Rakefile

@@ -12,7 +12,7 @@ begin
 
     gem.add_dependency('eventmachine', ">= 0.12.10")
     gem.add_dependency('log4r')
-    gem.add_dependency('nokogiri', ">= 1.4.1")
+    gem.add_dependency('nokogiri', "= 1.4.2")
     gem.add_dependency('utf8cleaner')
     gem.requirements = ["eventmachine", "yaml", "fileutils", "log4r", "nokogiri", "optparse", "digest/sha1", "base64", "resolv", "utf8cleaner"]
     gem.executables = "skates"

data/lib/skates/base/view.rb

@@ -17,6 +17,7 @@ module Skates
       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"
+        partial_path = Pathname.new(partial_path).cleanpath.to_s
         raise ViewFileNotFound, "No such file #{partial_path}" unless Skates.views[partial_path] 
         saved_locals = @locals
         @locals = options[:locals]

data/lib/skates.rb

@@ -11,6 +11,7 @@ require 'base64'
 require 'resolv'
 require 'cgi'
 require 'utf8cleaner'
+require 'pathname'
 
 require 'skates/ext/array.rb'
 require 'skates/xmpp_connection'

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

@@ -1,14 +1,14 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe Skates::Base::View do
-  describe ".initialize" do
+  describe :initialize do
     
     before(:each) do
-      @view = Skates::Base::View.new("/a/path/to/a/view/file", {:a => "a", :b => 123, :c => {:d => "d", :e => "123"}})
+      @view = Skates::Base::View.new("/a/path/to/views/file", {:a => "a", :b => 123, :c => {:d => "d", :e => "123"}})
     end
     
     it "should assign @view_template to path" do
-      @view.view_template == "/a/path/to/a/view/file"
+      @view.view_template == "/a/path/to/views/file"
     end
     
     it "should assign any variable passed in hash" do
@@ -18,9 +18,9 @@ describe Skates::Base::View do
     end
   end
 
-  describe ".evaluate" do
+  describe :evaluate do
     before(:each) do
-      @view_template = "/a/path/to/a/view/file"
+      @view_template = "/a/path/to/views/file"
       @view = Skates::Base::View.new(@view_template, {:a => "a", :b => 123, :c => {:d => "d", :e => "123"}})
       @xml_string = <<-eoxml
         xml.message(:to => "you", :from => "me", :type => :chat) do
@@ -54,29 +54,38 @@ describe Skates::Base::View do
     end
     
     it "should be able to access context's variables" do
-      @view = Skates::Base::View.new("/a/path/to/a/view/file", {:a => "a", :b => 123, :c => {:d => "d", :e => "123"}})
+      @view = Skates::Base::View.new("/a/path/to/views/file", {:a => "a", :b => 123, :c => {:d => "d", :e => "123"}})
       @view.instance_variable_get("@a").should == "a"
       @view.instance_variable_get("@b").should == 123
       @view.instance_variable_get("@c").should == {:e=>"123", :d=>"d"}
     end
   end
   
-  describe "render" do
+  describe :render do
     before(:each) do
-      @view_template = "/a/path/to/a/view/file"
+      @view_template = "/a/path/to/views/file"
       @view = Skates::Base::View.new(@view_template, {:a => "a", :b => 123, :c => {:d => "d", :e => "123"}})
+      
       @xml_string = <<-eoxml
         xml.message(:to => "you", :from => "me", :type => :chat) do |message|
           message.body("salut") 
           render(message, {:partial => "partial", :locals => {:subtitle => "bonjour monde"}})
+          render(message, {:partial => "../other_views/partial", :locals => {:subtitle => "bonjour monde", :name => "Joe"}})
        end
       eoxml
+      
       @partial_string = <<-eoxml
         xml.title("hello word")
         xml.subtitle(subtitle)
       eoxml
+
+      @partial_in_annother_controller_string = <<-eoxml
+        xml.name(name)
+      eoxml
+      
       Skates.views.stub!(:[]).with(@view_template).and_return(@xml_string)      
-      Skates.views.stub!(:[]).with("/a/path/to/a/view/partial.xml.builder").and_return(@partial_string)      
+      Skates.views.stub!(:[]).with("/a/path/to/views/partial.xml.builder").and_return(@partial_string)      
+      Skates.views.stub!(:[]).with("/a/path/to/other_views/partial.xml.builder").and_return(@partial_in_annother_controller_string) 
     end
     
     it "should render the partial in the right context" do
@@ -87,6 +96,10 @@ describe Skates::Base::View do
       @view.evaluate.xpath("//message/subtitle").text.should == "bonjour monde"
     end
     
+    it "should cleanup the path so only canonical paths are used" do
+      @view.evaluate.xpath("//message/name").text.should == "Joe"
+    end
+    
   end
   
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: skates
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - julien Genestoux
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-03 00:00:00 +02:00
+date: 2010-08-17 00:00:00 +02:00
 default_executable: skates
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 59
         segments: 
         - 0
         - 12
@@ -35,9 +38,11 @@ dependencies:
   name: log4r
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -47,23 +52,27 @@ dependencies:
   name: nokogiri
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 1
         - 4
-        - 1
-        version: 1.4.1
+        - 2
+        version: 1.4.2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: utf8cleaner
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -108,6 +117,22 @@ 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: []
@@ -118,16 +143,20 @@ rdoc_options:
 require_paths: 
 - lib
 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 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -143,7 +172,7 @@ requirements:
 - resolv
 - utf8cleaner
 rubyforge_project: skates
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Skates is a framework to create EventMachine based XMPP External Components in Ruby.