browsernizer 0.1.4 → 0.1.5

data/README.md

@@ -46,6 +46,15 @@ If you wish to completely prevent some browsers from accessing website
 
     config.supported "Internet Explorer", false
 
+There is also an option to provide block for more advanced checking.
+[UserAgent object](https://github.com/josh/useragent/tree/master/lib) will be
+passed to it. If you wish to state that *mobile safari* is not supported, you
+can declare it like this:
+
+    config.supported do |agent|
+      !(agent.browser == "Safari" && agent.mobile?)
+    end
+
 Specifying location is optional. If you prefer handling unsupported browsers on
 your own, you can access browsernizer info from `request.env['browsernizer']`
 within your controller.

data/lib/browsernizer/config.rb

@@ -8,8 +8,14 @@ module Browsernizer
       @handler = lambda { }
     end
 
-    def supported(browser, version)
-      @supported << Browser.new(browser, version)
+    def supported(*args, &block)
+      if args.length == 2
+        @supported << Browser.new(args[0], args[1])
+      elsif block_given?
+        @supported << block
+      else
+        raise ArgumentError, "accepts either (browser, version) or block"
+      end
     end
 
     def location(path)

data/lib/browsernizer/router.rb

@@ -57,15 +57,23 @@ module Browsernizer
       @config.get_location && @config.get_location == @env["PATH_INFO"]
     end
 
+    def raw_agent
+      ::UserAgent.parse @env["HTTP_USER_AGENT"]
+    end
+
     def agent
-      a = ::UserAgent.parse @env["HTTP_USER_AGENT"]
-      Browser.new a.browser.to_s, a.version.to_s
+      Browser.new raw_agent.browser.to_s, raw_agent.version.to_s
     end
 
     # supported by default
     def unsupported?
       @config.get_supported.any? do |requirement|
-        agent.meets?(requirement) === false
+        supported = if requirement.respond_to?(:call)
+          requirement.call(raw_agent)
+        else
+          agent.meets?(requirement)
+        end
+        supported === false
       end
     end
   end

data/lib/browsernizer/version.rb

@@ -1,3 +1,3 @@
 module Browsernizer
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/browsernizer/router_spec.rb

@@ -8,6 +8,9 @@ describe Browsernizer::Router do
     Browsernizer::Router.new(app) do |config|
       config.supported "Firefox", false
       config.supported "Chrome", "7.1"
+      config.supported do |agent|
+        !(agent.browser == "Safari" && agent.mobile?)
+      end
     end
   end
 
@@ -103,6 +106,15 @@ describe Browsernizer::Router do
     it_behaves_like "unsupported browser"
   end
 
+  context "Unsupported by proc" do
+    before do
+      @env = default_env.merge({
+        "HTTP_USER_AGENT" => mobile_safari_agent
+      })
+    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
@@ -111,4 +123,8 @@ describe Browsernizer::Router do
     "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:10.0.1) Gecko/20100101 Firefox/#{version}"
   end
 
+  def mobile_safari_agent
+    "Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420.1 (KHTML, like Gecko) Version/3.0 Mobile/4A102 Safari/419"
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browsernizer
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-15 00:00:00.000000000Z
+date: 2012-04-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70115443219560 !ruby/object:Gem::Requirement
+  requirement: &70114364841740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70115443219560
+  version_requirements: *70114364841740
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70115443219140 !ruby/object:Gem::Requirement
+  requirement: &70114364841180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70115443219140
+  version_requirements: *70114364841180
 - !ruby/object:Gem::Dependency
   name: useragent
-  requirement: &70115443218640 !ruby/object:Gem::Requirement
+  requirement: &70114364840480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 0.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *70115443218640
+  version_requirements: *70114364840480
 description: Rack middleware for redirecting unsupported user agents to "please upgrade"
   page
 email:
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: browsernizer
-rubygems_version: 1.8.15
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Want friendly "please upgrade your browser" page? This gem is for you.