link_preview 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b662c55f80ea8cfd8930b9330661fd479a06977
-  data.tar.gz: 64e9c6bbc68fcfc113471da67c06c3b22469566c
+  metadata.gz: d2535acc6627654fb5a535f4d6b93cea2a7761fb
+  data.tar.gz: 39ff7d89c69212bc384ea9c255f587e22da44d13
 SHA512:
-  metadata.gz: f82922a2ff9eeeb750a77dca1c650ba3e4700f286feb943dc4e2e612fdf39d7d4ef1664a9736700dba99b6be01c8d5c053a999d67cb10787e25dfe0032f970b5
-  data.tar.gz: 206b5c6e0f387a43e69605c118e71772a0e7ae52eac1946e5db5a6e3926b56da1dd54605aea22e6279087546e81d0b41ab1b3dc5e726504d6451da03896a2608
+  metadata.gz: f9cd6097b70f642478431d32ea6be8e4015894197256228663614c4771f3e21181c5da94921a19c97b00898085c6bc442cca39f24a6961879c31ed2d32d76cff
+  data.tar.gz: 55ed4eb19b76211c1c1a84a60ff494eb63cd639e6438b9adf1f31db1e7133e250ea649557ae9fd729e3e815a2bf1676890ab779eb0d14a80680f2ca7cbb4658f

data/lib/link_preview/parser.rb

@@ -48,27 +48,6 @@ module LinkPreview
       end
     end
 
-    def parse_image(data)
-      {
-        image: {
-          image_url: data.url,
-          image_data: parse_image_data(data),
-          image_content_type: data.headers[:content_type],
-          image_file_name: parse_image_file_name(data)
-        }
-      }
-    end
-
-    def parse_image_file_name(data)
-      content_disposition_filename = parse_content_disposition_filename(data)
-      if content_disposition_filename.present?
-        content_disposition_filename
-      elsif data.url
-        parsed_uri = LinkPreview::URI.parse(data.url, @options)
-        parsed_uri.path.split('/').last || parsed_uri.hostname.tr('.', '_')
-      end
-    end
-
     private
 
     def ignore_opengraph_video_type_html?
@@ -102,6 +81,27 @@ module LinkPreview
       }
     end
 
+    def parse_image(data)
+      {
+        image: {
+          image_url: data.url,
+          image_data: parse_image_data(data),
+          image_content_type: data.headers[:content_type],
+          image_file_name: parse_image_file_name(data)
+        }
+      }
+    end
+
+    def parse_image_file_name(data)
+      content_disposition_filename = parse_content_disposition_filename(data)
+      if content_disposition_filename.present?
+        content_disposition_filename
+      elsif data.url
+        parsed_uri = LinkPreview::URI.parse(data.url, @options)
+        parsed_uri.path.split('/').last || parsed_uri.hostname.tr('.', '_')
+      end
+    end
+
     def parse_opengraph_common_data(doc)
       opengraph_image_array_first_elem = find_meta_property_array(doc, 'og:image').first
       {
@@ -145,16 +145,17 @@ module LinkPreview
       )
     end
 
-    def parse_oembed(data)
-      # TODO: validate oembed response
-      { oembed: (parse_oembed_data(data) || {}).merge(url: parse_oembed_content_url(data)) }
-    end
-
     def parse_video_url_content(uri)
       url = LinkPreview::URI.parse(uri, @options)
       @config.http_client.get(url.to_s, @options)
     end
 
+    def parse_oembed(data)
+      oembed_data = parse_oembed_data(data)
+      return {} unless oembed_data.is_a?(Hash) && oembed_data['type']
+      { oembed: oembed_data.merge(url: parse_oembed_content_url(data)) }
+    end
+
     def parse_oembed_data(data)
       case data.headers[:content_type]
       when /xml/
@@ -162,6 +163,8 @@ module LinkPreview
       when /json/
         MultiJson.load(data.body)
       end
+    rescue
+      nil
     end
 
     def parse_oembed_content_url(data)

data/lib/link_preview/version.rb

@@ -19,5 +19,5 @@
 # SOFTWARE.
 
 module LinkPreview
-  VERSION = '0.3.1'.freeze
+  VERSION = '0.3.2'.freeze
 end

data/spec/link_preview/parser_spec.rb

@@ -23,35 +23,119 @@
 require 'spec_helper'
 
 describe LinkPreview::Parser do
-  describe '#parse_image_file_name' do
+  describe '#parse' do
     let(:config) { double(LinkPreview::Configuration) }
     let(:parser) { LinkPreview::Parser.new(config) }
     let(:response) do
       Faraday::Response.new.tap do |response|
-        allow(response).to receive(:headers).and_return(:'content-disposition' => content_disposition)
+        allow(response).to receive(:headers).and_return(headers)
+        allow(response).to receive(:url).and_return(url)
+        allow(response).to receive(:body).and_return(body)
+      end
+    end
+
+    subject(:data) { parser.parse(response) }
+
+    shared_examples 'oembed' do
+      context 'when empty string' do
+        let(:content) { '' }
+        it { expect(data).to be_empty }
+      end
+
+      context 'when empty hash' do
+        let(:content) { {} }
+        it { expect(data).to be_empty }
+      end
 
-        allow(response).to receive(:url).and_return('http://example.com/image-url.jpg')
+      context 'when invalid' do
+        let(:content) { { 'version' => '1.0' } }
+        it { expect(data).to be_empty }
+      end
+
+      context 'when valid link' do
+        let(:content) { { 'version' => '1.0', 'type' => 'link' } }
+        it { expect(data[:oembed]).to include(content) }
+      end
+
+      context 'when valid photo' do
+        let(:content) { { 'version' => '1.0', 'type' => 'photo', 'url' => 'http://example.com/image.jpg' } }
+        it { expect(data[:oembed]).to include(content) }
+      end
+
+      context 'when valid video' do
+        let(:content) { { 'version' => '1.0', 'type' => 'video', 'url' => 'http://example.com/videos/1.mp4', 'html' => '<video src="http://example.com/videos/1.mp4"></video>' } }
+        it { expect(data[:oembed]).to include(content) }
+      end
+
+      context 'when valid rich' do
+        let(:content) { { 'version' => '1.0', 'type' => 'rich', 'url' => 'http://example.com/widget/1', 'html' => '<iframe></iframe>' } }
+        it { expect(data[:oembed]).to include(content) }
       end
     end
 
-    context 'when the content-disposition header contains a valid filename' do
-      let(:content_disposition) { 'inline;filename="image-cd.jpg"' }
-      it 'parses the filename from the header' do
-        expect(parser.parse_image_file_name(response)).to eq('image-cd.jpg')
+    context 'with json oembed response' do
+      let(:headers) { { content_type: 'application/json' } }
+      let(:url) { 'http://example.com/oembed?url=http%3A%2F%2Fexample.com&format=json' }
+
+      let(:body) do
+        JSON.dump(content)
       end
+
+      include_examples 'oembed'
     end
 
-    context 'when the content-disposition header does not contain a filename' do
-      let(:content_disposition) { 'inline;' }
-      it 'parses the filename from the url' do
-        expect(parser.parse_image_file_name(response)).to eq('image-url.jpg')
+    context 'with xml oembed response' do
+      let(:headers) { { content_type: 'text/xml' } }
+      let(:url) { 'http://example.com/oembed?url=http%3A%2F%2Fexample.com&format=xml' }
+
+      let(:body) do
+        case content
+        when Hash
+          content.to_xml(root: 'oembed')
+        else
+          <<-EOS
+          <?xml version="1.0" encoding="utf-8" standalone="yes"?>
+          <oembed></oembed>
+          EOS
+        end
       end
+
+      include_examples 'oembed'
     end
 
-    context 'when the content-disposition header contains a blank filename' do
-      let(:content_disposition) { 'inline;filename=""' }
-      it 'parses the filename from the url' do
-        expect(parser.parse_image_file_name(response)).to eq('image-url.jpg')
+    context 'with image response' do
+      let(:headers) { { content_type: 'image/jpg', :'content-disposition' => content_disposition } }
+      let(:url) { 'http://example.com/image-url.jpg' }
+      let(:body) { '' }
+
+      context 'when the content-disposition header contains a valid filename' do
+        let(:content_disposition) { 'inline;filename="image-cd.jpg"' }
+
+        it do
+          expect(data[:image][:image_url]).to eq(url)
+          expect(data[:image][:image_content_type]).to eq('image/jpg')
+          expect(data[:image][:image_file_name]).to eq('image-cd.jpg')
+        end
+      end
+
+      context 'when the content-disposition header does not contain a filename' do
+        let(:content_disposition) { 'inline;' }
+
+        it do
+          expect(data[:image][:image_url]).to eq(url)
+          expect(data[:image][:image_content_type]).to eq('image/jpg')
+          expect(data[:image][:image_file_name]).to eq('image-url.jpg')
+        end
+      end
+
+      context 'when the content-disposition header contains a blank filename' do
+        let(:content_disposition) { 'inline;filename=""' }
+
+        it do
+          expect(data[:image][:image_url]).to eq(url)
+          expect(data[:image][:image_content_type]).to eq('image/jpg')
+          expect(data[:image][:image_file_name]).to eq('image-url.jpg')
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: link_preview
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Michael Andrews
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-oembed
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: builder
+  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'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement