link_preview 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ecbcafc85c04588af5ed7ef77f971756f97418e
-  data.tar.gz: f77f0214f0de673b6920e22d37b64f94adb41e00
+  metadata.gz: b34a79a352d9223fbe397ceb04ce50919f9b3542
+  data.tar.gz: 0f1258749159fa44af9a12876dbcce438e174da3
 SHA512:
-  metadata.gz: 711a72d409dafcde725db0de6acefd785fc968cec14914f5098630e79978ebd7f3dc0bf7e419d0b3c8af48ee0e0943d1b8dd95bac864c731c661f66d97023112
-  data.tar.gz: 43db146cbef88b3d00724c740e14979b9317b50d2a85cc4f13fa67f9b6ea94e0a590b26eb3044b94dac2fd61c391fef77b50033830e619010fc81d2139fd25b6
+  metadata.gz: 4bc7c72b3f941bacd49a9be7917065258026284008b1e9f073a97185480d55ceea2442d957691d0bed12efa2e3b1a7f68601a3c2ea500318e50fc6059b5dc366
+  data.tar.gz: 30c706fc5fff2c6424695c0c30d003fbfcb9e3993c58228a9d575635b0128e6809402020a565f3a381985f58b945153d768d83b080588b0be78e0152deb881c1

data/lib/link_preview/parser.rb

@@ -115,8 +115,9 @@ module LinkPreview
     end
 
     def parse_image_file_name(data)
-      if filename = parse_content_disposition_filename(data)
-        filename
+      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.gsub('.', '_')

data/lib/link_preview/uri.rb

@@ -109,6 +109,14 @@ module LinkPreview
       end
     end
 
+    def oembed_uri?
+      query_values.present? && path =~ /oembed/i && query_values['url']
+    end
+
+    def kaltura_uri?
+      query_values.present? && query_values['playerId'] && query_values['entryId']
+    end
+
     private
 
     def merge_query(query)
@@ -124,14 +132,6 @@ module LinkPreview
       self
     end
 
-    def oembed_uri?
-      query_values.present? && path =~ /oembed/i && query_values['url']
-    end
-
-    def kaltura_uri?
-      query_values.present? && query_values['playerId'] && query_values['entryId']
-    end
-
     def oembed_query
       {:maxwidth => @options[:width], :maxheight => @options[:height]}.reject { |_,value| value.nil? }
     end

data/lib/link_preview/version.rb

@@ -6,10 +6,10 @@
 # use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
 # of the Software, and to permit persons to whom the Software is furnished to do
 # so, subject to the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be included in all
 # copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -19,5 +19,5 @@
 # SOFTWARE.
 
 module LinkPreview
-  VERSION = '0.2.7'
+  VERSION = '0.2.8'
 end

data/spec/link_preview/http_crawler_spec.rb

@@ -34,8 +34,8 @@ describe LinkPreview::HTTPCrawler do
 
     context 'when http_client.get raises an exception' do
       before do
-        config.http_client.stub(:get).and_raise(Timeout::Error)
-        config.error_handler.should_receive(:call).once.and_return { 'something' }
+        allow(config.http_client).to receive(:get).and_raise(Timeout::Error)
+        expect(config.error_handler).to receive(:call).once { 'something' }
       end
 
       subject(:response) { crawler.dequeue! }

data/spec/link_preview/parser_spec.rb

@@ -0,0 +1,58 @@
+# encoding: UTF-8
+
+# Copyright (c) 2014, VMware, Inc. All Rights Reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+# of the Software, and to permit persons to whom the Software is furnished to do
+# so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'spec_helper'
+
+describe LinkPreview::Parser do
+  describe '#parse_image_file_name' 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(:url).and_return('http://example.com/image-url.jpg')
+      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')
+      end
+    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')
+      end
+    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')
+      end
+    end
+  end
+end

data/spec/link_preview/uri_spec.rb

@@ -30,41 +30,41 @@ describe LinkPreview::URI do
 
     context 'with nil' do
       let(:uri) { nil }
-      it { parsed_uri.should be_nil }
+      it { expect(parsed_uri).to be_nil }
     end
 
     context 'with parsed LinkPreview::URI' do
       let(:uri) { LinkPreview::URI.parse('http://socialcast.com') }
 
-      it { parsed_uri.should be_a(LinkPreview::URI) }
-      it { parsed_uri.to_s.should == 'http://socialcast.com/' }
-      it { parsed_uri.should_not be_a_kaltura_uri }
-      it { parsed_uri.should_not be_a_oembed_uri }
+      it { expect(parsed_uri).to be_a(LinkPreview::URI) }
+      it { expect(parsed_uri.to_s).to eq('http://socialcast.com/') }
+      it { expect(parsed_uri).not_to be_a_kaltura_uri }
+      it { expect(parsed_uri).not_to be_a_oembed_uri }
     end
 
     context 'with common uri' do
       let(:uri) { 'http://socialcast.com' }
 
