link_thumbnailer 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3677cdb11ee3930b3fac0464c6daf3262a8114fe
-  data.tar.gz: dfe19706e2e54885d2935573460de7959fe191dc
+  metadata.gz: bd2de89ee93a079ce228bbf77fd1362e359f5ce8
+  data.tar.gz: db435fc9864ba56d81d16425802f625e2faeeaf7
 SHA512:
-  metadata.gz: 885d0d41e9c0553885c519dc8008c8203b70e9645d6c3089398e8b2179c047feb8a22fecf478f50feb7e9949d5208e73e67ff21d9b00b1430d1292db6abe0532
-  data.tar.gz: 499caa974e1723f66657870cb18a32ffb950a8334308afd8f892f55a1c342a01e05882a9b58d868b7d13aefc2e269ef10d0ff613717013923bae1e3df192a561
+  metadata.gz: 32bf121c87417dfb69a716a3ebb912367b1eb107794d268f342b8eb9bda090b986faea21ff2d2e9db2a4546cca0d39e9d833ec75d719c08b89776ca98fbbfa05
+  data.tar.gz: 5ece7aa51e0a7211e0ac92e15c364591497f622dbfdd09d1525bb5aeca1cd4f14f65d1e67d2c89c86ca5eb9ee737b4f878ccac59be95548ff0170191616b4018

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 3.0.2
+
+- Replace FastImage gem dependency by [ImageInfo](https://github.com/gottfrois/image_info) to improve performances when
+fetching multiple images size information. Benchmark shows an order of magnitude improvement response time.
+- Fixes [#57](https://github.com/gottfrois/link_thumbnailer/issues/57)
+
 # 3.0.1
 
 - Remove useless dependencies

data/Gemfile

@@ -4,8 +4,6 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
-  gem 'coveralls',  require: false
-  gem 'simplecov',  require: false
   gem 'rspec',      '~> 2.14'
   gem 'webmock',    '~> 1.14'
   gem 'pry',        '~> 0.9'

data/README.md

@@ -1,7 +1,6 @@
 # LinkThumbnailer
 
 [![Code Climate](https://codeclimate.com/github/gottfrois/link_thumbnailer.png)](https://codeclimate.com/github/gottfrois/link_thumbnailer)
-[![Coverage Status](https://coveralls.io/repos/gottfrois/link_thumbnailer/badge.png?branch=master)](https://coveralls.io/r/gottfrois/link_thumbnailer?branch=master)
 [![Build Status](https://travis-ci.org/gottfrois/link_thumbnailer.png?branch=master)](https://travis-ci.org/gottfrois/link_thumbnailer)
 [![Gem Version](https://badge.fury.io/rb/link_thumbnailer.svg)](http://badge.fury.io/rb/link_thumbnailer)
 [![Dependency Status](https://gemnasium.com/gottfrois/link_thumbnailer.svg)](https://gemnasium.com/gottfrois/link_thumbnailer)
@@ -162,6 +161,10 @@ LinkThumbnailer.configure do |config|
   # is not an html or xml.
   #
   # config.raise_on_invalid_format = false
+  #
+  # Sets number of concurrent http connections that can be opened to fetch images informations such as size and type.
+  #
+  # config.max_concurrency = 20
 end
 ```
 

data/lib/generators/templates/initializer.rb

@@ -72,4 +72,8 @@ LinkThumbnailer.configure do |config|
   # is not an html or xml.
   #
   # config.raise_on_invalid_format = false
+  #
+  # Sets number of concurrent http connections that can be opened to fetch images informations such as size and type.
+  #
+  # config.max_concurrency = 20
 end

data/lib/link_thumbnailer/configuration.rb

@@ -25,7 +25,7 @@ module LinkThumbnailer
     attr_accessor :redirect_limit, :blacklist_urls, :user_agent,
                   :verify_ssl, :http_open_timeout, :http_read_timeout, :attributes,
                   :graders, :description_min_length, :positive_regex, :negative_regex,
-                  :image_limit, :image_stats, :raise_on_invalid_format
+                  :image_limit, :image_stats, :raise_on_invalid_format, :max_concurrency
 
     alias_method :http_timeout, :http_open_timeout
     alias_method :http_timeout=, :http_open_timeout=
@@ -59,6 +59,7 @@ module LinkThumbnailer
       @image_limit    = 5
       @image_stats    = true
       @raise_on_invalid_format = false
+      @max_concurrency = 20
     end
 
 	end

data/lib/link_thumbnailer/image_parser.rb

@@ -1,18 +1,50 @@
-require 'link_thumbnailer/image_parsers/size'
-require 'link_thumbnailer/image_parsers/type'
+require 'image_info'
 
 module LinkThumbnailer
   class ImageParser
-    class << self
 
-      def size(image)
-        ::LinkThumbnailer::ImageParsers::Size.perform(image)
+    attr_reader :images
+
+    def initialize(urls)
+      @images = perform? ? ::ImageInfo.from(urls, max_concurrency: max_concurrency) : Array(urls).map(&method(:build_default_image))
+    end
+
+    def size
+      images.first.size
+    end
+
+    def type
+      images.first.type
+    end
+
+    private
+
+    def build_default_image(uri)
+      NullImage.new(uri)
+    end
+
+    def perform?
+      ::LinkThumbnailer.page.config.image_stats
+    end
+
+    def max_concurrency
+      ::LinkThumbnailer.page.config.max_concurrency
+    end
+
+    class NullImage
+      attr_reader :uri
+
+      def initialize(uri)
+        @uri = uri
       end
 
-      def type(image)
-        ::LinkThumbnailer::ImageParsers::Type.perform(image)
+      def size
+        [0, 0]
       end
 
+      def type
+      end
     end
+
   end
 end

data/lib/link_thumbnailer/models/image.rb

@@ -11,8 +11,8 @@ module LinkThumbnailer
 
       def initialize(src, size = nil, type = nil)
         @src  = src
-        @size = size || parser.size(self)
-        @type = type || parser.type(self)
+        @size = size || parser.size
+        @type = type || parser.type
       end
 
       def to_s
@@ -38,7 +38,7 @@ module LinkThumbnailer
       private
 
       def parser
-        ::LinkThumbnailer::ImageParser
+        @parser ||= ::LinkThumbnailer::ImageParser.new(src)
       end
 
       def validator

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

@@ -7,11 +7,21 @@ module LinkThumbnailer
       class Images < ::LinkThumbnailer::Scrapers::Default::Base
 
         def value
-          abs_urls.each_with_index.take_while { |_, i| i < config.image_limit }.map { |e| modelize(e.first) }
+          images.map do |image|
+            modelize(image.uri, image.size, image.type)
+          end
         end
 
         private
 
+        def images
+          ::LinkThumbnailer::ImageParser.new(allowed_urls).images
+        end
+
+        def allowed_urls
+          abs_urls.shift(config.image_limit)
+        end
+
         def urls
           document.search('//img').map { |i| i['src'] }.compact
         end
@@ -54,8 +64,8 @@ module LinkThumbnailer
           ::LinkThumbnailer::Models::Image
         end
 
-        def modelize(uri)
-          model_class.new(uri)
+        def modelize(uri, size = nil, type = nil)
+          model_class.new(uri, size, type)
         end
 
       end

data/lib/link_thumbnailer/version.rb

@@ -1,3 +1,3 @@
 module LinkThumbnailer
-  VERSION = '3.0.1'
+  VERSION = '3.0.2'
 end

data/link_thumbnailer.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |spec|
   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.4'
+  spec.add_dependency 'image_info',             '~> 1.0'
 end

data/spec/configuration_spec.rb

@@ -17,6 +17,7 @@ describe LinkThumbnailer::Configuration do
   it { expect(instance.negative_regex).to_not     be_nil }
   it { expect(instance.image_limit).to            eq(5) }
   it { expect(instance.image_stats).to            eq(true) }
+  it { expect(instance.max_concurrency).to        eq(20) }
 
   describe "#http_timeout" do
     it { expect(instance.method(:http_timeout)).to eq(instance.method(:http_open_timeout)) }

data/spec/fixture_spec.rb

@@ -21,7 +21,7 @@ describe 'Fixture' do
 
     context 'when valid' do
 
-      let(:html) { File.open(File.dirname(__FILE__) + '/fixtures/og_valid_example.html').read() }
+      let(:html) { File.open(File.dirname(__FILE__) + '/fixtures/og_valid_example.html').read }
 
       it { expect(action.favicon).to                eq(favicon) }
       it { expect(action.title).to                  eq(title) }
@@ -38,8 +38,8 @@ describe 'Fixture' do
     context 'with multi image' do
 
       let(:png_url_2) { 'http://foo.com/bar.png' }
-      let(:png_2)     { File.open(File.dirname(__FILE__) + '/fixtures/bar.png') }
-      let(:html)      { File.open(File.dirname(__FILE__) + '/fixtures/og_valid_multi_image_example.html').read() }
+      let(:png_2)     { File.open(File.dirname(__FILE__) + '/fixtures/foo.png') }
+      let(:html)      { File.open(File.dirname(__FILE__) + '/fixtures/og_valid_multi_image_example.html').read }
 
       before do
         stub_request(:get, png_url_2).to_return(status: 200, body: png_2, headers: {})
@@ -57,7 +57,7 @@ describe 'Fixture' do
     context 'with multi video' do
 
       let(:video_url_2) { 'http://foo.com/bar.swf' }
-      let(:html)        { File.open(File.dirname(__FILE__) + '/fixtures/og_valid_multi_video_example.html').read() }
+      let(:html)        { File.open(File.dirname(__FILE__) + '/fixtures/og_valid_multi_video_example.html').read }
 
       it { expect(action.favicon).to                eq('') }
       it { expect(action.title).to                  eq(title) }
@@ -70,7 +70,7 @@ describe 'Fixture' do
 
     context 'when not valid' do
 
-      let(:html) { File.open(File.dirname(__FILE__) + '/fixtures/og_not_valid_example.html').read() }
+      let(:html) { File.open(File.dirname(__FILE__) + '/fixtures/og_not_valid_example.html').read }
 
       it { expect(action.title).to                  eq(title) }
       it { expect(action.description).to            eq(description) }
@@ -85,7 +85,7 @@ describe 'Fixture' do
 
     context 'from meta' do
 
-      let(:html)        { File.open(File.dirname(__FILE__) + '/fixtures/default_from_meta.html').read() }
+      let(:html)        { File.open(File.dirname(__FILE__) + '/fixtures/default_from_meta.html').read }
       let(:title)       { 'Title from meta' }
       let(:description) { 'Description from meta' }
 
@@ -97,7 +97,7 @@ describe 'Fixture' do
 
     context 'from body' do
 
-      let(:html)        { File.open(File.dirname(__FILE__) + '/fixtures/default_from_body.html').read() }
+      let(:html)        { File.open(File.dirname(__FILE__) + '/fixtures/default_from_body.html').read }
       let(:description) { 'Description from body' }
 
       it { expect(action.favicon).to                eq(favicon) }

data/spec/spec_helper.rb

@@ -1,13 +1,7 @@
-require 'simplecov'
-require 'coveralls'
-Coveralls.wear!
-
 require 'link_thumbnailer'
 require 'rspec'
 require 'webmock/rspec'
 
-SimpleCov.formatter = Coveralls::SimpleCov::Formatter
-
 RSpec.configure do |config|
   config.expect_with :rspec do |c|
     c.syntax = :expect

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: link_thumbnailer
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Pierre-Louis Gottfrois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-26 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -87,33 +87,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.9'
 - !ruby/object:Gem::Dependency
-  name: fastimage
+  name: video_info
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
-  name: video_info
+  name: image_info
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '1.0'
 description: Ruby gem generating thumbnail images from a given URL.
 email:
 - pierrelouis.gottfrois@gmail.com
@@ -122,7 +122,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .hound.yml
 - .rspec
 - .travis.yml
 - CHANGELOG.md
@@ -145,8 +144,6 @@ files:
 - lib/link_thumbnailer/image_comparators/base.rb
 - lib/link_thumbnailer/image_comparators/size.rb
 - lib/link_thumbnailer/image_parser.rb
-- lib/link_thumbnailer/image_parsers/size.rb
-- lib/link_thumbnailer/image_parsers/type.rb
 - lib/link_thumbnailer/image_validator.rb
 - lib/link_thumbnailer/model.rb
 - lib/link_thumbnailer/models/description.rb
@@ -195,8 +192,6 @@ files:
 - spec/graders/link_density_spec.rb
 - spec/graders/position_spec.rb
 - spec/image_comparators/size_spec.rb
-- spec/image_parsers/size_spec.rb
-- spec/image_parsers/type_spec.rb
 - spec/image_validator_spec.rb
 - spec/model_spec.rb
 - spec/models/description_spec.rb
@@ -254,8 +249,6 @@ test_files:
 - spec/graders/link_density_spec.rb
 - spec/graders/position_spec.rb
 - spec/image_comparators/size_spec.rb
-- spec/image_parsers/size_spec.rb
-- spec/image_parsers/type_spec.rb
 - spec/image_validator_spec.rb
 - spec/model_spec.rb
 - spec/models/description_spec.rb

data/.hound.yml

@@ -1,2 +0,0 @@
-ruby:
-  enabled: true

data/lib/link_thumbnailer/image_parsers/size.rb

@@ -1,22 +0,0 @@
-require 'fastimage'
-
-module LinkThumbnailer
-  module ImageParsers
-    class Size
-
-      def self.perform(image)
-        return [0, 0] unless perform?
-        ::FastImage.size(image.src.to_s, raise_on_failure: true)
-      rescue ::FastImage::FastImageException, ::Errno::ENAMETOOLONG
-        [0, 0]
-      end
-
-      private
-
-      def self.perform?
-        ::LinkThumbnailer.page.config.image_stats
-      end
-
-    end
-  end
-end

data/lib/link_thumbnailer/image_parsers/type.rb

@@ -1,22 +0,0 @@
-require 'fastimage'
-
-module LinkThumbnailer
-  module ImageParsers
-    class Type
-
-      def self.perform(image)
-        return unless perform?
-        ::FastImage.type(image.src.to_s, raise_on_failure: true)
-      rescue ::FastImage::FastImageException, ::Errno::ENAMETOOLONG
-        nil
-      end
-
-      private
-
-      def self.perform?
-        ::LinkThumbnailer.page.config.image_stats
-      end
-
-    end
-  end
-end

data/spec/image_parsers/size_spec.rb

@@ -1,34 +0,0 @@
-require 'spec_helper'
-
-describe LinkThumbnailer::ImageParsers::Size do
-
-  describe '.perform' do
-
-    let(:size)    { [10, 10] }
-    let(:src)     { 'http://foo.com' }
-    let(:image)   { double(src: src) }
-    let(:action)  { described_class.perform(image) }
-
-    context 'when no exception is raised' do
-
-      before do
-        expect(FastImage).to receive(:size).with(src, raise_on_failure: true).and_return(size)
-      end
-
-      it { expect(action).to eq(size) }
-
-    end
-
-    context 'when an exception is raised' do
-
-      before do
-        expect(FastImage).to receive(:size).with(src, raise_on_failure: true).and_raise(FastImage::FastImageException)
-      end
-
-      it { expect(action).to eq([0, 0]) }
-
-    end
-
-  end
-
-end

data/spec/image_parsers/type_spec.rb

@@ -1,34 +0,0 @@
-require 'spec_helper'
-
-describe LinkThumbnailer::ImageParsers::Type do
-
-  describe '.perform' do
-
-    let(:type)    { 'png' }
-    let(:src)     { 'http://foo.com' }
-    let(:image)   { double(src: src) }
-    let(:action)  { described_class.perform(image) }
-
-    context 'when no exception is raised' do
-
-      before do
-        expect(FastImage).to receive(:type).with(src, raise_on_failure: true).and_return(type)
-      end
-
-      it { expect(action).to eq(type) }
-
-    end
-
-    context 'when an exception is raised' do
-
-      before do
-        expect(FastImage).to receive(:type).with(src, raise_on_failure: true).and_raise(FastImage::FastImageException)
-      end
-
-      it { expect(action).to be_nil }
-
-    end
-
-  end
-
-end