faraday_middleware 0.2.3 → 0.3.0

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    faraday_middleware (0.2.3)
-      faraday (~> 0.5.2)
+    faraday_middleware (0.3.0)
+      faraday (~> 0.5.3)
 
 GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.2.2)
-    faraday (0.5.2)
+    faraday (0.5.3)
       addressable (~> 2.2.2)
       multipart-post (~> 1.0.1)
       rack (>= 1.1.0, < 2)
@@ -29,7 +29,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  faraday (~> 0.5.2)
+  faraday (~> 0.5.3)
   faraday_middleware!
   hashie (~> 0.4)
   json (~> 1.4)

data/README.md

@@ -14,7 +14,7 @@ Let's decode the response body with [MultiJson](http://github.com/intridea/multi
 
     conn = Faraday::Connection.new(:url => 'http://api.twitter.com/1') do |builder|
       builder.adapter Faraday.default_adapter
-      builder.use Faraday::Response::Parse
+      builder.use Faraday::Response::ParseJson
     end
 
     resp = conn.get do |req|
@@ -30,7 +30,7 @@ Want to ditch the brackets and use dot notation? [Mashify](http://github.com/int
 
     conn = Faraday::Connection.new(:url => 'http://api.twitter.com/1') do |builder|
       builder.adapter Faraday.default_adapter
-      builder.use Faraday::Response::Parse
+      builder.use Faraday::Response::ParseJson
       builder.use Faraday::Response::Mashify
     end
 

data/faraday_middleware.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rake', '~> 0.8')
   s.add_development_dependency('shoulda', '~> 2.11')
   s.add_development_dependency('test-unit', '~> 2.1')
-  s.add_runtime_dependency('faraday', '~> 0.5.2')
+  s.add_runtime_dependency('faraday', '~> 0.5.3')
   s.authors = ["Wynn Netherland"]
   s.description = %q{Various middleware for Faraday}
   s.email = ['wynn.netherland@gmail.com']

data/lib/faraday/parse_json.rb

@@ -0,0 +1,31 @@
+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

@@ -0,0 +1,22 @@
+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/lib/faraday_middleware/version.rb

@@ -1,3 +1,3 @@
 module FaradayMiddleware
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

data/test/mashify_test.rb

@@ -6,7 +6,7 @@ class MashifyTest < Test::Unit::TestCase
       @stubs = Faraday::Adapter::Test::Stubs.new
       @conn  = Faraday::Connection.new do |builder|
         builder.adapter :test, @stubs
-        builder.use Faraday::Response::Parse
+        builder.use Faraday::Response::ParseJson
         builder.use Faraday::Response::Mashify
       end
     end

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

@@ -1,13 +1,12 @@
 require 'helper'
 
-class ParseTest < Test::Unit::TestCase
+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
-        require 'rexml/document'
-        builder.use Faraday::Response::Parse
+        builder.use Faraday::Response::ParseJson
       end
     end
 
@@ -71,35 +70,5 @@ class ParseTest < Test::Unit::TestCase
         assert_equal false, response.body
       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 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

data/test/parse_xml_test.rb

@@ -0,0 +1,56 @@
+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

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: faraday_middleware
 version: !ruby/object:Gem::Version 
-  hash: 17
   prerelease: false
   segments: 
   - 0
-  - 2
   - 3
-  version: 0.2.3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Wynn Netherland
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-08 00:00:00 -08:00
+date: 2010-11-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         - 4
@@ -41,7 +39,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 1
         - 4
@@ -56,7 +53,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 0
         - 0
@@ -71,7 +67,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 0
         - 2
@@ -86,7 +81,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 0
         - 1
@@ -101,7 +95,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
         segments: 
         - 0
         - 8
@@ -116,7 +109,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
         segments: 
         - 2
         - 11
@@ -131,7 +123,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 2
         - 1
@@ -146,12 +137,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 0
         - 5
-        - 2
-        version: 0.5.2
+        - 3
+        version: 0.5.3
   type: :runtime
   version_requirements: *id009
 description: Various middleware for Faraday
@@ -173,13 +163,15 @@ files:
 - faraday_middleware.gemspec
 - lib/faraday/mashify.rb
 - lib/faraday/oauth2.rb
-- lib/faraday/parse.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/oauth2_test.rb
-- test/parse_test.rb
+- test/parse_json_test.rb
+- test/parse_xml_test.rb
 has_rdoc: true
 homepage: http://wynnnetherland.com/projects/faraday-middleware/
 licenses: []
@@ -194,7 +186,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -203,7 +194,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
       segments: 
       - 1
       - 3
@@ -220,4 +210,5 @@ test_files:
 - test/helper.rb
 - test/mashify_test.rb
 - test/oauth2_test.rb
-- test/parse_test.rb
+- test/parse_json_test.rb
+- test/parse_xml_test.rb

data/lib/faraday/parse.rb

@@ -1,49 +0,0 @@
-module Faraday
-  class Response::Parse < Response::Middleware
-    begin
-      require 'multi_json'
-      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
-          case response[:response_headers].values_at('content-type', 'Content-Type').first
-          when /\/json/
-            parse_json(response[:body])
-          when /\/xml/
-            parse_xml(response[:body])
-          else
-            ''
-          end
-        end
-      end
-    end
-
-    def initialize(app)
-      super
-      @parser = nil
-    end
-
-    private
-
-    def self.parse_json(response_body)
-      case response_body
-      when ''
-        nil
-      when 'true'
-        true
-      when 'false'
-        false
-      else
-        ::MultiJson.decode(response_body)
-      end
-    end
-
-    def self.parse_xml(response_body)
-      ::MultiXml.parse(response_body)
-    end
-  end
-end