faraday_middleware 0.1.7 → 0.2.0

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.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    faraday_middleware (0.1.7)
+    faraday_middleware (0.2.0)
       faraday (~> 0.5.1)
 
 GEM
@@ -15,7 +15,7 @@ GEM
     hashie (0.4.0)
     json (1.4.6)
     multi_json (0.0.4)
-    multi_xml (0.1.0)
+    multi_xml (0.1.4)
     multipart-post (1.0.1)
     oauth2 (0.1.0)
       faraday (~> 0.5.0)
@@ -23,6 +23,7 @@ GEM
     rack (1.2.1)
     rake (0.8.7)
     shoulda (2.11.3)
+    test-unit (2.1.1)
 
 PLATFORMS
   ruby
@@ -37,3 +38,4 @@ DEPENDENCIES
   oauth2 (~> 0.1)
   rake (~> 0.8)
   shoulda (~> 2.11)
+  test-unit (~> 2.1)

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,6 +8,7 @@ Gem::Specification.new do |s|
   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("test-unit", "~> 2.1")
   s.add_runtime_dependency('faraday', '~> 0.5.1')
   s.authors = ["Wynn Netherland"]
   s.description = %q{Various middleware for Faraday}

data/lib/faraday/mashify.rb

@@ -4,15 +4,15 @@ module Faraday
       require 'hashie'
     rescue LoadError, NameError => error
       self.load_error = error
-    end 
+    end
 
     def self.register_on_complete(env)
       env[:response].on_complete do |response|
-        json = response[:body]
-        if json.is_a?(Hash)
-          response[:body] = ::Hashie::Mash.new(json)
-        elsif json.is_a?(Array) and json.first.is_a?(Hash)
-          response[:body] = json.map{|item| ::Hashie::Mash.new(item) }
+        response_body = response[:body]
+        if response_body.is_a?(Hash)
+          response[:body] = ::Hashie::Mash.new(response_body)
+        elsif response_body.is_a?(Array) and response_body.first.is_a?(Hash)
+          response[:body] = response_body.map{|item| ::Hashie::Mash.new(item)}
         end
       end
     end

data/lib/faraday/oauth2.rb

@@ -4,7 +4,7 @@ module Faraday
       require 'oauth2'
     rescue LoadError, NameError => error
       self.load_error = error
-    end 
+    end
 
     def call(env)
       params = env[:url].query_values || {}

data/lib/faraday/parse.rb

@@ -0,0 +1,39 @@
+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]['content-type']
+          when /application\/json/
+            case response[:body]
+            when ''
+              nil
+            when 'true'
+              true
+            when 'false'
+              false
+            else
+              ::MultiJson.decode(response[:body])
+            end
+          when /application\/xml/
+            ::MultiXml.parse(response[:body])
+          else
+            ''
+          end
+        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.7"
+  VERSION = "0.2.0"
 end

data/test/mashify_test.rb

@@ -6,27 +6,27 @@ 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::ParseJson
+        builder.use Faraday::Response::Parse
         builder.use Faraday::Response::Mashify
       end
     end
 
     should 'create a Hashie::Mash from the body' do
-      @stubs.get('/hash') {[200, {}, '{"name":"Wynn Netherland","username":"pengwynn"}']}
+      @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, {}, '[{"username":"pengwynn"},{"username":"jnunemaker"}]']}
+      @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, {}, "[123, 456]"]}
+      @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

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

@@ -1,18 +1,19 @@
 require 'helper'
 
-class ParseJsonTest < Test::Unit::TestCase
+class ParseTest < 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
+        require 'rexml/document'
+        builder.use Faraday::Response::Parse
       end
     end
 
     context "when there is a JSON body" do
       setup do
-        @stubs.get('/me') {[200, {}, '{"name":"Wynn Netherland","username":"pengwynn"}']}
+        @stubs.get('/me') {[200, {'content-type' => 'application/json; charset=utf-8'}, '{"name":"Wynn Netherland","username":"pengwynn"}']}
       end
 
       should 'parse the body as JSON' do
@@ -25,7 +26,7 @@ class ParseJsonTest < Test::Unit::TestCase
 
     context "when the JSON body is empty" do
       setup do
-        @stubs.get('/me') {[200, {}, ""]}
+        @stubs.get('/me') {[200, {'content-type' => 'application/json; charset=utf-8'}, ""]}
       end
 
       should 'still have the status code' do
@@ -41,7 +42,7 @@ class ParseJsonTest < Test::Unit::TestCase
 
     context "when the JSON body is 'true'" do
       setup do
-        @stubs.get('/me') {[200, {}, "true"]}
+        @stubs.get('/me') {[200, {'content-type' => 'application/json; charset=utf-8'}, "true"]}
       end
 
       should 'still have the status code' do
@@ -57,7 +58,7 @@ class ParseJsonTest < Test::Unit::TestCase
 
     context "when the JSON body is 'false'" do
       setup do
-        @stubs.get('/me') {[200, {}, "false"]}
+        @stubs.get('/me') {[200, {'content-type' => 'application/json; charset=utf-8'}, "false"]}
       end
 
       should 'still have the status code' do
@@ -71,5 +72,34 @@ class ParseJsonTest < Test::Unit::TestCase
       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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: faraday_middleware
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 7
-  version: 0.1.7
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Wynn Netherland
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-15 00:00:00 -07:00
+date: 2010-10-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -124,9 +124,24 @@ dependencies:
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: faraday
+  name: test-unit
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 2
+        - 1
+        version: "2.1"
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: faraday
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -138,7 +153,7 @@ dependencies:
         - 1
         version: 0.5.1
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id009
 description: Various middleware for Faraday
 email: 
 - wynn.netherland@gmail.com
@@ -158,15 +173,13 @@ files:
 - faraday_middleware.gemspec
 - lib/faraday/mashify.rb
 - lib/faraday/oauth2.rb
-- lib/faraday/parse_json.rb
-- lib/faraday/parse_xml.rb
+- lib/faraday/parse.rb
 - lib/faraday_middleware.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
+- test/parse_test.rb
 has_rdoc: true
 homepage: http://wynnnetherland.com/projects/faraday-middleware/
 licenses: []
@@ -207,5 +220,4 @@ test_files:
 - test/helper.rb
 - test/mashify_test.rb
 - test/oauth2_test.rb
-- test/parse_json_test.rb
-- test/parse_xml_test.rb
+- test/parse_test.rb

data/lib/faraday/parse_json.rb

@@ -1,31 +0,0 @@
-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,22 +0,0 @@
-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/parse_xml_test.rb

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