faraday_csv 0.0.3 → 0.1.0

data/faraday_csv.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.description = 'CSV Parsing Middleware for use with Faraday'
   spec.summary     = spec.description
 
-  spec.add_dependency 'faraday'
+  spec.add_dependency 'faraday_middleware'
 
   spec.licenses    = ['MIT']
 

data/lib/faraday/response/csv.rb

@@ -1,18 +1,32 @@
-require 'faraday'
+require 'faraday_middleware/response_middleware'
 
 module Faraday
-  class Response::CSV < Response::Middleware
-    dependency 'csv'
+  class Response::CSV < FaradayMiddleware::ResponseMiddleware
+    dependency do
+      require 'csv' unless defined?(::CSV)
+    end
+
+    define_parser do |body, opts|
+      ::CSV.parse(body, opts) unless body.strip.empty?
+    end
 
     def initialize(app = nil, options = {})
-      super(app)
-      @options = options
+      super(app, options)
+      @parser_options = options[:parser_options] || {}
     end
 
+    # Parse the response body.
     def parse(body)
-      CSV.parse(body, @options)
-    rescue Object => err
-      raise Faraday::Error::ParsingError.new(err)
+      if self.class.parser
+        begin
+          self.class.parser.call(body, @parser_options)
+        rescue StandardError, SyntaxError => err
+          raise err if err.is_a? SyntaxError and err.class.name != 'Psych::SyntaxError'
+          raise Faraday::Error::ParsingError, err
+        end
+      else
+        body
+      end
     end
   end
 end

data/lib/faraday_csv/version.rb

@@ -1,3 +1,3 @@
 module FaradayCSV
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/spec/faraday/response/csv_spec.rb

@@ -1,27 +1,43 @@
 require 'spec_helper'
 
 describe Faraday::Response::CSV do
-  let(:csv) { Faraday::Response::CSV.new }
+  let(:options) { Hash.new }
+  let(:headers) { Hash.new }
+  let(:app) do
+    lambda { |env| Faraday::Response.new(env) }
+  end
+  let(:middleware) { Faraday::Response::CSV.new(app, options) }
   let(:body) { "integer,string\n12,foobar" }
 
+  def process(response_body, content_type = nil, opts = {})
+    env = {
+      :body             => response_body,
+      :request          => opts,
+      :response_headers => Faraday::Utils::Headers.new(headers)
+    }
+    env[:response_headers]['content-type'] = content_type if content_type
+    middleware.call(env)
+  end
+
   it "parses valid csv syntax" do
-    parsed = csv.on_complete(:body => body)
-    expect(parsed).to be_an Array
+    expect(process(body).body).to be_an Array
   end
 
   it 'raises Faraday::Error::ParsingError on invalid syntax' do
+    allow(::CSV).to receive(:parse).and_raise(StandardError)
+
     expect{
-      csv.on_complete(:body => ['foo'])
+      process('foo')
     }.to raise_error Faraday::Error::ParsingError
   end
 
   context 'with options' do
-    let(:options) { { :headers => true } }
-    let(:csv) { Faraday::Response::CSV.new(lambda { |env| env }, options) }
+    let(:options) do
+      { :parser_options => { :headers => true } }
+    end
 
     it "parses valid csv syntax" do
-      parsed = csv.on_complete(:body => body)
-      expect(parsed).to be_a CSV::Table
+      expect(process(body).body).to be_a CSV::Table
     end
   end
 

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ unless ENV['CI']
   SimpleCov.start do
     add_group 'FaradayCSV', 'lib/faraday'
     add_group 'Specs', 'spec'
+    add_filter '.bundle'
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faraday_csv
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -59,7 +59,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1541736267580842307
+      hash: 3263273483119408602
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1541736267580842307
+      hash: 3263273483119408602
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23