browsernizer 0.1.2 → 0.1.3

data/README.md

@@ -37,17 +37,14 @@ It states that IE9+, FF4+, Opera 11.1+ and Chrome 7+ are supported.
 Non listed browsers are considered to be supported regardless of their version.
 Unsupported browsers will be redirected to `/browser.html` page.
 
-By default, only requests with `HTTP_ACCEPT` header set to `text/html` are
-processed. Sometimes this header is not set by the browser. To overcome this
-issue, the `exclude` option is added to the config.
-
 You can specify which paths you wish to exclude with `exclude` method.
 It accepts string or regular expression. You can specify multiple paths by
 calling the `config.exclude` multiple times.
 
 If you wish to completely prevent some browsers from accessing website
-(regardless of their version), for now you can specify some really high
-version number (e.g. "666").
+(regardless of their version), just set browser version to `false`.
+
+    config.supported "Internet Explorer", false
 
 Specifying location is optional. If you prefer handling unsupported browsers on
 your own, you can access browsernizer info from `request.env['browsernizer']`

data/lib/browsernizer/browser.rb

@@ -1,6 +1,30 @@
 module Browsernizer
 
-  class Browser < Struct.new(:browser, :version)
+  class Browser
+
+    attr_reader :name, :version
+
+    def initialize(name, version)
+      @name = name.to_s
+      if version === false
+        @version = false
+      else
+        @version = BrowserVersion.new version.to_s
+      end
+    end
+
+    def meets?(requirement)
+      if name.downcase == requirement.name.downcase
+        if requirement.version === false
+          false
+        else
+          version >= requirement.version
+        end
+      else
+        nil
+      end
+    end
+
   end
 
 end

data/lib/browsernizer/browser_version.rb

@@ -20,5 +20,9 @@ module Browsernizer
       0
     end
 
+    def to_s
+      @version
+    end
+
   end
 end

data/lib/browsernizer/config.rb

@@ -9,7 +9,7 @@ module Browsernizer
     end
 
     def supported(browser, version)
-      @supported << Browser.new(browser.to_s, version.to_s)
+      @supported << Browser.new(browser, version)
     end
 
     def location(path)
@@ -39,9 +39,5 @@ module Browsernizer
       end
     end
 
-    def exclusions_defined?
-      @exclusions.length > 0
-    end
-
   end
 end

data/lib/browsernizer/router.rb

@@ -13,7 +13,7 @@ module Browsernizer
       @env = env
       @env["browsernizer"] = {
         "supported" => true,
-        "browser" => agent.browser.to_s,
+        "browser" => agent.name.to_s,
         "version" => agent.version.to_s
       }
       handle_request
@@ -21,13 +21,18 @@ module Browsernizer
 
   private
     def handle_request
-      if !html_request? || path_excluded?
-        propagate_request
-      elsif !on_redirection_path? && unsupported?
-        handle_unsupported
-      elsif on_redirection_path? && !unsupported?
-        handle_visits_by_accident
-      else
+      @env["browsernizer"]["supported"] = false if unsupported?
+
+      catch(:response) do
+        if !path_excluded?
+          if unsupported?
+            if !on_redirection_path? && @config.get_location
+              throw :response, redirect_to_specified
+            end
+          elsif on_redirection_path?
+            throw :response, redirect_to_root
+          end
+        end
         propagate_request
       end
     end
@@ -36,48 +41,31 @@ module Browsernizer
       @app.call(@env)
     end
 
-    def handle_unsupported
-      @env["browsernizer"]["supported"] = false
-
-      if @config.get_location
-        [307, {"Content-Type" => "text/plain", "Location" => @config.get_location}, []]
-      else
-        propagate_request
-      end
+    def redirect_to_specified
+      [307, {"Content-Type" => "text/plain", "Location" => @config.get_location}, []]
     end
 
-    def handle_visits_by_accident
+    def redirect_to_root
       [303, {"Content-Type" => "text/plain", "Location" => "/"}, []]
     end
 
-    # if exclusions are defined, we'll be ignoring HTTP_ACCEPT header
-    def html_request?
-      return true if @config.exclusions_defined?
-      @env["HTTP_ACCEPT"] && @env["HTTP_ACCEPT"].include?("text/html")
-    end
-
     def path_excluded?
       @config.excluded? @env["PATH_INFO"]
     end
 
     def on_redirection_path?
-      @env["PATH_INFO"] && @env["PATH_INFO"] == @config.get_location
+      @config.get_location && @config.get_location == @env["PATH_INFO"]
     end
 
     def agent
-      ::UserAgent.parse @env["HTTP_USER_AGENT"]
+      a = ::UserAgent.parse @env["HTTP_USER_AGENT"]
+      Browser.new a.browser.to_s, a.version.to_s
     end
 
     # supported by default
     def unsupported?
-      @config.get_supported.detect do |supported_browser|
-        if agent.browser.to_s.downcase == supported_browser.browser.to_s.downcase
-          a = BrowserVersion.new agent.version.to_s
-          b = BrowserVersion.new supported_browser.version.to_s
-          a < b
-        end
-        # TODO: when useragent is fixed you can use just this line instead the above
-        # agent < supported_browser
+      @config.get_supported.any? do |requirement|
+        agent.meets?(requirement) === false
       end
     end
   end

data/lib/browsernizer/version.rb

@@ -1,3 +1,3 @@
 module Browsernizer
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/browsernizer/browser_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Browsernizer::Browser do
+
+  describe "#meets?(requirement)" do
+    context "same vendor" do
+      it "returns true if version is >= to requirement" do
+        browser("Chrome", "10.0").meets?(browser("Chrome", "10"  )).should be_true
+        browser("Chrome", "10.0").meets?(browser("Chrome", "10.1")).should be_false
+        browser("Chrome", "10"  ).meets?(browser("Chrome", " 9.1")).should be_true
+      end
+      it "returns false if requirement version is set to false" do
+        browser("Chrome", "10"  ).meets?(browser("Chrome", false )).should be_false
+      end
+    end
+
+    context "different vendors" do
+      it "returns nil" do
+        browser("Chrome", "10").meets?(browser("Firefox", "10")).should be_nil
+      end
+    end
+  end
+
+  def browser(name, version)
+    Browsernizer::Browser.new(name, version)
+  end
+
+end

data/spec/browsernizer/config_spec.rb

@@ -10,6 +10,11 @@ describe Browsernizer::Config do
       subject.supported "Firefox", "10.0"
       subject.get_supported.should have(2).items
     end
+
+    it "allows to unsupport browser by using false as version number" do
+      subject.supported "Chrome", false
+      subject.get_supported[0].version.should be_false
+    end
   end
 
   describe "location(path)" do
@@ -29,8 +34,6 @@ describe Browsernizer::Config do
       subject.excluded?("/prefix/assets/foo.jpg").should be_false
       subject.excluded?("/foo/bar.html").should be_true
       subject.excluded?("/foo/bar2.html").should be_false
-
-      subject.exclusions_defined?.should be_true
     end
   end
 

data/spec/browsernizer/router_spec.rb

@@ -6,7 +6,7 @@ describe Browsernizer::Router do
 
   subject do
     Browsernizer::Router.new(app) do |config|
-      config.supported "Firefox", "4"
+      config.supported "Firefox", false
       config.supported "Chrome", "7.1"
     end
   end
@@ -14,50 +14,42 @@ describe Browsernizer::Router do
   let(:default_env) do
     {
       "HTTP_USER_AGENT" => chrome_agent("7.1.1"),
-      "HTTP_ACCEPT" => "text/html",
       "PATH_INFO" => "/index"
     }
   end
 
   context "All Good" do
-    it "sets browsernizer env and propagates request" do
-      response = default_env.dup
-      response['browsernizer'] = {
-        'supported' => true,
-        'browser' => "Chrome",
-        'version' => "7.1.1"
-      }
-      app.should_receive(:call).with(response)
+    it "propagates requrest with updated env" do
+      app.should_receive(:call).with do |env|
+        env['browsernizer']['supported'].should be_true
+        env['browsernizer']['browser'].should == "Chrome"
+        env['browsernizer']['version'].should == "7.1.1"
+      end
       subject.call(default_env)
     end
   end
 
-  context "Unsupported Browser" do
-    before do
-      @env = default_env.merge({
-        "HTTP_USER_AGENT" => chrome_agent("7")
-      })
-    end
 
-    it "updates 'browsernizer' env variable and propagates request" do
-      @response = @env.dup
-      @response['browsernizer'] = {
-        'supported' => false,
-        'browser' => "Chrome",
-        'version' => "7"
-      }
-      app.should_receive(:call).with(@response)
-      subject.call(@env)
+  shared_examples "unsupported browser" do
+    context "location not set" do
+      it "propagates requrest with updated env" do
+        app.should_receive(:call).with do |env|
+          env['browsernizer']['supported'].should be_false
+        end
+        subject.call(@env)
+      end
     end
 
     context "location is set" do
       before do
         subject.config.location "/browser.html"
       end
+
       it "prevents propagation" do
         app.should_not_receive(:call)
         subject.call(@env)
       end
+
       it "redirects to proper location" do
         response = subject.call(@env)
         response[0].should == 307
@@ -76,50 +68,47 @@ describe Browsernizer::Router do
           subject.call(@env)
         end
       end
-    end
 
-    context "Non-html request" do
-      before do
-        @env = @env.merge({
-          "HTTP_ACCEPT" => "text/css"
-        })
-      end
-      it "propagates request" do
-        app.should_receive(:call).with(@env)
-        subject.call(@env)
-      end
-
-      context "exclusions defined" do
+      context "Already on /browser.html page" do
         before do
-          subject.config.exclude %r{^/assets}
-          subject.config.location "/browser.html"
+          @env = @env.merge({
+            "PATH_INFO" => "/browser.html"
+          })
         end
-        it "handles the request" do
-          app.should_not_receive(:call).with(@env)
-          response = subject.call(@env)
-          response[0].should == 307
-          response[1]["Location"].should == "/browser.html"
+        it "propagates requrest with updated env" do
+          app.should_receive(:call).with do |env|
+            env['browsernizer']['supported'].should be_false
+          end
+          subject.call(@env)
         end
       end
     end
+  end
 
-
-    context "Already on /browser.html page" do
-      before do
-        @env = @env.merge({
-          "PATH_INFO" => "/browser.html"
-        })
-      end
-      it "propagates request" do
-        app.should_receive(:call).with(@env)
-        subject.call(@env)
-      end
+  context "Unsupported Version" do
+    before do
+      @env = default_env.merge({
+        "HTTP_USER_AGENT" => chrome_agent("7")
+      })
     end
+    it_behaves_like "unsupported browser"
   end
 
+  context "Unsupported Vendor" do
+    before do
+      @env = default_env.merge({
+        "HTTP_USER_AGENT" => firefox_agent("10.0.1")
+      })
+    end
+    it_behaves_like "unsupported browser"
+  end
 
   def chrome_agent(version)
     "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_2) AppleWebKit/535.7 (KHTML, like Gecko) Chrome/#{version} Safari/535.7"
   end
 
+  def firefox_agent(version)
+    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:10.0.1) Gecko/20100101 Firefox/#{version}"
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browsernizer
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-14 00:00:00.000000000Z
+date: 2012-02-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70284088116900 !ruby/object:Gem::Requirement
+  requirement: &70146036473060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70284088116900
+  version_requirements: *70146036473060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70284088116480 !ruby/object:Gem::Requirement
+  requirement: &70146036472640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70284088116480
+  version_requirements: *70146036472640
 - !ruby/object:Gem::Dependency
   name: useragent
-  requirement: &70284088115980 !ruby/object:Gem::Requirement
+  requirement: &70146036472140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 0.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *70284088115980
+  version_requirements: *70146036472140
 description: Rack middleware for redirecting unsupported user agents to "please upgrade"
   page
 email:
@@ -65,6 +65,7 @@ files:
 - lib/browsernizer/version.rb
 - lib/generators/browsernizer/install_generator.rb
 - lib/generators/templates/browsernizer.rb
+- spec/browsernizer/browser_spec.rb
 - spec/browsernizer/browser_version_spec.rb
 - spec/browsernizer/config_spec.rb
 - spec/browsernizer/router_spec.rb
@@ -94,6 +95,7 @@ signing_key:
 specification_version: 3
 summary: Want friendly "please upgrade your browser" page? This gem is for you.
 test_files:
+- spec/browsernizer/browser_spec.rb
 - spec/browsernizer/browser_version_spec.rb
 - spec/browsernizer/config_spec.rb
 - spec/browsernizer/router_spec.rb