deas 0.43.4 → 0.43.5

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA512: 
-  metadata.gz: 0408c659dda15d5dabe1982e6a062e9d9021d38cdb5068aeb96cd46298341a740b4c73875c59f7d39a538b93152f92b57fbf87dd2d2476d5091905286301976a
-  data.tar.gz: e6af545cc1ed6365fd6825e6ceb5d2490311ca67a86bdb261e42590d72593e20891fde53ebe7b718ccc4bf1ba5b7997aa60a61dbe92f1c4d810838d7390587f9
+  data.tar.gz: 9e29e2252316b365433cd71f765a48b6166292eccf4687041b8b26c531f35729671a03200427858b2658e085be4eef6f977ab6930c09e60e11e91bd76f949ce4
+  metadata.gz: 3f54a3b2fa607f784af01dd0e0ae399181f627d04f80434cbc19de3f083799b7e5b7868a8a4287e62f259300eebb289d02a029b84d5a9a85599d6318372e6b8e
 SHA1: 
-  metadata.gz: cccc4cbf0e9a8ee8e5cdfbd597bbb3d348d2bbac
-  data.tar.gz: d29bf90d2085ccaca87d0059e78b2a8a658ad287
+  data.tar.gz: dd45e7eb9ef4f0177a34df0f763b3a98b4d2bbbb
+  metadata.gz: b8c0087b1b413fc10120dcc340df5787f5bb6781

data/lib/deas/runner.rb

@@ -10,17 +10,23 @@ module Deas
 
     DEFAULT_MIME_TYPE = 'application/octet-stream'.freeze
     DEFAULT_CHARSET   = 'utf-8'.freeze
-    DEFAULT_STATUS    = 200.freeze
-    DEFAULT_BODY      = [].freeze
+
+    def self.body_value(value)
+      # http://www.rubydoc.info/github/rack/rack/master/file/SPEC#The_Body
+      # "The Body must respond to each and must only yield String values"
+      # String#each is a thing in 1.8.7, so account for it here
+      return nil if value.to_s.empty?
+      !value.respond_to?(:each) || value.kind_of?(String) ? [*value.to_s] : value
+    end
 
     attr_reader :handler_class, :handler
     attr_reader :request, :route_path, :params
     attr_reader :logger, :router, :template_source
 
     def initialize(handler_class, args = nil)
-      @status, @headers, @body = nil, Rack::Utils::HeaderHash.new, nil
-
       @handler_class = handler_class
+      @status, @body = nil, nil
+      @headers = Rack::Utils::HeaderHash.new.merge(@handler_class.default_headers)
       @handler = @handler_class.new(self)
 
       args ||= {}
@@ -41,7 +47,10 @@ module Deas
     end
 
     def to_rack
-      [self.status || DEFAULT_STATUS, self.headers.to_hash, self.body || DEFAULT_BODY]
+      [ self.status || @handler_class.default_status,
+        self.headers.to_hash,
+        self.body   || @handler_class.default_body
+      ]
     end
 
     def status(value = nil)
@@ -56,10 +65,7 @@ module Deas
 
     def body(value = nil)
       if !value.nil?
-        # http://www.rubydoc.info/github/rack/rack/master/file/SPEC#The_Body
-        # "The Body must respond to each and must only yield String values"
-        # String#each is a thing in 1.8.7, so account for it here
-        @body = !value.respond_to?(:each) || value.kind_of?(String) ? [*value.to_s] : value
+        @body = self.class.body_value(value)
       end
       @body
     end
@@ -79,7 +85,7 @@ module Deas
     def halt(*args)
       self.status(args.shift)  if args.first.instance_of?(::Fixnum)
       self.headers(args.shift) if args.first.kind_of?(::Hash)
-      self.body(args.shift)
+      self.body(args.shift)    if !args.first.to_s.empty?
       throw :halt
     end
 

data/lib/deas/version.rb

@@ -1,3 +1,3 @@
 module Deas
-  VERSION = "0.43.4"
+  VERSION = "0.43.5"
 end

data/lib/deas/view_handler.rb

@@ -11,6 +11,10 @@ module Deas
       include InstanceMethods
     end
 
+    DEFAULT_STATUS  = 200.freeze
+    DEFAULT_HEADERS = {}.freeze
+    DEFAULT_BODY    = [''].freeze
+
     module InstanceMethods
 
       def initialize(runner)
@@ -88,6 +92,23 @@ module Deas
 
     module ClassMethods
 
+      def default_status(value = nil)
+        @default_status = value if !value.nil?
+        @default_status || DEFAULT_STATUS
+      end
+
+      def default_headers(value = nil)
+        @default_headers = value if !value.nil? && value.kind_of?(::Hash)
+        @default_headers || DEFAULT_HEADERS
+      end
+
+      def default_body(value = nil)
+        if !value.nil?
+          @default_body = Deas::Runner.body_value(value)
+        end
+        @default_body || DEFAULT_BODY
+      end
+
       def layout(path = nil, &block)
         value = !path.nil? ? Proc.new{ path } : block
         self.layouts.push(value) if value

data/test/unit/runner_tests.rb

@@ -12,11 +12,13 @@ class Deas::Runner
   class UnitTests < Assert::Context
     desc "Deas::Runner"
     setup do
-      @handler_class = EmptyViewHandler
+      @handler_class = Class.new{ include Deas::ViewHandler }
       @runner_class  = Deas::Runner
     end
     subject{ @runner_class }
 
+    should have_imeth :body_value
+
     should "know its default mime type" do
       assert_equal 'application/octet-stream', subject::DEFAULT_MIME_TYPE
     end
@@ -25,12 +27,15 @@ class Deas::Runner
       assert_equal 'utf-8', subject::DEFAULT_CHARSET
     end
 
-    should "know its default status" do
-      assert_equal 200, subject::DEFAULT_STATUS
-    end
+    should "know how to build appropriate body values" do
+      assert_nil subject.body_value([nil, ''].sample)
 
-    should "know its default body" do
-      assert_equal [], subject::DEFAULT_BODY
+      exp = [Factory.string]
+      assert_equal exp, subject.body_value(exp)
+      assert_equal exp, subject.body_value(exp.first)
+
+      exp = [Factory.integer.to_s]
+      assert_equal exp, subject.body_value(exp.first.to_i)
     end
 
   end
@@ -38,6 +43,10 @@ class Deas::Runner
   class InitTests < UnitTests
     desc "when init"
     setup do
+      @handler_class.default_status(Factory.integer)
+      @handler_class.default_headers(Factory.string => Factory.string)
+      @handler_class.default_body(Factory.string)
+
       @request = Factory.request
       @runner  = @runner_class.new(@handler_class, :request => @request)
     end
@@ -151,9 +160,9 @@ class Deas::Runner
 
     should "know its `to_rack` representation" do
       exp = [
-        subject.class::DEFAULT_STATUS,
+        @handler_class.default_status,
         subject.headers.to_hash,
-        subject.class::DEFAULT_BODY
+        @handler_class.default_body
       ]
       assert_equal exp, subject.to_rack
 
@@ -180,32 +189,31 @@ class Deas::Runner
 
     should "know and merge values on its response headers" do
       assert_kind_of Rack::Utils::HeaderHash, subject.headers
-      assert_equal({}, subject.headers)
+      assert_equal @handler_class.default_headers, subject.headers
 
       new_header_values = { Factory.string => Factory.string }
       subject.headers(new_header_values)
       assert_kind_of Rack::Utils::HeaderHash, subject.headers
-      assert_equal new_header_values, subject.headers
+      exp = @handler_class.default_headers.merge(new_header_values)
+      assert_equal exp, subject.headers
 
       location = Factory.string
       subject.headers['Location'] = location
-      exp = new_header_values.merge('Location' => location)
+      exp = @handler_class.default_headers.merge(
+        new_header_values.merge('Location' => location)
+      )
       assert_equal exp, subject.headers
     end
 
     should "know and set its response body" do
       assert_nil subject.body
 
