faraday_middleware 0.6.3 → 0.6.5

data/.travis.yml

@@ -1,5 +1,8 @@
 rvm:
   - 1.8.7
+  - 1.9.1
   - 1.9.2
+  - jruby
+  - rbx
   - ree
-  - jruby
+  - ruby-head

data/Gemfile

@@ -1,3 +1,7 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
+
+platforms :jruby do
+  gem "jruby-openssl", "~> 0.7"
+end
 
 gemspec

data/README.md

@@ -1,43 +1,41 @@
-# Faraday Middleware
+Faraday Middleware
+==================
 
-Collection of [Faraday](http://github.com/technoweenie/faraday) middlewares I've been using in some of my API wrappers
+A collection of some useful [Faraday](https://github.com/technoweenie/faraday) middleware
 
+Installation
+------------
+    gem install faraday_middleware
 
-## Installation
+Examples
+--------
+Let's decode the response body with [MultiJson](https://github.com/intridea/multi_json)!
 
-    sudo gem install faraday_middleware
-
-
-#### Some examples
-
-Let's decode the response body with [MultiJson](http://github.com/intridea/multi_json)
-
-    conn = Faraday::Connection.new(:url => 'http://api.twitter.com/1') do |builder|
-      builder.adapter Faraday.default_adapter
+    connection = Faraday.new(:url => 'http://api.twitter.com/1') do |builder|
       builder.use Faraday::Response::ParseJson
+      builder.adapter Faraday.default_adapter
     end
 
-    resp = conn.get do |req|
-      req.url '/users/show.json', :screen_name => 'pengwynn'
+    response = connection.get do |request|
+      request.url '/users/show.json', :screen_name => 'pengwynn'
     end
 
-    u = resp.body
+    u = response.body
     u['name']
     # => "Wynn Netherland"
 
+Want to ditch the brackets and use dot notation? [Mashify](https://github.com/intridea/hashie) it!
 
-Want to ditch the brackets and use dot notation? [Mashify](http://github.com/intridea/hashie) it!
-
-    conn = Faraday::Connection.new(:url => 'http://api.twitter.com/1') do |builder|
-      builder.adapter Faraday.default_adapter
-      builder.use Faraday::Response::ParseJson
+    connection = Faraday.new(:url => 'http://api.twitter.com/1') do |builder|
       builder.use Faraday::Response::Mashify
+      builder.use Faraday::Response::ParseJson
+      builder.adapter Faraday.default_adapter
     end
 
-    resp = conn.get do |req|
-      req.url '/users/show.json', :screen_name => 'pengwynn'
+    response = connection.get do |request|
+      request.url '/users/show.json', :screen_name => 'pengwynn'
     end
 
-    u = resp.body
+    u = response.body
     u.name
     # => "Wynn Netherland"

data/Rakefile

@@ -1,3 +1,5 @@
+#!/usr/bin/env rake
+
 require 'bundler'
 Bundler::GemHelper.install_tasks
 

data/faraday_middleware.gemspec

@@ -1,33 +1,32 @@
 require File.expand_path('../lib/faraday_middleware/version', __FILE__)
 
-Gem::Specification.new do |s|
-  s.name = 'faraday_middleware'
-  s.summary = %q{Various middleware for Faraday}
-  s.description = s.summary
+Gem::Specification.new do |gem|
+  gem.name = 'faraday_middleware'
+  gem.summary = %q{Various middleware for Faraday}
+  gem.description = gem.summary
 
-  s.homepage = 'http://wynnnetherland.com/projects/faraday-middleware/'
+  gem.homepage = 'https://github.com/pengwynn/faraday_middleware'
 
-  s.authors = ["Erik Michaels-Ober", "Wynn Netherland"]
-  s.email   = ['sferik@gmail.com', 'wynn.netherland@gmail.com']
+  gem.authors = ["Erik Michaels-Ober", "Wynn Netherland"]
+  gem.email   = ['sferik@gmail.com', 'wynn.netherland@gmail.com']
 
-  s.version  = FaradayMiddleware::VERSION
-  s.platform = Gem::Platform::RUBY
+  gem.version  = FaradayMiddleware::VERSION
 
-  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) }
+  gem.require_paths = ['lib']
+  gem.files = `git ls-files`.split("\n")
+  gem.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 
-  s.required_rubygems_version = Gem::Requirement.new('>= 1.3.6') if s.respond_to? :required_rubygems_version=
+  gem.required_rubygems_version = Gem::Requirement.new('>= 1.3.6')
 
-  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('rash', '~> 0.3')
-  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')
+  gem.add_runtime_dependency 'faraday', '~> 0.6.0'
+  gem.add_development_dependency 'rake', '~> 0.9'
+  gem.add_development_dependency 'rspec', '~> 2.6'
+  gem.add_development_dependency 'simplecov', '~> 0.4'
+  gem.add_development_dependency 'rash', '~> 0.3'
+  gem.add_development_dependency 'json_pure', '~> 1.5'
+  gem.add_development_dependency 'multi_json', '~> 1.0'
+  gem.add_development_dependency 'multi_xml', '~> 0.2'
+  gem.add_development_dependency 'oauth2', '~> 0.2'
+  gem.add_development_dependency 'simple_oauth', '~> 0.1'
 end

data/lib/faraday/response/parse_marshal.rb

@@ -0,0 +1,10 @@
+require 'faraday'
+
+module Faraday
+  class Response::ParseMarshal < Response::Middleware
+
+    def parse(body)
+      ::Marshal.load(body)
+    end
+  end
+end

data/lib/faraday/response/parse_yaml.rb

@@ -0,0 +1,11 @@
+require 'faraday'
+
+module Faraday
+  class Response::ParseYaml < Response::Middleware
+    dependency 'yaml'
+
+    def parse(body)
+      ::YAML.load(body)
+    end
+  end
+end

data/lib/faraday_middleware.rb

@@ -6,8 +6,10 @@ class Faraday::Request
 end
 
 class Faraday::Response
-  autoload :Mashify,   'faraday/response/mashify'
-  autoload :ParseJson, 'faraday/response/parse_json'
-  autoload :ParseXml,  'faraday/response/parse_xml'
-  autoload :Rashify,   'faraday/response/rashify'
+  autoload :Mashify,      'faraday/response/mashify'
+  autoload :ParseJson,    'faraday/response/parse_json'
+  autoload :ParseMarshal, 'faraday/response/parse_marshal'
+  autoload :ParseXml,     'faraday/response/parse_xml'
+  autoload :ParseYaml,    'faraday/response/parse_yaml'
+  autoload :Rashify,      'faraday/response/rashify'
 end

data/lib/faraday_middleware/version.rb

@@ -1,3 +1,3 @@
 module FaradayMiddleware
-  VERSION = "0.6.3"
+  VERSION = "0.6.5"
 end

data/spec/helper.rb

@@ -1,16 +1,9 @@
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'although not required, its recommended you use bundler when running the tests'
-end
-
+$:.unshift File.expand_path('..', __FILE__)
+$:.unshift File.expand_path('../../lib', __FILE__)
 require 'simplecov'
 SimpleCov.start
-
-require 'rspec'
-
 require 'faraday_middleware'
-
+require 'rspec'
 
 class DummyApp
   attr_accessor :env
@@ -22,4 +15,4 @@ class DummyApp
   def reset
     @env = nil
   end
-end
+end

data/spec/parse_json_spec.rb

@@ -2,46 +2,46 @@ require 'helper'
 
 describe Faraday::Response::ParseJson do
   context 'when used' do
-    let(:multi_json) { Faraday::Response::ParseJson.new }
+    let(:parse_json) { Faraday::Response::ParseJson.new }
 
     it 'should handle a blank response' do
-      empty = multi_json.on_complete(:body => '')
+      empty = parse_json.on_complete(:body => '')
       empty.should be_nil
     end
 
     it 'should handle a true response' do
-      response = multi_json.on_complete(:body => 'true')
+      response = parse_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 = parse_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 = parse_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 = parse_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 = parse_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 = parse_json.on_complete(:body => '[123, {"screen_name":"sferik"}, 456]')
       values.class.should == Array
       values.first.should == 123
       values.last.should == 456

data/spec/parse_marshal_spec.rb

@@ -0,0 +1,33 @@
+require 'helper'
+
+describe Faraday::Response::ParseMarshal do
+  context 'when used' do
+    let(:parse_marshal) { Faraday::Response::ParseMarshal.new }
+
+    it 'should load a marshalled hash' do
+      me = parse_marshal.on_complete(:body => "\x04\b{\x06I\"\tname\x06:\x06ETI\"\x17Erik Michaels-Ober\x06;\x00T")
+      me.class.should == Hash
+    end
+
+    it 'should handle hashes' do
+      me = parse_marshal.on_complete(:body => "\x04\b{\x06I\"\tname\x06:\x06ETI\"\x17Erik Michaels-Ober\x06;\x00T")
+      me['name'].should == 'Erik Michaels-Ober'
+    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::ParseMarshal
+      end
+    end
+
+    it 'should create a Hash from the body' do
+      stubs.get('/hash') {[200, {'content-type' => 'application/xml; charset=utf-8'}, "\x04\b{\x06I\"\tname\x06:\x06ETI\"\x17Erik Michaels-Ober\x06;\x00T"]}
+      me = connection.get('/hash').body
+      me.class.should == Hash
+    end
+  end
+end

data/spec/parse_xml_spec.rb

@@ -2,20 +2,20 @@ require 'helper'
 
 describe Faraday::Response::ParseXml do
   context 'when used' do
-    let(:multi_xml) { Faraday::Response::ParseXml.new }
+    let(:parse_xml) { Faraday::Response::ParseXml.new }
 
     it 'should handle an empty response' do
-      empty = multi_xml.on_complete(:body => '')
+      empty = parse_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 = parse_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 = parse_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

data/spec/parse_yaml_spec.rb

@@ -0,0 +1,33 @@
+require 'helper'
+
+describe Faraday::Response::ParseYaml do
+  context 'when used' do
+    let(:parse_yaml) { Faraday::Response::ParseYaml.new }
+
+    it 'should load a marshalled hash' do
+      me = parse_yaml.on_complete(:body => "--- \nname: Erik Michaels-Ober\n")
+      me.class.should == Hash
+    end
+
+    it 'should handle hashes' do
+      me = parse_yaml.on_complete(:body => "--- \nname: Erik Michaels-Ober\n")
+      me['name'].should == 'Erik Michaels-Ober'
+    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::ParseYaml
+      end
+    end
+
+    it 'should create a Hash from the body' do
+      stubs.get('/hash') {[200, {'content-type' => 'application/xml; charset=utf-8'}, "--- \nname: Erik Michaels-Ober\n"]}
+      me = connection.get('/hash').body
+      me.class.should == Hash
+    end
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: faraday_middleware
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.3
+  version: 0.6.5
 platform: ruby
 authors: 
 - Erik Michaels-Ober
@@ -11,7 +11,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 Z
+date: 2011-06-22 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: faraday
@@ -32,7 +33,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.8"
+        version: "0.9"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -43,7 +44,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "2.5"
+        version: "2.6"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -87,7 +88,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.0"
+        version: "1.0"
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -148,7 +149,9 @@ files:
 - lib/faraday/request/oauth2.rb
 - lib/faraday/response/mashify.rb
 - lib/faraday/response/parse_json.rb
+- lib/faraday/response/parse_marshal.rb
 - lib/faraday/response/parse_xml.rb
+- lib/faraday/response/parse_yaml.rb
 - lib/faraday/response/rashify.rb
 - lib/faraday_middleware.rb
 - lib/faraday_middleware/version.rb
@@ -157,9 +160,12 @@ files:
 - spec/oauth2_spec.rb
 - spec/oauth_spec.rb
 - spec/parse_json_spec.rb
+- spec/parse_marshal_spec.rb
 - spec/parse_xml_spec.rb
+- spec/parse_yaml_spec.rb
 - spec/rashify_spec.rb
-homepage: http://wynnnetherland.com/projects/faraday-middleware/
+has_rdoc: true
+homepage: https://github.com/pengwynn/faraday_middleware
 licenses: []
 
 post_install_message: 
@@ -182,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Various middleware for Faraday
@@ -192,5 +198,7 @@ test_files:
 - spec/oauth2_spec.rb
 - spec/oauth_spec.rb
 - spec/parse_json_spec.rb
+- spec/parse_marshal_spec.rb
 - spec/parse_xml_spec.rb
+- spec/parse_yaml_spec.rb
 - spec/rashify_spec.rb