faraday_middleware 0.3.2 → 0.6.0

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--format=nested
+--backtrace

data/LICENSE.md

@@ -0,0 +1,20 @@
+Copyright (c) 2011 Erik Michaels-Ober, Wynn Netherland, et al.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,14 +1,8 @@
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
-require 'rake'
-require 'rake/testtask'
 require 'bundler'
-
 Bundler::GemHelper.install_tasks
 
-Rake::TestTask.new(:test) do |test|
-  test.ruby_opts = ["-rubygems"] if defined? Gem
-  test.libs << "lib" << "test"
-  test.pattern = "test/**/*_test.rb"
-end
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
 
-task :default => :test
+task :test => :spec
+task :default => :spec

data/faraday_middleware.gemspec

@@ -1,29 +1,36 @@
 require File.expand_path('../lib/faraday_middleware/version', __FILE__)
 
 Gem::Specification.new do |s|
-  s.add_development_dependency('hashie', '~> 1.0')
-  s.add_development_dependency('json', '~> 1.4')
-  s.add_development_dependency('multi_json', '~> 0.0')
-  s.add_development_dependency('multi_xml', '~> 0.2')
-  s.add_development_dependency('oauth2', '~> 0.1')
-  s.add_development_dependency('rake', '~> 0.8')
-  s.add_development_dependency('shoulda', '~> 2.11')
-  s.add_development_dependency('simplecov', '~> 0.3')
-  s.add_development_dependency('test-unit', '~> 2.1')
-  s.add_runtime_dependency('faraday', '~> 0.5.4')
-  s.authors = ["Wynn Netherland"]
-  s.description = %q{Various middleware for Faraday}
-  s.email = ['wynn.netherland@gmail.com']
-  s.executables = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f)}
-  s.extra_rdoc_files = ["README.md"]
-  s.files = `git ls-files`.split("\n")
-  s.homepage = 'http://wynnnetherland.com/projects/faraday-middleware/'
   s.name = 'faraday_middleware'
+  s.summary = %q{Various middleware for Faraday}
+  s.description = s.summary
+
+  s.homepage = 'http://wynnnetherland.com/projects/faraday-middleware/'
+
+  s.authors = ["Erik Michaels-Ober", "Wynn Netherland"]
+  s.email   = ['sferik@gmail.com', 'wynn.netherland@gmail.com']
+
+  s.version  = FaradayMiddleware::VERSION
   s.platform = Gem::Platform::RUBY
-  s.rdoc_options = ['--charset=UTF-8']
+
   s.require_paths = ['lib']
+  s.files = `git ls-files`.split("\n")
+  s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+
+  s.extra_rdoc_files = ["README.md"]
+  s.rdoc_options = ['--charset=UTF-8']
+
   s.required_rubygems_version = Gem::Requirement.new('>= 1.3.6') if s.respond_to? :required_rubygems_version=
-  s.summary = s.description
-  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.version = FaradayMiddleware::VERSION
+
+  s.add_runtime_dependency('faraday', '~> 0.6.0')
+  s.add_development_dependency('rake', '~> 0.8')
+  s.add_development_dependency('rspec', '~> 2.5')
+  s.add_development_dependency('simplecov', '~> 0.4')
+  s.add_development_dependency('hashie', '~> 1.0')
+  s.add_development_dependency('json_pure', '~> 1.5')
+  s.add_development_dependency('multi_json', '~> 0.0')
+  s.add_development_dependency('multi_xml', '~> 0.2')
+  s.add_development_dependency('oauth2', '~> 0.2')
+  s.add_development_dependency('simple_oauth', '~> 0.1')
 end

data/lib/faraday/request/oauth.rb

@@ -0,0 +1,23 @@
+require 'faraday'
+
+module Faraday
+  class Request::OAuth < Faraday::Middleware
+    dependency 'simple_oauth'
+
+    def call(env)
+      params = env[:body].is_a?(Hash) ? env[:body] : {}
+
+      signature_params = params.reject{ |k,v| v.respond_to?(:content_type) }
+
+      header = SimpleOAuth::Header.new(env[:method], env[:url], signature_params, @options)
+
+      env[:request_headers]['Authorization'] = header.to_s
+
+      @app.call(env)
+    end
+
+    def initialize(app, options)
+      @app, @options = app, options
+    end
+  end
+end

data/lib/faraday/{oauth2.rb → request/oauth2.rb}

@@ -2,16 +2,16 @@ require 'faraday'
 
 module Faraday
   class Request::OAuth2 < Faraday::Middleware
-    begin
-      require 'oauth2'
-    rescue LoadError, NameError => error
-      self.load_error = error
-    end
+    dependency 'oauth2'
 
     def call(env)
       params = env[:url].query_values || {}
-      env[:url].query_values = params.merge('access_token' => @token)
-      env[:request_headers].merge!('Authorization' => "Token token=\"#{@token}\"")
+
+      env[:url].query_values = { 'access_token' => @token }.merge(params)
+
+      token = env[:url].query_values['access_token']
+
+      env[:request_headers].merge!('Authorization' => "Token token=\"#{token}\"")
 
       @app.call env
     end

data/lib/faraday/response/mashify.rb

@@ -0,0 +1,24 @@
+require 'faraday'
+
+module Faraday
+  class Response::Mashify < Response::Middleware
+    dependency 'faraday_middleware/support/rash'
+
+    class << self
+      attr_accessor :mash_class
+    end
+
+    self.mash_class = ::Hashie::Rash
+
+    def parse(body)
+      case body
+      when Hash
+        self.class.mash_class.new(body)
+      when Array
+        body.map { |item| item.is_a?(Hash) ? self.class.mash_class.new(item) : item }
+      else
+        body
+      end
+    end
+  end
+end

data/lib/faraday/response/parse_json.rb

@@ -0,0 +1,20 @@
+require 'faraday'
+
+module Faraday
+  class Response::ParseJson < Response::Middleware
+    dependency 'multi_json'
+
+    def parse(body)
+      case body
+      when ''
+        nil
+      when 'true'
+        true
+      when 'false'
+        false
+      else
+        ::MultiJson.decode(body)
+      end
+    end
+  end
+end

data/lib/faraday/response/parse_xml.rb

@@ -0,0 +1,11 @@
+require 'faraday'
+
+module Faraday
+  class Response::ParseXml < Response::Middleware
+    dependency 'multi_xml'
+
+    def parse(body)
+      ::MultiXml.parse(body)
+    end
+  end
+end

data/lib/faraday_middleware.rb

@@ -1,4 +1,12 @@
-faraday_middleware_files = Dir[File.join(File.dirname(__FILE__), "/faraday/**/*.rb")].sort
-faraday_middleware_files.each do |file|
-  require file
+require 'faraday'
+
+class Faraday::Request
+  autoload :OAuth,  'faraday/request/oauth'
+  autoload :OAuth2, 'faraday/request/oauth2'
+end
+
+class Faraday::Response
+  autoload :Mashify,   'faraday/response/mashify'
+  autoload :ParseJson, 'faraday/response/parse_json'
+  autoload :ParseXml,  'faraday/response/parse_xml'
 end

data/lib/faraday_middleware/support/rash.rb

@@ -0,0 +1,26 @@
+require 'hashie/mash'
+
+module Hashie
+  class Rash < Mash
+
+    protected
+
+    def convert_key(key) #:nodoc:
+      underscore_string(key.to_s)
+    end
+
+    # converts a camel_cased string to a underscore string
+    # subs spaces with underscores, strips whitespace
+    # Same way ActiveSupport does string.underscore
+    def underscore_string(str)
+      str.to_s.strip.
+        gsub(' ', '_').
+        gsub(/::/, '/').
+        gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+        gsub(/([a-z\d])([A-Z])/,'\1_\2').
+        tr("-", "_").
+        downcase
+    end
+
+  end
+end

