faraday_middleware 0.3.0 → 0.3.1

data/.gitignore

@@ -18,7 +18,8 @@ coverage
 rdoc
 pkg
 *.gem
-.yardopts
+*.rbc
+.bundle
 .yardoc
 
 ## PROJECT::SPECIFIC

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    faraday_middleware (0.3.0)
+    faraday_middleware (0.3.1)
       faraday (~> 0.5.3)
 
 GEM
@@ -14,6 +14,7 @@ GEM
       rack (>= 1.1.0, < 2)
     hashie (0.4.0)
     json (1.4.6)
+    json (1.4.6-java)
     multi_json (0.0.5)
     multi_xml (0.2.0)
     multipart-post (1.0.1)
@@ -23,9 +24,13 @@ GEM
     rack (1.2.1)
     rake (0.8.7)
     shoulda (2.11.3)
-    test-unit (2.1.1)
+    simplecov (0.3.7)
+      simplecov-html (>= 0.3.7)
+    simplecov-html (0.3.9)
+    test-unit (2.1.2)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
@@ -38,4 +43,5 @@ DEPENDENCIES
   oauth2 (~> 0.1)
   rake (~> 0.8)
   shoulda (~> 2.11)
+  simplecov (~> 0.3)
   test-unit (~> 2.1)

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('simplecov', '~> 0.3')
   s.add_development_dependency('test-unit', '~> 2.1')
   s.add_runtime_dependency('faraday', '~> 0.5.3')
   s.authors = ["Wynn Netherland"]

data/lib/faraday/mashify.rb

@@ -1,3 +1,5 @@
+require 'faraday'
+
 module Faraday
   class Response::Mashify < Response::Middleware
     begin
@@ -11,8 +13,8 @@ module Faraday
         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)}
+        elsif response_body.is_a?(Array)
+          response[:body] = response_body.map{|item| item.is_a?(Hash) ? ::Hashie::Mash.new(item) : item}
         end
       end
     end

data/lib/faraday/oauth2.rb

@@ -1,3 +1,5 @@
+require 'faraday'
+
 module Faraday
   class Request::OAuth2 < Faraday::Middleware
     begin

data/lib/faraday/parse_json.rb

@@ -1,3 +1,5 @@
+require 'faraday'
+
 module Faraday
   class Response::ParseJson < Response::Middleware
     begin

data/lib/faraday/parse_xml.rb

@@ -1,3 +1,5 @@
+require 'faraday'
+
 module Faraday
   class Response::ParseXml < Response::Middleware
     begin

data/lib/faraday_middleware.rb

@@ -1,5 +1,3 @@
-require 'faraday'
-
 faraday_middleware_files = Dir[File.join(File.dirname(__FILE__), "/faraday/**/*.rb")].sort
 faraday_middleware_files.each do |file|
   require file

data/lib/faraday_middleware/version.rb

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

data/test/helper.rb

@@ -1,9 +1,9 @@
+require 'simplecov'
+SimpleCov.start do
+  add_group 'Libraries', 'lib'
+end
+
 require 'test/unit'
-require 'pathname'
-require 'rubygems'
 require 'shoulda'
-require 'faraday'
 
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'faraday_middleware'
+require File.expand_path('../../lib/faraday_middleware', __FILE__)

data/test/mashify_test.rb

@@ -31,5 +31,13 @@ class MashifyTest < Test::Unit::TestCase
       assert_equal 123, values.first
       assert_equal 456, values.last
     end
+    
+    should 'handle arrays of hashes and non-hashes' do
+      @stubs.get('/array/simple') {[200, {'content-type' => 'application/json; charset=utf-8'}, '[123, {"username":"slainer68"}, 42]']}
+      values = @conn.get("/array/simple").body
+      assert_equal 123, values[0]
+      assert_equal "slainer68", values[1].username
+      assert_equal 42, values[2]
+    end
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: faraday_middleware
 version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Wynn Netherland
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-09 00:00:00 -08:00
+date: 2010-11-30 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         - 4
@@ -39,6 +41,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 1
         - 4
@@ -53,6 +56,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
         - 0
@@ -67,6 +71,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 0
         - 2
@@ -81,6 +86,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 0
         - 1
@@ -95,6 +101,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 0
         - 8
@@ -109,6 +116,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 2
         - 11
@@ -116,34 +124,51 @@ dependencies:
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: test-unit
+  name: simplecov
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 0
+        - 3
+        version: "0.3"
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: test-unit
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 2
         - 1
         version: "2.1"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: faraday
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 0
         - 5
         - 3
         version: 0.5.3
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id010
 description: Various middleware for Faraday
 email: 
 - wynn.netherland@gmail.com
@@ -186,6 +211,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -194,6 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
       - 1
       - 3