http_content_type 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 423abcfd36ea5de5ddb56ef406aa65d20c51a2e3
-  data.tar.gz: 41ce1d5652424ebd802464a109a42e8e9e463fbd
+  metadata.gz: 48e54ccadb5f2a3be4ffb565490d947e6f187268
+  data.tar.gz: 58e4f06e28abe976cdd72733858b3fc1b043137e
 SHA512:
-  metadata.gz: a35dbb8bc55e95a17683f25167798a9090b81cc58c63aab0c8b139628e0ad0a8e71ce939d742a81779ce9ee2a750b54dffa7a28bbb10ec1aabc1d1dfb358fa29
-  data.tar.gz: 0921e556085c0d2428678114eab56c93cdcad58257649ae19efebf72b87e0ca1045ac18fa235d44bc0377aea2dafb44bcd02ca4e22774a52a4b53a04f1f30fbf
+  metadata.gz: 280f74d2bf0e83856be5aadafe41a6acfdac65406d05a9d33819321fb14b62395a63cc183d7de215a692d9e74bc7f17e81f082108dc519bd35fff2b41a8a3d74
+  data.tar.gz: 50782d036ee864a6f68bd0a07e32c29e4e67c95e31dacc6defbd8c3055e7bc70753335b96238e1b415e1eb7e6f4df80cc6322a960d998919a1478653acadc2c3

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 No changes.
 
+### 0.0.3 - 5 September, 2013 - ([@rymai][])
+
+- Fix issues due to specs focused in the CI!
+- Removed the `TooManyRedirections` exception.
+
 ### 0.0.2 - 5 September, 2013 - ([@rymai][])
 
 - Handle redirections & url with query params.

data/README.md

@@ -3,6 +3,8 @@
 
 This gem allows you to check the Content-Type of any asset accessible via HTTP.
 
+Compatible with Ruby >= 1.9, JRuby (1.9 mode) or Rubinius (1.9 mode).
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -27,8 +29,30 @@ $ gem install http_content_type
 ```ruby
 checker = HttpContentType::Checker.new('http://domain.com/video.mp4')
 
-checker.found?                # => true (asset doesn't return a 404)
-checker.expected_content_type # => 'video/mp4' (the expected content type is based on file extension)
+checker.error?                # => false (true if there was an error requesting
+                              #    the asset)
+checker.found?                # => true (the asset was found, i.e. request
+                              #    returned an `Net::HTTPSuccess` response)
+checker.expected_content_type # => 'video/mp4' (the expected content type is
+                              #    based on file extension but can also be
+                              #    hardcoded with the :expected_content_type option)
+checker.content_type          # => 'video/mp4'
+checker.valid_content_type?   # => true
+```
+
+### Options
+
+#### `:timeout`
+
+```ruby
+checker = HttpContentType::Checker.new('http://domain.com/video.mp4', timeout: 10) # in seconds
+```
+
+#### `:expected_content_type`
+
+```ruby
+checker = HttpContentType::Checker.new('http://domain.com/dynamic_asset.php', expected_content_type: 'video/mp4')
+checker.expected_content_type # => 'video/mp4'
 checker.content_type          # => 'video/mp4'
 checker.valid_content_type?   # => true
 ```

data/lib/http_content_type/checker.rb

@@ -3,7 +3,6 @@ require 'net/http'
 module HttpContentType
 
   class Checker
-    class TooManyRedirections < Exception; end
 
     DEFAULT_OPTIONS = {
       timeout: 5
@@ -27,9 +26,8 @@ module HttpContentType
     end
 
     # Returns true if there was an error requesting the asset. Most common
-    # errors are `HTTPClientError`, `HTTPServerError`, `HTTPUnknownResponse`,
-    # `HttpContentType::TooManyRedirections`. Note that any other (less common)
-    # exceptions are catched as well.
+    # errors are `HTTPClientError`, `HTTPServerError`, `HTTPUnknownResponse`.
+    # Note that any other (less common) exceptions are catched as well.
     #
     # @return [Boolean] whether or not there was an error while requesting the
     #   asset.
@@ -105,9 +103,10 @@ module HttpContentType
     end
 
     def _fetch(url, limit = 10)
-      raise TooManyRedirections if limit == 0
-
       uri ||= URI.parse(URI.escape(url))
+
+      return _other_error_response(uri, nil, error: 'Too many redirections') if limit == 0
+
       @last_response = Net::HTTP.start(uri.host, uri.port, _connection_options(uri)) do |http|
         req = Net::HTTP::Head.new(uri.request_uri)
         http.request(req)
@@ -115,30 +114,30 @@ module HttpContentType
 
       case @last_response
       when Net::HTTPSuccess
-        _found_response(uri, @last_response)
+        _success_response(uri, @last_response)
       when Net::HTTPRedirection
         _fetch(@last_response['location'], limit - 1)
-      when HTTPClientError
-        _not_found_response(uri, @last_response)
+      when Net::HTTPClientError
+        _client_error_response(uri, @last_response)
       else
-        _errored_response(uri, @last_response)
+        _other_error_response(uri, @last_response)
       end
 
     rescue => ex
       puts "Exception from HttpContentType::Checker#_fetch('#{uri}', #{limit}):"
       puts ex
-      _errored_response(@last_response, error: ex)
+      _other_error_response(uri, @last_response, error: ex)
     end
 
-    def _found_response(uri, http_response)
+    def _success_response(uri, http_response)
       _base_response(uri).merge(found: true, error: nil, content_type: http_response['content-type'])
     end
 
-    def _not_found_response(uri, http_response)
+    def _client_error_response(uri, http_response)
       _base_response(uri).merge(found: false, error: nil, content_type: 'unknown')
     end
 
-    def _errored_response(uri, http_response, opts = {})
+    def _other_error_response(uri, http_response, opts = {})
       error = opts[:error] || "#{http_response.code}: #{http_response.message}"
 
       _base_response(uri).merge(found: false, error: error, content_type: 'unknown')

data/lib/http_content_type/version.rb

@@ -1,3 +1,3 @@
 module HttpContentType
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/lib/http_content_type/checker_spec.rb

@@ -130,24 +130,60 @@ describe HttpContentType::Checker do
       it { be_valid_content_type }
     end
 
-    context 'asset cannot be found and do not return an error', :focus do
+    context 'asset cannot be found and do not return an error' do
       before { checker.stub(:_head).and_return({ uri: URI('http://foo.com/bar.mp4'), found: false, error: nil }) }
       it { be_valid_content_type }
     end
 
-    context 'asset is found without an error with valid content type', :focus do
+    context 'asset is found without an error with valid content type' do
       before { checker.stub(:_head).and_return({ uri: URI('http://foo.com/bar.mp4'), found: true, error: nil, content_type: 'video/mp4'  }) }
       it { be_valid_content_type }
     end
 
-    context 'asset is found without an error with invalid content type', :focus do
+    context 'asset is found without an error with invalid content type' do
       before { checker.stub(:_head).and_return({ uri: URI('http://foo.com/bar.mov'), found: true, error: nil, content_type: 'video/mov'  }) }
       it { be_valid_content_type }
     end
   end
 
   describe '#_fetch' do
-    context 'too many redirections' do
+    describe 'unexpected exception' do
+      before { Net::HTTP.should_receive(:start) { raise 'Unexpected error!' } }
+
+      it 'returns the right response' do
+        res = checker.send(:_fetch, 'http://domain.com/video.mp4')
+
+        expect(res).to include({ found: false, content_type: 'unknown' })
+      end
+    end
+
+    describe 'HTTP client error' do
+      let(:response) do
+        Net::HTTPNotFound.new('1.1', '404', 'Not found')
+      end
+      before { Net::HTTP.any_instance.stub(:request).and_return(response) }
+
+      it 'returns the right response' do
+        res = checker.send(:_fetch, 'http://domain.com/video.mp4')
+
+        expect(res).to include({ found: false, error: nil, content_type: 'unknown' })
+      end
+    end
+
+    describe 'other HTTP errors' do
+      let(:response) do
+        Net::HTTPServiceUnavailable.new('1.1', '503', 'The service is unavailable')
+      end
+      before { Net::HTTP.any_instance.stub(:request).and_return(response) }
+
+      it 'returns the right response' do
+        res = checker.send(:_fetch, 'http://domain.com/video.mp4')
+
+        expect(res).to include({ found: false, error: '503: The service is unavailable', content_type: 'unknown' })
+      end
+    end
+
+    describe 'too many redirections' do
       let(:response) do
         Net::HTTPRedirection.new('1.1', 302, '').tap do |res|
           res['content-type'] = 'foo/bar'
@@ -156,8 +192,10 @@ describe HttpContentType::Checker do
       end
       before { Net::HTTP.any_instance.stub(:request).and_return(response) }
 
-      it 'raise a TooManyRedirections exception' do
-        expect { checker.send(:_fetch, 'http://domain.com/video.mp4') }.to raise_error(HttpContentType::TooManyRedirections)
+      it 'returns the right response' do
+        res = checker.send(:_fetch, 'http://domain.com/video.mp4')
+
+        expect(res).to include({ found: false, error: 'Too many redirections', content_type: 'unknown' })
       end
     end
   end

data/spec/spec_helper.rb

@@ -8,7 +8,7 @@ require 'rspec'
 RSpec.configure do |config|
   config.color_enabled = true
   config.order = :random
-  config.filter_run :focus => true
+  config.filter_run focus: ENV['CI'] != 'true'
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http_content_type
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Rémy Coutable