data/lib/faraday_middleware/version.rb

@@ -1,3 +1,3 @@
 module FaradayMiddleware
-  VERSION = "0.3.2"
+  VERSION = "0.6.0"
 end

data/spec/helper.rb

@@ -0,0 +1,25 @@
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'although not required, its recommended you use bundler when running the tests'
+end
+
+require 'simplecov'
+SimpleCov.start
+
+require 'rspec'
+
+require 'faraday_middleware'
+
+
+class DummyApp
+  attr_accessor :env
+
+  def call(env)
+    @env = env
+  end
+
+  def reset
+    @env = nil
+  end
+end

data/spec/mashify_spec.rb

@@ -0,0 +1,85 @@
+require 'helper'
+
+describe Faraday::Response::Mashify do
+  context 'during configuration' do
+    it 'should allow for a custom Mash class to be set' do
+      Faraday::Response::Mashify.should respond_to(:mash_class)
+      Faraday::Response::Mashify.should respond_to(:mash_class=)
+    end
+  end
+
+  context 'when used' do
+    before(:each) { Faraday::Response::Mashify.mash_class = ::Hashie::Rash }
+    let(:mashify) { Faraday::Response::Mashify.new }
+
+    it 'should create a Hashie::Rash from the body' do
+      env = { :body => { "name" => "Erik Michaels-Ober", "username" => "sferik" } }
+      me  = mashify.on_complete(env)
+      me.class.should == Hashie::Rash
+    end
+
+    it 'should handle strings' do
+      env = { :body => "Most amazing string EVER" }
+      me  = mashify.on_complete(env)
+      me.should == "Most amazing string EVER"
+    end
+
+    it 'should handle hashes and decamelcase the keys' do
+      env = { :body => { "name" => "Erik Michaels-Ober", "userName" => "sferik" } }
+      me  = mashify.on_complete(env)
+      me.name.should == 'Erik Michaels-Ober'
+      me.user_name.should == 'sferik'
+    end
+
+    it 'should handle arrays' do
+      env = { :body => [123, 456] }
+      values = mashify.on_complete(env)
+      values.first.should == 123
+      values.last.should == 456
+    end
+
+    it 'should handle arrays of hashes' do
+      env = { :body => [{ "username" => "sferik" }, { "username" => "pengwynn" }] }
+      us  = mashify.on_complete(env)
+      us.first.username.should == 'sferik'
+      us.last.username.should == 'pengwynn'
+    end
+
+    it 'should handle mixed arrays' do
+      env = { :body => [123, { "username" => "sferik" }, 456] }
+      values = mashify.on_complete(env)
+      values.first.should == 123
+      values.last.should == 456
+      values[1].username.should == 'sferik'
+    end
+
+    it 'should allow for use of custom Mash subclasses' do
+      class MyMash < ::Hashie::Mash; end
+      Faraday::Response::Mashify.mash_class = MyMash
+
+      env = { :body => { "name" => "Erik Michaels-Ober", "username" => "sferik" } }
+      me  = mashify.on_complete(env)
+
+      me.class.should == MyMash
+    end
+  end
+
+  context 'integration test' do
+    let(:stubs) { Faraday::Adapter::Test::Stubs.new }
+    let(:connection) do
+      Faraday::Connection.new do |builder|
+        builder.adapter :test, stubs
+        builder.use Faraday::Response::Mashify
+      end
+    end
+
+    # although it is not good practice to pass a hash as the body, if we add ParseJson
+    # to the middleware stack we end up testing two middlewares instead of one
+    it 'should create a Hash from the body' do
+      stubs.get('/hash') {[200, {'content-type' => 'application/json; charset=utf-8'}, { "name" => "Erik Michaels-Ober", "username" => "sferik" }]}
+      me = connection.get('/hash').body
+      me.name.should == 'Erik Michaels-Ober'
+      me.username.should == 'sferik'
+    end
+  end
+end

data/spec/oauth2_spec.rb

