deas 0.23.4 → 0.24.0

data/lib/deas/runner.rb

@@ -2,7 +2,7 @@ module Deas
 
   class Runner
 
-    attr_reader :app_settings
+    attr_reader :handler_class, :handler
     attr_reader :request, :response, :params, :logger, :session
 
     def initialize(handler_class)
@@ -16,6 +16,7 @@ module Deas
     def status(*args);       raise NotImplementedError; end
     def headers(*args);      raise NotImplementedError; end
     def render(*args);       raise NotImplementedError; end
+    def partial(*args);      raise NotImplementedError; end
     def send_file(*args);    raise NotImplementedError; end
 
   end

data/lib/deas/sinatra_runner.rb

@@ -9,14 +9,18 @@ module Deas
       self.new(*args).run
     end
 
+    attr_reader :app_settings
+
     def initialize(handler_class, sinatra_call)
       @sinatra_call  = sinatra_call
       @app_settings  = @sinatra_call.settings
-      @logger        = @sinatra_call.settings.logger
-      @params        = normalize_params(@sinatra_call.params)
+
       @request       = @sinatra_call.request
       @response      = @sinatra_call.response
+      @params        = normalize_params(@sinatra_call.params)
+      @logger        = @sinatra_call.settings.logger
       @session       = @sinatra_call.session
+
       super(handler_class)
     end
 
@@ -67,6 +71,10 @@ module Deas
       Deas::Template.new(@sinatra_call, template_name, options).render(&block)
     end
 
+    def partial(partial_name, locals = nil)
+      Deas::Template::Partial.new(@sinatra_call, partial_name, locals).render
+    end
+
     def send_file(*args, &block)
       @sinatra_call.send_file(*args, &block)
     end

data/lib/deas/template.rb

@@ -40,7 +40,9 @@ module Deas
     end
 
     class Scope
+
       attr_reader :sinatra_call
+
       def initialize(sinatra_call)
         @sinatra_call = sinatra_call
       end
@@ -71,6 +73,7 @@ module Deas
         self.sinatra_call == other_scope.sinatra_call
         self.class.included_modules == other_scope.class.included_modules
       end
+
     end
 
     class Partial < Template

data/lib/deas/test_runner.rb

@@ -6,15 +6,16 @@ module Deas
 
   class TestRunner < Runner
 
-    attr_reader :handler, :return_value
+    attr_reader :app_settings, :return_value
 
     def initialize(handler_class, args = nil)
       args = (args || {}).dup
       @app_settings = OpenStruct.new(args.delete(:app_settings))
-      @logger       = args.delete(:logger) || Deas::NullLogger.new
-      @params       = normalize_params(args.delete(:params) || {})
+
       @request      = args.delete(:request)
       @response     = args.delete(:response)
+      @params       = normalize_params(args.delete(:params) || {})
+      @logger       = args.delete(:logger) || Deas::NullLogger.new
       @session      = args.delete(:session)
 
       super(handler_class)
@@ -54,31 +55,31 @@ module Deas
     def content_type(value, opts={})
       ContentTypeArgs.new(value, opts)
     end
-
     ContentTypeArgs = Struct.new(:value, :opts)
 
     def status(value)
       StatusArgs.new(value)
     end
-
     StatusArgs = Struct.new(:value)
 
     def headers(value)
       HeadersArgs.new(value)
     end
-
     HeadersArgs = Struct.new(:value)
 
     def render(template_name, options = nil, &block)
       RenderArgs.new(template_name, options, block)
     end
-
     RenderArgs = Struct.new(:template_name, :options, :block)
 
+    def partial(partial_name, locals = nil)
+      PartialArgs.new(partial_name, locals)
+    end
+    PartialArgs = Struct.new(:partial_name, :locals)
+
     def send_file(file_path, options = nil, &block)
       SendFileArgs.new(file_path, options, block)
     end
-
     SendFileArgs = Struct.new(:file_path, :options, :block)
 
     private

data/lib/deas/version.rb

@@ -1,3 +1,3 @@
 module Deas
-  VERSION = "0.23.4"
+  VERSION = "0.24.0"
 end

data/lib/deas/view_handler.rb

@@ -54,6 +54,7 @@ module Deas
     def headers(*args);      @deas_runner.headers(*args);      end
 
     def render(*args, &block);    @deas_runner.render(*args, &block);    end
+    def partial(*args, &block);   @deas_runner.partial(*args, &block);   end
     def send_file(*args, &block); @deas_runner.send_file(*args, &block); end
 
     def app_settings; @deas_runner.app_settings; end

data/test/support/fake_sinatra_call.rb

@@ -9,15 +9,16 @@ class FakeSinatraCall
   attr_accessor :request, :response, :params, :settings, :session, :logger
 
   def initialize(settings={})
-    @request = FakeRequest.new('GET','/something', {}, OpenStruct.new)
-    @params   = @request.params
-    @session  = @request.session
-    @response = FakeResponse.new
-    @logger   = Deas::NullLogger.new
     @settings = OpenStruct.new(settings.merge({
       :deas_template_scope => Deas::Template::Scope,
       :deas_default_charset => 'utf-8'
     }))
+
+    @request = FakeRequest.new('GET','/something', {}, OpenStruct.new)
+    @response = FakeResponse.new
+    @params   = @request.params
+    @logger   = Deas::NullLogger.new
+    @session  = @request.session
   end
 
   def halt(*args)
@@ -33,9 +34,6 @@ class FakeSinatraCall
   def headers(*args);      args; end
 
   # return the template name for each nested calls
-
-  RenderArgs = Struct.new(:template_name, :opts, :block_call_result)
-
   def erb(template_name, opts, &block)
     if block
       RenderArgs.new(template_name, opts, block.call)
@@ -43,6 +41,16 @@ class FakeSinatraCall
       RenderArgs.new(template_name, opts, nil)
     end
   end
+  RenderArgs = Struct.new(:template_name, :opts, :block_call_result)
+
+  def send_file(file_path, opts, &block)
+    if block
+      SendFileArgs.new(file_path, opts, block.call)
+    else
+      SendFileArgs.new(file_path, opts, nil)
+    end
+  end
+  SendFileArgs = Struct.new(:file_path, :options, :block_call_result)
 
 end
 

data/test/support/routes.rb

@@ -37,6 +37,7 @@ class DeasTestServer
   get  '/haml_with_layout',      'HamlWithLayoutHandler'
   get  '/with_haml_layout',      'WithHamlLayoutHandler'
   get  '/haml_with_haml_layout', 'HamlWithHamlLayoutHandler'
+  get  '/partial.html',          'PartialHandler'
 
   get '/handler/tests.json', 'HandlerTestsHandler'
 
@@ -194,6 +195,13 @@ class HamlWithHamlLayoutHandler
 
 end
 
+class PartialHandler
+  include Deas::ViewHandler
+
+  def run!; partial 'info', :info => 'some-info'; end
+
+end
+
 class RedirectHandler
   include Deas::ViewHandler
 

data/test/support/view_handlers.rb

@@ -24,6 +24,14 @@ class RenderViewHandler
   end
 end
 
+class PartialViewHandler
+  include Deas::ViewHandler
+
+  def run!
+    partial "my_partial", :some => 'locals'
+  end
+end
+
 class SendFileViewHandler
   include Deas::ViewHandler
 

data/test/system/rack_tests.rb

@@ -96,6 +96,13 @@ module Deas
       assert_equal expected_body, last_response.body
     end
 
+    should "render partial templates" do
+      get '/partial.html'
+      expected_body = "Stuff: some-info\n"
+      assert_equal 200,           last_response.status
+      assert_equal expected_body, last_response.body
+    end
+
     should "return a 302 redirecting to the expected locations" do
       get '/redirect'
       expected_location = 'http://google.com'

data/test/unit/runner_tests.rb

@@ -1,7 +1,8 @@
 require 'assert'
-require 'test/support/view_handlers'
 require 'deas/runner'
 
+require 'test/support/view_handlers'
+
 class Deas::Runner
 
   class BaseTests < Assert::Context
@@ -11,37 +12,33 @@ class Deas::Runner
     end
     subject{ @runner }
 
-    should have_reader :app_settings
+    should have_readers :handler_class, :handler
     should have_readers :request, :response, :params, :logger, :session
-    should have_imeths :halt, :redirect, :content_type, :status
-    should have_imeths :render, :send_file
+    should have_imeths :halt, :redirect, :content_type, :status, :headers
+    should have_imeths :render, :partial, :send_file
 
-    should "raise NotImplementedError with #send_file" do
-      assert_raises(NotImplementedError){ subject.send_file }
+    should "know its handler and handler class" do
+      assert_equal TestViewHandler, subject.handler_class
+      assert_instance_of subject.handler_class, subject.handler
     end
 
-    should "raise NotImplementedError with #halt" do
-      assert_raises(NotImplementedError){ subject.halt }
+    should "not set any settings" do
+      assert_nil subject.request
+      assert_nil subject.response
+      assert_nil subject.params
+      assert_nil subject.logger
+      assert_nil subject.session
     end
 