-      it { parsed_uri.should be_a(LinkPreview::URI) }
-      it { parsed_uri.to_s.should == 'http://socialcast.com/' }
-      it { parsed_uri.should_not be_a_kaltura_uri }
-      it { parsed_uri.should_not be_a_oembed_uri }
+      it { expect(parsed_uri).to be_a(LinkPreview::URI) }
+      it { expect(parsed_uri.to_s).to eq('http://socialcast.com/') }
+      it { expect(parsed_uri).not_to be_a_kaltura_uri }
+      it { expect(parsed_uri).not_to be_a_oembed_uri }
     end
 
     context 'with kaltura uri' do
       let(:uri) { 'http://demo.kaltura.com/mediaspace/media/index.php/action/oembed?url=http%3A%2F%2Fdemo.kaltura.com%2Fmediaspace%2Fmedia%2F%2Fid%2F1_h9tin5on&playerId=3073841&entryId=1_h9tin5on' }
-      it { parsed_uri.should be_a(LinkPreview::URI) }
-      it { parsed_uri.to_s.should == 'http://demo.kaltura.com/mediaspace/media/index.php/action/oembed/?url=http%3A%2F%2Fdemo.kaltura.com%2Fmediaspace%2Fmedia%2F%2Fid%2F1_h9tin5on&playerId=3073841&entryId=1_h9tin5on&width=420' }
-      it { parsed_uri.should be_a_kaltura_uri }
-      it { parsed_uri.should be_a_oembed_uri }
+      it { expect(parsed_uri).to be_a(LinkPreview::URI) }
+      it { expect(parsed_uri.to_s).to eq('http://demo.kaltura.com/mediaspace/media/index.php/action/oembed/?url=http%3A%2F%2Fdemo.kaltura.com%2Fmediaspace%2Fmedia%2F%2Fid%2F1_h9tin5on&playerId=3073841&entryId=1_h9tin5on&width=420') }
+      it { expect(parsed_uri).to be_a_kaltura_uri }
+      it { expect(parsed_uri).to be_a_oembed_uri }
     end
 
     context 'with kaltura uri with space error' do
       let(:uri) { 'https://cdnsecakmi.kaltura.com/ index.php/kwidget/wid/_1257971/uiconf_id//entry_id/0_aivu6h6k' }
-      it { parsed_uri.should be_a(LinkPreview::URI) }
-      it { parsed_uri.to_s.should == 'https://cdnsecakmi.kaltura.com/%20index.php/kwidget/wid/_1257971/uiconf_id//entry_id/0_aivu6h6k' }
-      it { parsed_uri.should_not be_a_kaltura_uri }
-      it { parsed_uri.should_not be_a_oembed_uri }
+      it { expect(parsed_uri).to be_a(LinkPreview::URI) }
+      it { expect(parsed_uri.to_s).to eq('https://cdnsecakmi.kaltura.com/%20index.php/kwidget/wid/_1257971/uiconf_id//entry_id/0_aivu6h6k') }
+      it { expect(parsed_uri).not_to be_a_kaltura_uri }
+      it { expect(parsed_uri).not_to be_a_oembed_uri }
     end
   end
 
@@ -78,22 +78,22 @@ describe LinkPreview::URI do
     context 'with absolute uri ' do
       let(:uri) { 'http://socialcast.com/a/b/c' }
 
-      it { absolute_uri.should be_a(LinkPreview::URI) }
-      it { absolute_uri.to_s.should == 'http://socialcast.com/a/b/c' }
+      it { expect(absolute_uri).to be_a(LinkPreview::URI) }
+      it { expect(absolute_uri.to_s).to eq('http://socialcast.com/a/b/c') }
     end
 
     context 'with relative uri' do
       let(:uri) { 'a/b/c' }
 
-      it { absolute_uri.should be_a(LinkPreview::URI) }
-      it { absolute_uri.to_s.should == 'http://socialcast.com/a/b/c' }
+      it { expect(absolute_uri).to be_a(LinkPreview::URI) }
+      it { expect(absolute_uri.to_s).to eq('http://socialcast.com/a/b/c') }
     end
 
     context 'with another relative uri' do
       let(:uri) { 'a/b/../../z' }
 
-      it { absolute_uri.should be_a(LinkPreview::URI) }
-      it { absolute_uri.to_s.should == 'http://socialcast.com/z' }
+      it { expect(absolute_uri).to be_a(LinkPreview::URI) }
+      it { expect(absolute_uri.to_s).to eq('http://socialcast.com/z') }
     end
   end
 end

data/spec/link_preview_spec.rb

@@ -35,20 +35,56 @@ describe LinkPreview do
     end
 
     it { should be_a(LinkPreview::Content) }
