lego-core 0.0.2 → 0.0.3

data/README.rdoc

@@ -52,7 +52,7 @@ It's all about the bits an pieces!
 
     module Matcher
       def self.match_route(route, env)
-        (route[:path] == env['PATH_INFO']) ? true : false
+        (route[:path] == env['PATH_INFO']) ? [env, {}] : false
       end
     end
   end

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/examples/config.ru

@@ -14,7 +14,7 @@ module BasicRoutes
 
   module RouteMatcher
     def self.match_route(route, env)
-      (route[:path] == env['PATH_INFO']) ? true : false
+      (route[:path] == env['PATH_INFO']) ? [env, {}] : false
     end
   end
 end
@@ -26,8 +26,9 @@ module RegexpMatcher
 
   def self.match_route(route, env)
     if route[:path].is_a?(Regexp) && match = route[:path].match(env['PATH_INFO'])
-      route[:instance_vars] = { :caps => match.captures }
-      true
+      match_data = {}
+      match_data[:instance_vars] = { :caps => match.captures }
+      [env, match_data]
     else
       false
     end
@@ -45,11 +46,12 @@ module SymbolExtractor
     if matches.size > 0 
       exp = Regexp.escape( route[:path] ).gsub(/:([\w]+)/, "([\\w]+)") 
       if match = Regexp.new("^#{exp}$").match(env["PATH_INFO"]) 
-        route[:instance_vars] = {} if route[:instance_vars].nil?  
+        match_data = {}
+        match_data[:instance_vars] = {}
         1.upto(matches.size) do |i| 
-           route[:instance_vars][matches[i-1]] = match.captures[i-1] 
+           match_data[:instance_vars][matches[i-1]] = match.captures[i-1] 
          end 
-        return true   
+        return [env, match_data]
       end 
     end 
     false 

data/examples/sample_with_plugins/config.ru

@@ -0,0 +1,32 @@
+require 'rubygems'
+require 'lego-modules'
+require 'lego-core'
+require 'erb'
+
+# Global options
+Lego.config do
+  plugin SimpleRouter
+  set :views => "./"
+end
+
+class MyApp < Lego::Controller
+
+  # Load our Erb plugin for this controller.
+  plugin ViewHelpers
+
+  get '/' do
+    redirect_to '/hello'
+  end
+
+  get '/hello' do
+    # Setup a instance var for our template to use...
+    @title = "Hello, right now it's:"
+    # Render our ERB template hello.erb found in the templates folder.
+    @userinput = "<b>hello bold</b>"
+    erb :hello
+  end
+
+end
+
+# Makes Rack run our app
+run MyApp

data/examples/sample_with_plugins/hello.erb

@@ -0,0 +1,5 @@
+<%= h1 @title %>
+
+<p><%= Time.new %></p>
+
+<p>...and here is some user input: <%=h @userinput %></p>

data/examples/sample_with_plugins/lego-modules.rb

@@ -0,0 +1,47 @@
+module SimpleRouter
+  def self.register(lego)
+    lego.add_plugin :router, RouteMatcher
+    lego.add_plugin :controller, RouteHandler
+  end
+
+  module RouteHandler
+    def get(path, &block)
+      add_route(:get, {:path => path, :action_block => block})
+    end
+  end
+
+  module RouteMatcher
+    def self.match_route(route, env)
+      (route[:path] == env['PATH_INFO']) ? [env, {}] : false
+    end
+  end
+end
+
+module ViewHelpers
+  def self.register(lego)
+    lego.add_plugin :view, View
+  end
+
+  module View
+    def redirect_to(path)
+      @response[:code] = 301
+      @response[:headers].merge!({'Location', path})
+      ""
+    end
+
+    def h1(content)
+     "<h1>#{content}</h1>"
+    end
+
+    def h(s)
+      html_escape = { '&' => '&amp;', '>' => '&gt;', '<' => '&lt;', '"' => '&quot;' }
+      s.to_s.gsub(/[&"><]/) { |special| html_escape[special]  }
+    end
+
+    def erb(template, bind = binding)
+      path = options(:views) || "#{File.dirname(__file__)/views}"
+      template = File.read("#{path}/#{template}.erb") if template.is_a? Symbol
+      ERB.new(template).result(bind)
+    end
+  end
+end

data/lego-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lego-core}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mathias Stjernstr\303\266m", "Patrik Hedman"]
-  s.date = %q{2010-01-12}
+  s.date = %q{2010-01-13}
   s.description = %q{It's all about the bits and peices}
   s.email = %q{mathias@globalinn.com}
   s.extra_rdoc_files = [
@@ -21,6 +21,9 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "examples/config.ru",
+     "examples/sample_with_plugins/config.ru",
+     "examples/sample_with_plugins/hello.erb",
+     "examples/sample_with_plugins/lego-modules.rb",
      "lego-core.gemspec",
      "lib/lego-core.rb",
      "lib/lego/controller.rb",
@@ -54,7 +57,8 @@ Gem::Specification.new do |s|
      "spec/lego/plugin/controller/not_found_spec.rb",
      "spec/lego/plugin_spec.rb",
      "spec/lego_spec.rb",
-     "spec/spec_helper.rb"
+     "spec/spec_helper.rb",
+     "examples/sample_with_plugins/lego-modules.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/lego/controller.rb

@@ -140,11 +140,11 @@ class Lego::Controller
     #
 
     def call(env)
-      if route = self::RouteHandler.match_all_routes(env)
-        self::ActionContext.new.run(route, env)
+      if match_data = self::RouteHandler.match_all_routes(env)
+        self::ActionContext.new.run(match_data)
       else
         if route = self::RouteHandler.routes[:not_found]
-          self::ActionContext.new.run(route, env)
+          self::ActionContext.new.run([route, env, { :set_response_code => 404 }])
         else
           [404, {'Content-Type' => 'text/html'}, '404 - Not found'] 
         end

data/lib/lego/controller/action_context.rb

@@ -3,7 +3,7 @@
 
 class Lego::Controller::ActionContext
 
-  attr_accessor :response, :env, :route
+  attr_accessor :response, :env, :route, :match_data
   
   def initialize
     setup_defaults
@@ -13,9 +13,8 @@ class Lego::Controller::ActionContext
     "#{self.class::ApplicationClass.current_config.options(key)}"
   end
 
-  def run(route, env)
-    @route = route
-    @env = env 
+  def run(match_data)
+    @route, @env, @match_data = match_data
     setup_instance_vars_from_route
     evaluate_action
     [@response[:code], @response[:headers], @response[:body]]
@@ -29,10 +28,10 @@ private
   #
 
   def setup_instance_vars_from_route
-    @route[:instance_vars].each_key do |var|
-      instance_variable_set("@#{var}", @route[:instance_vars][var])
-    end if @route[:instance_vars]
-    @response[:code] = @route[:set_response_code] if @route[:set_response_code]
+    @match_data[:instance_vars].each_key do |var|
+      instance_variable_set("@#{var}", @match_data[:instance_vars][var])
+    end if @match_data[:instance_vars]
+    @response[:code] = @match_data[:set_response_code] if @match_data[:set_response_code]
   end
 
   #

data/lib/lego/controller/route_handler.rb

@@ -16,7 +16,6 @@ module Lego::Controller::RouteHandler
 
   def extended(base)
     base.matchers.concat(matchers)
-    base.routes.merge!(routes)
   end
 
   def add_route(method, options)
@@ -50,7 +49,8 @@ module Lego::Controller::RouteHandler
 
   def run_matchers(route, env)
     matchers.each do |matcher|
-      return true if matcher.match_route(route, env) == true
+      match = matcher.match_route(route, env)
+      return match if match.kind_of?(Array)
     end
     false
   end
@@ -58,7 +58,9 @@ module Lego::Controller::RouteHandler
   def match_all_routes(env)
     method = extract_method_from_env(env)
     routes[method].each do |route|
-      return route if run_matchers(route, env)
+      if match_data = run_matchers(route, env)
+        return [route] | match_data
+      end
     end
     nil 
   end

data/spec/integration/test_full_stack_spec.rb

@@ -48,7 +48,8 @@ describe 'Full stack request' do
         end
         module Matcher
           def self.match_route(route, env)
-            (route[:path] == env['PATH_INFO']) ? true : false
+            match_data = { :instance_vars => { :foo => "bar" }}
+            (route[:path] == env['PATH_INFO']) ? [env, match_data] : false
           end
         end
       end
@@ -57,7 +58,7 @@ describe 'Full stack request' do
 
       class App1 < Lego::Controller
         get '/hello' do
-          h1 'Hello world'
+          h1 "Hello world, #{@foo}"
         end
       end
 
@@ -71,7 +72,7 @@ describe 'Full stack request' do
     it 'should respond with with valid data' do
       @result[0].should eql(200)
       @result[1].should eql({"Content-Type"=>"text/html"})
-      @result[2].should eql('<h1>Hello world</h1>')
+      @result[2].should eql('<h1>Hello world, bar</h1>')
     end
 
     after do

data/spec/lego/controller/action_context_spec.rb

@@ -9,17 +9,17 @@ describe Lego::Controller::ActionContext do
 
     it 'should set the current message body' do
       @instance.response[:body] = "Hello again"
-      @instance.run({},nil).should eql([ 200, {"Content-Type"=>"text/html"}, 'Hello again' ])
+      @instance.run([{},nil, {}]).should eql([ 200, {"Content-Type"=>"text/html"}, 'Hello again' ])
     end
 
     it 'should set response headers' do
       @instance.response[:headers] = {'Content-Type' => 'cust/head'}
-      @instance.run({},nil).should eql([ 200, {"Content-Type"=>"cust/head"}, '' ])
+      @instance.run([{},nil, {}]).should eql([ 200, {"Content-Type"=>"cust/head"}, '' ])
     end
 
     it 'should set response code' do
       @instance.response[:code] = 666 
-      @instance.run({},nil).should eql([ 666, {"Content-Type"=>"text/html"}, '' ])
+      @instance.run([{},nil,{}]).should eql([ 666, {"Content-Type"=>"text/html"}, '' ])
     end
   end
 
@@ -30,23 +30,25 @@ describe Lego::Controller::ActionContext do
     end
 
     it 'should have a default Rack response' do
-      @instance.run("", @env).should eql([200, {'Content-Type' => 'text/html'} , ''])
+      @instance.run(["", @env, {}]).should eql([200, {'Content-Type' => 'text/html'} , ''])
     end
 
     it 'should evaluate :action_block in instance if exists in route' do
       route = { :action_block => Proc.new{ "Hello my world!" }}
-      @instance.run(route, @env).should eql([200, {'Content-Type' => 'text/html'} , "Hello my world!" ])
+      @instance.run([route, @env, {}]).should eql([200, {'Content-Type' => 'text/html'} , "Hello my world!" ])
     end
 
     it 'should convert route[:instance_vars] to instance variables' do
-      route = { :instance_vars => { :myvar => "This is my var" } }
-      @instance.run(route, @env).should eql([200, {'Content-Type' => 'text/html'} , '' ])
+      route = {}
+      match_data = { :instance_vars => { :myvar => "This is my var" } }
+      @instance.run([route, @env, match_data]).should eql([200, {'Content-Type' => 'text/html'} , '' ])
       @instance.instance_variable_get(:@myvar).should eql("This is my var")
     end
 
     it 'should set response[:code] if set_response_route is set in route' do
-      route = { :set_response_code => 666 }
-      @instance.run(route, @env).should eql([666, {'Content-Type' => 'text/html'} , '' ])
+      route = {}
+      route_match = { :set_response_code => 666 }
+      @instance.run([route, @env, route_match]).should eql([666, {'Content-Type' => 'text/html'} , '' ])
     end
   end
 
@@ -61,7 +63,7 @@ describe Lego::Controller::ActionContext do
     it 'should evaluate :action_block in instance if exists in route' do
       Lego::Controller.set :foo => "bar"
       route = { :action_block => Proc.new{ options(:foo) }}
-      @instance.run(route, @env).should eql([200, {'Content-Type' => 'text/html'} , "bar" ])
+      @instance.run([route, @env, {}]).should eql([200, {'Content-Type' => 'text/html'} , "bar" ])
     end
 
     after do

data/spec/lego/controller/route_handler_spec.rb

@@ -12,11 +12,11 @@ describe Lego::Controller::RouteHandler do
       @fake_routes = {:get => [@other_route, @other_route, @valid_route], :post => [{}]}
     end
     
-    it 'should return matching route if found' do
+    it 'should return Array matching route found' do
       @route_handler.should_receive(:routes).and_return(@fake_routes)
       @route_handler.should_receive(:run_matchers).with(@other_route, @env).exactly(2).times.and_return(false)
-      @route_handler.should_receive(:run_matchers).with(@valid_route, @env).and_return(true)
-      @route_handler.match_all_routes(@env).should eql(@valid_route)
+      @route_handler.should_receive(:run_matchers).with(@valid_route, @env).and_return([@env, [:var => "some var"]])
+      @route_handler.match_all_routes(@env).should eql( [@valid_route, @env, [:var => "some var"]] )
     end
     
     it 'should return false when no matching route is found' do
@@ -36,11 +36,11 @@ describe Lego::Controller::RouteHandler do
       @matchers = [Match1, Match2]
     end
     
-    it 'should return true when matching route found' do
+    it 'should return Array when matching route found' do
       Match1.should_receive(:match_route).with(@route, @env).and_return(false)
-      Match2.should_receive(:match_route).with(@route, @env).and_return(true)
+      Match2.should_receive(:match_route).with(@route, @env).and_return([@env, { :var => "a var"}])
       @route_handler.should_receive(:matchers).and_return(@matchers)
-      @route_handler.run_matchers(@route, @env).should eql(true)
+      @route_handler.run_matchers(@route, @env).should eql([@env, { :var => "a var"}])
     end
     
     it 'should return false when no matching route found' do
@@ -88,6 +88,38 @@ describe Lego::Controller::RouteHandler do
     end
   end
 
+  context '.add_route with global plugins' do
+    before do
+      module RouterPlugin
+        reset_lego_base
+        def self.register(lego)
+          lego.add_plugin(:controller, self)
+        end
+        def get(path)
+          add_route(:get, {:path => path})
+        end
+      end
+      Lego.plugin RouterPlugin
+
+      class App1 < Lego::Controller
+        get('/app1')
+      end
+
+      class App2 < Lego::Controller
+        get('/app2')
+      end
+    end
+   
+    it 'should not share routes between apps' do
+      App1::RouteHandler.routes[:get].should eql([:path => "/app1"])
+      App2::RouteHandler.routes[:get].should eql([:path => "/app2"])
+    end
+
+    after do
+      rm_const 'App1', 'App2'
+    end
+  end
+
   context '.matchers' do
     before do
       @route_handler = empty_route_handler

data/spec/lego/controller_spec.rb

@@ -165,13 +165,15 @@ describe Lego::Controller do
     context 'with a route that matches' do
       before do
         @env = ["Environment"]
+        @match_data = [:foo => "bar"]
+        @match_route = [:route => "route"]
         create_new_app("MyApp", Lego::Controller)
-        MyApp::RouteHandler.should_receive(:match_all_routes).with(@env).and_return("route")
+        MyApp::RouteHandler.should_receive(:match_all_routes).with(@env).and_return([@match_route, @env, @match_data])
       end
 
       it 'should create a new instance of ActionContext' do
         mock = mock("ActionContext instance")
-        mock.should_receive(:run).with("route", @env)
+        mock.should_receive(:run).with([@match_route, @env, @match_data])
         MyApp::ActionContext.should_receive(:new).and_return(mock)
       end
 
@@ -181,45 +183,45 @@ describe Lego::Controller do
       end
     end
 
-    context 'with a route that don\'t matches' do
+    context 'without a route match and a not_found route defined' do
       before do
-        @env = ["Environment"]
+        @env = []
+        @block = lambda { "404, gone." } 
         create_new_app("MyApp", Lego::Controller)
         MyApp::RouteHandler.should_receive(:match_all_routes).with(@env).and_return(nil)
+        MyApp::RouteHandler.should_receive('routes').and_return({:not_found => { :action_block => @block }})
       end
 
-      it 'should create a new instance of ActionContext' do
-        MyApp::ActionContext.should_not_receive(:new)
+      it 'should get a valid 404 response with the block data' do
+        MyApp.call(@env).should eql(
+          [404, {'Content-Type' => 'text/html'}, '404, gone.']
+        )
       end
 
       after do
-        MyApp.call(@env).should eql(
-          [404, {'Content-Type' => 'text/html'}, '404 - Not found']
-        )
         rm_const "MyApp"
       end
     end
 
-    context 'without matching route and a :not_found route defined' do
+    context 'with a route that don\'t matches' do
       before do
-        @env = ["Rack Env"]
-        @routes = { :not_found => {}}
+        @env = ["Environment"]
         create_new_app("MyApp", Lego::Controller)
         MyApp::RouteHandler.should_receive(:match_all_routes).with(@env).and_return(nil)
-        MyApp::RouteHandler.should_receive(:routes).and_return( @routes )
       end
 
-      it 'should create a new ActionContext with the :not_found route' do
-        action_context = mock("ActionContext instance")
-        MyApp::ActionContext.should_receive(:new).and_return(action_context)
-        action_context.should_receive(:run).with(@routes[:not_found], @env)
+      it 'should create a new instance of ActionContext' do
+        MyApp::ActionContext.should_not_receive(:new)
       end
 
       after do
-        MyApp.call(@env)
+        MyApp.call(@env).should eql(
+          [404, {'Content-Type' => 'text/html'}, '404 - Not found']
+        )
         rm_const "MyApp"
       end
     end
+
   end
 
   context ".set" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lego-core
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - "Mathias Stjernstr\xC3\xB6m"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-12 00:00:00 +01:00
+date: 2010-01-13 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -28,6 +28,9 @@ files:
 - Rakefile
 - VERSION
 - examples/config.ru
+- examples/sample_with_plugins/config.ru
+- examples/sample_with_plugins/hello.erb
+- examples/sample_with_plugins/lego-modules.rb
 - lego-core.gemspec
 - lib/lego-core.rb
 - lib/lego/controller.rb
@@ -84,3 +87,4 @@ test_files:
 - spec/lego/plugin_spec.rb
 - spec/lego_spec.rb
 - spec/spec_helper.rb
+- examples/sample_with_plugins/lego-modules.rb