flavicon 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fa853720ba3467ae1e98ffc4867714d2396e37e
-  data.tar.gz: f35b0bbc8a07845cf6c66e00a49576fafec4926e
+  metadata.gz: bb77bbe0910de976833f57dcac196e53ea950339
+  data.tar.gz: d6a108eb16a4657f6cde6eca58046a2f01e6d69c
 SHA512:
-  metadata.gz: ee1f8fda545e3927f39c8551975f63fca9ab7bd7a6c7c9dcb91ed88efa17100315d8eeb3b13a2172be33433417d2d48d2a2a0e28fe2b318a08265c9a15c37366
-  data.tar.gz: 6f115a44c07cc3069bb88dbb1a40908a14c2bc2370e9e435f399485d1df9d8fcd98cffca2827b14b7a8c2b56b5b3fdbf2fac7c8c6932f4d06ad3bf7f8f8cc3a2
+  metadata.gz: 5d6d4fe83925c84bc05e9a6ba5c982b91c7680769dc16a696505ccb314a590de97a6218ba9bb122da194ace43ba0e6d2ed93bc3962f64583ab7fc3d8ddc8365b
+  data.tar.gz: edef26f6b50cf155d161a415ebd80efccc46c0add83dd2387b3f4d00107d91a72f1981274a5dec48c86e1c00c0958a9cbdee7c973ca073c837d14c1cc48775a5

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.1.1
+env:
+  - COVERAGE=true

data/Gemfile

@@ -12,4 +12,5 @@ group :development do
   gem 'jeweler', '~> 2.0'
   gem 'simplecov', '~> 0'
   gem 'pry', '~> 0'
+  gem 'coveralls'
 end

data/Gemfile.lock

@@ -4,6 +4,12 @@ GEM
     addressable (2.3.6)
     builder (3.2.2)
     coderay (1.1.0)
+    coveralls (0.7.0)
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      term-ansicolor
+      thor
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     descendants_tracker (0.0.4)
@@ -36,6 +42,7 @@ GEM
     jwt (0.1.11)
       multi_json (>= 1.5)
     method_source (0.8.2)
+    mime-types (2.2)
     mini_portile (0.5.3)
     multi_json (1.9.2)
     multi_xml (0.5.5)
@@ -56,6 +63,8 @@ GEM
     rake (10.3.1)
     rdoc (3.12.2)
       json (~> 1.4)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -71,7 +80,11 @@ GEM
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
     slop (3.5.0)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
+    thor (0.19.1)
     thread_safe (0.3.3)
+    tins (1.1.0)
     webmock (1.17.4)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
@@ -81,6 +94,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0)
+  coveralls
   jeweler (~> 2.0)
   nokogiri (~> 1.6)
   pry (~> 0)

data/README.md

@@ -1,3 +1,8 @@
+[![Build Status](https://travis-ci.org/hasghari/flavicon.png?branch=master)](https://travis-ci.org/hasghari/flavicon)
+[![Code Climate](https://codeclimate.com/github/hasghari/flavicon.png)](https://codeclimate.com/github/hasghari/flavicon)
+[![Coverage Status](https://coveralls.io/repos/hasghari/flavicon/badge.png)](https://coveralls.io/r/hasghari/flavicon)
+[![Gem Version](https://badge.fury.io/rb/flavicon.png)](http://badge.fury.io/rb/flavicon)
+
 # flavicon
 
 Disclaimer: This is a rewrite of the [www-favicon](https://github.com/youpy/www-favicon) gem for a couple reasons:

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/flavicon.gemspec

@@ -0,0 +1,85 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+# stub: flavicon 0.1.1 ruby lib
+
+Gem::Specification.new do |s|
+  s.name = "flavicon"
+  s.version = "0.1.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
+  s.authors = ["Hamed Asghari"]
+  s.date = "2016-09-22"
+  s.description = "fetch favicon url by parsing html and falling back on /favicon.ico as default"
+  s.email = "hasghari@gmail.com"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.md"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    ".ruby-gemset",
+    ".ruby-version",
+    ".travis.yml",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "flavicon.gemspec",
+    "lib/flavicon.rb",
+    "lib/flavicon/finder.rb",
+    "spec/fixtures/absolute.html",
+    "spec/fixtures/missing.html",
+    "spec/fixtures/multiple.html",
+    "spec/fixtures/relative.html",
+    "spec/flavicon/finder_spec.rb",
+    "spec/flavicon_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = "http://github.com/hasghari/flavicon"
+  s.licenses = ["MIT"]
+  s.rubygems_version = "2.2.2"
+  s.summary = "fetch favicon url for provided url"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<nokogiri>, ["~> 1.6"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.14"])
+      s.add_development_dependency(%q<webmock>, ["~> 1.17"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
+      s.add_development_dependency(%q<simplecov>, ["~> 0"])
+      s.add_development_dependency(%q<pry>, ["~> 0"])
+      s.add_development_dependency(%q<coveralls>, [">= 0"])
+    else
+      s.add_dependency(%q<nokogiri>, ["~> 1.6"])
+      s.add_dependency(%q<rspec>, ["~> 2.14"])
+      s.add_dependency(%q<webmock>, ["~> 1.17"])
+      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<bundler>, ["~> 1.0"])
+      s.add_dependency(%q<jeweler>, ["~> 2.0"])
+      s.add_dependency(%q<simplecov>, ["~> 0"])
+      s.add_dependency(%q<pry>, ["~> 0"])
+      s.add_dependency(%q<coveralls>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<nokogiri>, ["~> 1.6"])
+    s.add_dependency(%q<rspec>, ["~> 2.14"])
+    s.add_dependency(%q<webmock>, ["~> 1.17"])
+    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<bundler>, ["~> 1.0"])
+    s.add_dependency(%q<jeweler>, ["~> 2.0"])
+    s.add_dependency(%q<simplecov>, ["~> 0"])
+    s.add_dependency(%q<pry>, ["~> 0"])
+    s.add_dependency(%q<coveralls>, [">= 0"])
+  end
+end
+

data/lib/flavicon/finder.rb

@@ -9,12 +9,13 @@ module Flavicon
     def find
       response, resolved = request(url)
       favicon_url = extract_from_html(response.body, resolved) || default_path(resolved)
-      valid_favicon_url?(favicon_url) ? favicon_url : nil
+      verify_favicon_url(favicon_url)
     end
 
-    def valid_favicon_url?(url)
-      response, _ = request(url)
-      response.is_a?(Net::HTTPSuccess) && response.body.to_s != '' && response.content_type =~ /image/i
+    def verify_favicon_url(url)
+      response, resolved = request(url)
+      return unless response.is_a?(Net::HTTPSuccess) && response.body.to_s != '' && response.content_type =~ /image/i
+      resolved
     end
 
     def extract_from_html(html, url)

data/spec/flavicon/finder_spec.rb

@@ -2,15 +2,45 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'flavicon/finder'
 
 describe Flavicon::Finder do
+  def html(file)
+    File.read(File.expand_path(File.dirname(__FILE__) + "/../fixtures/#{file}"))
+  end
+
   subject { Flavicon::Finder.new('http://www.ex.com') }
 
   describe '#find' do
-    it '' do
+    it 'should delegate to #request' do
+      response = double('response', body: html('absolute.html'))
+      subject.should_receive(:request).with('http://www.ex.com').and_return([response, 'http://www.other.com'])
+      subject.should_receive(:verify_favicon_url).and_return('http://sub.example.com/absolute.ico')
+      subject.find
+    end
+
+    it 'should extract favicon from body' do
+      response = double('response', body: html('absolute.html'))
+      subject.should_receive(:request).with('http://www.ex.com').and_return([response, 'http://www.other.com'])
+      subject.should_receive(:verify_favicon_url).with('http://sub.example.com/absolute.ico')
+        .and_return('http://sub.example.com/absolute.ico')
+      subject.find.should == 'http://sub.example.com/absolute.ico'
+    end
+
+    it 'should fallback to default when response is empty' do
+      response = double('response', body: '')
+      subject.should_receive(:request).with('http://www.ex.com').and_return([response, 'http://www.other.com'])
+      subject.should_receive(:verify_favicon_url).with('http://www.other.com/favicon.ico')
+        .and_return('http://www.other.com/favicon.ico')
+      subject.find.should == 'http://www.other.com/favicon.ico'
+    end
 
+    it 'should return nil when not valid' do
+      response = double('response', body: html('absolute.html'))
+      subject.should_receive(:request).with('http://www.ex.com').and_return([response, 'http://www.other.com'])
+      subject.should_receive(:verify_favicon_url).and_return(nil)
+      subject.find.should be_nil
     end
   end
 
-  describe '#valid_favicon_url?' do
+  describe '#verify_favicon_url' do
     let(:favicon_url) { 'http://www.ex.com/favicon.ico' }
     let(:response) do
       { status: 200, body: 'blah', headers: { 'Content-Type' => 'image/x-icon'} }
@@ -20,8 +50,8 @@ describe Flavicon::Finder do
       stub_request(:get, favicon_url).to_return(response)
     end
 
-    it 'should be true by default' do
-      subject.valid_favicon_url?(favicon_url).should be_true
+    it 'should return favicon url' do
+      subject.verify_favicon_url(favicon_url).should == favicon_url
     end
 
     context 'http failure' do
@@ -29,8 +59,8 @@ describe Flavicon::Finder do
         { status: 400, body: 'blah', headers: { 'Content-Type' => 'image/x-icon'} }
       end
 
-      it 'should be false' do
-        subject.valid_favicon_url?(favicon_url).should be_false
+      it 'should return nil' do
+        subject.verify_favicon_url(favicon_url).should be_nil
       end
     end
 
@@ -39,8 +69,8 @@ describe Flavicon::Finder do
         { status: 200, body: '', headers: { 'Content-Type' => 'image/x-icon'} }
       end
 
-      it 'should be false' do
-        subject.valid_favicon_url?(favicon_url).should be_false
+      it 'should return nil' do
+        subject.verify_favicon_url(favicon_url).should be_nil
       end
     end
 
@@ -49,17 +79,13 @@ describe Flavicon::Finder do
         { status: 200, body: 'blah', headers: { 'Content-Type' => 'text/javascript'} }
       end
 
-      it 'should be false' do
-        subject.valid_favicon_url?(favicon_url).should be_false
+      it 'should return nil' do
+        subject.verify_favicon_url(favicon_url).should be_nil
       end
     end
   end
 
   describe '#extract_from_html' do
-    def html(file)
-      File.read(File.expand_path(File.dirname(__FILE__) + "/../fixtures/#{file}"))
-    end
-
     it 'should return nil for empty body' do
       subject.extract_from_html('', 'http://www.ex.com').should be_nil
     end
@@ -84,6 +110,24 @@ describe Flavicon::Finder do
     end
   end
 
+  describe '#default_path' do
+    it 'should return default favicon url' do
+      subject.default_path('http://www.basic.com').should == 'http://www.basic.com/favicon.ico'
+    end
+
+    it 'ignores query and fragment' do
+      subject.default_path('http://www.basic.com?query=a#fragment').should == 'http://www.basic.com/favicon.ico'
+    end
+
+    it 'ignores path with no trailing slash' do
+      subject.default_path('http://www.basic.com/basic').should == 'http://www.basic.com/favicon.ico'
+    end
+
+    it 'ignores path with trailing slash' do
+      subject.default_path('http://www.basic.com/basic/').should == 'http://www.basic.com/favicon.ico'
+    end
+  end
+
   describe '#request' do
     before do
       stub_request(:get, 'http://www.ex.com/abc/')
@@ -102,6 +146,21 @@ describe Flavicon::Finder do
       url.should == 'http://www.ex.com/abc/'
     end
 
+    context 'ssl' do
+      before do
+        stub_request(:get, 'http://secure.ex.com:443/abc/')
+          .to_return(status: 200, body: '', headers: {})
+      end
+
+      it 'should set http secure state' do
+        Net::HTTP.any_instance.should_receive(:use_ssl=).with(true)
+        Net::HTTP.any_instance.should_receive(:verify_mode=).with(OpenSSL::SSL::VERIFY_NONE)
+        response, url = subject.request('https://secure.ex.com/abc/')
+        response.should be_a Net::HTTPSuccess
+        url.should == 'https://secure.ex.com/abc/'
+      end
+    end
+
     context 'redirect' do
       before do
         stub_request(:get, 'http://www.ex.com/abc')

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'simplecov'
+require 'coveralls'
 
 module SimpleCov::Configuration
   def clean_filters
@@ -11,9 +12,15 @@ SimpleCov.configure do
   load_profile 'test_frameworks'
 end
 
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+
 ENV['COVERAGE'] && SimpleCov.start do
   add_filter '/.rvm/'
 end
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flavicon
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Hamed Asghari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-21 00:00:00.000000000 Z
+date: 2016-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: fetch favicon url by parsing html and falling back on /favicon.ico as
   default
 email: hasghari@gmail.com
@@ -135,12 +149,14 @@ files:
 - ".rspec"
 - ".ruby-gemset"
 - ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - VERSION
+- flavicon.gemspec
 - lib/flavicon.rb
 - lib/flavicon/finder.rb
 - spec/fixtures/absolute.html