rory 0.3.8 → 0.3.9

data/lib/rory/controller.rb

@@ -1,14 +1,29 @@
-require 'erb'
+require_relative 'renderer'
 
 module Rory
   # Interface for Controller class.  Subclass this to create controllers
   # with actions that will be called by the Dispatcher when a route matches.
   class Controller
-    def initialize(request, context = nil)
+    attr_accessor :locals
+
+    def initialize(request, routing, app = nil)
       @request = request
-      @route = request[:route]
+      @dispatcher = routing[:dispatcher]
+      @route = routing[:route]
       @params = request.params
-      @context = context
+      @app = app
+      @locals = {}
+    end
+
+    def expose(hsh)
+      locals.merge!(hsh)
+    end
+
+    def params
+      @converted_params ||= @params.inject({}) { |memo, (key, value)|
+        memo[key.to_sym] = memo[key.to_s] = value
+        memo
+      }
     end
 
     def route_template
@@ -19,33 +34,45 @@ module Rory
       nil
     end
 
-    def render(template, opts = {})
-      opts = { :layout => layout }.merge(opts)
-      file = view_path(template)
-      output = ERB.new(File.read(file)).result(binding)
-      if layout = opts[:layout]
-        output = render(File.join('layouts', layout.to_s), { :layout => false }) { output }
-      end
-      @body = output
+    def default_renderer_options
+      {
+        :layout => layout,
+        :locals => locals,
+        :app => @app,
+        :base_url => @request.script_name
+      }
     end
 
-    def view_path(template)
-      root = @context ? @context.root : Rory.root
-      File.expand_path(File.join('views', "#{template}.html.erb"), root)
+    def render(template_name, opts = {})
+      opts = default_renderer_options.merge(opts)
+      renderer = Rory::Renderer.new(template_name, opts)
+      @body = renderer.render
     end
 
     def redirect(path)
-      @response = @request[:dispatcher].redirect(path)
+      @response = @dispatcher.redirect(path)
     end
 
     def render_not_found
-      @response = @request[:dispatcher].render_not_found
+      @response = @dispatcher.render_not_found
+    end
+
+    # This method is called before the action method.
+    def before_action
+      #noop
+    end
+
+    # This method is called after the action method.
+    def after_action
+      #noop
     end
 
     def present
       # if a method exists on the controller for the requested action, call it.
       action = @route[:action]
+      before_action
       self.send(action) if self.respond_to?(action)
+      after_action
 
       if @response
         # that method may have resulted in a response already being generated

data/lib/rory/dispatcher.rb

@@ -3,13 +3,14 @@ module Rory
   # appropriate controller, after examining the routes.
   class Dispatcher
     attr_reader :request
-    def initialize(rack_request, context = nil)
+    def initialize(rack_request, app = nil)
       @request = rack_request
-      @context = context
+      @routing = {}
+      @app = app
     end
 
     def route
-      @request[:route] ||= get_route
+      @routing[:route] ||= get_route
     end
 
     def dispatch
@@ -45,9 +46,8 @@ module Rory
 
     def controller
       if klass = controller_class
-        request_for_delivery = @request.dup
-        request_for_delivery[:dispatcher] = self
-        klass.new(request_for_delivery, @context)
+        @routing.merge!(:dispatcher => self)
+        klass.new(request, @routing, @app)
       end
     end
 
@@ -77,7 +77,7 @@ module Rory
     end
 
     def route_map
-      @context ? @context.routes : []
+      @app ? @app.routes : []
     end
   end
 end

data/lib/rory/renderer.rb

@@ -0,0 +1,43 @@
+require 'erb'
+require_relative 'renderer/context'
+
+module Rory
+  class Renderer
+    def initialize(template_name, options = {})
+      @template_name = template_name
+      @options = options
+      @app = options[:app]
+    end
+
+    def render(&block)
+      erb = ERB.new(view_template)
+      output = erb.result(view_binding(&block))
+      if layout_path
+        layout_renderer = self.class.new(layout_path, @options.merge(:layout => false))
+        output = layout_renderer.render { output }
+      end
+      output
+    end
+
+    def view_binding
+      render_context = Context.new(@options)
+      render_context.get_binding { |*args|
+        yield(args) if block_given?
+      }
+    end
+
+    def view_template
+      File.read(view_path)
+    end
+
+    def layout_path
+      return nil unless @options[:layout]
+      File.join('layouts', @options[:layout].to_s)
+    end
+
+    def view_path
+      root = @app ? @app.root : Rory.root
+      File.expand_path(File.join('views', "#{@template_name}.html.erb"), root)
+    end
+  end
+end

