deas 0.30.0 → 0.31.0

data/lib/deas/deas_runner.rb

@@ -18,22 +18,6 @@ module Deas
       response_data
     end
 
-    def render(template_name, locals = nil)
-      source_render(self.template_source, template_name, locals)
-    end
-
-    def source_render(source, template_name, locals = nil)
-      source.render(template_name, self.handler, locals || {})
-    end
-
-    def partial(template_name, locals = nil)
-      source_partial(self.template_source, template_name, locals)
-    end
-
-    def source_partial(source, template_name, locals = nil)
-      source.partial(template_name, locals || {})
-    end
-
     private
 
     def run_callbacks(callbacks)

data/lib/deas/runner.rb

@@ -35,12 +35,27 @@ module Deas
     def content_type(*args);   raise NotImplementedError; end
     def status(*args);         raise NotImplementedError; end
     def headers(*args);        raise NotImplementedError; end
-    def render(*args);         raise NotImplementedError; end
-    def source_render(*args);  raise NotImplementedError; end
-    def partial(*args);        raise NotImplementedError; end
-    def source_partial(*args); raise NotImplementedError; end
     def send_file(*args);      raise NotImplementedError; end
 
+    # the render methods are used by both the deas and test runners
+    # so we implement here
+
+    def render(template_name, locals = nil)
+      source_render(self.template_source, template_name, locals)
+    end
+
+    def source_render(source, template_name, locals = nil)
+      source.render(template_name, self.handler, locals || {})
+    end
+
+    def partial(template_name, locals = nil)
+      source_partial(self.template_source, template_name, locals)
+    end
+
+    def source_partial(source, template_name, locals = nil)
+      source.partial(template_name, locals || {})
+    end
+
     class NormalizedParams
 
       attr_reader :value

data/lib/deas/test_helpers.rb

@@ -1,16 +1,20 @@
+require 'rack/request'
+require 'rack/response'
 require 'deas/test_runner'
 
 module Deas
 
   module TestHelpers
 
-    module_function
-
-    def test_runner(handler_class, args=nil)
+    def test_runner(handler_class, args = nil)
+      args ||= {}
+      args[:request]  ||= Rack::Request.new({})
+      args[:response] ||= Rack::Response.new
+      args[:session]  ||= args[:request].session
       TestRunner.new(handler_class, args)
     end
 
-    def test_handler(handler_class, args=nil)
+    def test_handler(handler_class, args = nil)
       test_runner(handler_class, args).handler
     end
 

data/lib/deas/test_runner.rb

@@ -75,30 +75,21 @@ module Deas
     end
     HeadersArgs = Struct.new(:value)
 
-    def render(template_name, locals = nil)
-      RenderArgs.new(template_name, locals)
+    def send_file(file_path, options = nil, &block)
+      SendFileArgs.new(file_path, options, block)
     end
-    RenderArgs = Struct.new(:template_name, :locals)
+    SendFileArgs = Struct.new(:file_path, :options, :block)
 
     def source_render(source, template_name, locals = nil)
-      SourceRenderArgs.new(source, template_name, locals)
-    end
-    SourceRenderArgs = Struct.new(:source, :template_name, :locals)
-
-    def partial(template_name, locals = nil)
-      PartialArgs.new(template_name, locals)
+      super # render the markup and discard it
+      RenderArgs.new(source, template_name, locals)
     end
-    PartialArgs = RenderArgs
+    RenderArgs = Struct.new(:source, :template_name, :locals)
 
     def source_partial(source, template_name, locals = nil)
-      SourcePartialArgs.new(source, template_name, locals)
+      super # render the markup and discard it
+      RenderArgs.new(source, template_name, locals)
     end
-    SourcePartialArgs = SourceRenderArgs
-
-    def send_file(file_path, options = nil, &block)
-      SendFileArgs.new(file_path, options, block)
-    end
-    SendFileArgs = Struct.new(:file_path, :options, :block)
 
     class NormalizedParams < Deas::Runner::NormalizedParams
       def file_type?(value)

data/lib/deas/version.rb

@@ -1,3 +1,3 @@
 module Deas
