ahora 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62ad288812b561ef44fb7da891c744a3f703bff7
-  data.tar.gz: 2022328ba2e73d65a131cafa976389e3b443cd5b
+  metadata.gz: f0985b57a670034c7945f5e36a9cc90101bf8f83
+  data.tar.gz: d0092b586366a543d87a11cec7b739c325fb7f50
 SHA512:
-  metadata.gz: f9ab7f72fe0aceb9dad7b35e9b9da672dd11a1dd1b60e12fdc8a8e77ebae33a9bc08e509de75d10b0acde640ca6d4811eece4faf51ef079f76a48955cb15eaf4
-  data.tar.gz: 93f01442df08707277bf9860e91212fda599c2809b1cec67f95a287184b943a27f507e97e2cd941fab75c74a815d99325a27bf0932d82816c39a8338d444fb2a
+  metadata.gz: 51b4dfac648230d1fd5e0e1623045e38ead1401db50509e6b982b1cd4a6b59b93e240c0dd9ce95329a139104745267db76307b0569258bfb64313cc21033b3e6
+  data.tar.gz: 1e388b5863a1f2a9808c3b1a59040464a1b35386296ad0d81afb53f578320da1b9b4745cf21b604430c695bf7b194551737e965d608d189f2a552ac98010af80

data/AUTHORS

@@ -1,2 +1,4 @@
-Norbert Crombach
+Mark Oude Veldhuis
 Matthijs Langenberg
+Mislav Marohnić
+Norbert Crombach

data/lib/ahora.rb

@@ -1,3 +1,3 @@
-%w( resource representation middleware ).each do |component|
+%w( error resource representation middleware ).each do |component|
   require File.join(File.expand_path(File.dirname(__FILE__)), 'ahora', component)
 end

data/lib/ahora/error.rb

@@ -0,0 +1,6 @@
+module Ahora
+	module Error
+		ClientError = Module.new
+		TimeoutError = Module.new
+	end
+end

data/lib/ahora/resource.rb

@@ -5,23 +5,35 @@ module Ahora
     attr_writer :document_parser
 
     def get(url, params = nil)
-      connection.run_request(:get, url, nil, nil) do |req|
-        req.params.update(params) if params
-        yield req if block_given?
+      begin
+        connection.run_request(:get, url, nil, nil) do |req|
+          req.params.update(params) if params
+          yield req if block_given?
+        end
+      rescue => e
+        handle_exception(e)
       end
     end
 
     # FIXME test
     def post(url, body = nil)
-      connection.run_request(:post, url, body, nil) do |req|
-        yield req if block_given?
+      begin
+        connection.run_request(:post, url, body, nil) do |req|
+          yield req if block_given?
+        end
+      rescue => e
+        handle_exception(e)
       end
     end
 
     # FIXME test
     def put(url, body = nil)
-      connection.run_request(:put, url, body, nil) do |req|
-        yield req if block_given?
+      begin
+        connection.run_request(:put, url, body, nil) do |req|
+          yield req if block_given?
+        end
+      rescue => e
+        handle_exception(e)
       end
     end
 
@@ -64,6 +76,7 @@ module Ahora
     end
 
     private
+
     def document_parser
       @document_parser ||= XmlParser.method(:parse)
     end
@@ -72,5 +85,16 @@ module Ahora
       (defined?(super) ? super.dup : {}).update \
         :headers => headers
     end
+
+    def handle_exception(e)
+      case e
+      when Faraday::Error::TimeoutError
+        e.extend Ahora::Error::TimeoutError
+      else
+        e.extend Ahora::Error::ClientError
+      end
+      raise
+    end
+
   end
 end

data/lib/ahora/version.rb

@@ -1,3 +1,3 @@
 module Ahora
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/ahora/resource_test.rb

@@ -77,3 +77,29 @@ describe '#put' do
     }.body.must_equal 'param'
   end
 end
+
+describe 'exception handling' do
+  before do
+    @post = DefaultPost.new
+  end
+
+  %w(get post put).each do |http_method|
+
+    describe "##{http_method}" do
+      it 'should raise a TimeoutError in case of a Faraday timeout' do
+        FakeWeb.register_uri http_method.to_sym, 'http://test.net/posts', :exception => Faraday::Error::TimeoutError
+        lambda {
+          @post.send(http_method, 'posts')
+        }.must_raise Ahora::Error::TimeoutError
+      end
+
+      it 'should raise an ClientError in case of a Faraday error' do
+        FakeWeb.register_uri http_method.to_sym, 'http://test.net/posts', :body => 'Forbidden', :status => [403, 'Forbidden']
+        lambda {
+          @post.send(http_method, 'posts')
+        }.must_raise Ahora::Error::ClientError
+      end
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahora
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Matthijs Langenberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nibbler
@@ -109,6 +109,7 @@ files:
 - Rakefile
 - ahora.gemspec
 - lib/ahora.rb
+- lib/ahora/error.rb
 - lib/ahora/middleware.rb
 - lib/ahora/middleware/last_modified_caching.rb
 - lib/ahora/middleware/request_logger.rb