-      exp = [Factory.string]
-      subject.body exp
-      assert_equal exp, subject.body
-
-      subject.body exp.first
-      assert_equal exp, subject.body
+      subject.body(nil)
+      assert_nil subject.body
 
-      exp = [Factory.integer.to_s]
-      subject.body exp.first.to_i
-      assert_equal exp, subject.body
+      value = ['', [Factory.string], Factory.string, Factory.integer].sample
+      exp   = Deas::Runner.body_value(value)
+      assert_equal exp, subject.body(value)
     end
 
     should "know and set its response content type header" do
@@ -263,7 +271,7 @@ class Deas::Runner
 
   end
 
-  class HaltTests < InitTests
+  class HaltTests < UnitTests
     desc "the `halt` method"
     setup do
       @status  = Factory.integer
@@ -297,6 +305,11 @@ class Deas::Runner
       assert_equal @headers, runner.headers
       assert_nil runner.body
 
+      runner = runner_halted_with(@status, @headers, '')
+      assert_equal @status,  runner.status
+      assert_equal @headers, runner.headers
+      assert_nil runner.body
+
       runner = runner_halted_with(@status, @body)
       assert_equal @status, runner.status
       assert_equal({},      runner.headers)
@@ -323,11 +336,15 @@ class Deas::Runner
 
   end
 
-  class HaltCalledWithTests < InitTests
+  class HaltCalledWithTests < UnitTests
     setup do
+      @request = Factory.request
+      @runner  = @runner_class.new(@handler_class, :request => @request)
+
       @halt_called_with = nil
       Assert.stub(@runner, :halt){ |*args| @halt_called_with = args; throw :halt }
     end
+    subject{ @runner }
 
   end
 

data/test/unit/view_handler_tests.rb

@@ -18,6 +18,7 @@ module Deas::ViewHandler
     end
     subject{ @handler_class }
 
+    should have_imeths :default_status, :default_headers, :default_body
     should have_imeths :layout, :layouts
     should have_imeths :before_callbacks, :after_callbacks
     should have_imeths :before_init_callbacks, :after_init_callbacks
@@ -33,6 +34,50 @@ module Deas::ViewHandler
       assert_includes MuchPlugin, Deas::ViewHandler
     end
 
+    should "know its default status" do
+      assert_equal 200, subject::DEFAULT_STATUS
+    end
+
+    should "know its default headers" do
+      assert_equal({}, subject::DEFAULT_HEADERS)
+    end
+
+    should "know its default body" do
+      assert_equal [''], subject::DEFAULT_BODY
+    end
+
+    should "know and set its default status" do
+      assert_equal subject::DEFAULT_STATUS, subject.default_status
+
+      exp = Factory.integer
+      subject.default_status exp
+      assert_equal exp, subject.default_status
+    end
+
+    should "know and merge values on its response headers" do
+      assert_equal subject::DEFAULT_HEADERS, subject.default_headers
+
+      new_header_values = { Factory.string => Factory.string }
+      subject.default_headers(new_header_values)
+      assert_equal new_header_values, subject.default_headers
+
+      location = Factory.string
+      subject.default_headers['Location'] = location
+      exp = new_header_values.merge('Location' => location)
+      assert_equal exp, subject.default_headers
+    end
+
+    should "know and set its response body" do
+      assert_equal subject::DEFAULT_BODY, subject.default_body
+
+      subject.default_body [nil, ''].sample
+      assert_equal subject::DEFAULT_BODY, subject.default_body
+
+      value = [[Factory.string], Factory.string, Factory.integer].sample
+      exp   = Deas::Runner.body_value(value)
+      assert_equal exp, subject.default_body(value)
+    end
+
     should "specify layouts" do
       subject.layout 'layouts/app'
       assert_equal ['layouts/app'], subject.layouts.map(&:call)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: deas
 version: !ruby/object:Gem::Version 
-  version: 0.43.4
+  version: 0.43.5
 platform: ruby
 authors: 
 - Kelly Redding
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2018-04-18 00:00:00 Z
+date: 2018-04-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: assert