-  VERSION = "0.30.0"
+  VERSION = "0.31.0"
 end

data/test/support/view_handlers.rb

@@ -35,40 +35,6 @@ class DeasRunnerViewHandler
 
 end
 
-class RenderViewHandler
-  include Deas::ViewHandler
-
-  def run!
-    render "my_template", :some => 'local'
-  end
-end
-
-class SourceRenderViewHandler
-  include Deas::ViewHandler
-
-  def run!
-    source = Deas::TemplateSource.new(Factory.path)
-    source_render source, "my_template", :some => 'local'
-  end
-end
-
-class PartialViewHandler
-  include Deas::ViewHandler
-
-  def run!
-    partial "my_partial", :some => 'local'
-  end
-end
-
-class SourcePartialViewHandler
-  include Deas::ViewHandler
-
-  def run!
-    source = Deas::TemplateSource.new(Factory.path)
-    source_partial source, "my_partial", :some => 'local'
-  end
-end
-
 class SendFileViewHandler
   include Deas::ViewHandler
 

data/test/unit/deas_runner_tests.rb

@@ -95,90 +95,4 @@ class Deas::DeasRunner
 
   end
 
-  class RenderSetupTests < InitTests
-    setup do
-      @template_name = Factory.path
-      @locals = { Factory.string => Factory.string }
-    end
-
-  end
-
-  class RenderTests < RenderSetupTests
-    desc "render method"
-    setup do
-      @render_args = nil
-      Assert.stub(@runner.template_source, :render){ |*args| @render_args = args }
-    end
-
-    should "call to its template source render method" do
-      subject.render(@template_name, @locals)
-      exp = [@template_name, subject.handler, @locals]
-      assert_equal exp, @render_args
-
-      subject.render(@template_name)
-      exp = [@template_name, subject.handler, {}]
-      assert_equal exp, @render_args
-    end
-
-  end
-
-  class SourceRenderTests < RenderSetupTests
-    desc "source render method"
-    setup do
-      @source_render_args = nil
-      @source = Deas::TemplateSource.new(Factory.path)
-      Assert.stub(@source, :render){ |*args| @source_render_args = args }
-    end
-
-    should "call to the given source's render method" do
-      subject.source_render(@source, @template_name, @locals)
-      exp = [@template_name, subject.handler, @locals]
-      assert_equal exp, @source_render_args
-
-      subject.source_render(@source, @template_name)
-      exp = [@template_name, subject.handler, {}]
-      assert_equal exp, @source_render_args
-    end
-
-  end
-
-  class PartialTests < RenderSetupTests
-    desc "partial method"
-    setup do
-      @partial_args = nil
-      Assert.stub(@runner.template_source, :partial){ |*args| @partial_args = args }
-    end
-
-    should "call to its template source partial method" do
-      subject.partial(@template_name, @locals)
-      exp = [@template_name, @locals]
-      assert_equal exp, @partial_args
-
-      subject.partial(@template_name)
-      exp = [@template_name, {}]
-      assert_equal exp, @partial_args
-    end
-
-  end
-
-  class SourcePartialTests < RenderSetupTests
-    desc "source partial method"
-    setup do
-      @source_partial_args = nil
-      @source = Deas::TemplateSource.new(Factory.path)
-      Assert.stub(@source, :partial){ |*args| @source_partial_args = args }
-    end
-
-    should "call to the given source's partial method" do
-      subject.source_partial(@source, @template_name, @locals)
-      exp = [@template_name, @locals]
-      assert_equal exp, @source_partial_args
-
-      subject.source_partial(@source, @template_name)
-      exp = [@template_name, {}]
-      assert_equal exp, @source_partial_args
-    end
-
-  end
-
 end

data/test/unit/runner_tests.rb

@@ -45,16 +45,12 @@ class Deas::Runner
       assert_kind_of Deas::NullTemplateSource, subject.template_source
     end
 
-    should "not implement any actions" do
+    should "not implement its non-rendering actions" do
       assert_raises(NotImplementedError){ subject.halt }
       assert_raises(NotImplementedError){ subject.redirect }
       assert_raises(NotImplementedError){ subject.content_type }
       assert_raises(NotImplementedError){ subject.status }
       assert_raises(NotImplementedError){ subject.headers }
-      assert_raises(NotImplementedError){ subject.render }
-      assert_raises(NotImplementedError){ subject.source_render }
-      assert_raises(NotImplementedError){ subject.partial }
-      assert_raises(NotImplementedError){ subject.source_partial }
       assert_raises(NotImplementedError){ subject.send_file }
     end
 
@@ -125,4 +121,90 @@ class Deas::Runner
 
   end
 
+  class RenderSetupTests < InitTests
+    setup do
+      @template_name = Factory.path
+      @locals = { Factory.string => Factory.string }
+    end
+
+  end
+
+  class RenderTests < RenderSetupTests
+    desc "render method"
+    setup do
+      @render_args = nil
+      Assert.stub(@runner.template_source, :render){ |*args| @render_args = args }
+    end
+
+    should "call to its template source render method" do
+      subject.render(@template_name, @locals)
+      exp = [@template_name, subject.handler, @locals]
+      assert_equal exp, @render_args
+
+      subject.render(@template_name)
+      exp = [@template_name, subject.handler, {}]
+      assert_equal exp, @render_args
+    end
+
+  end
+
+  class SourceRenderTests < RenderSetupTests
+    desc "source render method"
+    setup do
+      @source_render_args = nil
+      @source = Deas::TemplateSource.new(Factory.path)
+      Assert.stub(@source, :render){ |*args| @source_render_args = args }
+    end
+
+    should "call to the given source's render method" do
+      subject.source_render(@source, @template_name, @locals)
+      exp = [@template_name, subject.handler, @locals]
+      assert_equal exp, @source_render_args
+
+      subject.source_render(@source, @template_name)
+      exp = [@template_name, subject.handler, {}]
+      assert_equal exp, @source_render_args
+    end
+
+  end
+
+  class PartialTests < RenderSetupTests
+    desc "partial method"
+    setup do
+      @partial_args = nil
+      Assert.stub(@runner.template_source, :partial){ |*args| @partial_args = args }
+    end
+
+    should "call to its template source partial method" do
+      subject.partial(@template_name, @locals)
+      exp = [@template_name, @locals]
+      assert_equal exp, @partial_args
+
+      subject.partial(@template_name)
+      exp = [@template_name, {}]
+      assert_equal exp, @partial_args
+    end
+
+  end
+
+  class SourcePartialTests < RenderSetupTests
+    desc "source partial method"
+    setup do
+      @source_partial_args = nil
+      @source = Deas::TemplateSource.new(Factory.path)
+      Assert.stub(@source, :partial){ |*args| @source_partial_args = args }
+    end
+
+    should "call to the given source's partial method" do
+      subject.source_partial(@source, @template_name, @locals)
+      exp = [@template_name, @locals]
+      assert_equal exp, @source_partial_args
+
+      subject.source_partial(@source, @template_name)
+      exp = [@template_name, {}]
+      assert_equal exp, @source_partial_args
+    end
+
+  end
+
 end

data/test/unit/test_helpers_tests.rb

@@ -0,0 +1,53 @@
+require 'assert'
+require 'deas/test_helpers'
+
+require 'rack/request'
+require 'rack/response'
+require 'deas/view_handler'
+
+module Deas::TestHelpers
+
+  class UnitTests < Assert::Context
+    desc "Deas::TestHelpers"
+    setup do
+      @test_helpers = Deas::TestHelpers
+    end
+    subject{ @test_helpers }
+
+  end
+
+  class MixinTests < UnitTests
+    desc "as a mixin"
+    setup do
+      context_class = Class.new{ include Deas::TestHelpers }
+      @context = context_class.new
+    end
+    subject{ @context }
+
+    should have_imeths :test_runner, :test_handler
+
+  end
+
+  class HandlerTestRunnerTests < MixinTests
+    desc "for handler testing"
+    setup do
+      @handler_class = Class.new{ include Deas::ViewHandler }
+      @runner  = @context.test_runner(@handler_class)
+      @handler = @context.test_handler(@handler_class)
+    end
+
+    should "build a test runner for a given handler" do
+      assert_kind_of ::Deas::TestRunner, @runner
+      assert_kind_of Rack::Request,  @runner.request
+      assert_kind_of Rack::Response, @runner.response
+      assert_equal @runner.request.session, @runner.session
+    end
+
+    should "return an initialized handler instance" do
+      assert_kind_of @handler_class, @handler
+      assert_equal @runner.handler, @handler
+    end
+
+  end
+
+end

data/test/unit/test_runner_tests.rb

@@ -133,71 +133,72 @@ class Deas::TestRunner
       assert_equal exp_val, value.value
     end
 
-    should "build render args if render is called" do
-      template_name = Factory.path
-      locals = { Factory.string => Factory.string }
-      args = subject.render template_name, locals
+    should "build send file args if send file is called" do
+      path = Factory.path
+      args = subject.send_file path
 
-      assert_kind_of RenderArgs, args
-      [:template_name, :locals].each do |meth|
+      assert_kind_of SendFileArgs, args
+      [:file_path, :options, :block].each do |meth|
         assert_respond_to meth, args
       end
-      assert_equal template_name, args.template_name
-      assert_equal locals,        args.locals
+      assert_equal path, args.file_path
     end
 
-    should "build source render args if source source render is called" do
-      source = Deas::TemplateSource.new(Factory.path)
-      template_name = Factory.path
-      locals = { Factory.string => Factory.string }
-      args = subject.source_render source, template_name, locals
+  end
 
-      assert_kind_of SourceRenderArgs, args
-      [:source, :template_name, :locals].each do |meth|
-        assert_respond_to meth, args
-      end
-      assert_equal source,        args.source
-      assert_equal template_name, args.template_name
-      assert_equal locals,        args.locals
+  class RenderSetupTests < InitTests
+    setup do
+      @template_name = Factory.path
+      @locals = { Factory.string => Factory.string }
+      @source = Deas::TemplateSource.new(Factory.path)
     end
 
-    should "build partial args if partial is called" do
-      template_name = Factory.path
-      locals = { Factory.string => Factory.string }
-      args = subject.partial template_name, locals
+  end
 
-      assert_kind_of PartialArgs, args
-      [:template_name, :locals].each do |meth|
-        assert_respond_to meth, args
-      end
-      assert_equal template_name, args.template_name
-      assert_equal locals,        args.locals
+  class SourceRenderTests < RenderSetupTests
+    desc "source render method"
+    setup do
+      @source_render_args = nil
+      Assert.stub(@source, :render){ |*args| @source_render_args = args }
     end
 
-    should "build source partial args if source partial is called" do
-      source = Deas::TemplateSource.new(Factory.path)
-      template_name = Factory.path
-      locals = { Factory.string => Factory.string }
-      args = subject.source_partial source, template_name, locals
+    should "render the template, discard its output and build render args" do
+      args = subject.source_render(@source, @template_name, @locals)
 
-      assert_kind_of SourcePartialArgs, args
+      exp = [@template_name, subject.handler, @locals]
+      assert_equal exp, @source_render_args
+
+      assert_kind_of RenderArgs, args
       [:source, :template_name, :locals].each do |meth|
         assert_respond_to meth, args
       end
-      assert_equal source,        args.source
-      assert_equal template_name, args.template_name
-      assert_equal locals,        args.locals
+      assert_equal @source,        args.source
+      assert_equal @template_name, args.template_name
+      assert_equal @locals,        args.locals
     end
 
-    should "build send file args if send file is called" do
-      path = Factory.path
-      args = subject.send_file path
+  end
 
-      assert_kind_of SendFileArgs, args
-      [:file_path, :options, :block].each do |meth|
+  class SourcePartialTests < RenderSetupTests
+    desc "source partial method"
+    setup do
+      @source_partial_args = nil
+      Assert.stub(@source, :partial){ |*args| @source_partial_args = args }
+    end
+
+    should "render the template, discard its output build render args" do
+      args = subject.source_partial(@source, @template_name, @locals)
+
+      exp = [@template_name, @locals]
+      assert_equal exp, @source_partial_args
+
+      assert_kind_of RenderArgs, args
+      [:source, :template_name, :locals].each do |meth|
         assert_respond_to meth, args
       end
-      assert_equal path, args.file_path
+      assert_equal @source,        args.source
+      assert_equal @template_name, args.template_name
+      assert_equal @locals,        args.locals
     end
 
   end

data/test/unit/view_handler_tests.rb

@@ -37,7 +37,8 @@ module Deas::ViewHandler
   class InitTests < UnitTests
     desc "when init"
     setup do
-      @handler = test_handler(@handler_class)
+      @runner = test_runner(@handler_class)
+      @handler = @runner.handler
     end
     subject{ @handler }
 
@@ -72,36 +73,46 @@ module Deas::ViewHandler
       assert_raises(NotImplementedError){ test_runner(EmptyViewHandler).run }
     end
 
-    should "render templates" do
-      render_args = test_runner(RenderViewHandler).run
-      assert_equal "my_template",      render_args.template_name
-      assert_equal({:some => 'local'}, render_args.locals)
+    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)
     end
 
-    should "render templates on a given source" do
-      render_args = test_runner(SourceRenderViewHandler).run
-      assert_kind_of Deas::TemplateSource, render_args.source
-      assert_equal "my_template",      render_args.template_name
-      assert_equal({:some => 'local'}, render_args.locals)
-    end
+  end
 
-    should "render partial templates" do
-      partial_args = test_runner(PartialViewHandler).run
-      assert_equal "my_partial",       partial_args.template_name
-      assert_equal({:some => 'local'}, partial_args.locals)
+  class RenderTests < RunTests
+    setup do
+      @template_name = Factory.path
+      @locals = { Factory.string => Factory.string }
+      @source = Deas::TemplateSource.new(Factory.path)
+
+      @render_args = nil
+      Assert.stub(@runner.template_source, :render){ |*args| @render_args = args }
+      @source_render_args = nil
+      Assert.stub(@source, :render){ |*args| @source_render_args = args }
+      @partial_args = nil
+      Assert.stub(@runner.template_source, :partial){ |*args| @partial_args = args }
+      @source_partial_args = nil
+      Assert.stub(@source, :partial){ |*args| @source_partial_args = args }
     end
 
-    should "render partial templates on a given source" do
-      partial_args = test_runner(SourcePartialViewHandler).run
-      assert_kind_of Deas::TemplateSource, partial_args.source
-      assert_equal "my_partial",       partial_args.template_name
-      assert_equal({:some => 'local'}, partial_args.locals)
-    end
+    should "render templates" do
+      subject.send(:render, @template_name, @locals)
+      exp = [@template_name, subject, @locals]
+      assert_equal exp, @render_args
 
-    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)
+      subject.send(:source_render, @source, @template_name, @locals)
+      exp = [@template_name, subject, @locals]
+      assert_equal exp, @source_render_args
+
+      subject.send(:partial, @template_name, @locals)
+      exp = [@template_name, @locals]
+      assert_equal exp, @partial_args
+
+      subject.send(:source_partial, @source, @template_name, @locals)
+      exp = [@template_name, @locals]
+      assert_equal exp, @source_partial_args
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deas
 version: !ruby/object:Gem::Version 
-  hash: 103
+  hash: 99
   prerelease: 
   segments: 
   - 0
-  - 30
+  - 31
   - 0
-  version: 0.30.0
+  version: 0.31.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-02-04 00:00:00 Z
+date: 2015-02-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -171,6 +171,7 @@ files:
 - test/unit/sinatra_runner_tests.rb
 - test/unit/template_engine_tests.rb
 - test/unit/template_source_tests.rb
+- test/unit/test_helpers_tests.rb
 - test/unit/test_runner_tests.rb
 - test/unit/url_tests.rb
 - test/unit/view_handler_tests.rb
@@ -238,6 +239,7 @@ test_files:
 - test/unit/sinatra_runner_tests.rb
 - test/unit/template_engine_tests.rb
 - test/unit/template_source_tests.rb
+- test/unit/test_helpers_tests.rb
 - test/unit/test_runner_tests.rb
 - test/unit/url_tests.rb
 - test/unit/view_handler_tests.rb