faraday_yaml 0.0.2 → 0.1.0

data/.rspec

@@ -0,0 +1,2 @@
+--format d
+--colour

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+### 0.1.0 May 2, 2011
+
+* Support Faraday 0.6.x
+* Full request/response specs
+
 ### 0.0.2 February 9, 2011
 
 * Only set the request's Content-Type when actually needed. (Some APIs break when you send a Content-Type header and an empty body on GET requests.)

data/Gemfile.lock

@@ -1,32 +1,32 @@
 PATH
   remote: .
   specs:
-    faraday_yaml (0.0.2)
-      faraday (~> 0.5.5)
+    faraday_yaml (0.1.0)
+      faraday (~> 0.6.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.4)
+    addressable (2.2.5)
     diff-lcs (1.1.2)
-    faraday (0.5.5)
+    faraday (0.6.1)
       addressable (~> 2.2.4)
       multipart-post (~> 1.1.0)
-      rack (>= 1.1.0, < 2)
+      rack (< 2, >= 1.1.0)
     multipart-post (1.1.0)
-    rack (1.2.1)
-    rspec (2.4.0)
-      rspec-core (~> 2.4.0)
-      rspec-expectations (~> 2.4.0)
-      rspec-mocks (~> 2.4.0)
-    rspec-core (2.4.0)
-    rspec-expectations (2.4.0)
+    rack (1.2.2)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.4.0)
+    rspec-mocks (2.5.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   faraday_yaml!
-  rspec (~> 2.4.0)
+  rspec (~> 2.5.0)

data/faraday_yaml.gemspec

@@ -18,6 +18,6 @@ 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.require_paths = ["lib"]
-  s.add_development_dependency "rspec", "~> 2.4.0"
-  s.add_runtime_dependency "faraday", "~> 0.5.5"
+  s.add_development_dependency "rspec", "~> 2.5.0"
+  s.add_runtime_dependency "faraday", "~> 0.6.1"
 end

data/lib/{faraday_yaml → faraday}/request/yaml.rb

@@ -2,10 +2,10 @@ require 'faraday'
 
 module Faraday
   class Request::YAML < Faraday::Middleware
-    begin
-      require 'yaml'
-    rescue LoadError, NameError => e
-      self.load_error = e
+    dependency 'yaml'
+
+    def initialize(app)
+      @app = app
     end
 
     def call(env)

data/lib/faraday/response/yaml.rb

@@ -0,0 +1,18 @@
+require 'faraday'
+
+module Faraday
+  class Response::YAML < Response::Middleware
+    dependency 'yaml'
+
+    def parse(body)
+      case body
+      when ''
+        nil
+      else
+        YAML.load(body)
+      end
+    rescue Object => err
+      raise Faraday::Error::ParsingError.new(err)
+    end
+  end
+end

data/lib/faraday_yaml/version.rb

@@ -1,3 +1,3 @@
 module FaradayYaml
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/lib/faraday_yaml.rb

@@ -1,2 +1,9 @@
-require 'faraday_yaml/request/yaml.rb'
-require 'faraday_yaml/response/yaml.rb'
+require 'faraday'
+
+class Faraday::Request
+  autoload :YAML, 'faraday/request/yaml.rb'
+end
+
+class Faraday::Response
+  autoload :YAML, 'faraday/response/yaml.rb'
+end

data/spec/request_yaml_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+describe Faraday::Request::YAML do
+  let(:test_hash) do
+    {"user" => {"name" => "Dylan Markow", "username" => "dmarkow"}}
+  end
+
+  let(:test_yaml_string) { "--- \nuser: \n  name: Dylan Markow\n  username: dmarkow\n" }
+
+  context "when used" do
+    let(:yaml) { Faraday::Request::YAML.new(DummyApp.new) }
+    let(:env) do
+      {
+        :request_headers => {},
+        :method => :post,
+        :body => test_hash,
+        :url => Addressable::URI.parse("http://www.github.com")
+      }
+    end
+
+    it "converts the body hash to yaml" do
+      request = yaml.call(env)
+      request[:body].should == test_yaml_string
+    end
+
+    it "sets the Content-Type header to x-yaml on put and post requests" do
+      request = yaml.call(env)
+      request[:request_headers]['Content-Type'].should == 'application/x-yaml'
+    end
+
+    it "doesn't set the Content-Type header on get requests" do
+      env[:method] = :get
+      request = yaml.call(env)
+      request[:request_headers]['Content-Type'].should be_nil
+    end
+  end
+
+  context "integration tests" do
+    let(:stubs) { Faraday::Adapter::Test::Stubs.new }
+    let(:conn) do
+      Faraday.new do |conn|
+        conn.adapter :test, stubs
+        conn.use Faraday::Request::YAML
+      end
+    end
+
+    it "converts the body hash to yaml" do
+      stubs.post('/echo') do |env|
+        posted_as = env[:request_headers]['Content-Type']
+        [200, {'Content-Type' => posted_as}, env[:body]]
+      end
+      response = conn.post('/echo', test_hash, 'Content-Type' => 'application/x-yaml')
+      response.headers['Content-Type'].should == 'application/x-yaml'
+      response.body.should == test_yaml_string
+    end
+  end
+end

data/spec/response_yaml_spec.rb

@@ -1,54 +1,61 @@
 require 'spec_helper'
 
-describe "Using the YAML Response Middleware" do
+describe Faraday::Response::YAML do
 
-  before do
-    @stubs = Faraday::Adapter::Test::Stubs.new
-    @conn = Faraday::Connection.new do |conn|
-      conn.adapter :test, @stubs
-      conn.use Faraday::Response::YAML
-    end
-  end
+  context "when used" do
+    let(:yaml) { Faraday::Response::YAML.new }
 
-  context "with a valid YAML response" do
-    before do
-      @stubs.get("/me") {[200, {'Content-Type' => 'application/x-yaml'}, "---\nuser:\n  name: Dylan Markow\n  username: dmarkow"]}
+    it "handles an empty response" do
+      empty = yaml.on_complete(:body => '')
+      empty.should be_nil
     end
 
-    it "parses the response into a Hash" do
-      me = @conn.get("/me").body['user']
-      me.should be_a(Hash)
-      me['name'].should == "Dylan Markow"
-      me['username'].should == "dmarkow"
+    it "handles hashes" do
+      me = yaml.on_complete(:body => "--- \nuser:\n  name: Dylan Markow\n  username: dmarkow\n")
+      me.class.should == Hash
+      me['user']['name'].should == 'Dylan Markow'
+      me['user']['username'].should == 'dmarkow'
     end
-  end
 
-  context "with a nil response" do
-    before do
-      @stubs.get("/me") {[200, {'Content-Type' => 'application/x-yaml'}, nil]}
-      @response = @conn.get("/me")
+    it "handles arrays" do
+      values = yaml.on_complete(:body => "--- \n- 123\n- 456\n")
+      values.class.should == Array
+      values.first.should == 123
+      values.last.should == 456
     end
 
-    it "still uses the status code" do
-      @response.status.should == 200
-    end
-    it "should skip empty content" do
-      @response.body.should be_nil
+    it "handles arrays of hashes" do
+      values = yaml.on_complete(:body => "--- \n- user:\n    name: Dylan Markow\n    username: dmarkow\n- user:\n    name: Rick Olson\n    username: technoweenie\n")
+      values.class.should == Array
+      values.first['user']['username'].should == 'dmarkow'
+      values.last['user']['username'].should == 'technoweenie'
     end
-  end
 
-  context "with an empty response" do
-    before do
-      @stubs.get("/me") {[200, {'Content-Type' => 'application/x-yaml'}, ""]}
-      @response = @conn.get("/me")
+    it "handles mixed arrays" do
+      values = yaml.on_complete(:body => "--- \n- 123\n- user: \n    name: Dylan Markow\n    username: dmarkow\n- 456\n")
+      values.class.should == Array
+      values.first.should == 123
+      values.last.should == 456
+      values[1]['user']['username'].should == 'dmarkow'
     end
+  end
 
-    it "still uses the status code" do
-      @response.status.should == 200
+  context "integration tests" do
+    let(:stubs) { Faraday::Adapter::Test::Stubs.new }
+    let(:conn) do
+      Faraday.new do |conn|
+        conn.adapter :test, stubs
+        conn.use Faraday::Response::YAML
+      end
     end
 
-    it "should skip empty content" do
-      @response.body.should be_nil
+    it "creates a hash from the body" do
+      stubs.get("/me") {[200, {'Content-Type' => 'application/x-yaml'}, "---\nuser:\n  name: Dylan Markow\n  username: dmarkow"]}
+      me = conn.get("/me").body
+      me.class.should == Hash
+      me['user']['name'].should == "Dylan Markow"
+      me['user']['username'].should == "dmarkow"
     end
   end
 end
+

data/spec/spec_helper.rb

@@ -1 +1,14 @@
 require File.expand_path('../../lib/faraday_yaml.rb', __FILE__)
+
+class DummyApp
+  attr_accessor :env
+
+  def call(env)
+    @env = env
+  end
+
+  def reset
+    @env = nil
+  end
+end
+

metadata

@@ -2,7 +2,7 @@
 name: faraday_yaml
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Dylan Markow
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 -08:00
+date: 2011-05-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.4.0
+        version: 2.5.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.5.5
+        version: 0.6.1
   type: :runtime
   version_requirements: *id002
 description: YAML Response/Request Middleware for Faraday
@@ -46,16 +46,18 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .rspec
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - README.md
 - Rakefile
 - faraday_yaml.gemspec
+- lib/faraday/request/yaml.rb
+- lib/faraday/response/yaml.rb
 - lib/faraday_yaml.rb
-- lib/faraday_yaml/request/yaml.rb
-- lib/faraday_yaml/response/yaml.rb
 - lib/faraday_yaml/version.rb
+- spec/request_yaml_spec.rb
 - spec/response_yaml_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -82,10 +84,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: faraday_yaml
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: YAML Response/Request Middleware for Faraday
 test_files: 
+- spec/request_yaml_spec.rb
 - spec/response_yaml_spec.rb
 - spec/spec_helper.rb

data/lib/faraday_yaml/response/yaml.rb

@@ -1,28 +0,0 @@
-require 'faraday'
-
-module Faraday
-  class Response::YAML < Response::Middleware
-    begin
-      require 'yaml'
-
-      def self.register_on_complete(env)
-        env[:response].on_complete do |finished_env|
-          finished_env[:body] = parse(finished_env[:body])
-        end
-      end
-    rescue LoadError, NameError => e
-      self.load_error = e
-    end
-
-    def initialize(app)
-      super
-      @parser = nil
-    end
-
-    def self.parse(body)
-      YAML.load(body) || nil
-    rescue Object => err
-      raise Faraday::Error::ParsingError.new(err)
-    end
-  end
-end