deas-json 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61ae5145b44df2f3936dcf70381fe6385a4ee5df
-  data.tar.gz: 1490ab77c5cafdc5f38c1f40cc11700b7c78e2ad
+  metadata.gz: 55107842eeb3637f778f8e16577e0bee2fd0c200
+  data.tar.gz: d49484cda7e61e455a73545c21b3042d058b1215
 SHA512:
-  metadata.gz: df4da1f716409cb2ed13c095d088c0de7f080da51b2ae29d4a368ce705fa9f3e75c15bd3c02bffc557f88525d5fa67361e7ca44206f214b0469e712c7c0e859e
-  data.tar.gz: 5462a69cfbbf3e42d502b6655b5665dc0b51ca5e74b033e3936cd97e5d26981280a242a5cc267cc8bff1d3737c2d62371a1d5fa84ed8d479215b187daa68d8a4
+  metadata.gz: 0745d0de048a72bdcd85fb0a0f02116ae461cbe668eda971fe990abcf8ea4e36ffa5891af4979200fa6185c711fa404ba07d9a17be75e974c7db27be3a8ac29a
+  data.tar.gz: f9c60e7d663ae35c2a26ee4763b48687ff89686434db9185f990d940de36b63179b09202ae19e2e05024ab28cfe4aa0a8620e2c1d6e6eab4a8f350a2407a5aae

data/lib/deas-json/version.rb

@@ -1,4 +1,4 @@
 module Deas; end
 module Deas::Json
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/deas-json/view_handler.rb

@@ -4,6 +4,10 @@ module Deas::Json
 
   module ViewHandler
 
+    DEF_STATUS  = nil
+    DEF_HEADERS = {}.freeze
+    DEF_BODY    = '{}'.freeze
+
     def self.included(klass)
       klass.class_eval do
         include Deas::ViewHandler
@@ -23,7 +27,13 @@ module Deas::Json
       # Some http clients will error when trying to parse an empty body when the
       # content type is 'json'.  This will default the body to a string that
       # can be parsed to an empty json object
-      def halt(status, headers = {}, body = '{}')
+      def halt(*args)
+        super(DEF_STATUS, DEF_HEADERS, DEF_BODY) if args.empty?
+        body, headers, status = [
+          !args.last.kind_of?(::Hash) && !args.last.kind_of?(::Integer) ? args.pop : DEF_BODY,
+          args.last.kind_of?(::Hash) ? args.pop : DEF_HEADERS,
+          args.first.kind_of?(::Integer) ? args.first : DEF_STATUS
+        ]
         super(status, headers, body)
       end
 

data/test/unit/view_handler_tests.rb

@@ -17,6 +17,12 @@ module Deas::Json::ViewHandler
       assert_includes Deas::ViewHandler, subject
     end
 
+    should "know its default status, headers and body values" do
+      assert_equal nil,      subject::DEF_STATUS
+      assert_equal Hash.new, subject::DEF_HEADERS
+      assert_equal '{}',     subject::DEF_BODY
+    end
+
   end
 
   class InitTests < UnitTests
@@ -33,24 +39,80 @@ module Deas::Json::ViewHandler
       assert_equal :json, subject.content_type.value
     end
 
-    should "default its body and headers if not provided" do
+    should "use all given args" do
+      @handler.status  = Factory.integer
+      @handler.headers = { Factory.string => Factory.string }
+      @handler.body    = Factory.text
+      response = @runner.run
+
+      assert_equal @handler.status,  response.status
+      assert_equal @handler.headers, response.headers
+      assert_equal @handler.body,    response.body
+    end
+
+    should "default its status, headers and body if not provided" do
+      response = @runner.run
+
+      assert_equal DEF_STATUS,  response.status
+      assert_equal DEF_HEADERS, response.headers
+      assert_equal DEF_BODY,    response.body
+    end
+
+    should "default its headers and body if not provided" do
       @handler.status = Factory.integer
       response = @runner.run
 
       assert_equal @handler.status, response.status
-      assert_equal({},              response.headers)
-      assert_equal '{}',            response.body
+      assert_equal DEF_HEADERS,     response.headers
+      assert_equal DEF_BODY,        response.body
     end
 
-    should "allow halting with a body and headers" do
+    should "default its status and body if not provided" do
+      @handler.headers = { Factory.string => Factory.string }
+      response = @runner.run
+
+      assert_equal DEF_STATUS,       response.status
+      assert_equal @handler.headers, response.headers
+      assert_equal DEF_BODY,         response.body
+    end
+
+    should "default its status and headers if not provided" do
+      @handler.body = Factory.text
+      response = @runner.run
+
+      assert_equal DEF_STATUS,    response.status
+      assert_equal DEF_HEADERS,   response.headers
+      assert_equal @handler.body, response.body
+    end
+
+    should "default its status if not provided" do
+      @handler.headers = { Factory.string => Factory.string }
+      @handler.body = Factory.text
+      response = @runner.run
+
+      assert_equal DEF_STATUS,       response.status
+      assert_equal @handler.headers, response.headers
+      assert_equal @handler.body,    response.body
+    end
+
+    should "default its headers if not provided" do
+      @handler.status = Factory.integer
+      @handler.body = Factory.text
+      response = @runner.run
+
+      assert_equal @handler.status, response.status
+      assert_equal DEF_HEADERS,     response.headers
+      assert_equal @handler.body,   response.body
+    end
+
+    should "default its body if not provided" do
       @handler.status  = Factory.integer
       @handler.headers = { Factory.string => Factory.string }
-      @handler.body    = Factory.text
       response = @runner.run
 
       assert_equal @handler.status,  response.status
       assert_equal @handler.headers, response.headers
-      assert_equal @handler.body,    response.body
+      assert_equal DEF_BODY,         response.body
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deas-json
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Kelly Redding
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-07 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: assert