-    should "raise NotImplementedError with #redirect" do
+    should "not implement any actions" do
+      assert_raises(NotImplementedError){ subject.halt }
       assert_raises(NotImplementedError){ subject.redirect }
-    end
-
-    should "raise NotImplementedError with #content_type" do
       assert_raises(NotImplementedError){ subject.content_type }
-    end
-
-    should "raise NotImplementedError with #status" do
       assert_raises(NotImplementedError){ subject.status }
-    end
-
-    should "raise NotImplementedError with #headers" do
       assert_raises(NotImplementedError){ subject.headers }
-    end
-
-    should "raise NotImplementedError with #render" do
       assert_raises(NotImplementedError){ subject.render }
+      assert_raises(NotImplementedError){ subject.partial }
+      assert_raises(NotImplementedError){ subject.send_file }
     end
 
   end

data/test/unit/sinatra_runner_tests.rb

@@ -1,8 +1,9 @@
 require 'assert'
+require 'deas/sinatra_runner'
+
 require 'test/support/fake_sinatra_call'
 require 'test/support/view_handlers'
 require 'deas/template'
-require 'deas/sinatra_runner'
 
 class Deas::SinatraRunner
 
@@ -14,35 +15,23 @@ class Deas::SinatraRunner
     end
     subject{ @runner }
 
-    should have_imeths :run, :request, :response, :params, :logger, :session
-    should have_imeths :halt, :redirect, :content_type, :status, :render
+    should have_readers :app_settings
+    should have_imeths :run
 
-    should "return the sinatra_call's request with #request" do
+    should "get its settings from the sinatra call" do
       assert_equal @fake_sinatra_call.request, subject.request
-    end
-
-    should "return the sinatra_call's response with #response" do
       assert_equal @fake_sinatra_call.response, subject.response
-    end
-
-    should "return the sinatra_call's params with #params" do
       assert_equal @fake_sinatra_call.params, subject.params
-    end
-
-    should "return the sinatra_call's session with #session" do
-      assert_equal @fake_sinatra_call.session, subject.session
-    end
-
-    should "return the sinatra_call's settings logger with #logger" do
       assert_equal @fake_sinatra_call.settings.deas_logger, subject.logger
+      assert_equal @fake_sinatra_call.session, subject.session
     end
 
-    should "call the sinatra_call's halt with #halt" do
+    should "call the sinatra_call's halt with" do
       return_value = catch(:halt){ subject.halt('test') }
       assert_equal [ 'test' ], return_value
     end
 
-    should "call the sinatra_call's redirect method with #redirect" do
+    should "call the sinatra_call's redirect method with" do
       return_value = catch(:halt){ subject.redirect('http://google.com') }
       expected = [ 302, { 'Location' => 'http://google.com' } ]
 
@@ -61,7 +50,7 @@ class Deas::SinatraRunner
       assert_equal [422], subject.status(422)
     end
 
-    should "call the sinatra_call's status to set the response status" do
+    should "call the sinatra_call's headers to set the response headers" do
       exp_headers = {
         'a-header' => 'some value',
         'other'    => 'other'
@@ -69,7 +58,7 @@ class Deas::SinatraRunner
       assert_equal [exp_headers], subject.headers(exp_headers)
     end
 
-    should "render the template with a :view local and the handler layouts with #render" do
+    should "render the template with a :view local and the handler layouts" do
       exp_handler = FlagViewHandler.new(subject)
       exp_layouts = FlagViewHandler.layouts
       exp_result = Deas::Template.new(@fake_sinatra_call, 'index', {
@@ -80,6 +69,22 @@ class Deas::SinatraRunner
       assert_equal exp_result, subject.render('index')
     end
 
+    should "render partials with locals" do
+      exp_result = Deas::Template::Partial.new(@fake_sinatra_call, 'info', {
+        :some => 'locals'
+      }).render
+
+      assert_equal exp_result, subject.partial('info', :some => 'locals')
+    end
+
+    should "call the sinatra_call's send_file to set the send files" do
+      block_called = false
+      args = subject.send_file('a/file', {:some => 'opts'}, &proc{ block_called = true })
+      assert_equal 'a/file', args.file_path
+      assert_equal({:some => 'opts'}, args.options)
+      assert_true block_called
+    end
+
   end
 
   class RunTests < UnitTests

data/test/unit/test_runner_tests.rb

@@ -2,6 +2,7 @@ require 'assert'
 require 'deas/test_runner'
 
 require 'rack/test'
+require 'deas/runner'
 require 'test/support/view_handlers'
 
 class Deas::TestRunner
@@ -13,18 +14,22 @@ class Deas::TestRunner
     end
     subject{ @runner }
 
-    should have_readers :handler, :return_value
+    should have_readers :app_settings, :return_value
+    should have_imeths :run
 
-    should "build a handler instance" do
-      assert_kind_of TestRunnerViewHandler, subject.handler
+    should "be a Runner" do
+      assert subject.class < Deas::Runner
     end
 
-    should "default the handler settings" do
+    should "know its app_settings" do
       assert_kind_of OpenStruct, subject.app_settings
-      assert_kind_of Deas::NullLogger, subject.logger
-      assert_equal Hash.new, subject.params
+    end
+
+    should "default its settings" do
       assert_nil subject.request
       assert_nil subject.response
+      assert_equal Hash.new, subject.params
+      assert_kind_of Deas::NullLogger, subject.logger
       assert_nil subject.session
     end
 
@@ -94,6 +99,16 @@ class Deas::TestRunner
       assert_equal 'some/template', value.template_name
     end
 
+    should "build partial args if partial is called" do
+      value = subject.partial 'some/partial', :some => 'locals'
+      assert_kind_of PartialArgs, value
+      [:partial_name, :locals].each do |meth|
+        assert_respond_to meth, value
+      end
+      assert_equal 'some/partial', value.partial_name
+      assert_equal({:some => 'locals'}, value.locals)
+    end
+
     should "build send file args if send file is called" do
       value = subject.send_file 'some/file/path'
       assert_kind_of SendFileArgs, value

data/test/unit/view_handler_tests.rb

@@ -23,17 +23,23 @@ module Deas::ViewHandler
     should have_cmeths :before_run,  :prepend_before_run,  :before_run_callbacks
     should have_cmeths :after_run,   :prepend_after_run,   :after_run_callbacks
 
-    should "raise a NotImplementedError if run! is not overwritten" do
+    should "complain if run! is not overwritten" do
       assert_raises(NotImplementedError){ subject.run! }
     end
 
-    should "be able to render templates" do
+    should "render templates" do
       render_args = test_runner(RenderViewHandler).run
       assert_equal "my_template",        render_args.template_name
       assert_equal({ :some => :option }, render_args.options)
     end
 
-    should "be able to send files" do
+    should "render partial templates" do
+      partial_args = test_runner(PartialViewHandler).run
+      assert_equal "my_partial",        partial_args.partial_name
+      assert_equal({:some => 'locals'}, partial_args.locals)
+    end
+
+    should "send files" do
       send_file_args = test_runner(SendFileViewHandler).run
       assert_equal "my_file.txt",        send_file_args.file_path
       assert_equal({ :some => :option }, send_file_args.options)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deas
 version: !ruby/object:Gem::Version 
-  hash: 75
+  hash: 127
   prerelease: 
   segments: 
   - 0
-  - 23
-  - 4
-  version: 0.23.4
+  - 24
+  - 0
+  version: 0.24.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,11 +16,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-02-20 00:00:00 Z
+date: 2014-06-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -39,11 +37,11 @@ dependencies:
         - 1
         - 4
         version: 1.1.4
-  version_requirements: *id001
+  type: :runtime
   name: ns-options
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id001
   prerelease: false
-  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -54,11 +52,11 @@ dependencies:
         - 1
         - 5
         version: "1.5"
-  version_requirements: *id002
+  type: :runtime
   name: rack
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id002
   prerelease: false
-  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -69,11 +67,11 @@ dependencies:
         - 1
         - 4
         version: "1.4"
-  version_requirements: *id003
+  type: :runtime
   name: sinatra
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id003
   prerelease: false
-  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -84,11 +82,11 @@ dependencies:
         - 2
         - 8
         version: "2.8"
-  version_requirements: *id004
+  type: :development
   name: assert
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id004
   prerelease: false
-  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -98,11 +96,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id005
+  type: :development
   name: assert-mocha
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id005
   prerelease: false
-  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -112,11 +110,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id006
+  type: :development
   name: assert-rack-test
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id006
   prerelease: false
-  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -126,8 +124,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id007
+  type: :development
   name: haml
+  version_requirements: *id007
+  prerelease: false
 description: Handler-based web framework powered by Sinatra
 email: 
 - kelly@kellyredding.com
@@ -234,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Handler-based web framework powered by Sinatra