browsernizer 0.2.0 → 0.2.1

data/.gitignore

@@ -4,3 +4,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+/bin

data/CHANGELOG

@@ -1,2 +1,6 @@
+= Version 0.2.1
+  * Code cleanup by @Bertg
+  * Getting rid of warnings by @prowler
+
 = Version 0.2.0
   * ditched useragent, now using browser gem (backward compatibility might be broken)

data/README.md

@@ -1,5 +1,7 @@
 # Browsernizer
 
+[![Gem Version](https://badge.fury.io/rb/browsernizer.png)](http://badge.fury.io/rb/browsernizer)
+
 Want friendly "please upgrade your browser" page? This gem is for you.
 
 You can redirect your visitors to any page you like (static or dynamic).

data/lib/browsernizer/browser_version.rb

@@ -13,7 +13,7 @@ module Browsernizer
     end
 
     def <=>(other)
-      ([0]*6).zip(to_a, other.to_a).each do |dump, a, b|
+      ([0]*6).zip(to_a, [*other]).each do |dump, a, b|
         r = (a||0) <=> (b||0)
         return r unless r.zero?
       end

data/lib/browsernizer/router.rb

@@ -10,37 +10,26 @@ module Browsernizer
     end
 
     def call(env)
-      @env = env
-      @env["browsernizer"] = {
-        "supported" => true,
+      raw_browser, browser = get_browsers(env)
+      env["browsernizer"] = {
+        "supported" => supported?(raw_browser, browser),
         "browser" => browser.name.to_s,
         "version" => browser.version.to_s
       }
-      handle_request
+      redirect_request(env) || @app.call(env)
     end
 
   private
-    def handle_request
-      @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
+    def redirect_request(env)
+      return if path_excluded?(env)
+      if !env["browsernizer"]["supported"]
+        return redirect_to_specified if @config.get_location && !on_redirection_path?(env)
+      elsif on_redirection_path?(env)
+        return redirect_to_root
       end
     end
 
-    def propagate_request
-      @app.call(@env)
-    end
-
     def redirect_to_specified
       [307, {"Content-Type" => "text/plain", "Location" => @config.get_location}, []]
     end
@@ -49,25 +38,23 @@ module Browsernizer
       [303, {"Content-Type" => "text/plain", "Location" => "/"}, []]
     end
 
-    def path_excluded?
-      @config.excluded? @env["PATH_INFO"]
-    end
-
-    def on_redirection_path?
-      @config.get_location && @config.get_location == @env["PATH_INFO"]
+    def path_excluded?(env)
+      @config.excluded? env["PATH_INFO"]
     end
 
-    def raw_browser
-      ::Browser.new :ua => @env["HTTP_USER_AGENT"]
+    def on_redirection_path?(env)
+      @config.get_location && @config.get_location == env["PATH_INFO"]
     end
 
-    def browser
-      Browser.new raw_browser.name.to_s, raw_browser.full_version.to_s
+    def get_browsers(env)
+      raw_browser = ::Browser.new :ua => env["HTTP_USER_AGENT"]
+      browser = Browsernizer::Browser.new raw_browser.name.to_s, raw_browser.full_version.to_s
+      [raw_browser, browser]
     end
 
     # supported by default
-    def unsupported?
-      @config.get_supported.any? do |requirement|
+    def supported?(raw_browser, browser)
+      !@config.get_supported.any? do |requirement|
         supported = if requirement.respond_to?(:call)
           requirement.call(raw_browser)
         else

data/lib/browsernizer/version.rb

@@ -1,3 +1,3 @@
 module Browsernizer
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browsernizer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-03 00:00:00.000000000 Z
+date: 2013-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70211448089400 !ruby/object:Gem::Requirement
+  requirement: &70152071474760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70211448089400
+  version_requirements: *70152071474760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70211448116560 !ruby/object:Gem::Requirement
+  requirement: &70152071473880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70211448116560
+  version_requirements: *70152071473880
 - !ruby/object:Gem::Dependency
   name: browser
-  requirement: &70211448115820 !ruby/object:Gem::Requirement
+  requirement: &70152071472940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70211448115820
+  version_requirements: *70152071472940
 description: Rack middleware for redirecting unsupported user agents to "please upgrade"
   page
 email: