deas-json 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA512: 
-  metadata.gz: ffb78b97d32a51e70c814c6d4ba88679de271f00e93b013284119e3012332748ffc1375d6c9f5b7a6dee8c787ba1ed8e4b3f2b70d63a6f95b631c83d8e81e736
-  data.tar.gz: 697337237b5f8a0df6af90d68f9b2165289b3ae86557bf082b03255009e3258d88c7836ba5bd250ae9f224344bea322d3373fe7e1fe81569fa9bb26329454041
+  metadata.gz: f10592e8ae7579a179ff09c746c33237428123fc3f236d33f4aed052afde257636696eb27a9301d3f85a297a3e3563ce7213b6fa45f0d4aaed107775cf0b2860
+  data.tar.gz: bd4249d3019e86146d10a0e4686b8e67dab7e7f2e7852a8a59c069bcbbbfe91bde051be23569ee8afb26ebde75ae2ccc6a5ac651afc348feedb746e4b82352e8
 SHA1: 
-  metadata.gz: b86dfc65f0df9f644eca7b0cb7aa489922aec73e
-  data.tar.gz: 6e80493cd90b61b8e4b7c733e66cfdc3d5d6ca54
+  metadata.gz: 106b45bc2305eab2e914aa6ba24f7829716f09b8
+  data.tar.gz: 6b37408a031c490bb156b5429b67df18c2730286

data/deas-json.gemspec

@@ -18,9 +18,10 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency("assert", ["~> 2.16.3"])
+  gem.add_development_dependency("assert",           ["~> 2.16.3"])
+  gem.add_development_dependency("assert-rack-test", ["~> 1.0.5"])
 
-  gem.add_dependency("deas",        ["~> 0.43.4"])
+  gem.add_dependency("deas",        ["~> 0.43.5"])
   gem.add_dependency("much-plugin", ["~> 0.2.0"])
 
 end

data/lib/deas-json/version.rb

@@ -1,4 +1,4 @@
 module Deas; end
 module Deas::Json
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/lib/deas-json/view_handler.rb

@@ -6,33 +6,13 @@ module Deas::Json
   module ViewHandler
     include MuchPlugin
 
-    DEF_STATUS  = 200.freeze
-    DEF_HEADERS = {}.freeze
-    DEF_BODY    = '{}'.freeze
-
     plugin_included do
       include Deas::ViewHandler
-      include InstanceMethods
-
-      before_init{ content_type('.json', 'charset' => 'utf-8') }
-    end
 
-    module InstanceMethods
-
-      private
-
-      # 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.
-      # We call the `body` helper method to make sure it adhere's to the Rack spec
-      def halt(*args)
-        super(
-          args.first.instance_of?(::Fixnum) ? args.shift : DEF_STATUS,
-          args.first.kind_of?(::Hash) ? args.shift : DEF_HEADERS,
-          body(!args.first.to_s.empty? ? args.shift : DEF_BODY)
-        )
-      end
+      default_status 200
+      default_body   ['{}']
 
+      before_init{ content_type('.json', 'charset' => 'utf-8') }
     end
 
   end

data/test/system/rack_tests.rb

@@ -0,0 +1,85 @@
+require 'assert'
+require 'deas-json'
+
+require 'assert-rack-test'
+require 'deas'
+
+module Deas::Json
+
+  class RackTestsContext < Assert::Context
+    include Assert::Rack::Test
+
+    def app; @app; end
+  end
+
+  class RackTests < RackTestsContext
+    desc "a Deas server rack app"
+    setup do
+      @status_val = Factory.integer
+      @body_val   = Factory.text
+
+      @app = DeasTestServer.new
+    end
+
+    should "use given status/body values" do
+      get '/test.json', {
+        'status_val' => @status_val,
+        'body_val'   => @body_val
+      }
+
+      assert_equal @status_val, last_response.status
+      assert_equal @body_val,   last_response.body
+    end
+
+    should "default its status and body if not provided" do
+      get '/test.json'
+
+      assert_equal TestJsonHandler.default_status,     last_response.status
+      assert_equal TestJsonHandler.default_body.first, last_response.body
+    end
+
+    should "default its body if not provided" do
+      get '/test.json', {
+        'status_val' => @status_val
+      }
+
+      assert_equal @status_val,                        last_response.status
+      assert_equal TestJsonHandler.default_body.first, last_response.body
+    end
+
+    should "default its status if not provided" do
+      get '/test.json', {
+        'body_val' => @body_val
+      }
+
+      assert_equal TestJsonHandler.default_status, last_response.status
+      assert_equal @body_val,                      last_response.body
+    end
+
+  end
+
+end
+
+class DeasTestServer
+  include Deas::Server
+
+  router do
+    get '/test.json', 'TestJsonHandler'
+  end
+
+end
+
+class TestJsonHandler
+  include Deas::Json::ViewHandler
+
+  attr_accessor :halt_args
+
+  def run!
+    halt *([
+      (params['status_val'].to_i if params['status_val']),
+      params['body_val']
+    ].compact)
+  end
+
+end
+

data/test/unit/view_handler_tests.rb

@@ -20,10 +20,9 @@ module Deas::Json::ViewHandler
       assert_includes Deas::ViewHandler, subject
     end
 
-    should "know its default status, headers and body values" do
-      assert_equal 200,      subject::DEF_STATUS
-      assert_equal Hash.new, subject::DEF_HEADERS
-      assert_equal '{}',     subject::DEF_BODY
+    should "override the default status and body values" do
+      assert_equal 200,    subject.default_status
+      assert_equal ['{}'], subject.default_body
     end
 
   end
@@ -33,10 +32,6 @@ module Deas::Json::ViewHandler
 
     desc "when init"
     setup do
-      @status  = Factory.integer
-      @headers = { Factory.string => Factory.string }
-      @body    = [Factory.text]
-
       @runner  = test_runner(@handler_class)
       @handler = @runner.handler
     end
@@ -48,95 +43,6 @@ module Deas::Json::ViewHandler
       assert_equal exp, subject.content_type_args.params
     end
 
-    should "use all given args" do
-      @handler.halt_args = [@status, @headers, @body]
-      response = @runner.run
-
-      assert_equal @status,  response.status
-      assert_equal @headers, response.headers
-      assert_equal @body,    response.body
-    end
-
-    should "should adhere to the rack spec for its body" do
-      @handler.halt_args = [@status, @headers, @body.first]
-      response = @runner.run
-
-      assert_equal @status,  response.status
-      assert_equal @headers, response.headers
-      assert_equal @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.halt_args = [@status]
-      response = @runner.run
-
-      assert_equal @status,     response.status
-      assert_equal DEF_HEADERS, response.headers
-      assert_equal [DEF_BODY],  response.body
-    end
-
-    should "default its status and body if not provided" do
-      @handler.halt_args = [@headers]
-      response = @runner.run
-
-      assert_equal DEF_STATUS, response.status
-      assert_equal @headers,   response.headers
-      assert_equal [DEF_BODY], response.body
-    end
-
-    should "default its status and headers if not provided" do
-      @handler.halt_args = [@body]
-      response = @runner.run
-
-      assert_equal DEF_STATUS,  response.status
-      assert_equal DEF_HEADERS, response.headers
-      assert_equal @body,       response.body
-    end
-
-    should "default its status if not provided" do
-      @handler.halt_args = [@headers, @body]
-      response = @runner.run
-
-      assert_equal DEF_STATUS, response.status
-      assert_equal @headers,   response.headers
-      assert_equal @body,      response.body
-    end
-
-    should "default its headers if not provided" do
-      @handler.halt_args = [@status, @body]
-      response = @runner.run
-
-      assert_equal @status,     response.status
-      assert_equal DEF_HEADERS, response.headers
-      assert_equal @body,       response.body
-    end
-
-    should "default its body if not provided" do
-      @handler.halt_args = [@status, @headers, [nil, ''].sample]
-      response = @runner.run
-
-      assert_equal @status,    response.status
-      assert_equal @headers,   response.headers
-      assert_equal [DEF_BODY], response.body
-    end
-
-  end
-
-  class TestJsonHandler
-    include Deas::Json::ViewHandler
-
-    attr_accessor :halt_args
-
-    def run!; halt *(@halt_args || []).dup; end
-
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: deas-json
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  version: 0.3.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
@@ -23,25 +23,35 @@ dependencies:
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: deas
+  name: assert-rack-test
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.43.4
-  type: :runtime
+        version: 1.0.5
+  type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: much-plugin
+  name: deas
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.2.0
+        version: 0.43.5
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: much-plugin
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.2.0
+  type: :runtime
+  version_requirements: *id004
 description: JSON helpers for Deas apps
 email: 
 - kelly@kellyredding.com
@@ -64,6 +74,7 @@ files:
 - log/.gitkeep
 - test/helper.rb
 - test/support/factory.rb
+- test/system/rack_tests.rb
 - test/unit/view_handler_tests.rb
 - tmp/.gitkeep
 homepage: http://github.com/redding/deas-json
@@ -78,13 +89,13 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - &id004 
+  - &id005 
     - ">="
     - !ruby/object:Gem::Version 
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - *id004
+  - *id005
 requirements: []
 
 rubyforge_project: 
@@ -95,4 +106,5 @@ summary: JSON helpers for Deas apps
 test_files: 
 - test/helper.rb
 - test/support/factory.rb
+- test/system/rack_tests.rb
 - test/unit/view_handler_tests.rb