@@ -0,0 +1,50 @@
+require 'helper'
+
+describe Faraday::Request::OAuth2 do
+
+  context 'when used with a access token in the initializer' do
+    let(:oauth2) { Faraday::Request::OAuth2.new(DummyApp.new, '1234') }
+
+    it 'should add the access token to the request' do
+      env = {
+        :request_headers => {},
+        :url => Addressable::URI.parse('http://www.github.com')
+      }
+
+      request = oauth2.call(env)
+      request[:request_headers]["Authorization"].should == "Token token=\"1234\""
+      request[:url].query_values["access_token"].should == "1234"
+    end
+  end
+
+  context 'when used with a access token in the query_values' do
+    let(:oauth2) { Faraday::Request::OAuth2.new(DummyApp.new) }
+
+    it 'should add the access token to the request' do
+      env = {
+        :request_headers => {},
+        :url => Addressable::URI.parse('http://www.github.com/?access_token=1234')
+      }
+
+      request = oauth2.call(env)
+      request[:request_headers]["Authorization"].should == "Token token=\"1234\""
+      request[:url].query_values["access_token"].should == "1234"
+    end
+  end
+
+  context 'integration test' do
+    let(:stubs) { Faraday::Adapter::Test::Stubs.new }
+    let(:connection) do
+      Faraday::Connection.new do |builder|
+        builder.use Faraday::Request::OAuth2, '1234'
+        builder.adapter :test, stubs
+      end
+    end
+
+    it 'should add the access token to the query string' do
+      stubs.get('/me?access_token=1234') {[200, {}, 'sferik']}
+      me = connection.get('/me')
+      me.body.should == 'sferik'
+    end
+  end
+end

data/spec/oauth_spec.rb

@@ -0,0 +1,46 @@
+require 'helper'
+
+describe Faraday::Request::OAuth do
+  OAUTH_HEADER_REGEX = /^OAuth oauth_consumer_key=\"\d{4}\", oauth_nonce=\".+\", oauth_signature=\".+\", oauth_signature_method=\"HMAC-SHA1\", oauth_timestamp=\"\d{10}\", oauth_token=\"\d{4}\", oauth_version=\"1\.0\"/
+
+  let(:config) do
+    {
+      :consumer_key => '1234',
+      :consumer_secret => '1234',
+      :token => '1234',
+      :token_secret => '1234'
+    }
+  end
+
+  context 'when used' do
+    let(:oauth) { Faraday::Request::OAuth.new(DummyApp.new, config) }
+
+    let(:env) do
+      { :request_headers => {}, :url => Addressable::URI.parse('http://www.github.com') }
+    end
+
+    it 'should add the access token to the header' do
+      request = oauth.call(env)
+      request[:request_headers]["Authorization"].should match OAUTH_HEADER_REGEX
+    end
+  end
+
+
+  context 'integration test' do
+    let(:stubs) { Faraday::Adapter::Test::Stubs.new }
+    let(:connection) do
+      Faraday::Connection.new do |builder|
+        builder.use Faraday::Request::OAuth, config
+        builder.adapter :test, stubs
+      end
+    end
+
+    # Sadly we can not check the headers in this integration test, but this will
+    # confirm that the middleware doesn't break the stack
+    it 'should add the access token to the query string' do
+      stubs.get('/me') {[200, {}, 'sferik']}
+      me = connection.get('http://www.github.com/me')
+      me.body.should == 'sferik'
+    end
+  end
+end

data/spec/parse_json_spec.rb

@@ -0,0 +1,69 @@
+require 'helper'
+
+describe Faraday::Response::ParseJson do
+  context 'when used' do
+    let(:multi_json) { Faraday::Response::ParseJson.new }
+
+    it 'should handle a blank response' do
+      empty = multi_json.on_complete(:body => '')
+      empty.should be_nil
+    end
+
+    it 'should handle a true response' do
+      response = multi_json.on_complete(:body => 'true')
+      response.should be_true
+    end
+
+    it 'should handle a false response' do
+      response = multi_json.on_complete(:body => 'false')
+      response.should be_false
+    end
+
+    it 'should handle hashes' do
+      me = multi_json.on_complete(:body => '{"name":"Erik Michaels-Ober","screen_name":"sferik"}')
+      me.class.should == Hash
+      me['name'].should == 'Erik Michaels-Ober'
+      me['screen_name'].should == 'sferik'
+    end
+
+    it 'should handle arrays' do
+      values = multi_json.on_complete(:body => '[123, 456]')
+      values.class.should == Array
+      values.first.should == 123
+      values.last.should == 456
+    end
+
+    it 'should handle arrays of hashes' do
+      us = multi_json.on_complete(:body => '[{"screen_name":"sferik"},{"screen_name":"pengwynn"}]')
+      us.class.should == Array
+      us.first['screen_name'].should == 'sferik'
+      us.last['screen_name'].should  == 'pengwynn'
+    end
+
+    it 'should handle mixed arrays' do
+      values = multi_json.on_complete(:body => '[123, {"screen_name":"sferik"}, 456]')
+      values.class.should == Array
+      values.first.should == 123
+      values.last.should == 456
+      values[1]['screen_name'].should == 'sferik'
+    end
+  end
+
+  context 'integration test' do
+    let(:stubs) { Faraday::Adapter::Test::Stubs.new }
+    let(:connection) do
+      Faraday::Connection.new do |builder|
+        builder.adapter :test, stubs
+        builder.use Faraday::Response::ParseJson
+      end
+    end
+
+    it 'should create a Hash from the body' do
+      stubs.get('/hash') {[200, {'content-type' => 'application/json; charset=utf-8'}, '{"name":"Erik Michaels-Ober","screen_name":"sferik"}']}
+      me = connection.get('/hash').body
+      me.class.should == Hash
+      me['name'].should == 'Erik Michaels-Ober'
+      me['screen_name'].should == 'sferik'
+    end
+  end
+end

data/spec/parse_xml_spec.rb

@@ -0,0 +1,39 @@
+require 'helper'
+
+describe Faraday::Response::ParseXml do
+  context 'when used' do
+    let(:multi_xml) { Faraday::Response::ParseXml.new }
+
+    it 'should handle an empty response' do
+      empty = multi_xml.on_complete(:body => '')
+      empty.should == Hash.new
+    end
+
+    it 'should create a Hash from the body' do
+      me = multi_xml.on_complete(:body => '<user><name>Erik Michaels-Ober</name><screen_name>sferik</screen_name></user>')
+      me.class.should == Hash
+    end
+
+    it 'should handle hashes' do
+      me = multi_xml.on_complete(:body => '<user><name>Erik Michaels-Ober</name><screen_name>sferik</screen_name></user>')
+      me['user']['name'].should == 'Erik Michaels-Ober'
+      me['user']['screen_name'].should == 'sferik'
+    end
+  end
+
+  context 'integration test' do
+    let(:stubs) { Faraday::Adapter::Test::Stubs.new }
+    let(:connection) do
+      Faraday::Connection.new do |builder|
+        builder.adapter :test, stubs
+        builder.use Faraday::Response::ParseXml
+      end
+    end
+
+    it 'should create a Hash from the body' do
+      stubs.get('/hash') {[200, {'content-type' => 'application/xml; charset=utf-8'}, '<user><name>Erik Michaels-Ober</name><screen_name>sferik</screen_name></user>']}
+      me = connection.get('/hash').body
+      me.class.should == Hash
+    end
+  end
+end

metadata

@@ -2,129 +2,131 @@
 name: faraday_middleware
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.2
+  version: 0.6.0
 platform: ruby
 authors: 
