browser 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a021a6e70a34b34a47cf016fc88851dec3aaebe
-  data.tar.gz: f76665580a4eed8cfeb95fb1a67c8424aeacdeaf
+  metadata.gz: 0373ece943efe30b86eea58744eaa628c2a682c9
+  data.tar.gz: 29276aa59fd5d2a8f7ef066fcd14ed911d8bbea2
 SHA512:
-  metadata.gz: f2f700870abd8cddd6b9598699eee7547c6c5dc3e18d55bceedf32dc482e537b927136d295204fcc674a04da4c71e5f092c31ee43e08b562ce331336cba1e3b2
-  data.tar.gz: ac41b49b5e3ca509a40245bddde88838a2bffde851816f70e2e463ce0793a30b1e232383ae92b3efcc79aaa41db82b616c9cab6ff1c59f5964649acd0ac11f0b
+  metadata.gz: 470c3d3f2e2f521adf0734c6f4e9ee28da7ff29ceb946d0d513c0c818eab4d04b6c85758078d246b5a9c9d47923f6d71fc60e96a797d329b0e6edacf99ddd5a4
+  data.tar.gz: 48bf2e3967f5304d090c017b74732eba63fcc1e5bbd4796e7a1ede411f38f0d315e64d700f923fe2040374b8ea731f666ee692e1db50ba3b3c35980c629382c1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    browser (0.3.0)
+    browser (0.3.1)
 
 GEM
   remote: http://rubygems.org/

data/gemfiles/rails3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    browser (0.3.0)
+    browser (0.3.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/browser.rb

@@ -106,10 +106,10 @@ class Browser
   # Return true if browser is modern (Webkit, Firefox 17+, IE9+, Opera 12+).
   def modern?
     webkit? ||
-    (firefox? && version.to_i >= 17) ||
-    (ie? && version.to_i >= 9) ||
-    (opera? && version.to_i >= 12) ||
-    (firefox? && tablet? && android? && version.to_i >= 14)
+    newer_firefox? ||
+    newer_ie? ||
+    newer_opera? ||
+    newer_firefox_tablet?
   end
 
   # Detect if browser is WebKit-based.
@@ -171,4 +171,21 @@ class Browser
   def to_s
     meta.to_a.join(" ")
   end
+
+  private
+  def newer_firefox?
+    firefox? && version.to_i >= 17
+  end
+
+  def newer_ie?
+    ie? && version.to_i >= 9
+  end
+
+  def newer_opera?
+    opera? && version.to_i >= 12
+  end
+
+  def newer_firefox_tablet?
+    firefox? && tablet? && android? && version.to_i >= 14
+  end
 end

data/lib/browser/middleware.rb

@@ -12,14 +12,22 @@ class Browser
     def call(env)
       request = Rack::Request.new(env)
 
+      # Only apply verification on HTML requests.
+      # This ensures that images, CSS and JavaScript
+      # will be rendered.
+      return run_app(env) unless html?(request)
+
       path = catch(:redirected) do
         Context.new(request).instance_eval(&@block)
       end
 
-      path ? resolve_redirection(request.path, path) : run_app(env)
+      # No path, no match.
+      return run_app(env) unless path
+
+      resolve_redirection(env, request.path, path)
     end
 
-    def resolve_redirection(current_path, path)
+    def resolve_redirection(env, current_path, path)
       uri = URI.parse(path)
 
       if uri.path == current_path
@@ -36,5 +44,9 @@ class Browser
     def run_app(env)
       @app.call(env)
     end
+
+    def html?(request)
+      request.env["HTTP_ACCEPT"].to_s.include?("text/html")
+    end
   end
 end

data/lib/browser/version.rb

@@ -2,7 +2,7 @@ class Browser
   module Version
     MAJOR = 0
     MINOR = 3
-    PATCH = 0
+    PATCH = 1
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/test/middleware_test.rb

@@ -10,28 +10,34 @@ class MiddlewareTest < Test::Unit::TestCase
   end
 
   def test_redirect_uses_302
-    get "/", {}, {"HTTP_USER_AGENT" => "MSIE 6"}
+    get "/", {}, {"HTTP_USER_AGENT" => "MSIE 6", "HTTP_ACCEPT" => "text/html"}
     assert_equal 302, last_response.status
   end
 
   def test_redirect_ie6_to_upgrade_path
-    get "/", {}, {"HTTP_USER_AGENT" => "MSIE 6"}
+    get "/", {}, {"HTTP_USER_AGENT" => "MSIE 6", "HTTP_ACCEPT" => "text/html"}
     follow_redirect!
 
     assert_equal "UPGRADE: ie6", last_response.body
   end
 
   def test_redirect_ie7_to_upgrade_path
-    get "/", {}, {"HTTP_USER_AGENT" => "MSIE 7"}
+    get "/", {}, {"HTTP_USER_AGENT" => "MSIE 7", "HTTP_ACCEPT" => "text/html"}
     follow_redirect!
 
     assert_equal "UPGRADE: ie7", last_response.body
   end
 
   def test_redirect_ie8_and_404
-    get "/", {}, {"HTTP_USER_AGENT" => "MSIE 8"}
+    get "/", {}, {"HTTP_USER_AGENT" => "MSIE 8", "HTTP_ACCEPT" => "text/html"}
     follow_redirect!
 
     assert_equal 404, last_response.status
   end
+
+  def test_ignores_non_html_requests
+    get "/", {}, {"HTTP_USER_AGENT" => "MSIE 6", "HTTP_ACCEPT" => "image/png"}
+
+    assert_equal 200, last_response.status
+  end
 end

data/test/sample_app.rb

@@ -15,6 +15,10 @@ class SampleApp < Rails::Application
       browser = Rack::Request.new(env).params["browser"]
       [200, default_headers, ["UPGRADE: #{browser}"]]
     }, as: "upgrade"
+
+    get "/asset", to: -> env {
+      [200, {"Content-Type" => "image/png"}, []]
+    }
   end
 
   config.middleware.use Browser::Middleware do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browser
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Nando Vieira