data/lib/rory/renderer/context.rb

@@ -0,0 +1,25 @@
+module Rory
+  class Renderer
+    class Context
+      attr_reader :base_url
+
+      def initialize(options = {})
+        (options[:locals] || {}).each do |key, value|
+          singleton_class.send(:define_method, key) { value }
+        end
+        @app = options[:app]
+        @base_url = options[:base_url]
+      end
+
+      def get_binding
+        binding
+      end
+
+      def render(template_name, opts = {})
+        opts = { :layout => false, :app => @app }.merge(opts)
+        renderer = Rory::Renderer.new(template_name, opts)
+        renderer.render
+      end
+    end
+  end
+end

data/lib/rory/version.rb

@@ -1,3 +1,3 @@
 module Rory
-  VERSION = '0.3.8'
+  VERSION = '0.3.9'
 end

data/spec/fixture_app/controllers/for_reals_controller.rb

@@ -1,5 +1,6 @@
 class ForRealsController < Rory::Controller
   def srsly
-    @gibbit = @params[:parbles]
+    expose :gibbit => @params[:parbles]
+    expose :but_when => 'again'
   end
 end

data/spec/fixture_app/controllers/goose/lumpies_controller.rb

@@ -1,6 +1,6 @@
 module Goose
   class LumpiesController
-    def initialize(args, context)
+    def initialize(args, routing, context)
       @args = args
     end
 

data/spec/fixture_app/controllers/goose/wombat/rabbits_controller.rb

@@ -1,7 +1,7 @@
 module Goose
   module Wombat
     class RabbitsController
-      def initialize(args, context)
+      def initialize(args, routing, context)
         @args = args
       end
 

data/spec/fixture_app/controllers/stub_controller.rb

@@ -1,5 +1,5 @@
 class StubController
-  def initialize(args, context)
+  def initialize(args, routing, context)
     @args = args
   end
 

data/spec/fixture_app/views/for_reals/but_wait.html.erb

@@ -0,0 +1 @@
+But it's <%= when_is_it %> enough!

data/spec/fixture_app/views/for_reals/srsly.html.erb

@@ -1 +1 @@
-You've done it again, <%= @gibbit %>!
+You've done it <%= but_when %>, <%= gibbit %>!

data/spec/fixture_app/views/test/a_link.html.erb

@@ -0,0 +1 @@
+You came from <%= base_url %>.

data/spec/fixture_app/views/test/double_nested.html.erb

@@ -0,0 +1 @@
+Don't Say <%= render 'test/nested' %>

data/spec/fixture_app/views/test/nested.html.erb

@@ -0,0 +1 @@
+A Bad <%= render 'test/dynamic', :locals => { :word => 'Poop' } %>!

data/spec/{application_spec.rb → lib/rory/application_spec.rb}

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Rory::Application do
   describe ".configure" do
     it 'yields the given block to self' do

data/spec/lib/rory/controller_spec.rb

@@ -0,0 +1,125 @@
+describe Rory::Controller do
+  before :each do
+    @routing = {
+      :route => {
+        :controller => 'test',
+        :action => 'letsgo'
+      }
+    }
+
+    @request = double('Rack::Request', {
+      :params => { 'violet' => 'invisibility', :dash => 'superspeed' },
+      :script_name => 'script_root'
+    })
+  end
+
+  describe '#layout' do
+    it 'defaults to nil' do
+      controller = Rory::Controller.new(@request, @routing)
+      controller.layout.should be_nil
+    end
+  end
+
+  describe '#params' do
+    it 'returns params from request, converted for indifferent key access' do
+      controller = Rory::Controller.new(@request, @routing)
+      expect(controller.params).to eq({
+        'violet' => 'invisibility',
+        'dash' => 'superspeed',
+        :violet => 'invisibility',
+        :dash => 'superspeed'
+      })
+    end
+  end
+
+  describe "#render" do
+    it "returns renderer output" do
+      controller = Rory::Controller.new(@request, @routing)
+      allow(Rory::Renderer).to receive(:new).
+        with('not/real', controller.default_renderer_options).
+        and_return(double('Renderer', :render => 'Here ya go'))
+      controller.render('not/real').should == 'Here ya go'
+    end
+
+    it "passes layout, exposed locals, and app to renderer" do
+      controller = Rory::Controller.new(@request, @routing, :scooby)
+      controller.expose(:a => 1)
+      allow(controller).to receive(:layout).and_return('pretend')
+      renderer_options = {
+        :layout => 'pretend',
+        :locals => { :a => 1 },
+        :app => :scooby,
+        :base_url => 'script_root'
+      }
+      allow(Rory::Renderer).to receive(:new).
+        with('also/fake', renderer_options).
+        and_return(double('Renderer', :render => 'Scamazing!'))
+      controller.render('also/fake').should == 'Scamazing!'
+    end
+  end
+
+  describe "#redirect" do
+    it "delegates to dispatcher from request" do
+      @routing[:dispatcher] = dispatcher = double
+      dispatcher.should_receive(:redirect).with(:whatever)
+      controller = Rory::Controller.new(@request, @routing)
+      controller.redirect(:whatever)
+    end
+  end
+
+  describe "#render_not_found" do
+    it "delegates to dispatcher from request" do
+      @routing[:dispatcher] = dispatcher = double
+      dispatcher.should_receive(:render_not_found)
+      controller = Rory::Controller.new(@request, @routing)
+      controller.render_not_found
+    end
+  end
+
+  describe "#present" do
+    it "calls filters and action from route if exists on controller" do
+      controller = Rory::Controller.new(@request, @routing)
+      expect(controller).to receive('before_action').ordered
+      expect(controller).to receive('letsgo').ordered
+      expect(controller).to receive('after_action').ordered
+      expect(controller).to receive('render').ordered
+      controller.present
+    end
+
+    it "doesn't try to call action from route if nonexistent on controller" do
+      controller = Rory::Controller.new(@request, @routing)
+      allow(controller).to receive(:respond_to?).with('letsgo').and_return(false)
+      expect(controller).to receive('before_action').ordered
+      expect(controller).to receive('letsgo').never
+      expect(controller).to receive('after_action').ordered
+      expect(controller).to receive('render').ordered
+      controller.present
+    end
+
+    it "just returns a response if @response exists" do
+      controller = Rory::Controller.new(@request, @routing)
+      controller.instance_variable_set(:@response, 'Forced response')
+      controller.present.should == 'Forced response'
+    end
+
+    it "renders and returns the default template as a rack response" do
+      controller = Rory::Controller.new(@request, @routing)
+      controller.present.should == [
+        200,
+        {'Content-type' => 'text/html', 'charset' => 'UTF-8'},
+        ["Let's go content"]
+      ]
+    end
+
+    it "returns previously set @body as a rack response" do
+      controller = Rory::Controller.new(@request, @routing)
+      controller.instance_variable_set(:@body, 'Forced body')
+      controller.should_receive(:render).never
+      controller.present.should == [
+        200,
+        {'Content-type' => 'text/html', 'charset' => 'UTF-8'},
+        ["Forced body"]
+      ]
+    end
+  end
+end

data/spec/{dispatcher_spec.rb → lib/rory/dispatcher_spec.rb}

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Rory::Dispatcher do
   describe "#redirect" do
     it "redirects to given path if path has scheme" do
@@ -35,31 +33,29 @@ describe Rory::Dispatcher do
     end
 
     it "instantiates a controller with the parsed request and calls present" do
-      request[:route] = { :controller => 'stub' }
+      allow(dispatcher).to receive(:get_route).and_return({ :controller => 'stub' })
       dispatcher.dispatch.should == {
         :whatever => :yay,
-        :route => request[:route],
-        :dispatcher => dispatcher,
         :present_called => true # see StubController in /spec/fixture_app
       }
     end
 
     it "dispatches properly to a scoped controller" do
-      request[:route] = { :controller => 'lumpies', :module => 'goose' }
+      allow(dispatcher).to receive(:get_route).and_return({
+        :controller => 'lumpies', :module => 'goose'
+      })
       dispatcher.dispatch.should == {
         :whatever => :yay,
-        :route => request[:route],
-        :dispatcher => dispatcher,
         :in_scoped_controller => true # see Goose::LumpiesController in /spec/fixture_app
       }
     end
 
     it "dispatches properly to a nested scoped controller" do
-      request[:route] = { :controller => 'rabbits', :module => 'goose/wombat' }
+      allow(dispatcher).to receive(:get_route).and_return({
+        :controller => 'rabbits', :module => 'goose/wombat'
+      })
       dispatcher.dispatch.should == {
         :whatever => :yay,
-        :route => request[:route],
-        :dispatcher => dispatcher,
         :in_scoped_controller => true # see Goose::Wombat::RabbitsController in /spec/fixture_app
       }
     end
@@ -73,7 +69,7 @@ describe Rory::Dispatcher do
     end
 
     it "returns route from request if already set" do
-      @request[:route] = 'snaky pigeons'
+      @dispatcher.instance_variable_set(:@routing, { :route => 'snaky pigeons' })
       @dispatcher.route.should == 'snaky pigeons'
     end
 

data/spec/lib/rory/renderer_spec.rb

@@ -0,0 +1,47 @@
+describe Rory::Renderer do  
+  describe "#render" do
+    it "returns text of template" do
+      renderer = Rory::Renderer.new('test/static')
+      renderer.render.should == 'Static content'
+    end
+
+    it "returns text of template in given layout" do
+      controller = Rory::Renderer.new('test/static', :layout => 'surround')
+      controller.render.should == 'Surrounding Static content is fun'
+    end
+
+    it "handles symbolized layout name" do
+      controller = Rory::Renderer.new('test/static', :layout => :surround)
+      controller.render.should == 'Surrounding Static content is fun'
+    end
+
+    it "exposes locals to template" do
+      controller = Rory::Renderer.new('test/dynamic', :locals => { :word => 'hockey' })
+      controller.render.should == 'Word: hockey'
+    end
+
+    it "can render nested templates" do
+      controller = Rory::Renderer.new('test/double_nested', :locals => { :word => 'hockey' })
+      controller.render.should == 
+        "Don't Say A Bad Word: Poop!"
+    end
+
+    it "exposes base_url to template" do
+      controller = Rory::Renderer.new('test/a_link', :base_url => 'spoo')
+      controller.render.should == 'You came from spoo.'
+    end
+  end
+
+  describe '#view_path' do
+    it 'returns path to template from app root' do
+      fake_app = double('Application', :root => 'marbles')
+      renderer = Rory::Renderer.new('goose', :app => fake_app)
+      renderer.view_path.should == File.expand_path(File.join('views', 'goose.html.erb'), 'marbles')
+    end
+
+    it 'uses Rory.root if no app specified' do
+      renderer = Rory::Renderer.new('goose')
+      renderer.view_path.should == File.join(Rory.root, 'views', 'goose.html.erb')
+    end
+  end
+end

data/spec/{support_spec.rb → lib/rory/support_spec.rb}

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Rory::Support do
   describe ".camelize" do
     it "camelizes given snake-case string" do

data/spec/{rory_spec.rb → lib/rory_spec.rb}

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Rory do
   describe '.application' do
     it 'is by default set to the Rory::Application instance' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rory
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-01 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -192,6 +192,8 @@ files:
 - lib/rory/application.rb
 - lib/rory/controller.rb
 - lib/rory/dispatcher.rb
+- lib/rory/renderer/context.rb
+- lib/rory/renderer.rb
 - lib/rory/route_mapper.rb
 - lib/rory/support.rb
 - lib/rory/tasks.rb
@@ -199,24 +201,29 @@ files:
 - lib/rory.rb
 - lib/tasks/db.rake
 - lib/tasks/rory.rake
-- spec/application_spec.rb
-- spec/controller_spec.rb
-- spec/dispatcher_spec.rb
 - spec/fixture_app/config/application.rb
 - spec/fixture_app/config/routes.rb
 - spec/fixture_app/controllers/for_reals_controller.rb
 - spec/fixture_app/controllers/goose/lumpies_controller.rb
 - spec/fixture_app/controllers/goose/wombat/rabbits_controller.rb
 - spec/fixture_app/controllers/stub_controller.rb
+- spec/fixture_app/views/for_reals/but_wait.html.erb
 - spec/fixture_app/views/for_reals/srsly.html.erb
 - spec/fixture_app/views/layouts/surround.html.erb
+- spec/fixture_app/views/test/a_link.html.erb
+- spec/fixture_app/views/test/double_nested.html.erb
 - spec/fixture_app/views/test/dynamic.html.erb
 - spec/fixture_app/views/test/letsgo.html.erb
+- spec/fixture_app/views/test/nested.html.erb
 - spec/fixture_app/views/test/static.html.erb
+- spec/lib/rory/application_spec.rb
+- spec/lib/rory/controller_spec.rb
+- spec/lib/rory/dispatcher_spec.rb
+- spec/lib/rory/renderer_spec.rb
+- spec/lib/rory/support_spec.rb
+- spec/lib/rory_spec.rb
 - spec/requests/controller_spec.rb
-- spec/rory_spec.rb
 - spec/spec_helper.rb
-- spec/support_spec.rb
 - LICENSE.txt
 - Rakefile
 - README.rdoc

data/spec/controller_spec.rb

@@ -1,125 +0,0 @@
-require 'spec_helper'
-
-describe Rory::Controller do
-  before :each do
-    @request = {
-      :route => {
-        :controller => 'test',
-        :action => 'letsgo'
-      }
-    }
-
-    @request.stub(:params => {})
-  end
-
-  describe '#layout' do
-    it 'defaults to nil' do
-      controller = Rory::Controller.new(@request)
-      controller.layout.should be_nil
-    end
-  end
-
-  describe "#render" do
-    it "returns text of template" do
-      controller = Rory::Controller.new(@request)
-      controller.render('test/static').should == 'Static content'
-    end
-
-    it "returns text of template in controller's layout" do
-      controller = Rory::Controller.new(@request)
-      controller.stub(:layout => 'surround')
-      controller.render('test/static').should == 'Surrounding Static content is fun'
-    end
-
-    it "handles symbolized layout name" do
-      controller = Rory::Controller.new(@request)
-      controller.stub(:layout => :surround)
-      controller.render('test/static').should == 'Surrounding Static content is fun'
-    end
-
-    it "returns text of template in given layout from options" do
-      controller = Rory::Controller.new(@request)
-      controller.render('test/static', :layout => 'surround').should == 'Surrounding Static content is fun'
-    end
-
-    it "evaluates ERB in controller's context" do
-      controller = Rory::Controller.new(@request)
-      controller.stub(:word).and_return('hockey')
-      controller.render('test/dynamic').should == 'Word: hockey'
-    end
-  end
-
-  describe "#redirect" do
-    it "delegates to dispatcher from request" do
-      @request[:dispatcher] = dispatcher = double
-      dispatcher.should_receive(:redirect).with(:whatever)
-      controller = Rory::Controller.new(@request)
-      controller.redirect(:whatever)
-    end
-  end
-
-  describe "#render_not_found" do
-    it "delegates to dispatcher from request" do
-      @request[:dispatcher] = dispatcher = double
-      dispatcher.should_receive(:render_not_found)
-      controller = Rory::Controller.new(@request)
-      controller.render_not_found
-    end
-  end
-
-  describe "#present" do
-    it "calls action from route if exists on controller" do
-      controller = Rory::Controller.new(@request)
-      controller.stub(:render)
-      controller.should_receive('letsgo')
-      controller.present
-    end
-
-    it "doesn't try to call action from route if nonexistent on controller" do
-      controller = Rory::Controller.new(@request)
-      controller.stub(:render)
-      controller.stub(:respond_to?).with('letsgo').and_return(false)
-      controller.should_receive('letsgo').never
-      controller.present
-    end
-
-    it "just returns a response if @response exists" do
-      controller = Rory::Controller.new(@request)
-      controller.instance_variable_set(:@response, 'Forced response')
-      controller.present.should == 'Forced response'
-    end
-
-    it "renders and returns the default template as a rack response" do
-      controller = Rory::Controller.new(@request)
-      controller.present.should == [
-        200,
-        {'Content-type' => 'text/html', 'charset' => 'UTF-8'},
-        ["Let's go content"]
-      ]
-    end
-
-    it "returns previously set @body as a rack response" do
-      controller = Rory::Controller.new(@request)
-      controller.instance_variable_set(:@body, 'Forced body')
-      controller.should_receive(:render).never
-      controller.present.should == [
-        200,
-        {'Content-type' => 'text/html', 'charset' => 'UTF-8'},
-        ["Forced body"]
-      ]
-    end
-  end
-
-  describe '#view_path' do
-    it 'returns path to template from context root' do
-      fake_context = double('Context', :root => 'marbles')
-      controller = Rory::Controller.new(@request, fake_context)
-      controller.view_path('goose').should == File.expand_path(File.join('views', 'goose.html.erb'), 'marbles')
-    end
-
-    it 'uses Rory.root if no context' do
-      controller = Rory::Controller.new(@request)
-      controller.view_path('goose').should == File.join(Rory.root, 'views', 'goose.html.erb')
-    end
-  end
-end