-    its(:url) { should == url }
-    its(:title) { should == %Q{Open Graph protocol} }
-    its(:description) { should == %Q{The Open Graph protocol enables any web page to become a rich object in a social graph.} }
-    its(:site_name) { should == 'ogp.me' }
-    its(:site_url) { should == url }
-    its(:image_url) { should == 'http://ogp.me/logo.png' }
-    its(:image_data) { should be_a(StringIO) }
-    its(:image_content_type) { should == 'image/png' }
-    its(:image_file_name) { should == 'logo.png' }
+
+    describe '#url' do
+      subject { content.url }
+      it { should == url }
+    end
+
+    describe '#title' do
+      subject { content.title }
+      it { should == %Q{Open Graph protocol} }
+    end
+
+    describe '#description' do
+      subject { content.description }
+      it { should == %Q{The Open Graph protocol enables any web page to become a rich object in a social graph.} }
+    end
+
+    describe '#site_name' do
+      subject { content.site_name }
+      it { should == 'ogp.me' }
+    end
+
+    describe '#site_url' do
+      subject { content.site_url }
+      it { should == url }
+    end
+
+    describe '#image_url' do
+      subject { content.image_url }
+      it { should == 'http://ogp.me/logo.png' }
+    end
+
+    describe '#image_data' do
+      subject { content.image_data }
+      it { should be_a(StringIO) }
+    end
+
+    describe '#image_content_type' do
+      subject { content.image_content_type }
+      it { should == 'image/png' }
+    end
+
+    describe '#image_file_name' do
+      subject { content.image_file_name }
+      it { should == 'logo.png' }
+    end
 
     it 'should issue minimum number of requests' do
-      http_client.should_receive(:get).with('http://ogp.me/').ordered.and_call_original
+      expect(http_client).to receive(:get).with('http://ogp.me/').ordered.and_call_original
       content.title
-      http_client.should_receive(:get).with('http://ogp.me/logo.png').ordered.and_call_original
+      expect(http_client).to receive(:get).with('http://ogp.me/logo.png').ordered.and_call_original
       content.image_data
     end
 
@@ -75,22 +111,58 @@ describe LinkPreview do
     end
 
     it { should be_a(LinkPreview::Content) }
-    its(:url) { should == 'http://youtube.com/watch?v=M3r2XDceM6A' }
-    its(:title) { should == %Q{Amazing Nintendo Facts} }
-    its(:description) { should == %Q{Learn about the history of Nintendo, its gaming systems, and Mario! It's 21 amazing facts about Nintendo you may have never known. Update: As of late 2008, W...} }
-    its(:site_name) { should == 'YouTube' }
-    its(:site_url) { should == 'http://www.youtube.com/' }
-    its(:image_url) { should == 'http://i1.ytimg.com/vi/M3r2XDceM6A/hqdefault.jpg' }
-    its(:image_data) { should be_a(StringIO) }
-    its(:image_content_type) { should == 'image/jpeg' }
-    its(:image_file_name) { should == 'hqdefault.jpg' }
+
+    describe '#url' do
+      subject { content.url }
+      it { should == 'http://youtube.com/watch?v=M3r2XDceM6A' }
+    end
+
+    describe '#title' do
+      subject { content.title }
+      it { should == %Q{Amazing Nintendo Facts} }
+    end
+
+    describe '#description' do
+      subject { content.description }
+      it { should == %Q{Learn about the history of Nintendo, its gaming systems, and Mario! It's 21 amazing facts about Nintendo you may have never known. Update: As of late 2008, W...} }
+    end
+
+    describe '#site_name' do
+      subject { content.site_name }
+      it { should == 'YouTube' }
+    end
+
+    describe '#site_url' do
+      subject { content.site_url }
+      it { should == 'http://www.youtube.com/' }
+    end
+
+    describe '#image_url' do
+      subject { content.image_url }
+      it { should == 'http://i1.ytimg.com/vi/M3r2XDceM6A/hqdefault.jpg' }
+    end
+
+    describe '#image_data' do
+      subject { content.image_data }
+      it { should be_a(StringIO) }
+    end
+
+    describe '#image_content_type' do
+      subject { content.image_content_type }
+      it { should == 'image/jpeg' }
+    end
+
+    describe '#image_file_name' do
+      subject { content.image_file_name }
+      it { should == 'hqdefault.jpg' }
+    end
 
     it 'should issue minimum number of requests' do
-      http_client.should_receive(:get).with('http://www.youtube.com/oembed?format=json&url=http%3A%2F%2Fyoutube.com%2Fwatch%3Fv%3DM3r2XDceM6A').ordered.and_call_original
+      expect(http_client).to receive(:get).with('http://www.youtube.com/oembed?format=json&url=http%3A%2F%2Fyoutube.com%2Fwatch%3Fv%3DM3r2XDceM6A').ordered.and_call_original
       content.title
-      http_client.should_receive(:get).with('http://youtube.com/watch?v=M3r2XDceM6A').ordered.and_call_original
+      expect(http_client).to receive(:get).with('http://youtube.com/watch?v=M3r2XDceM6A').ordered.and_call_original
       content.description
-      http_client.should_receive(:get).with('http://i1.ytimg.com/vi/M3r2XDceM6A/hqdefault.jpg').ordered.and_call_original
+      expect(http_client).to receive(:get).with('http://i1.ytimg.com/vi/M3r2XDceM6A/hqdefault.jpg').ordered.and_call_original
       content.image_data
     end
 
@@ -125,22 +197,58 @@ describe LinkPreview do
     end
 
     it { should be_a(LinkPreview::Content) }
-    its(:url) { should == 'http://videos.kaltura.com/media//id/1_abxlxlll' }
-    its(:title) { should == %Q{KMC Overview | Kaltura KMC Tutorial} }
-    its(:description) { should be_nil }
-    its(:site_name) { should == 'Kaltura Videos' }
-    its(:site_url) { should == 'http://videos.kaltura.com/' }
-    its(:image_url) { should == "http://cdnbakmi.kaltura.com/p/811441/sp/81144100/thumbnail/entry_id/1_abxlxlll/version/100012/width//height/" }
-    its(:image_data) { should be_a(StringIO) }
-    its(:image_content_type) { should == 'image/jpeg' }
-    its(:image_file_name) { should == 'height' }
+
+    describe '#url' do
+      subject { content.url }
+      it { should == 'http://videos.kaltura.com/media//id/1_abxlxlll' }
+    end
+
+    describe '#title' do
+      subject { content.title }
+      it { should == %Q{KMC Overview | Kaltura KMC Tutorial} }
+    end
+
+    describe '#description' do
+      subject { content.description }
+      it { should be_nil }
+    end
+
+    describe '#site_name' do
+      subject { content.site_name }
+      it { should == 'Kaltura Videos' }
+    end
+
+    describe '#site_url' do
+      subject { content.site_url }
+      it { should == 'http://videos.kaltura.com/' }
+    end
+
+    describe '#image_url' do
+      subject { content.image_url }
+      it { should == "http://cdnbakmi.kaltura.com/p/811441/sp/81144100/thumbnail/entry_id/1_abxlxlll/version/100012/width//height/" }
+    end
+
+    describe '#image_data' do
+      subject { content.image_data }
+      it { should be_a(StringIO) }
+    end
+
+    describe '#image_content_type' do
+      subject { content.image_content_type }
+      it { should == 'image/jpeg' }
+    end
+
+    describe '#image_file_name' do
+      subject { content.image_file_name }
+      it { should == 'height' }
+    end
 
     it 'should issue minimum number of requests' do
-      http_client.should_receive(:get).with('http://videos.kaltura.com/oembed/?url=http%3A%2F%2Fvideos.kaltura.com%2Fmedia%2F%2Fid%2F1_abxlxlll&playerId=3073841&entryId=1_abxlxlll&width=420').ordered.and_call_original
+      expect(http_client).to receive(:get).with('http://videos.kaltura.com/oembed/?url=http%3A%2F%2Fvideos.kaltura.com%2Fmedia%2F%2Fid%2F1_abxlxlll&playerId=3073841&entryId=1_abxlxlll&width=420').ordered.and_call_original
       content.title
-      http_client.should_receive(:get).with('http://cdnbakmi.kaltura.com/p/811441/sp/81144100/thumbnail/entry_id/1_abxlxlll/version/100012/width//height/').ordered.and_call_original
+      expect(http_client).to receive(:get).with('http://cdnbakmi.kaltura.com/p/811441/sp/81144100/thumbnail/entry_id/1_abxlxlll/version/100012/width//height/').ordered.and_call_original
       content.image_data
-      http_client.should_receive(:get).with('http://videos.kaltura.com/media//id/1_abxlxlll').ordered.and_call_original
+      expect(http_client).to receive(:get).with('http://videos.kaltura.com/media//id/1_abxlxlll').ordered.and_call_original
       content.description
     end
   end
@@ -151,22 +259,58 @@ describe LinkPreview do
     end
 
     it { should be_a(LinkPreview::Content) }
-    its(:url) { should == 'http://portal.sliderocket.com/SlideRocket-Presentations/Hoshyar-Foundation' }
-    its(:title) { should == %Q{Hoshyar-Foundation} }
-    its(:description) { should == %Q{Proudly crafted with SlideRocket.} }
-    its(:site_name) { should == 'SlideRocket' }
-    its(:site_url) { should == 'http://sliderocket.com/' }
-    its(:image_url) { should == 'http://cdn.sliderocket.com/thumbnails/4/43/43b475a4-192e-455e-832f-4a40697d8d25.jpg' }
-    its(:image_data) { should be_a(StringIO) }
-    its(:image_content_type) { should == 'binary/octet-stream' }
-    its(:image_file_name) { should == '43b475a4-192e-455e-832f-4a40697d8d25.jpg' }
+
+    describe '#url' do
+      subject { content.url }
+      it { should == 'http://portal.sliderocket.com/SlideRocket-Presentations/Hoshyar-Foundation' }
+    end
+
+    describe '#title' do
+      subject { content.title }
+      it { should == %Q{Hoshyar-Foundation} }
+    end
+
+    describe '#description' do
+      subject { content.description }
+      it { should == %Q{Proudly crafted with SlideRocket.} }
+    end
+
+    describe '#site_name' do
+      subject { content.site_name }
+      it { should == 'SlideRocket' }
+    end
+
+    describe '#site_url' do
+      subject { content.site_url }
+      it { should == 'http://sliderocket.com/' }
+    end
+
+    describe '#image_url' do
+      subject { content.image_url }
+      it { should == 'http://cdn.sliderocket.com/thumbnails/4/43/43b475a4-192e-455e-832f-4a40697d8d25.jpg' }
+    end
+
+    describe '#image_data' do
+      subject { content.image_data }
+      it { should be_a(StringIO) }
+    end
+
+    describe '#image_content_type' do
+      subject { content.image_content_type }
+      it { should == 'binary/octet-stream' }
+    end
+
+    describe '#image_file_name' do
+      subject { content.image_file_name }
+      it { should == '43b475a4-192e-455e-832f-4a40697d8d25.jpg' }
+    end
 
     it 'should issue minimum number of requests' do
-      http_client.should_receive(:get).with('http://portal.sliderocket.com/SlideRocket-Presentations/Hoshyar-Foundation').ordered.and_call_original
+      expect(http_client).to receive(:get).with('http://portal.sliderocket.com/SlideRocket-Presentations/Hoshyar-Foundation').ordered.and_call_original
       content.title
-      http_client.should_receive(:get).with('http://cdn.sliderocket.com/thumbnails/4/43/43b475a4-192e-455e-832f-4a40697d8d25.jpg').ordered.and_call_original
+      expect(http_client).to receive(:get).with('http://cdn.sliderocket.com/thumbnails/4/43/43b475a4-192e-455e-832f-4a40697d8d25.jpg').ordered.and_call_original
       content.image_data
-      http_client.should_receive(:get).with('http://app.sliderocket.com/app/oEmbed.aspx?url=http%3A%2F%2Fapp.sliderocket.com%2Fapp%2Ffullplayer.aspx%3Fid%3Df614ec65-0f9b-4167-bb2a-b384dad535f3&maxwidth=420').ordered.and_call_original
+      expect(http_client).to receive(:get).with('http://app.sliderocket.com/app/oEmbed.aspx?url=http%3A%2F%2Fapp.sliderocket.com%2Fapp%2Ffullplayer.aspx%3Fid%3Df614ec65-0f9b-4167-bb2a-b384dad535f3&maxwidth=420').ordered.and_call_original
       content.as_oembed
     end
 
@@ -197,18 +341,54 @@ describe LinkPreview do
     end
 
     it { should be_a(LinkPreview::Content) }
-    its(:url) { should == 'http://support.apple.com/kb/HT5642' }
-    its(:title) { should == %Q{About the security content of iOS 6.1 Software Update} }
-    its(:description) { should == %Q{This document describes the security content of iOS 6.1.\nFor the protection of our customers, Apple does not disclose, discuss, or confirm security issues until a full investigation has occurred and any necessary patches or releases are available. To learn more about Apple Product Security, see the Apple Product Security website.\nFor information about the Apple Product Security PGP Key, see How to use the Apple Product Security PGP Key.\nWhere possible, CVE IDs are used to reference the vulnerabilities for further information.\nTo learn about other Security Updates, see Apple Security Updates.} }
-    its(:site_name) { should == 'support.apple.com' }
-    its(:site_url) { should == 'http://support.apple.com' }
-    its(:image_url) { should be_nil }
-    its(:image_data) { should be_nil }
-    its(:image_content_type) { should be_nil }
-    its(:image_file_name) { should be_nil }
+
+    describe '#url' do
+      subject { content.url }
+      it { should == 'http://support.apple.com/kb/HT5642' }
+    end
+
+    describe '#title' do
+      subject { content.title }
+      it { should == %Q{About the security content of iOS 6.1 Software Update} }
+    end
+
+    describe '#description' do
+      subject { content.description }
+      it { should == %Q{This document describes the security content of iOS 6.1.\nFor the protection of our customers, Apple does not disclose, discuss, or confirm security issues until a full investigation has occurred and any necessary patches or releases are available. To learn more about Apple Product Security, see the Apple Product Security website.\nFor information about the Apple Product Security PGP Key, see How to use the Apple Product Security PGP Key.\nWhere possible, CVE IDs are used to reference the vulnerabilities for further information.\nTo learn about other Security Updates, see Apple Security Updates.} }
+    end
+
+    describe '#site_name' do
+      subject { content.site_name }
+      it { should == 'support.apple.com' }
+    end
+
+    describe '#site_url' do
+      subject { content.site_url }
+      it { should == 'http://support.apple.com' }
+    end
+
+    describe '#image_url' do
+      subject { content.image_url }
+      it { should be_nil }
+    end
+
+    describe '#image_data' do
+      subject { content.image_data }
+      it { should be_nil }
+    end
+
+    describe '#image_content_type' do
+      subject { content.image_content_type }
+      it { should be_nil }
+    end
+
+    describe '#image_file_name' do
+      subject { content.image_file_name }
+      it { should be_nil }
+    end
 
     it 'should issue minimum number of requests' do
-      http_client.should_receive(:get).with('http://support.apple.com/kb/HT5642').ordered.and_call_original
+      expect(http_client).to receive(:get).with('http://support.apple.com/kb/HT5642').ordered.and_call_original
       content.title
       content.image_data
     end
@@ -235,15 +415,51 @@ describe LinkPreview do
     end
 
     it { should be_a(LinkPreview::Content) }
-    its(:url) { should == 'http://www.golden-gate-park.com/wp-content/uploads/2011/02/Golden_Gate_Park_Logo_Header.png' }
-    its(:title) { should == 'http://www.golden-gate-park.com/wp-content/uploads/2011/02/Golden_Gate_Park_Logo_Header.png' }
-    its(:description) { should be_nil }
-    its(:site_name) { should == 'www.golden-gate-park.com' }
-    its(:site_url) { should == 'http://www.golden-gate-park.com' }
-    its(:image_url) { should == 'http://www.golden-gate-park.com/wp-content/uploads/2011/02/Golden_Gate_Park_Logo_Header.png' }
-    its(:image_data) { should be_a(StringIO) }
-    its(:image_content_type) { should == 'image/png' }
-    its(:image_file_name) { should == 'Golden_Gate_Park_Logo_Header.png' }
+
+    describe '#url' do
+      subject { content.url }
+      it { should == 'http://www.golden-gate-park.com/wp-content/uploads/2011/02/Golden_Gate_Park_Logo_Header.png' }
+    end
+
+    describe '#title' do
+      subject { content.title }
+      it { should == 'http://www.golden-gate-park.com/wp-content/uploads/2011/02/Golden_Gate_Park_Logo_Header.png' }
+    end
+
+    describe '#description' do
+      subject { content.description }
+      it { should be_nil }
+    end
+
+    describe '#site_name' do
+      subject { content.site_name }
+      it { should == 'www.golden-gate-park.com' }
+    end
+
+    describe '#site_url' do
+      subject { content.site_url }
+      it { should == 'http://www.golden-gate-park.com' }
+    end
+
+    describe '#image_url' do
+      subject { content.image_url }
+      it { should == 'http://www.golden-gate-park.com/wp-content/uploads/2011/02/Golden_Gate_Park_Logo_Header.png' }
+    end
+
+    describe '#image_data' do
+      subject { content.image_data }
+      it { should be_a(StringIO) }
+    end
+
+    describe '#image_content_type' do
+      subject { content.image_content_type }
+      it { should == 'image/png' }
+    end
+
+    describe '#image_file_name' do
+      subject { content.image_file_name }
+      it { should == 'Golden_Gate_Park_Logo_Header.png' }
+    end
 
     # FIXME should convert to photo via paperclip
     context '#as_oembed' do
@@ -269,8 +485,8 @@ describe LinkPreview do
 
     it { should_not be_found }
     it 'should issue minimum number of requests' do
-      http_client.should_receive(:get).with('http://www.youtube.com/oembed?format=json&url=http%3A%2F%2Fyoutube.com%2Fwatch%3Fv%3D1').ordered.and_call_original
-      http_client.should_receive(:get).with('http://youtube.com/watch?v=1').ordered.and_call_original
+      expect(http_client).to receive(:get).with('http://www.youtube.com/oembed?format=json&url=http%3A%2F%2Fyoutube.com%2Fwatch%3Fv%3D1').ordered.and_call_original
+      expect(http_client).to receive(:get).with('http://youtube.com/watch?v=1').ordered.and_call_original
       content.title
     end
 
@@ -294,21 +510,57 @@ describe LinkPreview do
     end
 
     it { should be_a(LinkPreview::Content) }
-    its(:url) { should == 'http://media.mediaspace.kaltura.com/media/Despicable+Me/0_w2zsofdj' }
-    its(:title) { should == %Q{Despicable Me} }
-    its(:description) { should == %Q{In a happy suburban neighborhood surrounded by white picket fences with flowering rose bushes, sits a black house with a dead lawn. Unbeknownst to the neighbors, hidden beneath this home is a vast secret hideout. Surrounded by a small army of minions, we discover Gru planning the biggest heist in the history of the world. He is going to steal the moon, yes, the moon. Gru delights in all things wicked. Armed with his arsenal of shrink rays, freeze rays, and battle-ready vehicles for land and air, he vanquishes all who stand in his way. Until the day he encounters the immense will of three little orphaned girls who look at him and see something that no one else has ever seen: a potential Dad. The world's greatest villain has just met his greatest challenge: three little girls named Margo, Edith and Agnes.} }
-    its(:site_name) { should == 'MediaSpace Demo Site' }
-    its(:site_url) { should == 'http://media.mediaspace.kaltura.com' }
-    its(:image_url) { should == 'https://cdnbakmi.kaltura.com/p/1059491/sp/105949100/thumbnail/entry_id/0_w2zsofdj/version/100021/width/400' }
-    its(:image_data) { should be_a(StringIO) }
-    its(:image_content_type) { should == 'image/jpeg' }
-    its(:image_file_name) { should == '400' }
+
+    describe '#url' do
+      subject { content.url }
+      it { should == 'http://media.mediaspace.kaltura.com/media/Despicable+Me/0_w2zsofdj' }
+    end
+
+    describe '#title' do
+      subject { content.title }
+      it { should == %Q{Despicable Me} }
+    end
+
+    describe '#description' do
+      subject { content.description }
+      it { should == %Q{In a happy suburban neighborhood surrounded by white picket fences with flowering rose bushes, sits a black house with a dead lawn. Unbeknownst to the neighbors, hidden beneath this home is a vast secret hideout. Surrounded by a small army of minions, we discover Gru planning the biggest heist in the history of the world. He is going to steal the moon, yes, the moon. Gru delights in all things wicked. Armed with his arsenal of shrink rays, freeze rays, and battle-ready vehicles for land and air, he vanquishes all who stand in his way. Until the day he encounters the immense will of three little orphaned girls who look at him and see something that no one else has ever seen: a potential Dad. The world's greatest villain has just met his greatest challenge: three little girls named Margo, Edith and Agnes.} }
+    end
+
+    describe '#site_name' do
+      subject { content.site_name }
+      it { should == 'MediaSpace Demo Site' }
+    end
+
+    describe '#site_url' do
+      subject { content.site_url }
+      it { should == 'http://media.mediaspace.kaltura.com' }
+    end
+
+    describe '#image_url' do
+      subject { content.image_url }
+      it { should == 'https://cdnbakmi.kaltura.com/p/1059491/sp/105949100/thumbnail/entry_id/0_w2zsofdj/version/100021/width/400' }
+    end
+
+    describe '#image_data' do
+      subject { content.image_data }
+      it { should be_a(StringIO) }
+    end
+
+    describe '#image_content_type' do
+      subject { content.image_content_type }
+      it { should == 'image/jpeg' }
+    end
+
+    describe '#image_file_name' do
+      subject { content.image_file_name }
+      it { should == '400' }
+    end
 
     it 'should issue minimum number of requests' do
-      http_client.should_receive(:get).with('https://media.mediaspace.kaltura.com/media/Despicable+Me/0_w2zsofdj/6065172').ordered.and_call_original
+      expect(http_client).to receive(:get).with('https://media.mediaspace.kaltura.com/media/Despicable+Me/0_w2zsofdj/6065172').ordered.and_call_original
       content.title
-      http_client.should_receive(:get).with('https://cdnbakmi.kaltura.com/p/1059491/sp/105949100/thumbnail/entry_id/0_w2zsofdj/version/100021/width/400').ordered.and_call_original
-      http_client.should_receive(:get).with('http://cdnbakmi.kaltura.com/p/1059491/sp/105949100/thumbnail/entry_id/0_w2zsofdj/version/100021/width/400').ordered.and_call_original
+      expect(http_client).to receive(:get).with('https://cdnbakmi.kaltura.com/p/1059491/sp/105949100/thumbnail/entry_id/0_w2zsofdj/version/100021/width/400').ordered.and_call_original
+      expect(http_client).to receive(:get).with('http://cdnbakmi.kaltura.com/p/1059491/sp/105949100/thumbnail/entry_id/0_w2zsofdj/version/100021/width/400').ordered.and_call_original
       content.image_data
       content.description
     end
@@ -340,15 +592,50 @@ describe LinkPreview do
       LinkPreview.fetch(url)
     end
 
-    its(:url) { should == url }
-    its(:title) { should == %Q{Hadoop | Elasticsearch} }
-    its(:description) { should == %Q{Search your Hadoop Data and Get Real-Time Results Deep API integration makes searching data in Hadoop easy Elasticsearch for Apache Hadoop enables real-time searching against data stored in Apache Hadoop. It provides native integration with Map/Reduce, Hive, Pig, and Cascading, all with no customization. Download Elasticsearch for Apache Hadoop Documentation Great fit for “Big Data” [...]} }
-    its(:site_name) { should == 'Elasticsearch.org' }
-    its(:site_url) { should_not be_nil }
-    its(:image_url) { should == 'http://www.elasticsearch.org/content/uploads/2013/10/blank_hero.png' }
-    its(:image_data) { should be_a(StringIO) }
-    its(:image_content_type) { should == 'image/png' }
-    its(:image_file_name) { should == 'blank_hero.png' }
+    describe '#url' do
+      subject { content.url }
+      it { should == url }
+    end
+
+    describe '#title' do
+      subject { content.title }
+      it { should == %Q{Hadoop | Elasticsearch} }
+    end
+
+    describe '#description' do
+      subject { content.description }
+      it { should == %Q{Search your Hadoop Data and Get Real-Time Results Deep API integration makes searching data in Hadoop easy Elasticsearch for Apache Hadoop enables real-time searching against data stored in Apache Hadoop. It provides native integration with Map/Reduce, Hive, Pig, and Cascading, all with no customization. Download Elasticsearch for Apache Hadoop Documentation Great fit for “Big Data” [...]} }
+    end
+
+    describe '#site_name' do
+      subject { content.site_name }
+      it { should == 'Elasticsearch.org' }
+    end
+
+    describe '#site_url' do
+      subject { content.site_url }
+      it { should_not be_nil }
+    end
+
+    describe '#image_url' do
+      subject { content.image_url }
+      it { should == 'http://www.elasticsearch.org/content/uploads/2013/10/blank_hero.png' }
+    end
+
+    describe '#image_data' do
+      subject { content.image_data }
+      it { should be_a(StringIO) }
+    end
+
+    describe '#image_content_type' do
+      subject { content.image_content_type }
+      it { should == 'image/png' }
+    end
+
+    describe '#image_file_name' do
+      subject { content.image_file_name }
+      it { should == 'blank_hero.png' }
+    end
 
     context '#as_oembed' do
       subject(:oembed) { content.as_oembed }
@@ -373,11 +660,34 @@ describe LinkPreview do
       LinkPreview.fetch(url)
     end
 
-    its(:url) { should == url }
-    its(:title) { should == url }
-    its(:description) { should be_nil }
-    its(:site_name) { should == 's.taobao.com' }
-    its(:site_url) { should == url }
-    its(:image_url) { should be_nil }
+    describe '#url' do
+      subject { content.url }
+      it { should == url }
+    end
+
+    describe '#title' do
+      subject { content.title }
+      it { should == url }
+    end
+
+    describe '#description' do
+      subject { content.description }
+      it { should be_nil }
+    end
+
+    describe '#site_name' do
+      subject { content.site_name }
+      it { should == 's.taobao.com' }
+    end
+
+    describe '#site_url' do
+      subject { content.site_url }
+      it { should == url }
+    end
+
+    describe '#image_url' do
+      subject { content.image_url }
+      it { should be_nil }
+    end
   end
 end

data/spec/support/link_preview/link_preview_stubs.rb

@@ -12,8 +12,8 @@ module LinkPreviewStubs
     simple_properties = properties.reject { |k, v| v.is_a?(Hash) }
 
     content = double('content', DEFAULT_PROPERTIES.merge(:found? => true).merge(simple_properties))
-    content.stub(:sources).and_return(nested_properties)
-    content.stub(:as_oembed).and_return({ :version => '1.0', :type => 'link' }.merge(nested_properties[:oembed]))
+    allow(content).to receive(:sources).and_return(nested_properties)
+    allow(content).to receive(:as_oembed).and_return({ :version => '1.0', :type => 'link' }.merge(nested_properties[:oembed]))
 
     stub_content_helper uri, content
   end
@@ -21,6 +21,6 @@ module LinkPreviewStubs
   private
 
   def stub_content_helper(uri, content)
-    LinkPreview.stub(:fetch).with(uri, an_instance_of(Hash), an_instance_of(Hash)).and_return(content)
+    allow(LinkPreview).to receive(:fetch).with(uri, an_instance_of(Hash), an_instance_of(Hash)).and_return(content)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: link_preview
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Michael Andrews
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-oembed
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: debugger
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -196,6 +196,7 @@ files:
 - spec/files/requests/youtube.yml
 - spec/files/requests/youtube_404.yml
 - spec/link_preview/http_crawler_spec.rb
+- spec/link_preview/parser_spec.rb
 - spec/link_preview/uri_spec.rb
 - spec/link_preview_spec.rb
 - spec/spec_helper.rb
@@ -235,6 +236,7 @@ test_files:
 - spec/files/requests/youtube.yml
 - spec/files/requests/youtube_404.yml
 - spec/link_preview/http_crawler_spec.rb
+- spec/link_preview/parser_spec.rb
 - spec/link_preview/uri_spec.rb
 - spec/link_preview_spec.rb
 - spec/spec_helper.rb