faraday_bang 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c86ab07973616e783fc90b028611e2553f8d9cd
-  data.tar.gz: c954035229658542ea9be28c378bac598a405704
+  metadata.gz: d081b24c1907767fd2b1f56b8e44c5e03b9fc849
+  data.tar.gz: 95067e15decc159c0723b21ccf420da2a08b24cb
 SHA512:
-  metadata.gz: fbf870ac82be8668c9bd567385bc64c0ac77615017ecbdb48b0f07f7b0c756d7131bcfedac3d3095d19018dd473d66b7df3b7f19a8ae1fede9c83d5b56f50d45
-  data.tar.gz: 090a6094059669e372f5e8672e8596ec0a1adc036d970f727432f4a669e0ee50c4a030cc739867033c2ed964df2733a6a961ce4ed26467a6f316a15b4a2232d0
+  metadata.gz: 3e4df43e55c679347aded6728de30ba4295321873363c09a5af8d4f1cfef28c9a1d2438a75dbfc0651e88df8c908ecbc9649eb22627e34103f3327eea342b247
+  data.tar.gz: 48053d8c8fbcaee0f351e8dab32433aec3d2b7c66d8bf30dbe2ab04de511865a0f2ba15a220a3f64862a8abe5ed8ba1fb0a42ca018f744cc2da148367e3c2835

data/lib/faraday_bang/bang.rb

@@ -1,22 +1,33 @@
 module Faraday::Bang
   ERROR_CODES = [(400..417).to_a, (500..505).to_a].flatten
+  SUPPORTED_HTTP_METHODS = Faraday::Connection::METHODS - [ :options ]
 
-  Faraday::Connection::METHODS.each do |verb|
-    define_method("#{verb}!") do |*args|
-      response = self.send(verb, *args)
-      if response.status >= 400
-        err_name = "Response#{response.status}Error"
-        if Faraday::Bang.const_defined?(err_name)
-          klass = Faraday::Bang.const_get(err_name)
-          raise klass.new(response)
-        else
-          raise Faraday::Bang::ResponseError.new(response)
-        end
-      end
-      return response
+  SUPPORTED_HTTP_METHODS.each do |verb|
+    define_method("#{verb}!") do |*args, &block|
+      response = self.send(verb, *args, &block)
+      handle_response(response)
     end
   end
 
+  def options!(*args, &block)
+    url, body, headers = args
+    response = run_request(:options, url, body, headers, &block)
+    handle_response(response)
+  end
+
+  private
+  def handle_response(response)
+    if response.status >= 400
+      err_name = "Response#{response.status}Error"
+      if Faraday::Bang.const_defined?(err_name)
+        klass = Faraday::Bang.const_get(err_name)
+        raise klass.new(response)
+      else
+        raise Faraday::Bang::ResponseError.new(response)
+      end
+    end
+    response
+  end
 end
 
 Faraday.extend(Faraday::Bang)

data/lib/faraday_bang/version.rb

@@ -1,3 +1,3 @@
 module FaradayBang
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/test/lib/faraday_bang/bang_test.rb

@@ -7,12 +7,19 @@ describe Faraday::Bang do
   let(:body) { {foo: 'bar'}.to_json }
 
   [Faraday, Faraday.new].each do |klass|
+    let(:response) { mock(body: body, status: 200) }
 
-    Faraday::Connection::METHODS.each do |verb|
+    Faraday::Bang::SUPPORTED_HTTP_METHODS.each do |verb|
 
-      describe "##{verb}!" do
+      it "##{verb}! passes a block" do
+        block = Proc.new do |req|
+          raise "dummy error #{verb}"
+        end
+        error = ->{ klass.send("#{verb}!", &block) }.must_raise RuntimeError
+        error.message.must_equal "dummy error #{verb}"
+      end
 
-        let(:response) { mock(body: body, status: 200) }
+      describe "##{verb}!" do
 
         before do
           klass.expects(verb).with(url, args).returns(response)
@@ -56,6 +63,53 @@ describe Faraday::Bang do
 
     end
 
+    describe "options!" do
+      it "passes a block" do
+        block = Proc.new do |req|
+          raise "dummy error options"
+        end
+        error = ->{ klass.send("options!", &block) }.must_raise RuntimeError
+        error.message.must_equal "dummy error options"
+      end
+
+      describe 'successful response' do
+        before do
+          klass.expects(:run_request).with(:options, url, args, nil).returns(response)
+        end
+
+        it 'passes the call onto Faraday' do
+          res = klass.send("options!", url, args)
+          res.body.must_equal body
+        end
+      end
+
+      describe 'unsuccessful response' do
+        let(:env) { OpenStruct.new(url: 'http://example.com') }
+        let(:response) { OpenStruct.new(body: body, status: 506, env: env) }
+
+        before do
+          klass.expects(:run_request).with(:options, url, args, nil).returns(response)
+        end
+
+        it 'raises an error if its a non-200 response without an explicit exception' do
+          ->{klass.send("options!", url, args)}.must_raise Faraday::Bang::ResponseError, body
+        end
+
+        Faraday::Bang::ERROR_CODES.each do |code|
+
+          context code do
+
+            let(:response) { OpenStruct.new(body: body, status: code, env: env) }
+
+            it "raises a Faraday::Bang::Response#{code}Error" do
+              ->{klass.send("options!", url, args)}.must_raise Faraday::Bang.const_get("Response#{code}Error")
+            end
+
+          end
+        end
+      end
+    end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday_bang
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Mark Bates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-18 00:00:00.000000000 Z
+date: 2015-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Adds error raising ! methods to Farday.