link_thumbnailer 2.4.0 → 2.5.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YWFmNmRhOTA0NTA0NjAyMDAyZjgwNzhjYzQxOGJiODNlYmQwOTU0OQ==
-  data.tar.gz: !binary |-
-    OGM1ZDk2ODQ3MTBkMTc4MTAyNzMwMWNmMzQyOGY0YWM2OWQwNTU0Zg==
+SHA1:
+  metadata.gz: e82e842f04354aa42e0d379f3bb7f1260f9d12ef
+  data.tar.gz: 472731d1a762495f3deef46028d68481a77f1eb3
 SHA512:
-  metadata.gz: !binary |-
-    ZmNjZjg5YTk0NTIxMWVhZjQ0MjAwNzRjZDM1NGJmM2Y5MTdlZjdiNjYwMWU5
-    MzEyYmNmZTY4YzI3YjUwYzY2Mzk4ZjYwZWE3NmE1OGQxZjI0MDVhNTFjZDQz
-    OTJmMmQyZGNlM2Y0MzBjYWUxMzAyMjZlYjY0ZGFmOGRmZDcyZGQ=
-  data.tar.gz: !binary |-
-    NTQyMGVmZjkzZmZkOGYxMTkxMGEzZmRkMDlmMzRmZmVlOThhM2IyNjI1ZmY3
-    MjY5MzBjYmQ3MzE0ZmQyYmU1MWY0NmFmMzc4YjUxYzYxZjcyZjgzMzJmYzcz
-    ZGY5MDVmMjM0MjM5Y2Q0NGY5YjM1YjIwZTY5YTJiZGIxYzMwZmY=
+  metadata.gz: 615f8cf840ce82c6080340730f33146732c14d1c32ab11d9c8d71228c9c0cec05f84a55a846f3e55e4b31df91efb0f84854c4e02f033626b95a65888fb8ebd2d
+  data.tar.gz: bb113d233c1296b407d44091d64dd50d6c031eae0eb28f5d816415abdcfea5ffb8c861ea53e36b6be9914c202254db5689f1e545d645cf457ac312f1c5dfddd5

data/.rspec

@@ -1,2 +1,2 @@
 --colour
---format=nested
+--format=documentation

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 2.5.0
+
+- Handles seamlessly `og:image` and `og:image:url`
+- Handles seamlessly `og:video` and `og:video:url`
+- Handles `og:video:width` and `og:video:height` for one video only (please create a ticket if you want support for multiple videos/images width & height)
+- Fix calling `as_json` on `website` to return `as_json` representation of videos and images, not just their urls
+- Gem updates and fix rspec deprecation warnings
+
 # 2.4.0
 
 - Handle connection through proxy automatically using the `ENV['HTTP_PROXY']` variable thanks to [taganaka](https://github.com/taganaka).

data/README.md

@@ -28,7 +28,9 @@ Demo Application is [here](http://link-thumbnailer-demo.herokuapp.com/) !
 
 Add this line to your application's Gemfile:
 
-    gem 'link_thumbnailer'
+```ruby
+gem 'link_thumbnailer'
+```
 
 And then execute:
 
@@ -48,29 +50,35 @@ This will add `link_thumbnailer.rb` to `config/initializers/`.
 
 Run `irb` and require the gem:
 
-	require 'link_thumbnailer'
+```ruby
+require 'link_thumbnailer'
+```
 
 The gem handle regular website but also website that use the [Opengraph](http://ogp.me/) protocol.
 
-	object = LinkThumbnailer.generate('http://stackoverflow.com')
-	 => #<LinkThumbnailer::Models::Website:...>
+```ruby
+object = LinkThumbnailer.generate('http://stackoverflow.com')
+ => #<LinkThumbnailer::Models::Website:...>
 
-	object.title
-	 => "Stack Overflow"
+object.title
+ => "Stack Overflow"
 
-	object.favicon
-	 => "//cdn.sstatic.net/stackoverflow/img/favicon.ico?v=038622610830"
+object.favicon
+ => "//cdn.sstatic.net/stackoverflow/img/favicon.ico?v=038622610830"
 
-	object.description
-	 => "Q&A for professional and enthusiast programmers"
+object.description
+ => "Q&A for professional and enthusiast programmers"
 
-	object.images.first.src.to_s
-	 => "http://cdn.sstatic.net/stackoverflow/img/apple-touch-icon@2.png?v=fde65a5a78c6"
+object.images.first.src.to_s
+ => "http://cdn.sstatic.net/stackoverflow/img/apple-touch-icon@2.png?v=fde65a5a78c6"
+```
 
 LinkThumbnailer `generate` method return an instance of `LinkThumbnailer::Models::Website` that respond to `to_json` and `as_json` as you would expect:
 
-	object.to_json
-	 => "{\"url\":\"http://stackoverflow.com\",\"title\":\"Stack Overflow\",\"description\":\"Q&A for professional and enthusiast programmers\",\"images\":[{\"src\":\"http://cdn.sstatic.net/stackoverflow/img/apple-touch-icon@2.png?v=fde65a5a78c6\",\"size\":[316,316],\"type\":\"png\"}]}"
+```ruby
+object.to_json
+ => "{\"url\":\"http://stackoverflow.com\",\"title\":\"Stack Overflow\",\"description\":\"Q&A for professional and enthusiast programmers\",\"images\":[{\"src\":\"http://cdn.sstatic.net/stackoverflow/img/apple-touch-icon@2.png?v=fde65a5a78c6\",\"size\":[316,316],\"type\":\"png\"}]}"
+```
 
 
 ## Configuration
@@ -79,80 +87,84 @@ LinkThumnailer comes with default configuration values. You can change default v
 
 In `config/initializers/link_thumbnailer.rb`
 
-	LinkThumbnailer.configure do |config|
-	  # Numbers of redirects before raising an exception when trying to parse given url.
-	  #
-	  # config.redirect_limit = 3
-
-	  # Set user agent
-	  #
-	  # config.user_agent = 'link_thumbnailer'
-
-	  # Enable or disable SSL verification
-	  #
-	  # config.verify_ssl = true
-
-	  # The amount of time in seconds to wait for a connection to be opened.
-	  # If the HTTP object cannot open a connection in this many seconds,
-	  # it raises a Net::OpenTimeout exception.
-	  #
-	  # See http://www.ruby-doc.org/stdlib-2.1.1/libdoc/net/http/rdoc/Net/HTTP.html#open_timeout
-	  #
-	  # config.http_timeout = 5
-
-	  # List of blacklisted urls you want to skip when searching for images.
-	  #
-	  # config.blacklist_urls = [
-	  #   %r{^http://ad\.doubleclick\.net/},
-	  #   %r{^http://b\.scorecardresearch\.com/},
-	  #   %r{^http://pixel\.quantserve\.com/},
-	  #   %r{^http://s7\.addthis\.com/}
-	  # ]
-
-	  # List of attributes you want LinkThumbnailer to fetch on a website.
-	  #
-	  # config.attributes = [:title, :images, :description, :videos, :favicon]
-
-	  # List of procedures used to rate the website description. Add you custom class
-	  # here. Note that the order matter to compute the score. See wiki for more details
-	  # on how to build your own graders.
-	  #
-	  # config.graders = [
-	  #   ->(description) { ::LinkThumbnailer::Graders::Length.new(description) },
-	  #   ->(description) { ::LinkThumbnailer::Graders::HtmlAttribute.new(description, :class) },
-	  #   ->(description) { ::LinkThumbnailer::Graders::HtmlAttribute.new(description, :id) },
-	  #   ->(description) { ::LinkThumbnailer::Graders::Position.new(description) },
-	  #   ->(description) { ::LinkThumbnailer::Graders::LinkDensity.new(description) }
-	  # ]
-
-	  # Minimum description length for a website.
-	  #
-	  # config.description_min_length = 25
-
-	  # Regex of words considered positive to rate website description.
-	  #
-	  # config.positive_regex = /article|body|content|entry|hentry|main|page|pagination|post|text|blog|story/i
-
-	  # Regex of words considered negative to rate website description.
-	  #
-	  # config.negative_regex = /combx|comment|com-|contact|foot|footer|footnote|masthead|media|meta|outbrain|promo|related|scroll|shoutbox|sidebar|sponsor|shopping|tags|tool|widget|modal/i
-
-	  # Numbers of images to fetch. Fetching too many images will be slow.
-	  # Note that LinkThumbnailer will only sort fetched images between each other.
-	  # Meaning that they could be a "better" image on the page.
-	  #
-	  # config.image_limit = 5
-
-	  # Whether you want LinkThumbnailer to return image size and type or not.
-	  # Setting this value to false will increase performance since for each images, LinkThumbnailer
-	  # does not have to fetch its size and type.
-	  #
-	  # config.image_stats = true
-	end
+```ruby
+LinkThumbnailer.configure do |config|
+  # Numbers of redirects before raising an exception when trying to parse given url.
+  #
+  # config.redirect_limit = 3
+
+  # Set user agent
+  #
+  # config.user_agent = 'link_thumbnailer'
+
+  # Enable or disable SSL verification
+  #
+  # config.verify_ssl = true
+
+  # The amount of time in seconds to wait for a connection to be opened.
+  # If the HTTP object cannot open a connection in this many seconds,
+  # it raises a Net::OpenTimeout exception.
+  #
+  # See http://www.ruby-doc.org/stdlib-2.1.1/libdoc/net/http/rdoc/Net/HTTP.html#open_timeout
+  #
+  # config.http_timeout = 5
+
+  # List of blacklisted urls you want to skip when searching for images.
+  #
+  # config.blacklist_urls = [
+  #   %r{^http://ad\.doubleclick\.net/},
+  #   %r{^http://b\.scorecardresearch\.com/},
+  #   %r{^http://pixel\.quantserve\.com/},
+  #   %r{^http://s7\.addthis\.com/}
+  # ]
+
+  # List of attributes you want LinkThumbnailer to fetch on a website.
+  #
+  # config.attributes = [:title, :images, :description, :videos, :favicon]
+
+  # List of procedures used to rate the website description. Add you custom class
+  # here. Note that the order matter to compute the score. See wiki for more details
+  # on how to build your own graders.
+  #
+  # config.graders = [
+  #   ->(description) { ::LinkThumbnailer::Graders::Length.new(description) },
+  #   ->(description) { ::LinkThumbnailer::Graders::HtmlAttribute.new(description, :class) },
+  #   ->(description) { ::LinkThumbnailer::Graders::HtmlAttribute.new(description, :id) },
+  #   ->(description) { ::LinkThumbnailer::Graders::Position.new(description) },
+  #   ->(description) { ::LinkThumbnailer::Graders::LinkDensity.new(description) }
+  # ]
+
+  # Minimum description length for a website.
+  #
+  # config.description_min_length = 25
+
+  # Regex of words considered positive to rate website description.
+  #
+  # config.positive_regex = /article|body|content|entry|hentry|main|page|pagination|post|text|blog|story/i
+
+  # Regex of words considered negative to rate website description.
+  #
+  # config.negative_regex = /combx|comment|com-|contact|foot|footer|footnote|masthead|media|meta|outbrain|promo|related|scroll|shoutbox|sidebar|sponsor|shopping|tags|tool|widget|modal/i
+
+  # Numbers of images to fetch. Fetching too many images will be slow.
+  # Note that LinkThumbnailer will only sort fetched images between each other.
+  # Meaning that they could be a "better" image on the page.
+  #
+  # config.image_limit = 5
+
+  # Whether you want LinkThumbnailer to return image size and type or not.
+  # Setting this value to false will increase performance since for each images, LinkThumbnailer
+  # does not have to fetch its size and type.
+  #
+  # config.image_stats = true
+end
+```
 
 Or at runtime:
 
-	object = LinkThumbnailer.generate('http://stackoverflow.com', redirect_limit: 5, user_agent: 'foo')
+```ruby
+object = LinkThumbnailer.generate('http://stackoverflow.com', redirect_limit: 5, user_agent: 'foo')
+```
 
 Note that runtime options will override default global configuration.
 

data/lib/link_thumbnailer/models/video.rb

@@ -7,10 +7,10 @@ module LinkThumbnailer
 
       attr_reader :src, :size, :duration, :provider, :id, :embed_code
 
-      def initialize(src)
+      def initialize(src, size = nil)
         @src        = src
         @id         = parser.id
-        @size       = parser.size
+        @size       = size || parser.size
         @duration   = parser.duration
         @provider   = parser.provider
         @embed_code = parser.embed_code

data/lib/link_thumbnailer/models/website.rb

@@ -42,8 +42,8 @@ module LinkThumbnailer
           favicon:      favicon,
           title:        title,
           description:  description,
-          images:       images,
-          videos:       videos
+          images:       images.map(&:as_json),
+          videos:       videos.map(&:as_json)
         }
       end
 

data/lib/link_thumbnailer/scraper.rb

@@ -34,7 +34,7 @@ module LinkThumbnailer
     def call
       config.attributes.each do |name|
         scrapers.each do |scraper_prefix|
-          scraper_class(scraper_prefix, name).new(document).call(website, name.to_s)
+          scraper_class(scraper_prefix, name).new(document, website).call(name.to_s)
           break unless website.send(name).blank?
         end
       end

data/lib/link_thumbnailer/scrapers/base.rb

@@ -10,16 +10,18 @@ module LinkThumbnailer
 
       attr_reader :config, :document, :website, :attribute_name
 
-      def initialize(document)
+      def initialize(document, website = nil)
         @config   = ::LinkThumbnailer.page.config
         @document = document
+        @website  = website
 
         super(config)
       end
 
-      def call(website, attribute_name)
+      def call(attribute_name)
+        return false unless website.present?
         return false unless applicable?
-        @website        = website
+
         @attribute_name = attribute_name
 
         website.send("#{attribute_name}=", value)
@@ -31,7 +33,7 @@ module LinkThumbnailer
       end
 
       def value
-        raise 'must implement'
+        fail NotImplementedError
       end
 
       private

data/lib/link_thumbnailer/scrapers/opengraph/image.rb

@@ -6,60 +6,91 @@ module LinkThumbnailer
       class Image < ::LinkThumbnailer::Scrapers::Opengraph::Base
 
         def value
-          model
+          ::LinkThumbnailer::Scrapers::Opengraph::Image::Base.new(document, website).value +
+          ::LinkThumbnailer::Scrapers::Opengraph::Image::Url.new(document, website).value
         end
 
         private
 
-        def model
-          nodes.map { |n| modelize(n, n.attributes['content'].to_s) }
-        end
+        # Handles `og:image` attributes.
+        class Base < ::LinkThumbnailer::Scrapers::Opengraph::Base
 
-        def modelize(node, text = nil)
-          model_class.new(text, size)
-        end
+          def value
+            model
+          end
 
-        def nodes
-          nodes = meta_xpaths(attribute: attribute)
-          nodes.empty? ? meta_xpaths(attribute: attribute, key: :name) : nodes
-        end
+          def model
+            nodes.map { |n| modelize(n, n.attributes['content'].to_s) }
+          end
 
-        def size
-          [width.to_i, height.to_i] if width && height
-        end
+          def modelize(node, text = nil)
+            model_class.new(text, size)
+          end
 
-        def width
-          Width.new(document).value
-        end
+          def model_class
+            ::LinkThumbnailer::Models::Image
+          end
+
+          def nodes
+            nodes = meta_xpaths(attribute: attribute)
+            nodes.empty? ? meta_xpaths(attribute: attribute, key: :name) : nodes
+          end
+
+          def attribute
+            'og:image'
+          end
+
+          def size
+            [width.to_i, height.to_i] if width && height
+          end
+
+          def width
+            ::LinkThumbnailer::Scrapers::Opengraph::Image::Width.new(document).value
+          end
+
+          def height
+            ::LinkThumbnailer::Scrapers::Opengraph::Image::Height.new(document).value
+          end
 
-        def height
-          Height.new(document).value
         end
 
-        class Base < ::LinkThumbnailer::Scrapers::Opengraph::Base
+        # Handles `og:image:url` attributes.
+        class Url < ::LinkThumbnailer::Scrapers::Opengraph::Image::Base
 
-          def value
-            node.attributes['content'].to_s if node
+          private
+
+          def attribute
+            'og:image:url'
           end
 
         end
 
-        class Width < Base
+        # Handles `og:image:width` attributes.
+        class Width < ::LinkThumbnailer::Scrapers::Opengraph::Base
+
+          def value
+            node.attributes['content'].to_s if node
+          end
 
           private
 
           def attribute
-            "og:image:width"
+            'og:image:width'
           end
 
         end
 
-        class Height < Base
+        # Handles `og:image:height` attributes.
+        class Height < ::LinkThumbnailer::Scrapers::Opengraph::Base
+
+          def value
+            node.attributes['content'].to_s if node
+          end
 
           private
 
           def attribute
-            "og:image:height"
+            'og:image:height'
           end
 
         end

data/lib/link_thumbnailer/scrapers/opengraph/images.rb

@@ -6,8 +6,8 @@ module LinkThumbnailer
     module Opengraph
       class Images < ::LinkThumbnailer::Scrapers::Opengraph::Base
 
-        def call(website, attribute_name)
-          ::LinkThumbnailer::Scrapers::Opengraph::Image.new(document).call(website, 'image')
+        def call(attribute_name)
+          ::LinkThumbnailer::Scrapers::Opengraph::Image.new(document, website).call('image')
         end
 
       end

data/lib/link_thumbnailer/scrapers/opengraph/video.rb

@@ -6,34 +6,105 @@ module LinkThumbnailer
       class Video < ::LinkThumbnailer::Scrapers::Opengraph::Base
 
         def value
-          model
+          ::LinkThumbnailer::Scrapers::Opengraph::Video::Base.new(document, website).value +
+          ::LinkThumbnailer::Scrapers::Opengraph::Video::Url.new(document, website).value
         end
 
         private
-        
-        def attribute
-          if website.url.host =~ /vimeo/
-            # Vimeo uses a SWF file for its og:video property which doesn't
-            # provide any metadata for the VideoInfo gem downstream. Using
-            # og:url means VideoInfo is passed a webpage URL with metadata
-            # it can parse:
-            'og:url'
-          else
-            super
+
+        # Handles `og:video` attributes.
+        class Base < ::LinkThumbnailer::Scrapers::Opengraph::Base
+
+          def value
+            model
+          end
+
+          private
+
+          def model
+            nodes.map { |n| modelize(n, n.attributes['content'].to_s) }
+          end
+
+          def modelize(node, text = nil)
+            model_class.new(text, size)
+          end
+
+          def model_class
+            ::LinkThumbnailer::Models::Video
+          end
+
+          def nodes
+            nodes = meta_xpaths(attribute: attribute)
+            nodes.empty? ? meta_xpaths(attribute: attribute, key: :name) : nodes
+          end
+
+          def attribute
+            return 'og:url' if vimeo?
+            'og:video'
+          end
+
+          # Vimeo uses a SWF file for its og:video property which doesn't
+          # provide any metadata for the VideoInfo gem downstream. Using
+          # og:url means VideoInfo is passed a webpage URL with metadata
+          # it can parse.
+          def vimeo?
+            website.url.host =~ /vimeo/
+          end
+
+          def size
+            [width.to_i, height.to_i] if width && height
+          end
+
+          def width
+            ::LinkThumbnailer::Scrapers::Opengraph::Video::Width.new(document).value
           end
+
+          def height
+            ::LinkThumbnailer::Scrapers::Opengraph::Video::Height.new(document).value
+          end
+
         end
 
-        def model
-          nodes.map { |n| modelize(n, n.attributes['content'].to_s) }
+        # Handles `og:video:url` attributes.
+        class Url < ::LinkThumbnailer::Scrapers::Opengraph::Video::Base
+
+          private
+
+          def attribute
+            super
+            'og:video:url'
+          end
+
         end
 
-        def modelize(node, text = nil)
-          model_class.new(text)
+        # Handles `og:video:width` attributes.
+        class Width < ::LinkThumbnailer::Scrapers::Opengraph::Base
+
+          def value
+            node.attributes['content'].to_s if node
+          end
+
+          private
+
+          def attribute
+            'og:video:width'
+          end
+
         end
 
-        def nodes
-          nodes = meta_xpaths(attribute: attribute)
-          nodes.empty? ? meta_xpaths(attribute: attribute, key: :name) : nodes
+        # Handles `og:video:height` attributes.
+        class Height < ::LinkThumbnailer::Scrapers::Opengraph::Base
+
+          def value
+            node.attributes['content'].to_s if node
+          end
+
+          private
+
+          def attribute
+            'og:video:height'
+          end
+
         end
 
       end

data/lib/link_thumbnailer/scrapers/opengraph/videos.rb

@@ -6,8 +6,8 @@ module LinkThumbnailer
     module Opengraph
       class Videos < ::LinkThumbnailer::Scrapers::Opengraph::Base
 
-        def call(website, attribute_name)
-          ::LinkThumbnailer::Scrapers::Opengraph::Video.new(document).call(website, 'video')
+        def call(attribute_name)
+          ::LinkThumbnailer::Scrapers::Opengraph::Video.new(document, website).call('video')
         end
 
       end

data/lib/link_thumbnailer/version.rb

@@ -1,3 +1,3 @@
 module LinkThumbnailer
-  VERSION = '2.4.0'
+  VERSION = '2.5.0'
 end

data/link_thumbnailer.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'activesupport',          '>= 3.0'
-  spec.add_dependency 'json',                   ['>= 1.7.7', '~> 1.7']
+  spec.add_dependency 'json',                   ['>= 1.7.7', '~> 1.8']
   spec.add_dependency 'rake',                   '>= 0.9'
   spec.add_dependency 'nokogiri',               '~> 1.6'
   spec.add_dependency 'net-http-persistent',    '~> 2.9'
   spec.add_dependency 'fastimage',              '~> 1.6'
-  spec.add_dependency 'video_info',             '~> 2.3'
+  spec.add_dependency 'video_info',             '~> 2.4'
 end

data/spec/fixture_spec.rb

@@ -31,6 +31,7 @@ describe 'Fixture' do
       it { expect(action.images.first.size).to      eq([100, 100]) }
       it { expect(action.videos.count).to           eq(1) }
       it { expect(action.videos.first.src.to_s).to  eq(video_url) }
+      it { expect(action.videos.first.size).to      eq([100, 100]) }
 
     end
 

data/spec/fixtures/og_valid_example.html

@@ -9,6 +9,8 @@
     <meta property="og:image:width" content="100">
     <meta property="og:image:height" content="100">
     <meta property="og:video" content="http://foo.com/foo.swf">
+    <meta property="og:video:width" content="100">
+    <meta property="og:video:height" content="100">
     <link rel="icon" href="http://foo.com/foo.ico">
     <title>Title</title>
   </head>

data/spec/fixtures/og_valid_multi_image_example.html

@@ -6,7 +6,7 @@
     <meta property="og:title" content="Title from og">
     <meta property="og:description" content="Description from og">
     <meta property="og:image" content="http://foo.com/foo.png">
-    <meta property="og:image" content="http://foo.com/bar.png">
+    <meta property="og:image:url" content="http://foo.com/bar.png">
     <title>Title</title>
   </head>
 

data/spec/fixtures/og_valid_multi_video_example.html

@@ -6,7 +6,7 @@
     <meta property="og:title" content="Title from og">
     <meta property="og:description" content="Description from og">
     <meta property="og:video" content="http://foo.com/foo.swf">
-    <meta property="og:video" content="http://foo.com/bar.swf">
+    <meta property="og:video:url" content="http://foo.com/bar.swf">
     <title>Title</title>
   </head>
 

data/spec/graders/length_spec.rb

@@ -64,7 +64,7 @@ describe LinkThumbnailer::Graders::Length do
 
       let(:text) { 'f' * 9 }
 
-      it { expect(action).to be_true }
+      it { expect(action).to be_truthy }
 
     end
 
@@ -72,7 +72,7 @@ describe LinkThumbnailer::Graders::Length do
 
       let(:text) { 'f' * 10 }
 
-      it { expect(action).to be_false }
+      it { expect(action).to be_falsey }
 
     end
 

data/spec/image_validator_spec.rb

@@ -18,7 +18,7 @@ describe LinkThumbnailer::ImageValidator do
 
       let(:blacklist_urls) { [src] }
 
-      it { expect(action).to be_false }
+      it { expect(action).to be_falsey }
 
     end
 
@@ -26,7 +26,7 @@ describe LinkThumbnailer::ImageValidator do
 
       let(:blacklist_urls) { [] }
 
-      it { expect(action).to be_true }
+      it { expect(action).to be_truthy }
 
     end
 

data/spec/models/website_spec.rb

@@ -40,7 +40,7 @@ describe LinkThumbnailer::Models::Website do
         image.stub(:valid?).and_return(false)
       end
 
-      it { expect { action }.to_not change { instance.images.size }.by(1) }
+      it { expect { action }.to_not change { instance.images.size } }
 
     end
 

data/spec/processor_spec.rb

@@ -286,7 +286,7 @@ describe LinkThumbnailer::Processor do
         instance.stub(:url).and_return("http://foo.com")
       end
 
-      it { expect(action).to be_false }
+      it { expect(action).to be_falsey }
 
     end
 
@@ -296,7 +296,7 @@ describe LinkThumbnailer::Processor do
         instance.stub(:url).and_return(URI("http://foo.com"))
       end
 
-      it { expect(action).to be_true }
+      it { expect(action).to be_truthy }
 
     end
 
@@ -313,7 +313,7 @@ describe LinkThumbnailer::Processor do
         instance.stub(:redirect_limit).and_return(4)
       end
 
-      it { expect(action).to be_true }
+      it { expect(action).to be_truthy }
 
     end
 
@@ -324,7 +324,7 @@ describe LinkThumbnailer::Processor do
         instance.stub(:redirect_limit).and_return(5)
       end
 
-      it { expect(action).to be_false }
+      it { expect(action).to be_falsey }
 
     end
 
@@ -335,7 +335,7 @@ describe LinkThumbnailer::Processor do
         instance.stub(:redirect_limit).and_return(5)
       end
 
-      it { expect(action).to be_false }
+      it { expect(action).to be_falsey }
 
     end
 

data/spec/scraper_spec.rb

@@ -35,9 +35,9 @@ describe LinkThumbnailer::Scraper do
 
       before do
         expect(website).to                receive(:bar).once.and_return('bar')
-        expect(valid_scraper).to          receive(:call).once.with(website, 'bar')
-        expect(not_valid_scraper).to_not  receive(:call).with(website, 'bar')
-        expect(scraper_class).to          receive(:new).with(document).once.and_return(valid_scraper)
+        expect(valid_scraper).to          receive(:call).once.with('bar')
+        expect(not_valid_scraper).to_not  receive(:call).with('bar')
+        expect(scraper_class).to          receive(:new).with(document, website).once.and_return(valid_scraper)
         expect(instance).to               receive(:scraper_class).with(prefix_1, :bar).and_return(scraper_class)
       end
 
@@ -52,9 +52,9 @@ describe LinkThumbnailer::Scraper do
 
       before do
         expect(website).to            receive(:bar).and_return('', 'bar')
-        expect(valid_scraper).to      receive(:call).once.with(website, 'bar')
-        expect(not_valid_scraper).to  receive(:call).once.with(website, 'bar')
-        expect(scraper_class).to      receive(:new).with(document).and_return(not_valid_scraper, valid_scraper)
+        expect(valid_scraper).to      receive(:call).once.with('bar')
+        expect(not_valid_scraper).to  receive(:call).once.with('bar')
+        expect(scraper_class).to      receive(:new).with(document, website).and_return(not_valid_scraper, valid_scraper)
         expect(instance).to           receive(:scraper_class).with(prefix_1, :bar).and_return(scraper_class)
         expect(instance).to           receive(:scraper_class).with(prefix_2, :bar).and_return(scraper_class)
       end

data/spec/scrapers/base_spec.rb

@@ -3,14 +3,14 @@ require 'spec_helper'
 describe LinkThumbnailer::Scrapers::Base do
 
   let(:document) { double('document') }
-  let(:instance) { described_class.new(document) }
+  let(:website)  { LinkThumbnailer::Models::Website.new }
+  let(:instance) { described_class.new(document, website) }
 
   describe '#call' do
 
-    let(:website) { LinkThumbnailer::Models::Website.new }
     let(:attr)    { :title }
     let(:value)   { 'foo' }
-    let(:action)  { instance.call(website, attr) }
+    let(:action)  { instance.call(attr) }
 
     before do
       instance.stub(:value).and_return(value)

data/spec/scrapers/opengraph/base_spec.rb

@@ -21,7 +21,7 @@ describe LinkThumbnailer::Scrapers::Opengraph::Base do
         instance.stub(:opengraph_node?).and_return(true, true)
       end
 
-      it { expect(action).to be_true }
+      it { expect(action).to be_truthy }
 
     end
 
@@ -31,7 +31,7 @@ describe LinkThumbnailer::Scrapers::Opengraph::Base do
         instance.stub(:opengraph_node?).and_return(true, false)
       end
 
-      it { expect(action).to be_true }
+      it { expect(action).to be_truthy }
 
     end
 
@@ -41,7 +41,7 @@ describe LinkThumbnailer::Scrapers::Opengraph::Base do
         instance.stub(:opengraph_node?).and_return(false, false)
       end
 
-      it { expect(action).to be_false }
+      it { expect(action).to be_falsey }
 
     end
 
@@ -59,7 +59,7 @@ describe LinkThumbnailer::Scrapers::Opengraph::Base do
 
       let(:attribute_from_name) { 'og:foo' }
 
-      it { expect(action).to be_true }
+      it { expect(action).to be_truthy }
 
     end
 
@@ -75,7 +75,7 @@ describe LinkThumbnailer::Scrapers::Opengraph::Base do
 
         let(:attribute_from_property) { 'og:bar' }
 
-        it { expect(action).to be_true }
+        it { expect(action).to be_truthy }
 
       end
 
@@ -83,7 +83,7 @@ describe LinkThumbnailer::Scrapers::Opengraph::Base do
 
         let(:attribute_from_property) { 'bar' }
 
-        it { expect(action).to be_false }
+        it { expect(action).to be_falsey }
 
       end
 

metadata

@@ -1,61 +1,61 @@
 --- !ruby/object:Gem::Specification
 name: link_thumbnailer
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Pierre-Louis Gottfrois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-18 00:00:00.000000000 Z
+date: 2015-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.7.7
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.7.7
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
@@ -106,14 +106,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
 description: Ruby gem generating thumbnail images from a given URL.
 email:
 - pierrelouis.gottfrois@gmail.com
@@ -220,17 +220,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Ruby gem ranking images from a given URL returning an object containing images
@@ -269,4 +269,3 @@ test_files:
 - spec/scrapers/opengraph/base_spec.rb
 - spec/spec_helper.rb
 - spec/video_parser_spec.rb
-has_rdoc: