skates 0.2.1 → 0.2.2

data/lib/skates/base/controller.rb

@@ -50,16 +50,19 @@ module Skates
         return if @view and !options[:force] # Avoid double rendering, if we have already attached a view
         
         if options == {} # default rendering
-          result = render(:file => default_template_name)
+          render(:file => default_template_name)
+
+        elsif action_name = options[:action]
+          result = render(:file => default_template_name(action_name.to_s))
+
         elsif options[:file]
           file = options[:file]
           if file =~ /^\// # Render from view root
-            result = render_for_file(File.join("app", "views", "#{file}.xml.builder"))
+            @view = render_for_file(File.join("app", "views", "#{file}.xml.builder"))
           else
-            result = render_for_file(view_path(file)) 
+            @view = render_for_file(view_path(file)) 
           end
-        elsif action_name = options[:action]
-          result = render(:file => default_template_name(action_name.to_s))
+
         elsif options[:nothing]
           @view = Skates::Base::View.new()
         end
@@ -105,10 +108,7 @@ module Skates
         Skates.logger.info {
           "RENDERING : #{file}"
         }
-        @view = Skates::Base::View.new(file, assigns)
-        Skates.logger.info {
-          " "
-        }
+        Skates::Base::View.new(file, assigns)
       end
       
     end

data/lib/skates/router/dsl.rb

@@ -1,5 +1,8 @@
 module Skates
   module Router
+    ##
+    # We use this class to assert the ordering of the router DSL
+    class OutOfOrder < StandardError; end
 
     # Creates a simple DSL for stanza routing.
     class DSL
@@ -17,7 +20,9 @@ module Skates
 
       # Set the priority of the last created route.
       def priority(n)
-        set(:priority, n)
+        route = @routes.last
+        raise OutOfOrder unless route.is_a?(Route) # check that this is in the right order
+        route.priority = n
         self
       end
 
@@ -33,23 +38,15 @@ module Skates
 
       # Map a route to a specific controller and action.
       def to(params)
-        set(:controller, params[:controller])
-        set(:action, params[:action])
+        last = @routes.pop
+        last["controller"] = params[:controller]
+        last["action"] = params[:action]
         # We now have all the properties we really need to create a route.
-        route = Route.new(@routes.pop)
-        @routes << route
+        @routes << Route.new(last)
         self
       end
 
       protected
-      # We do this magic, or crap depending on your perspective, because we don't know whether we're setting values on a 
-      # Hash or a Route. We can't create the Route until we have a controller and action.
-      def set(property, value)
-        last = @routes.last
-        last[property.to_s] = value if last.is_a?(Hash)
-        last.send("#{property.to_s}=", value) if last.is_a?(Route)
-      end
-
       def disco_for(type, node = nil)
         str = "//iq[@type='get']/*[namespace(., 'query', 'http://jabber.org/protocol/disco##{type.to_s}')"
         str += " and @node = '#{node}'" if node

data/spec/lib/{babylon → skates}/router/dsl_spec.rb

@@ -25,10 +25,10 @@ describe Skates::Router::DSL do
     end }.should raise_error(/destination/)
   end
 
-  it "creates a route with the specified xpath, controller and action" do
+  it "creates a route with the specified xpath, controller, action and priority" do
     Skates.router.draw do
       xpath("//test"
-      ).to(:controller => "controller", :action => "action")
+      ).to(:controller => "controller", :action => "action").priority(5)
     end
     routes = Skates.router.instance_variable_get("@routes")
     routes.length.should == 1

data/templates/skates/config/boot.rb

@@ -10,7 +10,7 @@ require File.dirname(__FILE__) + "/dependencies"
 
 
 # Start the App
-Skates::Runner::run(ARGV[0] || "development") do
+Skates::Runner::run(SKATES_ENV || "development") do
   # Run the initializers, too. This is done here since some initializers might need EventMachine to be started.
   Dir.glob('config/initializers/*.rb').each { |f| require f }
 end

data/templates/skates/script/component

@@ -13,7 +13,7 @@ ARGV.options do |o|
   
   o.set_summary_indent('  ')
   o.banner =    "Usage: script/#{script_name} [OPTIONS]"
-  o.define_head "Runs the Babylon Application."
+  o.define_head "Runs the Skates Application."
   o.separator   ""
   o.separator   "Arguments :" 
   
@@ -31,6 +31,6 @@ ARGV.options do |o|
   o.parse!
 end
 
-$appname = OPTIONS[:name]
-BABYLON_ENV = OPTIONS[:environment]
+$appname        = OPTIONS[:name]
+SKATES_ENV      = OPTIONS[:environment]
 require File.dirname(__FILE__) + '/../config/boot.rb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: skates
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - julien Genestoux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-03 00:00:00 -08:00
+date: 2009-11-04 00:00:00 -08:00
 default_executable: skates
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -141,20 +141,20 @@ signing_key:
 specification_version: 3
 summary: Skates is a framework to create EventMachine based XMPP External Components in Ruby.
 test_files: 
-- spec/bin/babylon_spec.rb
+- spec/bin/skates_spec.rb
 - spec/em_mock.rb
-- spec/lib/babylon/base/controller_spec.rb
-- spec/lib/babylon/base/stanza_spec.rb
-- spec/lib/babylon/base/view_spec.rb
-- spec/lib/babylon/client_connection_spec.rb
-- spec/lib/babylon/component_connection_spec.rb
-- spec/lib/babylon/generator_spec.rb
-- spec/lib/babylon/router/dsl_spec.rb
-- spec/lib/babylon/router_spec.rb
-- spec/lib/babylon/runner_spec.rb
-- spec/lib/babylon/xmpp_connection_spec.rb
-- spec/lib/babylon/xmpp_parser_spec.rb
-- spec/lib/babylon/xpath_helper_spec.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/lib/skates/xpath_helper_spec.rb
 - spec/spec_helper.rb
 - test/skates_test.rb
 - test/test_helper.rb