faraday_middleware 0.2.0 → 0.2.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    faraday_middleware (0.2.0)
+    faraday_middleware (0.2.1)
       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.4)
+    multi_xml (0.2.0)
     multipart-post (1.0.1)
     oauth2 (0.1.0)
       faraday (~> 0.5.0)
@@ -34,7 +34,7 @@ DEPENDENCIES
   hashie (~> 0.4)
   json (~> 1.4)
   multi_json (~> 0.0)
-  multi_xml (~> 0.1)
+  multi_xml (~> 0.2)
   oauth2 (~> 0.1)
   rake (~> 0.8)
   shoulda (~> 2.11)

data/faraday_middleware.gemspec

@@ -1,28 +1,28 @@
-require File.expand_path("../lib/faraday_middleware/version", __FILE__)
+require File.expand_path('../lib/faraday_middleware/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.add_development_dependency('hashie', '~> 0.4')
   s.add_development_dependency('json', '~> 1.4')
   s.add_development_dependency('multi_json', '~> 0.0')
-  s.add_development_dependency('multi_xml', '~> 0.1')
+  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("test-unit", "~> 2.1")
+  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}
   s.email = ['wynn.netherland@gmail.com']
-  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  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.platform = Gem::Platform::RUBY
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.required_rubygems_version = ">= 1.3.6"
-  s.summary = %q{Various middleware for Faraday}
+  s.rdoc_options = ['--charset=UTF-8']
+  s.require_paths = ['lib']
+  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
 end

data/lib/faraday/parse.rb

@@ -12,18 +12,9 @@ module Faraday
         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
+            parse_json(response[:body])
           when /application\/xml/
-            ::MultiXml.parse(response[:body])
+            parse_xml(response[:body])
           else
             ''
           end
@@ -35,5 +26,24 @@ module Faraday
       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

data/lib/faraday_middleware/version.rb

@@ -1,3 +1,3 @@
 module FaradayMiddleware
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: faraday_middleware
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Wynn Netherland
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-20 00:00:00 -07:00
+date: 2010-10-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,11 +71,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 15
         segments: 
         - 0
-        - 1
-        version: "0.1"
+        - 2
+        version: "0.2"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency