link_thumbnailer 1.0.5 → 1.0.6

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.0.6
+
+- Fix: Issue when setting `strict` option. Always returning OG representation.
+
 # 1.0.5
 
 - Thanks to [phlegx](https://github.com/phlegx), support for timeout http connection through configurations.

data/app/controllers/link_thumbnailer/previews_controller.rb

@@ -5,7 +5,7 @@ module LinkThumbnailer
 
     def create
       @preview = LinkThumbnailer.generate(params[:url])
-      render :json => @preview.to_json
+      respond_with @preview
     end
   end
 end

data/lib/link_thumbnailer.rb

@@ -1,5 +1,5 @@
 require 'link_thumbnailer/engine' if defined? Rails
-require 'link_thumbnailer/config'
+require 'link_thumbnailer/configuration'
 require 'link_thumbnailer/object'
 require 'link_thumbnailer/fetcher'
 require 'link_thumbnailer/doc_parser'
@@ -24,21 +24,21 @@ module LinkThumbnailer
 
     def config
       self.configuration ||= Configuration.new(
-        :mandatory_attributes => %w(url title images),
-        :strict               => true,
-        :redirect_limit       => 3,
-        :blacklist_urls       => [
+        mandatory_attributes: %w(url title images),
+        strict:               true,
+        redirect_limit:       3,
+        blacklist_urls:       [
           %r{^http://ad\.doubleclick\.net/},
           %r{^http://b\.scorecardresearch\.com/},
           %r{^http://pixel\.quantserve\.com/},
           %r{^http://s7\.addthis\.com/}
         ],
-        :rmagick_attributes   => %w(source_url mime_type colums rows filesize number_colors),
-        :limit                => 10,
-        :top                  => 5,
-        :user_agent           => 'linkthumbnailer',
-        :verify_ssl           => true,
-        :http_timeout         => 5
+        rmagick_attributes:   %w(source_url mime_type colums rows filesize number_colors),
+        limit:                10,
+        top:                  5,
+        user_agent:           'linkthumbnailer',
+        verify_ssl:           true,
+        http_timeout:         5
       )
     end
 
@@ -72,19 +72,24 @@ module LinkThumbnailer
     end
 
     def opengraph(doc)
+      return nil unless opengraph?(doc)
       self.object = LinkThumbnailer::Opengraph.parse(self.object, doc)
       return self.object if self.object.valid?
       nil
     end
 
     def custom(doc)
-      self.object[:title] = doc.title
+      self.object[:title]       = doc.title
       self.object[:description] = doc.description
-      self.object[:images] = self.img_parser.parse(doc.img_abs_urls.dup)
+      self.object[:images]      = self.img_parser.parse(doc.img_abs_urls.dup)
       return self.object if self.object.valid?
       nil
     end
 
+    def opengraph?(doc)
+      !doc.xpath('//meta[starts-with(@property, "og:") and @content]').empty?
+    end
+
   end
 
 end

data/lib/link_thumbnailer/doc.rb

@@ -24,10 +24,10 @@ module LinkThumbnailer
         end
 
         result << if u.is_a?(URI::HTTP)
-          u
-        else
-          URI.join(base_url || doc_base_href || source_url, i)
-        end
+                    u
+                  else
+                    URI.join(base_url || doc_base_href || source_url, i)
+                  end
       end
 
       result

data/lib/link_thumbnailer/fetcher.rb

@@ -8,22 +8,21 @@ module LinkThumbnailer
 
     def fetch(url, redirect_count = 0)
       if redirect_count > LinkThumbnailer.configuration.redirect_limit
-        raise ArgumentError,
-          "too many redirects (#{redirect_count})"
+        raise ArgumentError, "too many redirects (#{redirect_count})"
       end
 
       self.url = url.is_a?(URI) ? url : URI(url)
 
       if self.url.is_a?(URI::HTTP)
-        http = Net::HTTP::Persistent.new('linkthumbnailer')
-        http.headers['User-Agent'] = LinkThumbnailer.configuration.user_agent
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE unless LinkThumbnailer.configuration.verify_ssl
-        http.open_timeout = LinkThumbnailer.configuration.http_timeout
-        resp = http.request(self.url)
+        http                        = Net::HTTP::Persistent.new('linkthumbnailer')
+        http.headers['User-Agent']  = LinkThumbnailer.configuration.user_agent
+        http.verify_mode            = OpenSSL::SSL::VERIFY_NONE unless LinkThumbnailer.configuration.verify_ssl
+        http.open_timeout           = LinkThumbnailer.configuration.http_timeout
+        resp                        = http.request(self.url)
         case resp
-          when Net::HTTPSuccess; resp.body
-          when Net::HTTPRedirection; fetch(resp['location'], redirect_count + 1)
-          else resp.error!
+        when Net::HTTPSuccess     then resp.body
+        when Net::HTTPRedirection then fetch(resp['location'], redirect_count + 1)
+        else resp.error!
         end
       end
     end

data/lib/link_thumbnailer/img_parser.rb

@@ -5,8 +5,8 @@ module LinkThumbnailer
   class ImgParser
 
     def initialize(fetcher, img_url_filter)
-      @fetcher = fetcher
-      @img_url_filters = [*img_url_filter]
+      @fetcher          = fetcher
+      @img_url_filters  = [*img_url_filter]
     end
 
     def parse(img_urls)
@@ -14,7 +14,7 @@ module LinkThumbnailer
         img_urls.delete_if { |i| filter.reject?(i) }
       end
 
-      imgs = []
+      imgs  = []
       count = 0
       img_urls.each { |i|
         break if count >= LinkThumbnailer.configuration.limit
@@ -37,7 +37,7 @@ module LinkThumbnailer
       )
       img.source_url = img_url
       img
-    rescue Exception
+    rescue StandardError
       nil
     end
 

data/lib/link_thumbnailer/opengraph.rb

@@ -10,7 +10,7 @@ module LinkThumbnailer
 
         object[:images] = []
         if object[:image]
-          object[:images] << { :source_url => object[:image] }
+          object[:images] << { source_url: object[:image] }
         end
 
         object

data/lib/link_thumbnailer/rails/routes.rb

@@ -12,7 +12,7 @@ module LinkThumbnailer
       end
 
       def self.install!
-        ActionDispatch::Routing::Mapper.send :include, LinkThumbnailer::Rails::Routes::Helper
+        ActionDispatch::Routing::Mapper.send(:include, LinkThumbnailer::Rails::Routes::Helper)
       end
 
       attr_accessor :routes
@@ -23,7 +23,7 @@ module LinkThumbnailer
 
       def generate_routes!(options)
         @mapping = Mapper.new.map(&@options)
-        routes.scope 'link', :as => 'link' do
+        routes.scope 'link', as: 'link' do
           map_route(:previews, :preview_routes)
         end
       end
@@ -37,8 +37,8 @@ module LinkThumbnailer
       end
 
       def preview_routes(mapping)
-        routes.scope :controller => mapping[:controllers] do
-          routes.match 'preview', :via => :post, :action => :create, :as => mapping[:as], :defaults => { :format => 'json' }
+        routes.scope controller: mapping[:controllers] do
+          routes.match 'preview', via: :post, action: :create, as: mapping[:as], defaults: { format: 'json' }
         end
       end
 

data/lib/link_thumbnailer/rails/routes/mapping.rb

@@ -7,11 +7,11 @@ module LinkThumbnailer
 
         def initialize
           @controllers = {
-            :previews => 'link_thumbnailer/previews'
+            previews: 'link_thumbnailer/previews'
           }
 
           @as = {
-            :previews => :preview
+            previews: :preview
           }
 
           @skips = []
@@ -19,13 +19,13 @@ module LinkThumbnailer
 
         def [](routes)
           {
-            :controllers => @controllers[routes],
-            :as => @as[routes]
+            controllers:  @controllers[routes],
+            as:           @as[routes]
           }
         end
 
         def skipped?(controller)
-          return @skips.include?(controller)
+          @skips.include?(controller)
         end
       end
     end

data/lib/link_thumbnailer/version.rb

@@ -1,3 +1,3 @@
 module LinkThumbnailer
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

data/lib/link_thumbnailer/web_image.rb

@@ -6,9 +6,9 @@ module LinkThumbnailer
     def to_hash
       result = {}
       LinkThumbnailer.configuration.rmagick_attributes.each {|m|
-        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)
+        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

data/spec/doc_parser_spec.rb

@@ -2,6 +2,24 @@ require 'spec_helper'
 
 describe LinkThumbnailer::DocParser do
 
-  it { should respond_to :parse }
+  it { should respond_to(:parse).with(1).arguments }
+
+  let(:instance) { LinkThumbnailer::DocParser.new }
+
+  describe "#parse" do
+
+    let(:source_url) { 'http://foo.com' }
+
+    subject { instance.parse('', source_url) }
+
+    it { expect(subject.source_url).to eq(source_url) }
+    it { expect(subject).to respond_to(:doc_base_href) }
+    it { expect(subject).to respond_to(:img_srcs) }
+    it { expect(subject).to respond_to(:img_abs_urls) }
+    it { expect(subject).to respond_to(:title) }
+    it { expect(subject).to respond_to(:description) }
+    it { expect(subject).to respond_to(:source_url) }
+
+  end
 
 end

data/spec/fetcher_spec.rb

@@ -17,14 +17,14 @@ describe LinkThumbnailer::Fetcher do
 
     context "when redirect_count is more than config" do
 
-      it { lambda { fetcher.fetch(url, 10) }.should raise_exception(ArgumentError) }
+      it { expect { fetcher.fetch(url, 10) }.to raise_exception(ArgumentError) }
 
     end
 
     context "when no http error" do
 
       before do
-        stub_request(:get, url).to_return(:status => 200, :body => 'foo', :headers => {})
+        stub_request(:get, url).to_return(status: 200, body: 'foo', headers: {})
       end
 
       it "returns body response" do
@@ -43,8 +43,8 @@ describe LinkThumbnailer::Fetcher do
       let(:another_url) { 'http://bar.com' }
 
       before do
-        stub_request(:get, url).to_return(:status => 300, :body => 'foo', :headers => { 'Location' =>  another_url})
-        stub_request(:get, another_url).to_return(:status => 200, :body => 'bar', :headers => {})
+        stub_request(:get, url).to_return(status: 300, body: 'foo', headers: { 'Location' => another_url })
+        stub_request(:get, another_url).to_return(status: 200, body: 'bar', headers: {})
       end
 
       it "returns body response" do
@@ -61,10 +61,10 @@ describe LinkThumbnailer::Fetcher do
     context "when http error" do
 
       before do
-        stub_request(:get, url).to_return(:status => 500, :body => 'foo', :headers => {})
+        stub_request(:get, url).to_return(status: 500, body: 'foo', headers: {})
       end
 
-      it { lambda { fetcher.fetch(url) }.should raise_exception(Net::HTTPFatalError) }
+      it { expect { fetcher.fetch(url) }.to raise_exception(Net::HTTPFatalError) }
 
     end
 

data/spec/img_url_filter_spec.rb

@@ -16,13 +16,13 @@ describe LinkThumbnailer::ImgUrlFilter do
 
     context "when img_url does not contain any blacklisted urls" do
 
-      it { img_url_filter.reject?('http://valid.com/foo/bar.png').should be_false }
+      it { expect(img_url_filter.reject?('http://valid.com/foo/bar.png')).to be_false }
 
     end
 
     context "when img_url does contain any blacklisted urls" do
 
-      it { img_url_filter.reject?('http://not_valid.net/foo/bar.png').should be_true }
+      it { expect(img_url_filter.reject?('http://not_valid.net/foo/bar.png')).to be_true }
 
     end
 

data/spec/opengraph_spec.rb

@@ -2,6 +2,6 @@ require 'spec_helper'
 
 describe LinkThumbnailer::Opengraph do
 
-  it { LinkThumbnailer::Opengraph.should respond_to :parse }
+  it { LinkThumbnailer::Opengraph.should respond_to(:parse).with(2).arguments }
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: link_thumbnailer
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-02 00:00:00.000000000 Z
+date: 2013-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -142,7 +142,7 @@ files:
 - lib/generators/link_thumbnailer/install_generator.rb
 - lib/generators/templates/initializer.rb
 - lib/link_thumbnailer.rb
-- lib/link_thumbnailer/config.rb
+- lib/link_thumbnailer/configuration.rb
 - lib/link_thumbnailer/doc.rb
 - lib/link_thumbnailer/doc_parser.rb
 - lib/link_thumbnailer/engine.rb