faraday_middleware-multi_json 0.0.4 → 0.0.5

data/.travis.yml

@@ -0,0 +1,13 @@
+script: rspec
+
+language: ruby
+
+rvm:
+  - rbx-18mode
+  - rbx-19mode
+  - jruby-18mode
+  - jruby-19mode
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ruby-head

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in faraday_middleware-multi_json.gemspec
 gemspec
+
+gem 'json', :platforms => [:ruby_18, :jruby]
+
+gem 'rake', :group => :test

data/README.md

@@ -1,6 +1,6 @@
 # FaradayMiddleware::MultiJson
 
-A simple Faraday middleware that parses JSON responses with MultiJson for unobtrusiveness.
+Simple Faraday middleware that uses MultiJson to unobtrusively encode JSON requests and parse JSON responses.
 
 ## Installation
 
@@ -20,20 +20,25 @@ Or install it yourself as:
 
 The same as FaradayMiddleware::ParseJson:
 
-```
+```ruby
 require 'faraday_middleware/multi_json'
 
 connection = Faraday.new do |conn|
+  conn.request :multi_json
   conn.response :multi_json
   conn.adapter  Faraday.default_adapter
 end
 
 connection.get('http://example.com/example.json')
+
+resp = connection.post 'http://example.com/example.json' do |req|
+  req.body = {:hello => 'world'}
+end
 ```
 
 ### Passing parser options
 
-```
+```ruby
 conn.response :multi_json, symbolize_keys: true
 ```
 

data/faraday_middleware-multi_json.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = 'faraday_middleware-multi_json'
   gem.require_paths = ['lib']
-  gem.version       = '0.0.4'
+  gem.version       = '0.0.5'
 
   gem.add_dependency 'faraday_middleware'
   gem.add_dependency 'multi_json'

data/lib/faraday_middleware/multi_json.rb

@@ -1,13 +1,29 @@
 require 'faraday_middleware/response_middleware'
+require 'faraday_middleware/request/encode_json'
 
 module FaradayMiddleware
-  class MultiJson < ResponseMiddleware
-    dependency 'multi_json'
+  module MultiJson
+    class ParseJson < FaradayMiddleware::ResponseMiddleware
+      dependency 'multi_json'
 
-    def parse(body)
-      ::MultiJson.load(body, @options) unless body.strip.empty?
+      def parse(body)
+        ::MultiJson.load(body, @options) rescue body
+      end
+    end
+
+    class EncodeJson < FaradayMiddleware::EncodeJson
+      dependency 'multi_json'
+
+      def initialize(app, *)
+        super(app)
+      end
+
+      def encode(data)
+        ::MultiJson.dump data
+      end
     end
   end
 end
 
-Faraday.register_middleware :response, :multi_json => FaradayMiddleware::MultiJson
+Faraday.register_middleware :response, :multi_json => FaradayMiddleware::MultiJson::ParseJson
+Faraday.register_middleware :request, :multi_json => FaradayMiddleware::MultiJson::EncodeJson

data/spec/faraday_middleware/multi_json_spec.rb

@@ -1,7 +1,8 @@
 require 'spec_helper'
 
-describe FaradayMiddleware::MultiJson do
-  let(:json) { ::MultiJson.dump(a:1, b:2) }
+describe FaradayMiddleware::MultiJson::ParseJson do
+  let(:response) { {:a => 1, :b => 2} }
+  let(:json) { ::MultiJson.dump(response) }
 
   def connection(options={})
     Faraday.new do |builder|
@@ -19,6 +20,27 @@ describe FaradayMiddleware::MultiJson do
   end
 
   it 'should delegate options given by builder' do
-    connection(symbolize_keys: true).get('/').body.should == {a:1, b:2}
+    connection(:symbolize_keys => true).get('/').body.should == response
+  end
+end
+
+describe FaradayMiddleware::MultiJson::EncodeJson do
+  let(:request) { {:a => 1, :b => 2} }
+  let(:json) { ::MultiJson.dump(request) }
+
+  def connection
+    Faraday.new do |builder|
+      builder.request :multi_json
+      builder.adapter :test do |stub|
+        stub.post('/update', json) do
+          [200, {}, json]
+        end
+      end
+    end
+  end
+
+  it 'should parse the request body' do
+    resp = connection.post('/update', request)
+    resp.body.should == json
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faraday_middleware-multi_json
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-22 00:00:00.000000000 Z
+date: 2012-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
@@ -68,7 +68,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
-- .rvmrc
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md

data/.rvmrc

@@ -1 +0,0 @@
-rvm use --create ruby-1.9.3-p194@faraday_middleware-multi_json