+- Erik Michaels-Ober
 - Wynn Netherland
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-02-03 00:00:00 -05:00
+date: 2011-04-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hashie
+  name: faraday
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "1.0"
-  type: :development
+        version: 0.6.0
+  type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: rake
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "1.4"
+        version: "0.8"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: multi_json
+  name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.0"
+        version: "2.5"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: multi_xml
+  name: simplecov
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.2"
+        version: "0.4"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: oauth2
+  name: hashie
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.1"
+        version: "1.0"
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: json_pure
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.8"
+        version: "1.5"
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: multi_json
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "2.11"
+        version: "0.0"
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: simplecov
+  name: multi_xml
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.3"
+        version: "0.2"
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: test-unit
+  name: oauth2
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "2.1"
+        version: "0.2"
   type: :development
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: faraday
+  name: simple_oauth
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.5.4
-  type: :runtime
+        version: "0.1"
+  type: :development
   version_requirements: *id010
 description: Various middleware for Faraday
 email: 
+- sferik@gmail.com
 - wynn.netherland@gmail.com
 executables: []
 
@@ -135,22 +137,27 @@ extra_rdoc_files:
 files: 
 - .gemtest
 - .gitignore
+- .rspec
 - CHANGELOG.md
 - Gemfile
+- LICENSE.md
 - README.md
 - Rakefile
 - faraday_middleware.gemspec
-- lib/faraday/mashify.rb
-- lib/faraday/oauth2.rb
-- lib/faraday/parse_json.rb
-- lib/faraday/parse_xml.rb
+- lib/faraday/request/oauth.rb
+- lib/faraday/request/oauth2.rb
+- lib/faraday/response/mashify.rb
+- lib/faraday/response/parse_json.rb
+- lib/faraday/response/parse_xml.rb
 - lib/faraday_middleware.rb
+- lib/faraday_middleware/support/rash.rb
 - lib/faraday_middleware/version.rb
-- test/helper.rb
-- test/mashify_test.rb
-- test/oauth2_test.rb
-- test/parse_json_test.rb
-- test/parse_xml_test.rb
+- spec/helper.rb
+- spec/mashify_spec.rb
+- spec/oauth2_spec.rb
+- spec/oauth_spec.rb
+- spec/parse_json_spec.rb
+- spec/parse_xml_spec.rb
 has_rdoc: true
 homepage: http://wynnnetherland.com/projects/faraday-middleware/
 licenses: []
@@ -175,13 +182,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Various middleware for Faraday
 test_files: 
-- test/helper.rb
-- test/mashify_test.rb
-- test/oauth2_test.rb
-- test/parse_json_test.rb
-- test/parse_xml_test.rb
+- spec/helper.rb
+- spec/mashify_spec.rb
+- spec/oauth2_spec.rb
+- spec/oauth_spec.rb
+- spec/parse_json_spec.rb
+- spec/parse_xml_spec.rb

data/lib/faraday/mashify.rb

@@ -1,27 +0,0 @@
-require 'faraday'
-
-module Faraday
-  class Response::Mashify < Response::Middleware
-    begin
-      require 'hashie'
-    rescue LoadError, NameError => error
-      self.load_error = error
-    end
-
-    def self.register_on_complete(env)
-      env[:response].on_complete do |response|
-        response_body = response[:body]
-        if response_body.is_a?(Hash)
-          response[:body] = ::Hashie::Mash.new(response_body)
-        elsif response_body.is_a?(Array)
-          response[:body] = response_body.map{|item| item.is_a?(Hash) ? ::Hashie::Mash.new(item) : item}
-        end
-      end
-    end
-
-    def initialize(app)
-      super
-      @parser = nil
-    end
-  end
-end

data/lib/faraday/parse_json.rb

@@ -1,33 +0,0 @@
-require 'faraday'
-
-module Faraday
-  class Response::ParseJson < Response::Middleware
-    begin
-      require 'multi_json'
-    rescue LoadError, NameError => error
-      self.load_error = error
-    end
-
-    def self.register_on_complete(env)
-      env[:response].on_complete do |response|
-        response[:body] = begin
-          case response[:body]
-          when ''
-            nil
-          when 'true'
-            true
-          when 'false'
-            false
-          else
-            ::MultiJson.decode(response[:body])
-          end
-        end
-      end
-    end
-
-    def initialize(app)
-      super
-      @parser = nil
-    end
-  end
-end

data/lib/faraday/parse_xml.rb

@@ -1,24 +0,0 @@
-require 'faraday'
-
-module Faraday
-  class Response::ParseXml < Response::Middleware
-    begin
-      require 'multi_xml'
-    rescue LoadError, NameError => error
-      self.load_error = error
-    end
-
-    def self.register_on_complete(env)
-      env[:response].on_complete do |response|
-        response[:body] = begin
-          ::MultiXml.parse(response[:body])
-        end
-      end
-    end
-
-    def initialize(app)
-      super
-      @parser = nil
-    end
-  end
-end

data/test/helper.rb

@@ -1,9 +0,0 @@
-require 'simplecov'
-SimpleCov.start do
-  add_group 'Libraries', 'lib'
-end
-
-require 'test/unit'
-require 'shoulda'
-
-require File.expand_path('../../lib/faraday_middleware', __FILE__)

data/test/mashify_test.rb

@@ -1,43 +0,0 @@
-require 'helper'
-
-class MashifyTest < Test::Unit::TestCase
-  context 'when used' do
-    setup do
-      @stubs = Faraday::Adapter::Test::Stubs.new
-      @conn  = Faraday::Connection.new do |builder|
-        builder.adapter :test, @stubs
-        builder.use Faraday::Response::ParseJson
-        builder.use Faraday::Response::Mashify
-      end
-    end
-
-    should 'create a Hashie::Mash from the body' do
-      @stubs.get('/hash') {[200, {'content-type' => 'application/json; charset=utf-8'}, '{"name":"Wynn Netherland","username":"pengwynn"}']}
-      me = @conn.get("/hash").body
-      assert_equal 'Wynn Netherland', me.name
-      assert_equal 'pengwynn', me.username
-    end
-
-    should 'handle arrays' do
-      @stubs.get('/array') {[200, {'content-type' => 'application/json; charset=utf-8'}, '[{"username":"pengwynn"},{"username":"jnunemaker"}]']}
-      us = @conn.get("/array").body
-      assert_equal 'pengwynn', us.first.username
-      assert_equal 'jnunemaker', us.last.username
-    end
-
-    should 'handle arrays of non-hashes' do
-      @stubs.get('/array/simple') {[200, {'content-type' => 'application/json; charset=utf-8'}, "[123, 456]"]}
-      values = @conn.get("/array/simple").body
-      assert_equal 123, values.first
-      assert_equal 456, values.last
-    end
-    
-    should 'handle arrays of hashes and non-hashes' do
-      @stubs.get('/array/simple') {[200, {'content-type' => 'application/json; charset=utf-8'}, '[123, {"username":"slainer68"}, 42]']}
-      values = @conn.get("/array/simple").body
-      assert_equal 123, values[0]
-      assert_equal "slainer68", values[1].username
-      assert_equal 42, values[2]
-    end
-  end
-end

data/test/oauth2_test.rb

@@ -1,18 +0,0 @@
-require 'helper'
-
-class OAuth2Test < Test::Unit::TestCase
-  context 'when used' do
-    setup do
-      @stubs = Faraday::Adapter::Test::Stubs.new
-      @stubs.get('/me?access_token=OU812') {[200, {}, 'pengwynn']}
-    end
-
-    should 'add the access token to the request' do
-      do_you  = Faraday::Connection.new do |builder|
-        builder.use Faraday::Request::OAuth2, 'OU812'
-        builder.adapter :test, @stubs
-      end
-      do_you.get("/me")
-    end
-  end
-end

data/test/parse_json_test.rb

@@ -1,74 +0,0 @@
-require 'helper'
-
-class ParseJsonTest < Test::Unit::TestCase
-  context 'when used' do
-    setup do
-      @stubs = Faraday::Adapter::Test::Stubs.new
-      @conn  = Faraday::Connection.new do |builder|
-        builder.adapter :test, @stubs
-        builder.use Faraday::Response::ParseJson
-      end
-    end
-
-    context "when there is a JSON body" do
-      setup do
-        @stubs.get('/me') {[200, {'content-type' => 'application/json; charset=utf-8'}, '{"name":"Wynn Netherland","username":"pengwynn"}']}
-      end
-
-      should 'parse the body as JSON' do
-        me = @conn.get("/me").body
-        assert me.is_a?(Hash)
-        assert_equal 'Wynn Netherland', me['name']
-        assert_equal 'pengwynn', me['username']
-      end
-    end
-
-    context "when the JSON body is empty" do
-      setup do
-        @stubs.get('/me') {[200, {'content-type' => 'application/json; charset=utf-8'}, ""]}
-      end
-
-      should 'still have the status code' do
-        response = @conn.get("/me")
-        assert_equal 200, response.status
-      end
-
-      should 'set body to nil' do
-        response = @conn.get("/me")
-        assert_equal nil, response.body
-      end
-    end
-
-    context "when the JSON body is 'true'" do
-      setup do
-        @stubs.get('/me') {[200, {'content-type' => 'application/json; charset=utf-8'}, "true"]}
-      end
-
-      should 'still have the status code' do
-        response = @conn.get("/me")
-        assert_equal 200, response.status
-      end
-
-      should 'set body to true' do
-        response = @conn.get("/me")
-        assert_equal true, response.body
-      end
-    end
-
-    context "when the JSON body is 'false'" do
-      setup do
-        @stubs.get('/me') {[200, {'content-type' => 'application/json; charset=utf-8'}, "false"]}
-      end
-
-      should 'still have the status code' do
-        response = @conn.get("/me")
-        assert_equal 200, response.status
-      end
-
-      should 'set body to false' do
-        response = @conn.get("/me")
-        assert_equal false, response.body
-      end
-    end
-  end
-end

data/test/parse_xml_test.rb

@@ -1,56 +0,0 @@
-require 'helper'
-
-class ParseXmlTest < Test::Unit::TestCase
-  context 'when used' do
-    setup do
-      @stubs = Faraday::Adapter::Test::Stubs.new
-      @conn  = Faraday::Connection.new do |builder|
-        builder.adapter :test, @stubs
-        builder.use Faraday::Response::ParseXml
-      end
-    end
-
-    context "when there is a XML body" do
-      setup do
-        @stubs.get('/me') {[200, {'content-type' => 'application/xml; charset=utf-8'}, '<user><name>Erik Michaels-Ober</name><username>sferik</username></user>']}
-      end
-
-      should 'parse the body as XML' do
-        me = @conn.get("/me").body['user']
-        assert me.is_a?(Hash)
-        assert_equal 'Erik Michaels-Ober', me['name']
-        assert_equal 'sferik', me['username']
-      end
-    end
-
-    context "when there is a ATOM body" do
-      setup do
-        @stubs.get('/me') {[200, {'content-type' => 'application/atom+xml; charset=utf-8'}, '<user><name>Erik Michaels-Ober</name><username>sferik</username></user>']}
-      end
-
-      should 'parse the body as XML' do
-        me = @conn.get("/me").body['user']
-        assert me.is_a?(Hash)
-        assert_equal 'Erik Michaels-Ober', me['name']
-        assert_equal 'sferik', me['username']
-      end
-    end
-
-    context "when the XML body is empty" do
-      setup do
-        @stubs.get('/me') {[200, {'content-type' => 'application/xml; charset=utf-8'}, ""]}
-      end
-
-      should 'still have the status code' do
-        response = @conn.get("/me")
-        assert_equal 200, response.status
-      end
-
-      should 'set body to nil' do
-        response = @conn.get("/me")
-        assert_equal Hash.new, response.body
-      end
-    end
-
-  end
-end