http_status_checker 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9acb8d925d1ee90d4005641d43fd5fa5494299d
-  data.tar.gz: 479235114bfff51eb94e279f187941685507f38f
+  metadata.gz: 05033eced256b186dbc266e52867b44d9d74d053
+  data.tar.gz: c584834e0dfb5c2bb4d319b5c8ddd6c77bb45535
 SHA512:
-  metadata.gz: c122dc69546548ec6b3183ae84134ab36b13ee65182931ab031efd1b998641a65cd42e0c69a9641ff979f13fd2d0fed77894b7e6e42bd498c52003929d32cc7e
-  data.tar.gz: 29eeb1438142591460edb954ffd2653552e155e6c2d0ac50e1a4f81b099825b085eb7fed400e011dbee83f5f97bc20faa04e41220750bbc30fbe00f5e67a3af2
+  metadata.gz: b481d34c22d0540621537f7d972fa647d514381933ad87cc1bb03d4acd4097130f7d305afe3167cc68021d770e9feedbc589325a78f0305dd7ba27be25e4fbd2
+  data.tar.gz: 1e1d63f8509d18b32d698bdc172b1d14442bd9d531f0834de0095d449d6f7d37401229efe254f3aedea1d3f119ece61151de1db9b878596e4adf414c84b37f65

data/lib/http_status_checker.rb

@@ -3,10 +3,10 @@ require 'parallel'
 
 require 'http_status_checker/version'
 
+require 'http_status_checker/error'
 require 'http_status_checker/connection'
 require 'http_status_checker/base'
 
 module HttpStatusChecker
-  extend HttpStatusChecker::Connection
   extend HttpStatusChecker::Base
 end

data/lib/http_status_checker/base.rb

@@ -4,9 +4,6 @@ module HttpStatusChecker
     REDIRECT_MAX = 5.freeze
     RETRY_MAX = 1.freeze
 
-    class InvalidResponseError < StandardError; end
-    class InvalidRedirectError < StandardError; end
-
     def check(urls, wait_sec = 1)
       results = []
 
@@ -23,13 +20,13 @@ module HttpStatusChecker
 
     private
 
-    def get_response(url, redirect_url = nil, redirect_count = 0, retry_count = 0, result = nil)
-      result = get_header(redirect_url || url)
-      if result.is_a?(Net::HTTPRedirection) # redirect
-        redirect_url = result['location']
-        raise InvalidRedirectError if redirect_url.nil? || redirect_count > REDIRECT_MAX
-        get_response(url, redirect_url, redirect_count + 1, 0)
-      elsif result.is_a?(Net::HTTPOK)
+    def get_response(url, redirect_url = nil, redirect_count = 0, retry_count = 0)
+      result = HttpStatusChecker::Connection.get_header(redirect_url || url)
+      location_url = result['location']
+      if !location_url.nil? && (redirect_url || url) != location_url
+        raise InvalidRedirectError if redirect_count > REDIRECT_MAX
+        get_response(url, location_url, redirect_count + 1, 0)
+      elsif result.code =~ /^(2|3)[0-9]{2}$/
         { url => { code: result.code, is_alive: true, redirect_url: redirect_url } }
       else
         raise InvalidResponseError, "Unknown class #{result.class} : #{result.to_s}"

data/lib/http_status_checker/connection.rb

@@ -1,6 +1,6 @@
 module HttpStatusChecker
   module Connection
-    def get_header(url)
+    def self.get_header(url)
       uri = URI.parse(url)
       http = Net::HTTP.new(uri.host)
       http.head(uri.request_uri)

data/lib/http_status_checker/error.rb

@@ -0,0 +1,7 @@
+module HttpStatusChecker
+
+  class InvalidResponseError < StandardError; end
+
+  class InvalidRedirectError < StandardError; end
+
+end

data/lib/http_status_checker/version.rb

@@ -1,3 +1,3 @@
 module HttpStatusChecker
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/spec/http_status_checker/base_spec.rb

@@ -14,6 +14,17 @@ describe HttpStatusChecker::Connection do
       end
     end
 
+    context 'when set valid url with invalid http status' do
+      let!(:atnd_http_url)  { 'http://atnd.org/events/14386' }
+      let!(:atnd_https_url) { 'https://atnd.org/events/14386' }
+      it 'returns is_alive = true, redirect = nil, error = nil' do
+        response = HttpStatusChecker.check(atnd_http_url)
+        expect(response.first[atnd_http_url][:is_alive]).to eq(true)
+        expect(response.first[atnd_http_url][:redirect_url]).to eq(atnd_https_url)
+        expect(response.first[atnd_http_url][:error]).to be_nil
+      end
+    end
+
     context 'when set 2 urls' do
       let!(:morizyun_css) { 'http://morizyun.github.io/blog/css3-html-front-coding-book-review/' }
       let!(:morizyun_js) { 'http://morizyun.github.io/blog/javascript-learning-tech-yourself_01/' }

data/spec/http_status_checker/connection_spec.rb

@@ -4,26 +4,37 @@ describe HttpStatusChecker::Connection do
   describe '.get_header' do
     let!(:valid_url) { 'http://www.yahoo.co.jp/' }
     let!(:redirect_url) { 'http://yahoo.co.jp/' }
+    let!(:atnd_http_url) { 'http://atnd.org/events/14386' }
+    let!(:atnd_https_url) { 'https://atnd.org/events/14386' }
 
     context 'when get http valid url' do
       it 'return Net::HTTPOK response' do
-        response = HttpStatusChecker.get_header(valid_url)
+        response = HttpStatusChecker::Connection.get_header(valid_url)
         expect(response.is_a?(Net::HTTPOK)).to be == true
+        expect(response['location']).to be_nil
       end
     end
 
     context 'when get http redirect url' do
       it 'return Net::HTTPRedirection response' do
-        response = HttpStatusChecker.get_header(redirect_url)
+        response = HttpStatusChecker::Connection.get_header(redirect_url)
         expect(response.is_a?(Net::HTTPRedirection)).to be == true
         expect(response['location']).to eq(valid_url)
       end
     end
 
+    context 'when get invalid http status(atnd.org)' do
+      it 'return Net::HTTPRedirection response' do
+        response = HttpStatusChecker::Connection.get_header(atnd_https_url)
+        expect(response.is_a?(Net::HTTPRedirection)).to be == true
+        expect(response['location']).to eq(atnd_https_url)
+      end
+    end
+
     context 'when get http invalid url' do
       let!(:invalid_url) { 'http://www.nothing-dummy.com/' }
       it 'raise SocketError' do
-        expect{ HttpStatusChecker.get_header(invalid_url) }.to raise_error(SocketError)
+        expect{ HttpStatusChecker::Connection.get_header(invalid_url) }.to raise_error(SocketError)
       end
     end
   end

data/spec/spec_helper.rb

@@ -14,7 +14,6 @@ $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'http_status_checker'
 require 'rspec'
 require 'fakeweb'
-require 'pry'
 
 def fixture(path)
   File.read("#{File.dirname(__FILE__)}/fixtures/#{path}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: http_status_checker
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - morizyun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-25 00:00:00.000000000 Z
+date: 2014-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -113,6 +113,7 @@ files:
 - lib/http_status_checker.rb
 - lib/http_status_checker/base.rb
 - lib/http_status_checker/connection.rb
+- lib/http_status_checker/error.rb
 - lib/http_status_checker/version.rb
 - spec/http_status_checker/base_spec.rb
 - spec/http_status_checker/connection_spec.rb