link_thumbnailer 1.0.9 → 1.1.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NTA1YjA5YWExNGFlMWQwYTdlOWRjZGNiYTJkZTE2ZGU5YzdhZGM5MQ==
+  data.tar.gz: !binary |-
+    MjFjYmQ5NDFkMDQ2YTFlY2IxZmEwZmM3OTZhOTdiOTFkZjU1MzMyNw==
+SHA512:
+  metadata.gz: !binary |-
+    MjY0NTUzZDE0ZDkyYjhjMjY0MzBhYThlYmNlZGIwMGY3MDIxMGIxOTg1ZGQ0
+    MTVhNzlkZDJmYTlkMjhkZmE5NjgxOGZmZWRhMzk4N2E4Y2E3MzBmMWRlMGI3
+    N2U5MGQ1NjFjYjM4M2EzZDM5ZGI5MjFhYzZlNjM4NDBlYzZhOWY=
+  data.tar.gz: !binary |-
+    YjcxOWQ5OWEzOWMzNjE0N2VkN2JiOTE1YjRmZjA5ZGI5YTliYzA5NDczNmQx
+    MWY0YjkyODFlZDU3OWQ2M2ZiZTEzOTYxOWZhYmI1MGZlM2JhMzY4NTIxYWNj
+    ZWIxMDI2ZjQwNzQzYjQ5ZDU3NWVlMGJmOTc4MDI0OGZmYWNiMmQ=

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 .project
+.coveralls.yml

data/.travis.yml

@@ -0,0 +1,6 @@
+bundler_args: --without development
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 1.1.0
+
+- Replace RMagick by [FastImage](https://github.com/sdsykes/fastimage)
+- Rename `rmagick_attributes` config into `image_attributes`
+
+# 1.0.9
+
+- Fix issue when Location header used a relative path instead of an absolute path
+- Update gemfile to be more flexible when using Hashie gem
+
 # 1.0.8
 
 - Thanks to [juriglx](https://github.com/juriglx), support for canonical urls

data/Gemfile

@@ -2,3 +2,11 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in link_thumbnailer.gemspec
 gemspec
+
+group :test do
+  gem 'coveralls',  require: false
+  gem 'simplecov',  require: false
+  gem 'rspec',      '~> 2.14'
+  gem 'webmock',    '~> 1.14'
+  gem 'pry',        '~> 0.9'
+end

data/README.md

@@ -1,6 +1,8 @@
 # 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)
 
 Ruby gem generating image thumbnails from a given URL. Rank them and give you back an object containing images and website informations. Works like Facebook link previewer.
 
@@ -176,3 +178,7 @@ Coming soon:
 
 - [phlegx](https://github.com/phlegx)
 - [juriglx](https://github.com/juriglx)
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/gottfrois/link_thumbnailer/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

data/Rakefile

@@ -1,4 +1,7 @@
-#!/usr/bin/env rake
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
 RSpec::Core::RakeTask.new('spec')
+
+task default: :spec
+task test:    :spec

data/lib/generators/templates/initializer.rb

@@ -22,20 +22,20 @@ LinkThumbnailer.configure do |config|
   # for more details.
   # 'source_url' is a custom attribute and should always be included since this
   # is where you'll find the image url.
-  # config.rmagick_attributes = %w(source_url mime_type colums rows filesize number_colors)
+  # config.image_attributes = %w(source_url size type)
 
   # Fetch 10 images maximum.
   # config.limit = 10
 
   # Return top 5 images only.
   # config.top = 5
-  
+
   # Set user agent
   # config.user_agent = 'linkthumbnailer'
-  
-  # Enable or disable SSL verification 
+
+  # Enable or disable SSL verification
   # config.verify_ssl = true
-  
+
   # HTTP open_timeout: The amount of time in seconds to wait for a connection to be opened.
   # config.http_timeout = 5
 end

data/lib/link_thumbnailer/configuration.rb

@@ -2,5 +2,16 @@ require 'hashie'
 
 module LinkThumbnailer
 	class Configuration < Hashie::Mash
+
+    def rmagick_attributes
+      LinkThumbnailer.logger.info "[DEPRECATION] rmagick_attributes is deprecated. Use image_attributes instead."
+      image_attributes
+    end
+
+    def rmagick_attributes=(value)
+      LinkThumbnailer.logger.info "[DEPRECATION] rmagick_attributes is deprecated. Use image_attributes instead."
+      self.image_attributes = value
+    end
+
 	end
 end

data/lib/link_thumbnailer/img_comparator.rb

@@ -3,14 +3,13 @@ module LinkThumbnailer
   module ImgComparator
 
     def <=> other
-      result = ([other.rows, other.columns].min ** 2) <=>
-        ([rows, columns].min ** 2)
-
-      if result == 0
-        result = other.number_colors <=> number_colors
+      if other.size != nil && size != nil
+        return (other.size.min ** 2) <=> (size.min ** 2)
+      elsif other.size != nil
+        return 1
+      else
+        return -1
       end
-
-      result
     end
 
   end

data/lib/link_thumbnailer/img_parser.rb

@@ -1,4 +1,4 @@
-require 'RMagick'
+require 'fastimage'
 
 module LinkThumbnailer
 
@@ -20,23 +20,18 @@ module LinkThumbnailer
         break if count >= LinkThumbnailer.configuration.limit
         img = parse_one(i)
         next unless img
+        img.extend LinkThumbnailer::WebImage
         img.extend LinkThumbnailer::ImgComparator
         imgs << img
         count += 1
       }
 
       imgs.sort! unless imgs.count <= 1
-
       imgs.first(LinkThumbnailer.configuration.top)
     end
 
     def parse_one(img_url)
-      img_data = @fetcher.fetch(img_url)
-      img = Magick::ImageList.new.from_blob(img_data).extend(
-        LinkThumbnailer::WebImage
-      )
-      img.source_url = img_url
-      img
+      FastImage.new(img_url, raise_on_failure: false)
     rescue StandardError
       nil
     end

data/lib/link_thumbnailer/object.rb

@@ -16,24 +16,24 @@ module LinkThumbnailer
     end
 
     def valid?
-      return false if self.keys.empty?
-      LinkThumbnailer.configuration.mandatory_attributes.each {|a| return false if self[a].nil? || self[a].empty? } if LinkThumbnailer.configuration.strict
+      return false if keys.empty?
+      LinkThumbnailer.configuration.mandatory_attributes.each { |a| return false if self[a].nil? || self[a].empty? } if LinkThumbnailer.configuration.strict
       true
     end
 
     def to_hash
-      if self.images.none? {|i| i.is_a?(String)}
-        super.merge('images' => self.images.map(&:to_hash))
+      if images.none? { |i| i.is_a?(String) }
+        super.merge('images' => images.map(&:to_hash))
       else
         super
       end
     end
 
     def to_json
-      if self.images.none? {|i| i.is_a?(String)}
-        JSON.generate(self.to_hash.merge('images' => self.images.map(&:to_hash)))
+      if images.none? { |i| i.is_a?(String) }
+        JSON.generate(to_hash.merge('images' => images.map(&:to_hash)))
       else
-        JSON.generate(self.to_hash)
+        JSON.generate(to_hash)
       end
     end
 

data/lib/link_thumbnailer/version.rb

@@ -1,3 +1,3 @@
 module LinkThumbnailer
-  VERSION = "1.0.9"
+  VERSION = "1.1.0"
 end

data/lib/link_thumbnailer/web_image.rb

@@ -1,17 +1,18 @@
 module LinkThumbnailer
   module WebImage
 
-    attr_accessor :source_url, :doc
+    attr_accessor :doc
+
+    def source_url
+      instance_variable_get(:@uri)
+    end
 
     def to_hash
-      result = {}
-      LinkThumbnailer.configuration.rmagick_attributes.each {|m|
+      LinkThumbnailer.configuration.image_attributes.each_with_object({}) { |m, result|
         k         = m.to_sym
         result[k] = self.send(m)    if self.respond_to?(m)
-        result[k] = result[k].to_s  if result[k].is_a?(URI)
+        result[k] = result[k].to_s  if result[k].is_a?(URI) || result[k].respond_to?(:to_str)
       }
-
-      result
     end
 
   end

data/lib/link_thumbnailer.rb

@@ -20,7 +20,11 @@ module LinkThumbnailer
   class << self
 
     attr_accessor :configuration, :object, :fetcher, :doc_parser,
-                  :img_url_filters, :img_parser
+                  :img_url_filters, :img_parser, :logger
+
+    def logger
+      @logger ||= ::Rails.logger
+    end
 
     def config
       self.configuration ||= Configuration.new(
@@ -33,7 +37,7 @@ module LinkThumbnailer
           %r{^http://pixel\.quantserve\.com/},
           %r{^http://s7\.addthis\.com/}
         ],
-        rmagick_attributes:   %w(source_url mime_type colums rows filesize number_colors),
+        image_attributes:     %w(source_url size type),
         limit:                10,
         top:                  5,
         user_agent:           'linkthumbnailer',
@@ -50,9 +54,9 @@ module LinkThumbnailer
       set_options(options)
       instantiate_classes
 
-      doc = self.doc_parser.parse(self.fetcher.fetch(url), url)
+      doc = doc_parser.parse(fetcher.fetch(url), url)
 
-      self.object[:url] = self.fetcher.url.to_s
+      self.object[:url] = fetcher.url.to_s
       opengraph(doc) || custom(doc)
     end
 
@@ -68,22 +72,22 @@ module LinkThumbnailer
       self.fetcher          = LinkThumbnailer::Fetcher.new
       self.doc_parser       = LinkThumbnailer::DocParser.new
       self.img_url_filters  = [LinkThumbnailer::ImgUrlFilter.new]
-      self.img_parser       = LinkThumbnailer::ImgParser.new(self.fetcher, self.img_url_filters)
+      self.img_parser       = LinkThumbnailer::ImgParser.new(fetcher, img_url_filters)
     end
 
     def opengraph(doc)
-      return nil unless opengraph?(doc)
-      self.object = LinkThumbnailer::Opengraph.parse(self.object, doc)
-      return self.object if self.object.valid?
+      return unless opengraph?(doc)
+      self.object = LinkThumbnailer::Opengraph.parse(object, doc)
+      return object if object.valid?
       nil
     end
 
     def custom(doc)
       self.object[:title]       = doc.title
       self.object[:description] = doc.description
-      self.object[:images]      = self.img_parser.parse(doc.img_abs_urls.dup)
-      self.object[:url]         = doc.canonical_url || self.object[:url]
-      return self.object if self.object.valid?
+      self.object[:images]      = img_parser.parse(doc.img_abs_urls.dup)
+      self.object[:url]         = doc.canonical_url || object[:url]
+      return object if object.valid?
       nil
     end
 

data/link_thumbnailer.gemspec

@@ -15,12 +15,14 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = LinkThumbnailer::VERSION
 
-  gem.add_dependency(%q{nokogiri},            ['~> 1.5.5'])
-  gem.add_dependency(%q{hashie},              ['>= 1.2.0'])
-  gem.add_dependency(%q{net-http-persistent}, ['~> 2.7'])
-  gem.add_dependency(%q{rmagick},             ['~> 2.13.1'])
-  gem.add_dependency(%q{json},                ['~> 1.7.6'])
+  gem.add_dependency 'rake',                  '>= 0.9'
+  gem.add_dependency 'nokogiri',              '>= 1.5.5', '< 1.7'
+  gem.add_dependency 'hashie',                '>= 1.2.0'
+  gem.add_dependency 'net-http-persistent',   '~> 2.7'
+  gem.add_dependency 'fastimage',             '~> 1.5.5'
+  gem.add_dependency 'json',                  '>= 1.7.6', '< 1.9'
 
-  gem.add_development_dependency(%q{rspec},   ['~> 2.11.0'])
-  gem.add_development_dependency(%q{webmock}, ['~> 1.8.10'])
+  gem.add_development_dependency 'bundler',  '~> 1.3'
+  gem.add_development_dependency 'rspec',    '~> 2.14'
+  gem.add_development_dependency 'pry',      '~> 0.9'
 end

data/spec/link_thumbnailer_spec.rb

@@ -24,7 +24,7 @@ describe LinkThumbnailer do
         config.strict               = false
         config.redirect_limit       = 5
         config.blacklist_urls       = []
-        config.rmagick_attributes   = []
+        config.image_attributes     = []
         config.limit                = 5
         config.top                  = 10
         config.user_agent           = 'linkthumbnailer'
@@ -41,7 +41,7 @@ describe LinkThumbnailer do
     specify { LinkThumbnailer.configuration.strict.should               be_false }
     specify { LinkThumbnailer.configuration.redirect_limit.should       eq(5) }
     specify { LinkThumbnailer.configuration.blacklist_urls.should       eq([]) }
-    specify { LinkThumbnailer.configuration.rmagick_attributes.should   eq([]) }
+    specify { LinkThumbnailer.configuration.image_attributes.should     eq([]) }
     specify { LinkThumbnailer.configuration.limit.should                eq(5) }
     specify { LinkThumbnailer.configuration.top.should                  eq(10) }
     specify { LinkThumbnailer.configuration.user_agent.should           eq('linkthumbnailer') }
@@ -65,7 +65,7 @@ describe LinkThumbnailer do
       %r{^http://pixel\.quantserve\.com/},
       %r{^http://s7\.addthis\.com/}
     ]) }
-    specify { LinkThumbnailer.configuration.rmagick_attributes.should   eq(%w(source_url mime_type colums rows filesize number_colors)) }
+    specify { LinkThumbnailer.configuration.image_attributes.should     eq(%w(source_url size type)) }
     specify { LinkThumbnailer.configuration.limit.should                eq(10) }
     specify { LinkThumbnailer.configuration.top.should                  eq(5) }
     specify { LinkThumbnailer.configuration.user_agent.should           eq('linkthumbnailer') }
@@ -109,8 +109,8 @@ describe LinkThumbnailer do
           expect { LinkThumbnailer.generate('foo', blacklist_urls: [%r{^http://foo\.bar\.com/}]).to change(LinkThumbnailer.configuration.blacklist_urls).to([%r{^http://foo\.bar\.com/}]) }
         end
 
-        it "should set rmagick_attributes option" do
-          expect { LinkThumbnailer.generate('foo', rmagick_attributes: %w(one two)).to change(LinkThumbnailer.configuration.rmagick_attributes).to(%w(one two)) }
+        it "should set image_attributes option" do
+          expect { LinkThumbnailer.generate('foo', image_attributes: %w(one two)).to change(LinkThumbnailer.configuration.image_attributes).to(%w(one two)) }
         end
 
         it "should set user_agent option" do

data/spec/spec_helper.rb

@@ -1,9 +1,13 @@
+require 'simplecov'
+require 'coveralls'
+Coveralls.wear!
+
+require 'link_thumbnailer'
 require 'rspec'
 require 'webmock/rspec'
 require 'json'
 
-require 'link_thumbnailer'
+SimpleCov.formatter = Coveralls::SimpleCov::Formatter
 
 RSpec.configure do |config|
-  config.mock_with :rspec
 end

data/spec/web_image_spec.rb

@@ -35,7 +35,7 @@ describe LinkThumbnailer::WebImage do
 
     context "with all attributes" do
 
-      let(:attributes) { LinkThumbnailer.configuration.rmagick_attributes }
+      let(:attributes) { LinkThumbnailer.configuration.image_attributes }
 
       before do
         attributes.each {|a| foo.class.send(:define_method, a.to_sym) { 'foo' } }

metadata

@@ -1,36 +1,52 @@
 --- !ruby/object:Gem::Specification
 name: link_thumbnailer
 version: !ruby/object:Gem::Version
-  version: 1.0.9
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Pierre-Louis Gottfrois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-23 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
+- !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
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.5
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.5
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +54,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +61,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,75 +68,86 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.7'
 - !ruby/object:Gem::Dependency
-  name: rmagick
+  name: fastimage
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.1
+        version: 1.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.1
+        version: 1.5.5
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.7.6
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.7.6
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.9'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: '2.14'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.10
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.10
+        version: '0.9'
 description: Ruby gem generating thumbnail images from a given URL.
 email:
 - pierrelouis.gottfrois@gmail.com
@@ -132,6 +157,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -173,27 +199,26 @@ files:
 - spec/web_image_spec.rb
 homepage: https://github.com/gottfrois/link_thumbnailer
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby gem ranking images from a given URL returning an object containing images
   and website informations.
 test_files: