faraday_middleware 0.6.0 → 0.6.3

data/.travis.yml

@@ -0,0 +1,5 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - ree
+  - jruby

data/faraday_middleware.gemspec

@@ -18,16 +18,13 @@ Gem::Specification.new do |s|
   s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 
-  s.extra_rdoc_files = ["README.md"]
-  s.rdoc_options = ['--charset=UTF-8']
-
   s.required_rubygems_version = Gem::Requirement.new('>= 1.3.6') if s.respond_to? :required_rubygems_version=
 
   s.add_runtime_dependency('faraday', '~> 0.6.0')
   s.add_development_dependency('rake', '~> 0.8')
   s.add_development_dependency('rspec', '~> 2.5')
   s.add_development_dependency('simplecov', '~> 0.4')
-  s.add_development_dependency('hashie', '~> 1.0')
+  s.add_development_dependency('rash', '~> 0.3')
   s.add_development_dependency('json_pure', '~> 1.5')
   s.add_development_dependency('multi_json', '~> 0.0')
   s.add_development_dependency('multi_xml', '~> 0.2')

data/lib/faraday/request/oauth.rb

@@ -5,7 +5,7 @@ module Faraday
     dependency 'simple_oauth'
 
     def call(env)
-      params = env[:body].is_a?(Hash) ? env[:body] : {}
+      params = env[:body] || {}
 
       signature_params = params.reject{ |k,v| v.respond_to?(:content_type) }
 
@@ -20,4 +20,4 @@ module Faraday
       @app, @options = app, options
     end
   end
-end
+end

data/lib/faraday/response/mashify.rb

@@ -2,13 +2,13 @@ require 'faraday'
 
 module Faraday
   class Response::Mashify < Response::Middleware
-    dependency 'faraday_middleware/support/rash'
+    dependency 'hashie/mash'
 
     class << self
       attr_accessor :mash_class
     end
 
-    self.mash_class = ::Hashie::Rash
+    self.mash_class = ::Hashie::Mash
 
     def parse(body)
       case body

data/lib/faraday/response/rashify.rb

@@ -0,0 +1,19 @@
+require 'faraday'
+
+module Faraday
+  class Response::Rashify < Response::Middleware
+    dependency 'hashie/mash'
+    dependency 'rash'
+
+    def parse(body)
+      case body
+      when Hash
+        ::Hashie::Rash.new(body)
+      when Array
+        body.map { |item| item.is_a?(Hash) ? ::Hashie::Rash.new(item) : item }
+      else
+        body
+      end
+    end
+  end
+end

data/lib/faraday_middleware.rb

@@ -9,4 +9,5 @@ class Faraday::Response
   autoload :Mashify,   'faraday/response/mashify'
   autoload :ParseJson, 'faraday/response/parse_json'
   autoload :ParseXml,  'faraday/response/parse_xml'
+  autoload :Rashify,   'faraday/response/rashify'
 end

data/lib/faraday_middleware/version.rb

@@ -1,3 +1,3 @@
 module FaradayMiddleware
-  VERSION = "0.6.0"
+  VERSION = "0.6.3"
 end

data/spec/mashify_spec.rb

@@ -9,13 +9,13 @@ describe Faraday::Response::Mashify do
   end
 
   context 'when used' do
-    before(:each) { Faraday::Response::Mashify.mash_class = ::Hashie::Rash }
+    before(:each) { Faraday::Response::Mashify.mash_class = ::Hashie::Mash }
     let(:mashify) { Faraday::Response::Mashify.new }
 
-    it 'should create a Hashie::Rash from the body' do
+    it 'should create a Hashie::Mash from the body' do
       env = { :body => { "name" => "Erik Michaels-Ober", "username" => "sferik" } }
       me  = mashify.on_complete(env)
-      me.class.should == Hashie::Rash
+      me.class.should == Hashie::Mash
     end
 
     it 'should handle strings' do
@@ -24,13 +24,6 @@ describe Faraday::Response::Mashify do
       me.should == "Most amazing string EVER"
     end
 
-    it 'should handle hashes and decamelcase the keys' do
-      env = { :body => { "name" => "Erik Michaels-Ober", "userName" => "sferik" } }
-      me  = mashify.on_complete(env)
-      me.name.should == 'Erik Michaels-Ober'
-      me.user_name.should == 'sferik'
-    end
-
     it 'should handle arrays' do
       env = { :body => [123, 456] }
       values = mashify.on_complete(env)

data/spec/rashify_spec.rb

@@ -0,0 +1,68 @@
+require 'helper'
+
+describe Faraday::Response::Rashify do
+
+  context 'when used' do
+    let(:rashify) { Faraday::Response::Rashify.new }
+
+    it 'should create a Hashie::Rash from the body' do
+      env = { :body => { "name" => "Erik Michaels-Ober", "username" => "sferik" } }
+      me  = rashify.on_complete(env)
+      me.class.should == Hashie::Rash
+    end
+
+    it 'should handle strings' do
+      env = { :body => "Most amazing string EVER" }
+      me  = rashify.on_complete(env)
+      me.should == "Most amazing string EVER"
+    end
+
+    it 'should handle hashes and decamelcase the keys' do
+      env = { :body => { "name" => "Erik Michaels-Ober", "userName" => "sferik" } }
+      me  = rashify.on_complete(env)
+      me.name.should == 'Erik Michaels-Ober'
+      me.user_name.should == 'sferik'
+    end
+
+    it 'should handle arrays' do
+      env = { :body => [123, 456] }
+      values = rashify.on_complete(env)
+      values.first.should == 123
+      values.last.should == 456
+    end
+
+    it 'should handle arrays of hashes' do
+      env = { :body => [{ "username" => "sferik" }, { "username" => "pengwynn" }] }
+      us  = rashify.on_complete(env)
+      us.first.username.should == 'sferik'
+      us.last.username.should == 'pengwynn'
+    end
+
+    it 'should handle mixed arrays' do
+      env = { :body => [123, { "username" => "sferik" }, 456] }
+      values = rashify.on_complete(env)
+      values.first.should == 123
+      values.last.should == 456
+      values[1].username.should == 'sferik'
+    end
+  end
+
+  context 'integration test' do
+    let(:stubs) { Faraday::Adapter::Test::Stubs.new }
+    let(:connection) do
+      Faraday::Connection.new do |builder|
+        builder.adapter :test, stubs
+        builder.use Faraday::Response::Rashify
+      end
+    end
+
+    # although it is not good practice to pass a hash as the body, if we add ParseJson
+    # to the middleware stack we end up testing two middlewares instead of one
+    it 'should create a Hash from the body' do
+      stubs.get('/hash') {[200, {'content-type' => 'application/json; charset=utf-8'}, { "name" => "Erik Michaels-Ober", "username" => "sferik" }]}
+      me = connection.get('/hash').body
+      me.name.should == 'Erik Michaels-Ober'
+      me.username.should == 'sferik'
+    end
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: faraday_middleware
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.0
+  version: 0.6.3
 platform: ruby
 authors: 
 - Erik Michaels-Ober
@@ -11,8 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-01 00:00:00 -07:00
-default_executable: 
+date: 2011-04-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: faraday
@@ -59,14 +58,14 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: hashie
+  name: rash
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "1.0"
+        version: "0.3"
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -132,12 +131,13 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.md
+extra_rdoc_files: []
+
 files: 
 - .gemtest
 - .gitignore
 - .rspec
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE.md
@@ -149,8 +149,8 @@ files:
 - lib/faraday/response/mashify.rb
 - lib/faraday/response/parse_json.rb
 - lib/faraday/response/parse_xml.rb
+- lib/faraday/response/rashify.rb
 - lib/faraday_middleware.rb
-- lib/faraday_middleware/support/rash.rb
 - lib/faraday_middleware/version.rb
 - spec/helper.rb
 - spec/mashify_spec.rb
@@ -158,13 +158,13 @@ files:
 - spec/oauth_spec.rb
 - spec/parse_json_spec.rb
 - spec/parse_xml_spec.rb
-has_rdoc: true
+- spec/rashify_spec.rb
 homepage: http://wynnnetherland.com/projects/faraday-middleware/
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -182,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Various middleware for Faraday
@@ -193,3 +193,4 @@ test_files:
 - spec/oauth_spec.rb
 - spec/parse_json_spec.rb
 - spec/parse_xml_spec.rb
+- spec/rashify_spec.rb

data/lib/faraday_middleware/support/rash.rb

@@ -1,26 +0,0 @@
-require 'hashie/mash'
-
-module Hashie
-  class Rash < Mash
-
-    protected
-
-    def convert_key(key) #:nodoc:
-      underscore_string(key.to_s)
-    end
-
-    # converts a camel_cased string to a underscore string
-    # subs spaces with underscores, strips whitespace
-    # Same way ActiveSupport does string.underscore
-    def underscore_string(str)
-      str.to_s.strip.
-        gsub(' ', '_').
-        gsub(/::/, '/').
-        gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-        gsub(/([a-z\d])([A-Z])/,'\1_\2').
-        tr("-", "_").
-        downcase
-    end
-
-  end
-end