deas 0.9.0 → 0.10.0

data/lib/deas/logging.rb

@@ -96,7 +96,7 @@ module Deas
       log SummaryLine.new({
         'method'  => request.request_method,
         'path'    => request.path,
-        'handler' => env['deas.handler_class'],
+        'handler' => env['deas.handler_class_name'],
         'params'  => env['sinatra.params'],
         'time'    => env['deas.time_taken'],
         'status'  => status

data/lib/deas/redirect_handler.rb

@@ -0,0 +1,34 @@
+require 'deas/view_handler'
+
+module Deas
+
+  module RedirectHandler
+
+    def self.new(path = nil, &block)
+      handler_class = Class.new do
+        include Deas::ViewHandler
+        include InstanceMethods
+        extend ClassMethods
+      end
+      handler_class.redirect_path = path ? proc{ path } : block
+      handler_class
+    end
+
+    module InstanceMethods
+
+      def run!
+        path = self.instance_eval(&self.class.redirect_path)
+        redirect path
+      end
+
+    end
+
+    module ClassMethods
+
+      attr_accessor :redirect_path
+
+    end
+
+  end
+
+end

data/lib/deas/route.rb

@@ -5,11 +5,11 @@ module Deas
   class Route
     attr_reader :method, :path, :handler_class_name, :handler_class
 
-    def initialize(method, path, handler_class_name)
+    def initialize(method, path, handler_class_name, handler_class = nil)
       @method = method
       @path   = path
       @handler_class_name = handler_class_name
-      @handler_class      = nil
+      @handler_class      = handler_class
     end
 
     def constantize!
@@ -19,9 +19,9 @@ module Deas
 
     def run(sinatra_call)
       sinatra_call.request.env.tap do |env|
-        env['sinatra.params']     = sinatra_call.params
-        env['deas.handler_class'] = @handler_class
-        env['deas.logging'].call "  Handler: #{env['deas.handler_class']}"
+        env['sinatra.params']          = sinatra_call.params
+        env['deas.handler_class_name'] = @handler_class_name
+        env['deas.logging'].call "  Handler: #{env['deas.handler_class_name']}"
         env['deas.logging'].call "  Params:  #{env['sinatra.params'].inspect}"
       end
       Deas::SinatraRunner.run(@handler_class, sinatra_call)

data/lib/deas/runner.rb

@@ -22,10 +22,6 @@ module Deas
       raise NotImplementedError
     end
 
-    def redirect_to(*args)
-      raise NotImplementedError
-    end
-
   end
 
 end

data/lib/deas/server.rb

@@ -2,6 +2,7 @@ require 'ns-options'
 require 'ns-options/boolean'
 require 'pathname'
 require 'deas/template'
+require 'deas/redirect_handler'
 require 'deas/route'
 require 'deas/sinatra_app'
 
@@ -172,6 +173,14 @@ module Deas::Server
       self.route(:delete, path, handler_class_name)
     end
 
+    def redirect(http_method, path, to_path = nil, &block)
+      name          = 'Deas::RedirectHandler'
+      handler_class = Deas::RedirectHandler.new(to_path, &block)
+      Deas::Route.new(http_method, path, name, handler_class).tap do |route|
+        self.configuration.routes.push(route)
+      end
+    end
+
     def route(http_method, path, handler_class_name)
       if self.view_handler_ns && !(handler_class_name =~ /^::/)
         handler_class_name = "#{self.view_handler_ns}::#{handler_class_name}"

data/lib/deas/sinatra_runner.rb

@@ -34,21 +34,17 @@ module Deas
       @sinatra_call.halt(*args)
     end
 
-    def render(name, options = nil, &block)
+    def render(template_name, options = nil, &block)
       options ||= {}
       options[:locals] = { :view => @handler }.merge(options[:locals] || {})
       options[:layout] ||= @handler_class.layouts
-      Deas::Template.new(@sinatra_call, name, options).render(&block)
+      Deas::Template.new(@sinatra_call, template_name, options).render(&block)
     end
 
     def redirect(*args)
       @sinatra_call.redirect(*args)
     end
 
-    def redirect_to(path, *args)
-      @sinatra_call.redirect(@sinatra_call.to(path), *args)
-    end
-
     private
 
     def run_callbacks(callbacks)

data/lib/deas/test_runner.rb

@@ -32,8 +32,20 @@ module Deas
       throw(:halt, args)
     end
 
-    def render(*args, &block)
-      [ args, block ].compact.flatten
+    def render(template_name, options = nil, &block)
+      RenderArgs.new(template_name, options, block)
+    end
+
+    def redirect(path, *halt_args)
+      RedirectArgs.new(path, halt_args)
+    end
+
+    RenderArgs = Struct.new(:template_name, :options, :block)
+
+    class RedirectArgs < Struct.new(:path, :halt_args)
+      def redirect?
+        true
+      end
     end
 
   end

data/lib/deas/version.rb

@@ -1,3 +1,3 @@
 module Deas
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

data/lib/deas/view_handler.rb

@@ -47,9 +47,8 @@ module Deas
 
     # Helpers
 
-    def halt(*args);        @deas_runner.halt(*args);        end
-    def redirect(*args);    @deas_runner.redirect(*args);    end
-    def redirect_to(*args); @deas_runner.redirect_to(*args); end
+    def halt(*args);     @deas_runner.halt(*args);     end
+    def redirect(*args); @deas_runner.redirect(*args); end
 
     def render(*args, &block)
       @deas_runner.render(*args, &block)

data/test/support/fake_app.rb

@@ -29,10 +29,6 @@ class FakeApp
     end
   end
 
-  def to(relative_path)
-    File.join("http://test.local", relative_path)
-  end
-
   def redirect(*args)
     halt 302, { 'Location' => args[0] }
   end

data/test/support/routes.rb

@@ -25,12 +25,14 @@ class DeasTestServer
   get  '/with_layout',     'WithLayoutHandler'
   get  '/alt_with_layout', 'AlternateWithLayoutHandler'
   get  '/redirect',        'RedirectHandler'
-  get  '/redirect_to',     'RedirectToHandler'
   post '/session',         'SetSessionHandler'
   get  '/session',         'UseSessionHandler'
 
   get '/handler/tests.json', 'HandlerTestsHandler'
 
+  redirect :get, '/route_redirect',   '/somewhere'
+  redirect(:get, '/:prefix/redirect'){ "/#{params['prefix']}/somewhere" }
+
 end
 
 class ShowHandler
@@ -100,21 +102,12 @@ class RedirectHandler
 
 end
 
-class RedirectToHandler
-  include Deas::ViewHandler
-
-  def run!
-    redirect_to '/somewhere'
-  end
-
-end
-
 class SetSessionHandler
   include Deas::ViewHandler
 
   def run!
     session[:secret] = 'session_secret'
-    redirect_to '/session'
+    redirect '/session'
   end
 
 end

data/test/system/rack_tests.rb

@@ -64,12 +64,21 @@ module Deas
 
       assert_equal 302,               last_response.status
       assert_equal expected_location, last_response.headers['Location']
+    end
 
-      get '/redirect_to'
+    should "return a 302 redirect to the expected location " \
+           "when using a route redirect" do
+      get '/route_redirect'
       expected_location = 'http://example.org/somewhere'
 
       assert_equal 302,               last_response.status
       assert_equal expected_location, last_response.headers['Location']
+
+      get '/my_prefix/redirect'
+      expected_location = 'http://example.org/my_prefix/somewhere'
+
+      assert_equal 302,               last_response.status
+      assert_equal expected_location, last_response.headers['Location']
     end
 
   end

data/test/unit/redirect_handler_tests.rb

@@ -0,0 +1,59 @@
+require 'assert'
+require 'deas/redirect_handler'
+require 'deas/test_helpers'
+
+module Deas::RedirectHandler
+
+  class BaseTests < Assert::Context
+    desc "Deas::RedirectHandler"
+    setup do
+      @handler_class = Deas::RedirectHandler.new('/somewhere')
+    end
+    subject{ @handler_class }
+
+    should have_accessors :redirect_path
+
+    should "build a redirect handler class" do
+      subject.included_modules.tap do |modules|
+        assert_includes Deas::ViewHandler, modules
+        assert_includes Deas::RedirectHandler::InstanceMethods, modules
+      end
+
+      assert_instance_of Proc, subject.redirect_path
+      assert_equal '/somewhere', subject.redirect_path.call
+    end
+
+    should "allow passing a block instead of a static path" do
+      path_proc = proc{ '/somewhere' }
+
+      handler_class = Deas::RedirectHandler.new(&path_proc)
+      assert_equal path_proc, handler_class.redirect_path
+    end
+
+  end
+
+  class RunTests < BaseTests
+    include Deas::TestHelpers
+
+    desc "when run"
+
+    should "redirect to the path that it was build with" do
+      render_args = test_runner(@handler_class).run
+      assert_equal true,         render_args.redirect?
+      assert_equal '/somewhere', render_args.path
+    end
+
+    should "redirect to the path returned from instance evaling the proc" do
+      path_proc = proc{ params['redirect_to'] }
+      handler_class = Deas::RedirectHandler.new(&path_proc)
+
+      render_args = test_runner(handler_class, {
+        :params => { 'redirect_to' => '/go_here' }
+      }).run
+      assert_equal true,       render_args.redirect?
+      assert_equal '/go_here', render_args.path
+    end
+
+  end
+
+end

data/test/unit/route_tests.rb

@@ -16,6 +16,13 @@ class Deas::Route
     should have_instance_methods :method, :path, :handler_class_name,
       :handler_class, :run
 
+    should "allow passing a constantized handler when initialized" do
+      route = Deas::Route.new(:get, '/test', 'TestViewHandler', TestViewHandler)
+
+      # handler class is set without calling constantize
+      assert_equal TestViewHandler, route.handler_class
+    end
+
     should "constantize the handler class with #constantize!" do
       assert_nil subject.handler_class
 

data/test/unit/runner_tests.rb

@@ -26,10 +26,6 @@ class Deas::Runner
       assert_raises(NotImplementedError){ subject.redirect }
     end
 
-    should "raise NotImplementedError with #redirect_to" do
-      assert_raises(NotImplementedError){ subject.redirect_to }
-    end
-
   end
 
 end

data/test/unit/server_tests.rb

@@ -125,6 +125,17 @@ module Deas::Server
       assert_equal 'DeleteAsset', route.handler_class_name
     end
 
+    should "add a redirect route using #redirect" do
+      subject.redirect(:get, '/invalid', '/assets')
+
+      route = subject.configuration.routes[0]
+      assert_instance_of Deas::Route, route
+      assert_equal :get,       route.method
+      assert_equal '/invalid', route.path
+      assert_equal 'Deas::RedirectHandler', route.handler_class_name
+      assert_not_nil route.handler_class
+    end
+
     should "allow defining any kind of route using #route" do
       subject.route(:options, '/get_info', 'GetInfo')
 
@@ -152,7 +163,7 @@ module Deas::Server
     end
 
     should "add and query helper modules using #template_helpers and #template_helper?" do
-      subject.template_helpers (helper_module = Module.new)
+      subject.template_helpers(helper_module = Module.new)
       assert subject.template_helper?(helper_module)
     end
 

data/test/unit/sinatra_runner_tests.rb

@@ -14,8 +14,8 @@ class Deas::SinatraRunner
     end
     subject{ @runner }
 
-    should have_instance_methods :run, :request, :response, :params, :logger,
-      :halt, :render, :session, :redirect, :redirect_to
+    should have_imeths :run, :request, :response, :params, :logger, :halt
+    should have_imeths :render, :session, :redirect
 
     should "return the sinatra_call's request with #request" do
       assert_equal @fake_sinatra_call.request, subject.request
@@ -60,13 +60,6 @@ class Deas::SinatraRunner
       assert_equal expected, return_value
     end
 
-    should "call the sinatra_call's redirect and to methods with #redirect_to" do
-      return_value = catch(:halt){ subject.redirect_to('/somewhere') }
-      expected = [ 302, { 'Location' => "http://test.local/somewhere" } ]
-
-      assert_equal expected, return_value
-    end
-
   end
 
   class RunTests < BaseTests

data/test/unit/view_handler_tests.rb

@@ -28,9 +28,9 @@ module Deas::ViewHandler
     end
 
     should "be able to render templates" do
-      return_value = test_runner(RenderViewHandler).run
-      assert_equal "my_template",        return_value[0]
-      assert_equal({ :some => :option }, return_value[1])
+      render_args = test_runner(RenderViewHandler).run
+      assert_equal "my_template",        render_args.template_name
+      assert_equal({ :some => :option }, render_args.options)
     end
 
     should "allow specifying the layouts using #layout or #layouts" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deas
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 55
   prerelease: 
   segments: 
   - 0
-  - 9
+  - 10
   - 0
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,12 +16,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-13 00:00:00 Z
+date: 2013-05-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: ns-options
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -39,12 +38,12 @@ dependencies:
         - 1
         - 4
         version: 1.1.4
+  requirement: *id001
+  name: ns-options
   type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -54,12 +53,12 @@ dependencies:
         - 1
         - 5
         version: "1.5"
+  requirement: *id002
+  name: rack
   type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -69,12 +68,12 @@ dependencies:
         - 1
         - 4
         version: "1.4"
+  requirement: *id003
+  name: sinatra
   type: :runtime
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: assert
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -83,12 +82,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id004
+  name: assert
   type: :development
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: assert-mocha
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -97,12 +96,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id005
+  name: assert-mocha
   type: :development
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: assert-rack-test
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -111,8 +110,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id006
+  name: assert-rack-test
   type: :development
-  version_requirements: *id006
 description: Handler-based web framework powered by Sinatra
 email: 
 - kelly@kellyredding.com
@@ -134,6 +134,7 @@ files:
 - lib/deas/error_handler.rb
 - lib/deas/logging.rb
 - lib/deas/rack_request_fix.rb
+- lib/deas/redirect_handler.rb
 - lib/deas/route.rb
 - lib/deas/runner.rb
 - lib/deas/server.rb
@@ -158,6 +159,7 @@ files:
 - test/system/rack_tests.rb
 - test/unit/error_handler_tests.rb
 - test/unit/logging_tests.rb
+- test/unit/redirect_handler_tests.rb
 - test/unit/route_tests.rb
 - test/unit/runner_tests.rb
 - test/unit/server_tests.rb
@@ -195,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Handler-based web framework powered by Sinatra
@@ -213,6 +215,7 @@ test_files:
 - test/system/rack_tests.rb
 - test/unit/error_handler_tests.rb
 - test/unit/logging_tests.rb
+- test/unit/redirect_handler_tests.rb
 - test/unit/route_tests.rb
 - test/unit/runner_tests.rb
 - test/unit/server_tests.rb