faraday 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/faraday.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{faraday}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["rick"]
-  s.date = %q{2010-02-04}
+  s.date = %q{2010-02-06}
   s.description = %q{HTTP/REST API client library with pluggable components}
   s.email = %q{technoweenie@gmail.com}
   s.extra_rdoc_files = [

data/lib/faraday/adapter/patron.rb

@@ -3,7 +3,7 @@ module Faraday
     class Patron < Middleware
       begin
         require 'patron'
-      rescue LoadError => e
+      rescue LoadError, NameError => e
         self.load_error = e
       end
 

data/lib/faraday/adapter/typhoeus.rb

@@ -9,7 +9,7 @@ module Faraday
 
       begin
         require 'typhoeus'
-      rescue LoadError => e
+      rescue LoadError, NameError => e
         self.load_error = e
       end
 

data/lib/faraday/request/active_support_json.rb

@@ -3,9 +3,10 @@ module Faraday
     begin
       if !defined?(ActiveSupport::JSON)
         require 'active_support'
+        ActiveSupport::JSON
       end
 
-    rescue LoadError => e
+    rescue LoadError, NameError => e
       self.load_error = e
     end
 

data/lib/faraday/request/yajl.rb

@@ -3,7 +3,7 @@ module Faraday
     begin
       require 'yajl'
 
-    rescue LoadError => e
+    rescue LoadError, NameError => e
       self.load_error = e
     end
 

data/lib/faraday/response.rb

@@ -41,6 +41,7 @@ module Faraday
     end
 
     def finish(env)
+      env[:body] ||= ''
       @on_complete_callbacks.each { |c| c.call(env) }
       @status, @headers, @body = env[:status], env[:response_headers], env[:body]
       self

data/lib/faraday/response/active_support_json.rb

@@ -3,6 +3,7 @@ module Faraday
     begin
       if !defined?(ActiveSupport::JSON)
         require 'active_support'
+        ActiveSupport::JSON
       end
 
       def self.register_on_complete(env)
@@ -10,7 +11,7 @@ module Faraday
           finished_env[:body] = ActiveSupport::JSON.decode(finished_env[:body])
         end
       end
-    rescue LoadError => e
+    rescue LoadError, NameError => e
       self.load_error = e
     end
     

data/lib/faraday/response/yajl.rb

@@ -8,7 +8,7 @@ module Faraday
           finished_env[:body] = Yajl::Parser.parse(finished_env[:body])
         end
       end
-    rescue LoadError => e
+    rescue LoadError, NameError => e
       self.load_error = e
     end
     

data/test/response_middleware_test.rb

@@ -5,10 +5,10 @@ class ResponseMiddlewareTest < Faraday::TestCase
     [:yajl, :rails_json].each do |key|
       parser = Faraday::Response.lookup_module(key)
       next if !parser.loaded?
-      it "uses #{parser}" do
+      it "uses #{parser} to parse json content" do
         @connection = Faraday::Connection.new do |b|
           b.adapter :test do |stub|
-            stub.get('json') { [200, {'Content-Type' => 'text/html'}, "[1,2,3]"] }
+            stub.get('json')  { [200, {'Content-Type' => 'text/html'}, "[1,2,3]"] }
           end
           b.use parser
         end
@@ -16,6 +16,30 @@ class ResponseMiddlewareTest < Faraday::TestCase
         assert response.success?
         assert_equal [1,2,3], response.body
       end
+
+      it "uses #{parser} to skip blank content" do
+        @connection = Faraday::Connection.new do |b|
+          b.adapter :test do |stub|
+            stub.get('blank') { [200, {'Content-Type' => 'text/html'}, ''] }
+          end
+          b.use parser
+        end
+        response = @connection.get('blank')
+        assert response.success?
+        assert_equal nil, response.body
+      end
+
+      it "uses #{parser} to skip nil content" do
+        @connection = Faraday::Connection.new do |b|
+          b.adapter :test do |stub|
+            stub.get('nil') { [200, {'Content-Type' => 'text/html'}, nil] }
+          end
+          b.use parser
+        end
+        response = @connection.get('nil')
+        assert response.success?
+        assert_equal nil, response.body
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: faraday
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - rick
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-04 00:00:00 -08:00
+date: 2010-02-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency