deas-json 0.2.0 → 0.3.0

data/Gemfile

@@ -3,4 +3,4 @@ source "https://rubygems.org"
 gemspec
 
 gem 'rake', "~> 10.4.0"
-gem 'pry', "~> 0.9.0"
+gem 'pry',  "~> 0.9.0"

data/deas-json.gemspec

@@ -18,8 +18,9 @@ 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.14"])
+  gem.add_development_dependency("assert", ["~> 2.15"])
 
-  gem.add_dependency("deas", ["~> 0.34"])
+  gem.add_dependency("deas",        ["~> 0.39"])
+  gem.add_dependency("much-plugin", ["~> 0.1"])
 
 end

data/lib/deas-json/version.rb

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

data/lib/deas-json/view_handler.rb

@@ -1,40 +1,35 @@
 require 'deas/view_handler'
+require 'much-plugin'
 
 module Deas::Json
 
   module ViewHandler
+    include MuchPlugin
 
-    DEF_STATUS  = nil
+    DEF_STATUS  = 200.freeze
     DEF_HEADERS = {}.freeze
     DEF_BODY    = '{}'.freeze
 
-    def self.included(klass)
-      klass.class_eval do
-        include Deas::ViewHandler
-        include InstanceMethods
-      end
+    plugin_included do
+      include Deas::ViewHandler
+      include InstanceMethods
+
+      before_init{ content_type('.json', 'charset' => 'utf-8') }
     end
 
     module InstanceMethods
 
-      def initialize(*args)
-        super(*args)
-        content_type :json
-      end
-
       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
       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)
+        super(
+          args.first.instance_of?(::Fixnum) ? args.shift : DEF_STATUS,
+          args.first.kind_of?(::Hash) ? args.shift : DEF_HEADERS,
+          args.first.respond_to?(:each) ? args.shift : DEF_BODY
+        )
       end
 
     end

data/test/unit/view_handler_tests.rb

@@ -1,7 +1,6 @@
 require 'assert'
 require 'deas-json/view_handler'
 
-require 'deas/test_helpers'
 require 'deas/view_handler'
 
 module Deas::Json::ViewHandler
@@ -13,12 +12,16 @@ module Deas::Json::ViewHandler
     end
     subject{ @handler_class }
 
+    should "use much-plugin" do
+      assert_includes MuchPlugin, Deas::Json::ViewHandler
+    end
+
     should "be a deas view handler" do
       assert_includes Deas::ViewHandler, subject
     end
 
     should "know its default status, headers and body values" do
-      assert_equal nil,      subject::DEF_STATUS
+      assert_equal 200,      subject::DEF_STATUS
       assert_equal Hash.new, subject::DEF_HEADERS
       assert_equal '{}',     subject::DEF_BODY
     end
@@ -26,28 +29,32 @@ module Deas::Json::ViewHandler
   end
 
   class InitTests < UnitTests
-    include Deas::TestHelpers
+    include Deas::ViewHandler::TestHelpers
 
     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
     subject{ @runner }
 
     should "force its content type to :json" do
-      assert_equal :json, subject.content_type.value
+      assert_equal '.json', subject.content_type_args.extname
+      exp = { 'charset' => 'utf-8' }
+      assert_equal exp, subject.content_type_args.params
     end
 
     should "use all given args" do
-      @handler.status  = Factory.integer
-      @handler.headers = { Factory.string => Factory.string }
-      @handler.body    = Factory.text
+      @handler.halt_args = [@status, @headers, @body]
       response = @runner.run
 
-      assert_equal @handler.status,  response.status
-      assert_equal @handler.headers, response.headers
-      assert_equal @handler.body,    response.body
+      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
@@ -59,60 +66,57 @@ module Deas::Json::ViewHandler
     end
 
     should "default its headers and body if not provided" do
-      @handler.status = Factory.integer
+      @handler.halt_args = [@status]
       response = @runner.run
 
-      assert_equal @handler.status, response.status
-      assert_equal DEF_HEADERS,     response.headers
-      assert_equal DEF_BODY,        response.body
+      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.headers = { Factory.string => Factory.string }
+      @handler.halt_args = [@headers]
       response = @runner.run
 
-      assert_equal DEF_STATUS,       response.status
-      assert_equal @handler.headers, response.headers
-      assert_equal DEF_BODY,         response.body
+      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.body = Factory.text
+      @handler.halt_args = [@body]
       response = @runner.run
 
-      assert_equal DEF_STATUS,    response.status
-      assert_equal DEF_HEADERS,   response.headers
-      assert_equal @handler.body, response.body
+      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.headers = { Factory.string => Factory.string }
-      @handler.body = Factory.text
+      @handler.halt_args = [@headers, @body]
       response = @runner.run
 
-      assert_equal DEF_STATUS,       response.status
-      assert_equal @handler.headers, response.headers
-      assert_equal @handler.body,    response.body
+      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.status = Factory.integer
-      @handler.body = Factory.text
+      @handler.halt_args = [@status, @body]
       response = @runner.run
 
-      assert_equal @handler.status, response.status
-      assert_equal DEF_HEADERS,     response.headers
-      assert_equal @handler.body,   response.body
+      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.status  = Factory.integer
-      @handler.headers = { Factory.string => Factory.string }
+      @handler.halt_args = [@status, @headers]
       response = @runner.run
 
-      assert_equal @handler.status,  response.status
-      assert_equal @handler.headers, response.headers
-      assert_equal DEF_BODY,         response.body
+      assert_equal @status,  response.status
+      assert_equal @headers, response.headers
+      assert_equal DEF_BODY, response.body
     end
 
   end
@@ -120,12 +124,9 @@ module Deas::Json::ViewHandler
   class TestJsonHandler
     include Deas::Json::ViewHandler
 
-    attr_accessor :status, :headers, :body
+    attr_accessor :halt_args
 
-    def run!
-      args = [status, headers, body].compact
-      halt *args
-    end
+    def run!; halt *(@halt_args || []).dup; end
 
   end
 

metadata

@@ -1,55 +1,82 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: deas-json
-version: !ruby/object:Gem::Version
-  version: 0.2.0
+version: !ruby/object:Gem::Version 
+  hash: 19
+  prerelease: 
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
-authors:
+authors: 
 - Kelly Redding
 - Collin Redding
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: assert
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.14'
+
+date: 2015-11-24 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 2
+        - 15
+        version: "2.15"
   type: :development
+  name: assert
+  version_requirements: *id001
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.14'
-- !ruby/object:Gem::Dependency
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 69
+        segments: 
+        - 0
+        - 39
+        version: "0.39"
+  type: :runtime
   name: deas
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.34'
+  version_requirements: *id002
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 1
+        version: "0.1"
   type: :runtime
+  name: much-plugin
+  version_requirements: *id003
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.34'
 description: JSON helpers for Deas apps
-email:
+email: 
 - kelly@kellyredding.com
 - collin.redding@me.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
-- ".gitignore"
+
+files: 
+- .gitignore
 - Gemfile
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
 - deas-json.gemspec
@@ -62,30 +89,39 @@ files:
 - test/unit/view_handler_tests.rb
 - tmp/.gitkeep
 homepage: http://github.com/redding/deas-json
-licenses:
+licenses: 
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 1.8.29
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: JSON helpers for Deas apps
-test_files:
+test_files: 
 - test/helper.rb
 - test/support/factory.rb
 - test/unit/view_handler_tests.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 55107842eeb3637f778f8e16577e0bee2fd0c200
-  data.tar.gz: d49484cda7e61e455a73545c21b3042d058b1215
-SHA512:
-  metadata.gz: 0745d0de048a72bdcd85fb0a0f02116ae461cbe668eda971fe990abcf8ea4e36ffa5891af4979200fa6185c711fa404ba07d9a17be75e974c7db27be3a8ac29a
-  data.tar.gz: f9c60e7d663ae35c2a26ee4763b48687ff89686434db9185f990d940de36b63179b09202ae19e2e05024ab28cfe4aa0a8620e2c1d6e6eab4a8f350a2407a5aae