open_graph_reader 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54533bcbded9b149032a31977d775c2f898d77d4
-  data.tar.gz: 39a32a31b7bdff1a1bbcd5577222a3ccbc80770e
+  metadata.gz: a0a3bc88e9a52edb75e3e43fb979c7e80e08c28f
+  data.tar.gz: 6f4c978e5ecd6dce4abf675fe928e6ef785d3538
 SHA512:
-  metadata.gz: 8b50816f5d78ec562bda2c3120250050b9ba381409d5659595a824c16922c8d1ce9b4ff5a09d0178978ff630d8d89a96c05304e9be2e4152d886d923873f271e
-  data.tar.gz: cc958a19ba7db998332c666ed42e40a646b28dc26e1ee533636c3a5d5178d4c924a03f3f2fc69d34f79cc1b7374f09d1429c6b574a64de39280251620d495c91
+  metadata.gz: d7fc1741f800e9bd13368916914e101c3da9345eb85cdd3bbf6933ed2235265ec190b58cb035273060148c9721196dbf8573371a7c8218299dab3d893c5eca4c
+  data.tar.gz: 1f1013ee595b4fcfc0434034cb66f3662e2bc884c7932ebc82536909ac1ccadc753587c3131a53864ba78d7b0456c2f432546d32db2e5254ce201ebaffb3926a

data/lib/open_graph_reader/fetcher.rb

@@ -26,8 +26,11 @@ module OpenGraphReader
     def initialize uri
       raise ArgumentError, "url needs to be an instance of URI" unless uri.is_a? URI
       @uri = uri
+      @fetch_failed = false
       @connection = Faraday.default_connection.dup
       @connection.headers.replace(HEADERS)
+      @head_response = nil
+      @get_response = nil
 
       prepend_middleware Faraday::CookieJar if defined? Faraday::CookieJar
       prepend_middleware FaradayMiddleware::FollowRedirects if defined? FaradayMiddleware
@@ -46,6 +49,7 @@ module OpenGraphReader
     def fetch
       @get_response = @connection.get(@uri)
     rescue Faraday::Error
+      @fetch_failed = true
     end
     alias_method :fetch_body, :fetch
 
@@ -55,6 +59,7 @@ module OpenGraphReader
     def fetch_headers
       @head_response = @connection.head(@uri)
     rescue Faraday::Error
+      @fetch_failed = true
     end
 
     # Retrieve the body
@@ -64,7 +69,8 @@ module OpenGraphReader
     # @return [String]
     def body
       fetch_body unless fetched?
-      raise ArgumentError, "Did not receive a HTML site at #{@uri}" unless html?
+      raise NoOpenGraphDataError, "No response body received for #{@uri}" if fetch_failed?
+      raise NoOpenGraphDataError, "Did not receive a HTML site at #{@uri}" unless html?
       @get_response.body
     end
 
@@ -74,6 +80,7 @@ module OpenGraphReader
     def html?
       fetch_headers unless fetched_headers?
       response = @get_response || @head_response
+      return false if fetch_failed?
       return false unless response
       return false unless response.success?
       return false unless response["content-type"]
@@ -84,7 +91,7 @@ module OpenGraphReader
     #
     # @return [Bool]
     def fetched?
-      !@get_response.nil?
+      fetch_failed? || !@get_response.nil?
     end
     alias_method :fetched_body?, :fetched?
 
@@ -92,11 +99,15 @@ module OpenGraphReader
     #
     # @return [Bool]
     def fetched_headers?
-      !@get_response.nil? || !@head_response.nil?
+      fetch_failed? || !@get_response.nil? || !@head_response.nil?
     end
 
     private
 
+    def fetch_failed?
+      @fetch_failed
+    end
+
     def prepend_middleware middleware
       return if @connection.builder.handlers.include? middleware
 

data/lib/open_graph_reader/version.rb

@@ -1,4 +1,4 @@
 module OpenGraphReader
   # Tbe library version
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/spec/open_graph_reader/fetcher_spec.rb

@@ -0,0 +1,20 @@
+require "spec_helper"
+
+RSpec.describe OpenGraphReader::Fetcher do
+  let(:uri) { URI("http://example.org") }
+  let(:fetcher) { described_class.new uri }
+  let(:good_response) { {status: 200, body: "", headers: {"Content-Type" => "text/html"}} }
+
+  context "error during body fetch" do
+    before do
+      stub_request(:head, uri).to_return(good_response)
+      stub_request(:get, uri).to_raise(Faraday::ConnectionFailed.new("execution expired"))
+    end
+
+    describe "#body" do
+      it "raises" do
+        expect { fetcher.body }.to raise_error OpenGraphReader::NoOpenGraphDataError, /response body/
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: open_graph_reader
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Jonne Haß
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -28,14 +28,14 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.20'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.20'
+        version: '2.3'
 description: A library to fetch and parse OpenGraph properties from an URL or a given
   string.
 email:
@@ -186,6 +186,7 @@ files:
 - spec/integration/invalid_examples_spec.rb
 - spec/integration/real_world_spec.rb
 - spec/integration/valid_examples_spec.rb
+- spec/open_graph_reader/fetcher_spec.rb
 - spec/open_graph_reader_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/jhass/open_graph_reader
@@ -208,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: OpenGraph protocol parser
@@ -279,6 +280,6 @@ test_files:
 - spec/integration/invalid_examples_spec.rb
 - spec/integration/real_world_spec.rb
 - spec/integration/valid_examples_spec.rb
+- spec/open_graph_reader/fetcher_spec.rb
 - spec/open_graph_reader_spec.rb
 - spec/spec_helper.rb
-has_rdoc: