faraday_middleware 0.1.0 → 0.1.1

data/.gitignore

@@ -1,24 +1,24 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-*.gem
-.yardopts
-.yardoc
-
-## PROJECT::SPECIFIC
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+*.gem
+.yardopts
+.yardoc
+
+## PROJECT::SPECIFIC

data/CHANGELOG.md

@@ -1,10 +1,10 @@
-# Changelog
-
-### 0.0.2 September 25, 2010
-
-* Mashify now handles arrays of non-hashes
-
-### 0.0.1 June 27, 2010
-
-* MultiJSON
+# Changelog
+
+### 0.0.2 September 25, 2010
+
+* Mashify now handles arrays of non-hashes
+
+### 0.0.1 June 27, 2010
+
+* MultiJSON
 * Mashify

data/Gemfile

@@ -1,3 +1,3 @@
-source "http://rubygems.org"
-
-gemspec
+source "http://rubygems.org"
+
+gemspec

data/Gemfile.lock

@@ -1,11 +1,13 @@
 PATH
   remote: .
   specs:
-    faraday_middleware (0.1.0)
+    faraday_middleware (0.1.1)
       faraday (~> 0.4.5)
       hashie (~> 0.4.0)
       multi_json (~> 0.0.4)
+      multi_xml (~> 0.0.1)
       oauth2 (~> 0.0.13)
+      roauth (~> 0.0.3)
 
 GEM
   remote: http://rubygems.org/
@@ -17,11 +19,13 @@ GEM
     hashie (0.4.0)
     json (1.4.6)
     multi_json (0.0.4)
+    multi_xml (0.0.1)
     oauth2 (0.0.13)
       faraday (~> 0.4.1)
       multi_json (>= 0.0.4)
     rack (1.2.1)
     rake (0.8.7)
+    roauth (0.0.3)
     shoulda (2.11.3)
 
 PLATFORMS
@@ -33,6 +37,8 @@ DEPENDENCIES
   hashie (~> 0.4.0)
   json (~> 1.4.6)
   multi_json (~> 0.0.4)
+  multi_xml (~> 0.0.1)
   oauth2 (~> 0.0.13)
   rake (~> 0.8.7)
+  roauth (~> 0.0.3)
   shoulda (~> 2.11.3)

data/README.md

@@ -1,43 +1,43 @@
-# Faraday Middleware
-
-Collection of [Faraday](http://github.com/technoweenie/faraday) middlewares I've been using in some of my API wrappers
-
-
-## Installation
-
-    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
-      builder.use Faraday::Response::MultiJson
-    end
-
-    resp = conn.get do |req|
-      req.url '/users/show.json', :screen_name => 'pengwynn'
-    end
-
-    u = resp.body
-    u['name']
-    # => "Wynn Netherland"
-    
-
-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::MultiJson
-      builder.use Faraday::Response::Mashify
-    end
-
-    resp = conn.get do |req|
-      req.url '/users/show.json', :screen_name => 'pengwynn'
-    end
-
-    u = resp.body
-    u.name
+# Faraday Middleware
+
+Collection of [Faraday](http://github.com/technoweenie/faraday) middlewares I've been using in some of my API wrappers
+
+
+## Installation
+
+    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
+      builder.use Faraday::Response::MultiJson
+    end
+
+    resp = conn.get do |req|
+      req.url '/users/show.json', :screen_name => 'pengwynn'
+    end
+
+    u = resp.body
+    u['name']
+    # => "Wynn Netherland"
+
+
+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::MultiJson
+      builder.use Faraday::Response::Mashify
+    end
+
+    resp = conn.get do |req|
+      req.url '/users/show.json', :screen_name => 'pengwynn'
+    end
+
+    u = resp.body
+    u.name
     # => "Wynn Netherland"

data/Rakefile

@@ -1,14 +1,14 @@
-$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
-
-task :default => :test
+$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
+
+task :default => :test

data/faraday_middleware.gemspec

@@ -8,7 +8,9 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('faraday', ['~> 0.4.5'])
   s.add_runtime_dependency('hashie', ['~> 0.4.0'])
   s.add_runtime_dependency('multi_json', ['~> 0.0.4'])
+  s.add_runtime_dependency('multi_xml', ['~> 0.0.1'])
   s.add_runtime_dependency('oauth2', ['~> 0.0.13'])
+  s.add_runtime_dependency('roauth', ['~> 0.0.3'])
   s.authors = ["Wynn Netherland"]
   s.description = %q{Various middleware for Faraday}
   s.email = ['wynn.netherland@gmail.com']

data/lib/faraday/oauth.rb

@@ -0,0 +1,22 @@
+require 'roauth'
+
+module Faraday
+  class Request::OAuth < Faraday::Middleware
+    def initialize(app, *args)
+      @app = app
+      @oauth_params = {
+        :consumer_secret => args.shift,
+        :consumer_key => args.shift,
+        :access_key   => args.shift,
+        :access_secret   => args.shift
+      }
+      
+    end
+
+    def call(env)
+      params = env[:url].query_values || {}
+      env[:request_headers].merge!('Authorization' => ROAuth.header(@oauth_params, env[:url], params))
+      @app.call env
+    end
+  end
+end

data/lib/faraday/parse_xml.rb

@@ -0,0 +1,18 @@
+require 'multi_xml'
+
+module Faraday
+  class Response::ParseXml < Response::Middleware
+    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/lib/faraday_middleware/version.rb

@@ -1,3 +1,3 @@
 module FaradayMiddleware
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/test/mashify_test.rb

@@ -12,21 +12,21 @@ class MashifyTest < Test::Unit::TestCase
     end
 
     should 'create a Hashie::Mash from the body' do
-      @stubs.get('/hash') { [200, {}, "{\"name\":\"Wynn Netherland\",\"username\":\"pengwynn\"}"] }
+      @stubs.get('/hash') {[200, {}, '{"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, {}, "[{\"username\":\"pengwynn\"},{\"username\":\"jnunemaker\"}]" ] }
+      @stubs.get('/array') {[200, {}, '[{"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, {}, "[123, 456]" ] }
+      @stubs.get('/array/simple') {[200, {}, "[123, 456]"]}
       values = @conn.get("/array/simple").body
       assert_equal 123, values.first
       assert_equal 456, values.last

data/test/oauth2_test.rb

@@ -4,7 +4,7 @@ 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'] }
+      @stubs.get('/me?access_token=OU812') {[200, {}, 'pengwynn']}
     end
 
     should 'add the access token to the request' do

data/test/oauth_test.rb

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

data/test/{multi_json_test.rb → parse_json_test.rb}

@@ -12,7 +12,7 @@ class ParseJsonTest < Test::Unit::TestCase
 
     context "when there is a JSON body" do
       setup do
-        @stubs.get('/me') { [200, {}, "{\"name\":\"Wynn Netherland\",\"username\":\"pengwynn\"}"] }
+        @stubs.get('/me') {[200, {}, '{"name":"Wynn Netherland","username":"pengwynn"}']}
       end
 
       should 'parse the body as JSON' do
@@ -25,7 +25,7 @@ class ParseJsonTest < Test::Unit::TestCase
 
     context "when the JSON body is empty" do
       setup do
-        @stubs.get('/me') { [200, {}, ""] }
+        @stubs.get('/me') {[200, {}, ""]}
       end
 
       should 'still have the status code' do
@@ -35,13 +35,13 @@ class ParseJsonTest < Test::Unit::TestCase
 
       should 'set body to nil' do
         response = @conn.get("/me")
-        assert_equal response.body, nil
+        assert_equal nil, response.body
       end
     end
 
     context "when the JSON body is 'true'" do
       setup do
-        @stubs.get('/me') { [200, {}, "true"] }
+        @stubs.get('/me') {[200, {}, "true"]}
       end
 
       should 'still have the status code' do
@@ -49,15 +49,15 @@ class ParseJsonTest < Test::Unit::TestCase
         assert_equal 200, response.status
       end
 
-      should 'set body to nil' do
+      should 'set body to true' do
         response = @conn.get("/me")
-        assert_equal response.body, true
+        assert_equal true, response.body
       end
     end
 
     context "when the JSON body is 'false'" do
       setup do
-        @stubs.get('/me') { [200, {}, "false"] }
+        @stubs.get('/me') {[200, {}, "false"]}
       end
 
       should 'still have the status code' do
@@ -65,9 +65,9 @@ class ParseJsonTest < Test::Unit::TestCase
         assert_equal 200, response.status
       end
 
-      should 'set body to nil' do
+      should 'set body to false' do
         response = @conn.get("/me")
-        assert_equal response.body, false
+        assert_equal false, response.body
       end
     end
 

data/test/parse_xml_test.rb

@@ -0,0 +1,44 @@
+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
+        require 'rexml/document'
+        builder.use Faraday::Response::ParseXml
+      end
+    end
+
+    context "when there is a XML body" do
+      setup do
+        @stubs.get('/me') {[200, {}, '<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, {}, ""]}
+      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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: faraday_middleware
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Wynn Netherland
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-01 00:00:00 -07:00
+date: 2010-10-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -131,9 +131,25 @@ dependencies:
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: oauth2
+  name: multi_xml
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 0
+        - 1
+        version: 0.0.1
+  type: :runtime
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: oauth2
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -145,7 +161,23 @@ dependencies:
         - 13
         version: 0.0.13
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: roauth
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 0
+        - 3
+        version: 0.0.3
+  type: :runtime
+  version_requirements: *id010
 description: Various middleware for Faraday
 email: 
 - wynn.netherland@gmail.com
@@ -164,14 +196,18 @@ files:
 - Rakefile
 - faraday_middleware.gemspec
 - lib/faraday/mashify.rb
+- lib/faraday/oauth.rb
 - lib/faraday/oauth2.rb
 - lib/faraday/parse_json.rb
+- lib/faraday/parse_xml.rb
 - lib/faraday_middleware.rb
 - lib/faraday_middleware/version.rb
 - test/helper.rb
 - test/mashify_test.rb
-- test/multi_json_test.rb
 - test/oauth2_test.rb
+- test/oauth_test.rb
+- test/parse_json_test.rb
+- test/parse_xml_test.rb
 has_rdoc: true
 homepage: http://wynnnetherland.com/projects/faraday-middleware/
 licenses: []
@@ -211,5 +247,7 @@ summary: Various middleware for Faraday
 test_files: 
 - test/helper.rb
 - test/mashify_test.rb
-- test/multi_json_test.rb
 - test/oauth2_test.rb
+- test/oauth_test.rb
+- test/parse_json_test.rb
+- test/parse_xml_test.rb