mingle_events 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55b4b6193e950f37183bc12d5bee6093877b88ac
-  data.tar.gz: d15c856be0b1b009a95113427b33c204148941ed
+  metadata.gz: d698d7bfba52d210386fcfcc08932d91c83e1eee
+  data.tar.gz: ecbc8067509a2d0c09d752f0f29e3b7c769b2a92
 SHA512:
-  metadata.gz: 66045fe8f4ae9b6c7b99496172b2980acfe9be07a8fec314a31189ccddcfaa3164e2e4edfca9f17f4953dccc671a45d30fc0f6f7433eb505f84f70d15e104f3a
-  data.tar.gz: a8730e1706e0f7d1573d9a0774122a462c034cea4f6a579f7c5380f9f07c40500b646dc3052745a0a77852fd67db50153709cb85420a592bed8ccbe28cfed5a8
+  metadata.gz: 6dd16e77733ee7dbd5703bc82ca8201c5b52d89d7fdc81d7e08959b4e137f72ac52d4b5c1761c7b7a792bf0bd6aea3f1ff45036864359ba65e2a7ab5c11c40af
+  data.tar.gz: 64b001acbcd89fd8f45e11e43dfdb18069a22e41b4f4a14396e256ed57e65c3fb776be245e965b6fecb61289b92ebac50b8d7d08c42f9a3af25cc80e0e184a1c

data/lib/mingle_events/http.rb

@@ -5,8 +5,22 @@ module MingleEvents
     MAX_RETRY_TIMES = 5
 
     # get response body for a url, a block can be passed in for request pre-processing
-    def get(url, retry_count=0, &block)
-      rsp = fetch_page_response(url, &block)
+    def get(url, retry_count=0, max_retry_times=MAX_RETRY_TIMES, &block)
+      rsp = nil
+      retrying = lambda do
+        raise HttpError.new(rsp, url) if retry_count >= max_retry_times
+        cooldown = retry_count * 2
+        MingleEvents.log.info "Getting service error when get page at #{url}, retry after #{cooldown}s..."
+        sleep cooldown
+        get(url, retry_count + 1, max_retry_times, &block)
+      end
+
+      begin
+        rsp = fetch_page_response(url, &block)
+      rescue EOFError => e
+        return retrying.call
+      end
+
       case rsp
       when Net::HTTPSuccess
         rsp.body
@@ -15,12 +29,8 @@ module MingleEvents
 If you think you are passing correct credentials, please check
 that you have enabled Mingle for basic authentication.
 See <http://www.thoughtworks-studios.com/mingle/3.3/help/configuring_mingle_authentication.html>.})
-      when Net::HTTPBadGateway, Net::HTTPServiceUnavailable, Net::HTTPGatewayTimeOut, EOFError
-        raise HttpError.new(rsp, url) if retry_count >= MAX_RETRY_TIMES
-        cooldown = retry_count * 2
-        MingleEvents.log.info "Getting service error when get page at #{url}, retry after #{cooldown}s..."
-        sleep cooldown
-        get(url, retry_count + 1, &block)
+      when Net::HTTPBadGateway, Net::HTTPServiceUnavailable, Net::HTTPGatewayTimeOut
+        retrying.call
       else
         raise HttpError.new(rsp, url)
       end

data/lib/mingle_events/http_error.rb

@@ -1,26 +1,26 @@
 module MingleEvents
-  
+
   class HttpError < StandardError
-    
+
     attr_reader :response, :requested_location, :additional_context
-    
+
     def initialize(response, requested_location, additional_context = nil)
       super(%{
         Unable to retrieve 200 response from URI: <#{requested_location}>!
-        HTTP Code: #{response.code}
-        Body: #{response.body}
+        HTTP Code: #{response && response.code}
+        Body: #{response && response.body}
         #{additional_context.nil? ? "" : additional_context}
       })
       @response = response
       @requested_location = requested_location
       @additional_context = additional_context
     end
-    
+
     def not_found?
       # has to be a better way to do this!!
       response.class == Net::HTTPNotFound
     end
-    
+
   end
 
-end
+end

data/test/mingle_events/http_test.rb

@@ -0,0 +1,48 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'test_helper'))
+
+module MingleEvents
+  class HttpTest < MiniTest::Test
+    def setup
+      @http = MingleEvents::Http
+    end
+
+    def test_should_return_response_body_on_success_request
+      stub_request(:get, "http://www.example.com/").
+         to_return(:status => 200, :body => "abc")
+      assert_equal 'abc', @http.get("http://www.example.com")
+    end
+
+    def test_should_raise_error_when_unauthorized
+      stub_request(:get, "http://www.example.com/").
+         to_return(:status => 403, :body => "Forbidden")
+      assert_raises(HttpError) { @http.get("http://www.example.com") }
+    end
+
+    def test_should_raise_error_on_service_unavailable_response
+      stub_request(:get, "http://www.example.com/").
+         to_return(:status => 503, :body => "Overloaded")
+      assert_raises(HttpError) { @http.get("http://www.example.com", 0, 1) }
+    end
+
+    def test_should_retry_on_service_unavailable_response
+      stub_request(:get, "http://www.example.com/").
+        to_return(:status => 503, :body => "Overloaded").then.
+        to_return(:status => 200, :body => "abc")
+      assert_equal 'abc', @http.get("http://www.example.com", 0, 1)
+    end
+
+
+    def test_should_raise_error_on_eof
+      stub_request(:get, "http://www.example.com/").
+        to_raise(EOFError)
+      assert_raises(HttpError) { @http.get("http://www.example.com", 0, 1) }
+    end
+
+    def test_should_retry_on_eof
+      stub_request(:get, "http://www.example.com/").
+        to_raise(EOFError).then.
+        to_return(:status => 200, :body => "abc")
+      assert_equal 'abc', @http.get("http://www.example.com", 0, 1)
+    end
+  end
+end

data/test/test_helper.rb

@@ -1,6 +1,7 @@
 require 'minitest/autorun'
 require 'ostruct'
 require 'fileutils'
+require 'webmock/minitest'
 
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'mingle_events'))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mingle_events
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - David Rice
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: "\n    Mingle 3.3 introduced a new Events API in the form of an \"Atom
   feed\":http://www.thoughtworks-studios.com/mingle/3.3/help/mingle_api_events.html.
   The Mingle team and ThoughtWorks Studios are big believers in the use of Atom for
@@ -142,6 +156,7 @@ files:
 - test/mingle_events/feed/entry_test.rb
 - test/mingle_events/feed/links_test.rb
 - test/mingle_events/feed/page_test.rb
+- test/mingle_events/http_test.rb
 - test/mingle_events/mingle_basic_auth_access_test.rb
 - test/mingle_events/mingle_hmac_auth_access_test.rb
 - test/mingle_events/mingle_oauth_access_test.rb