rack-favicon_all 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bb434520514b27f2cf284c181c6a16ad8a9670c
-  data.tar.gz: 86a6805293218268995cbb7a2aadfd7ffed0c379
+  metadata.gz: 513049bb88c601dcee1c68ff16d3b1ab7969185d
+  data.tar.gz: 79488265fa69bced0a432ddd5fe6be0cc8d5681d
 SHA512:
-  metadata.gz: 80b440fc6e131f08e0c52c1edb12fbb1373b8b1918d812264e26aae8e85b663e296b7e6f61ab5d90173c18b4fe5e655fd766eb459a5182633219bc72a2e90645
-  data.tar.gz: 9fe7cc16293a2bad41f76983d90ee6f3e8caae56fa17934def8ac40d6eab4dad08d0cf5f9f7626c9e3a7215feb50d2794975a03ebf159f11b623efcfdbb4873b
+  metadata.gz: 16918a625a26d1279736878ed692af66a81a555194c1da65ade2486432629789482ab0ac23b103204b463c75f029d9b1af515c5f219f1dfed95815ab86578cf1
+  data.tar.gz: 8def4ee4848ce5b4cb9fcaa71d9de35871f27c8f64f66d9545bbb9e500b753dd91d0b242612c6fcfbf1d5d450fa2f335070228984d892d36fef01e6e526d8bd3

data/Gemfile

@@ -14,5 +14,6 @@ group :test do
   gem 'rspec'
   gem 'simplecov', require: false
   gem 'simplecov-rcov', require: false
+  gem 'timecop'
 end
 

data/lib/rack/favicon_all/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class FaviconAll
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/rack/favicon_all.rb

@@ -29,21 +29,25 @@ module Rack
     def initialize(app, options = {})
       @app = app
       @favicon_path = options[:favicon_path]
-      @image = Magick::Image.read(@favicon_path).first unless @favicon_path.nil?
+      if !@favicon_path.nil? && ::File.exist?(@favicon_path)
+        @image = Magick::Image.read(@favicon_path).first
+      end
     end
 
     def call(env)
-      status, headers, body = @app.call(env)
-      return [status, headers, body] if @image.nil?
+      return @app.call(env) if @image.nil?
 
       favicon_info = FAVICON.find { |f| env['PATH_INFO'] =~ f[:path] }
-
-      return [status, headers, body] if favicon_info.nil?
+      return @app.call(env) if favicon_info.nil?
 
       body = genarate_favicon(favicon_info)
-      headers["Content-Length"] = body.bytesize.to_s
-      headers["Content-Type"]   = favicon_info[:mime_type] || "imgae/png"
-      [status, headers, [body]]
+      headers = {
+        "Content-Length" => body.bytesize.to_s,
+        "Content-Type"   => favicon_info[:mime_type] || "imgae/png",
+        "Last-Modified"  => Time.now.httpdate
+      }
+
+      [200, headers, [body]]
     end
 
     private

data/spec/rack-favicon_all_spec.rb

@@ -17,5 +17,30 @@ describe Rack::FaviconAll do
     end
   end
 
+  context 'return valid favicon' do
+    before { Timecop.freeze(Time.now) }
+    subject do
+      Rack::Lint.new(Rack::FaviconAll.new(app, favicon_path: File.expand_path('images/icon.png', __dir__)))
+    end
+    it do
+      response = Rack::MockRequest.new(subject).get('/favicon.ico')
+      expect(response.successful?).to be_truthy
+      expect(response.headers["Content-Type"]).to eq "image/x-icon"
+      expect(response.headers["Last-Modified"]).to eq Time.now.httpdate
+    end
+    after { Timecop.return }
+  end
+
+  context 'invalid favicon_path' do
+    subject do
+      Rack::Lint.new(Rack::FaviconAll.new(app, favicon_path: File.expand_path('images/hoge', __dir__)))
+    end
+    it do
+      response = Rack::MockRequest.new(subject).get('/favicon.ico')
+      expect(response.successful?).to be_truthy
+      expect(response.body).to eq 'Hello, World!'
+    end
+  end
+
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-favicon_all
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - SpringMT
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-10 00:00:00.000000000 Z
+date: 2015-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -70,6 +70,7 @@ files:
 - lib/rack/favicon_all.rb
 - lib/rack/favicon_all/version.rb
 - rack-favicon_all.gemspec
+- spec/images/icon.png
 - spec/rack-favicon_all_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/SpringMT/rack-favicon_all
@@ -97,6 +98,7 @@ signing_key:
 specification_version: 4
 summary: Generate favicons for IE, FF, Chrome, Safari!
 test_files:
+- spec/images/icon.png
 - spec/rack-favicon_all_spec.rb
 - spec/spec_helper.rb
 has_rdoc: