browsernizer 0.2.2 → 0.2.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7dd10a5602dbe925a6e861a29820259986292e83
+  data.tar.gz: 1a2602a4e5bda131e7f72a0d20a168e3bac2d079
+SHA512:
+  metadata.gz: 94f21d35f5197a663cf05a7b402f23bc8e596a65fe2df01b0bfe40f16756f272b8a281322250c2cd31b6554fe2f3af17ff477d4be77f1f19c7580e5ff8d7058d
+  data.tar.gz: cb828676b75e87b317ce6b8d57c66961d6b1af7364cba1f865c67fe3f964b11fc6fda780bc97cbab4bb21eb4a5e5fdf01d853445a3aa81ed6837a4b964efcf9a

data/CHANGELOG

@@ -1,3 +1,6 @@
+= Version 0.2.3
+  * Allow arbitrary include/exclude logic - #13 by @romanbsd
+
 = Version 0.2.2
   * Relax version dependency of the 'browser' gem - by @adammck
 

data/README.md

@@ -57,6 +57,17 @@ can declare it like this:
       !(browser.name == "Safari" && browser.mobile?)
     end
 
+The block should return false to block the browser, true to allow it, and nil if it
+cannot decide. This way you can make any arbitrary User-Agent explicitly allowed,
+even if its version would have been blocked otherwise:
+
+    config.supported do |browser|
+      true if browser.user_agent.include?('Linux')
+    end
+
+Please note, that the order is important, thus the first block or requirement returning
+a boolean wins.
+
 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/router.rb

@@ -54,13 +54,14 @@ module Browsernizer
 
     # supported by default
     def supported?(raw_browser, browser)
-      !@config.get_supported.any? do |requirement|
+      @config.get_supported.inject(true) do |default, requirement|
         supported = if requirement.respond_to?(:call)
           requirement.call(raw_browser)
         else
           browser.meets?(requirement)
         end
-        supported === false
+        break supported unless supported.nil?
+        default
       end
     end
   end

data/lib/browsernizer/version.rb

@@ -1,3 +1,3 @@
 module Browsernizer
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/browsernizer/browser_spec.rb

@@ -5,18 +5,18 @@ 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
+        expect(browser("Chrome", "10.0").meets?(browser("Chrome", "10"  ))).to be_true
+        expect(browser("Chrome", "10.0").meets?(browser("Chrome", "10.1"))).to be_false
+        expect(browser("Chrome", "10"  ).meets?(browser("Chrome", " 9.1"))).to be_true
       end
       it "returns false if requirement version is set to false" do
-        browser("Chrome", "10"  ).meets?(browser("Chrome", false )).should be_false
+        expect(browser("Chrome", "10"  ).meets?(browser("Chrome", false ))).to be_false
       end
     end
 
     context "different vendors" do
       it "returns nil" do
-        browser("Chrome", "10").meets?(browser("Firefox", "10")).should be_nil
+        expect(browser("Chrome", "10").meets?(browser("Firefox", "10"))).to be_nil
       end
     end
   end

data/spec/browsernizer/browser_version_spec.rb

@@ -5,20 +5,20 @@ describe Browsernizer::BrowserVersion do
   describe "Comparable" do
 
     it "is greater" do
-     version("2").should > version("1")
-     version("1.1").should > version("1")
-     version("1.1").should > version("1.0")
-     version("2").should > version("1.9")
+     expect(version("2")).to be > version("1")
+     expect(version("1.1")).to be > version("1")
+     expect(version("1.1")).to be > version("1.0")
+     expect(version("2")).to be > version("1.9")
    end
 
     it "is equal" do
-      version("1").should == version("1")
-      version("1").should == version("1.0")
-      version("1.0").should == version("1")
+      expect(version("1")).to eq(version("1"))
+      expect(version("1")).to eq(version("1.0"))
+      expect(version("1.0")).to eq(version("1"))
     end
 
     it "handles strings" do
-      version("1.0").should == version("1.0.alpha")
+      expect(version("1.0")).to eq(version("1.0.alpha"))
     end
 
   end

data/spec/browsernizer/config_spec.rb

@@ -8,19 +8,19 @@ describe Browsernizer::Config do
     it "defines new supported browser" do
       subject.supported "Chrome", "16.0"
       subject.supported "Firefox", "10.0"
-      subject.get_supported.should have(2).items
+      expect(subject.get_supported.size).to eq(2)
     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
+      expect(subject.get_supported[0].version).to be_false
     end
   end
 
   describe "location(path)" do
     it "sets the redirection path for unsupported browsers" do
       subject.location "foo.html"
-      subject.get_location.should == "foo.html"
+      expect(subject.get_location).to eq("foo.html")
     end
   end
 
@@ -29,11 +29,11 @@ describe Browsernizer::Config do
       subject.exclude %r{^/assets}
       subject.exclude "/foo/bar.html"
 
-      subject.excluded?("/assets/foo.jpg").should be_true
-      subject.excluded?("/Assets/foo.jpg").should be_false
-      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
+      expect(subject.excluded?("/assets/foo.jpg")).to be_true
+      expect(subject.excluded?("/Assets/foo.jpg")).to be_false
+      expect(subject.excluded?("/prefix/assets/foo.jpg")).to be_false
+      expect(subject.excluded?("/foo/bar.html")).to be_true
+      expect(subject.excluded?("/foo/bar2.html")).to be_false
     end
   end
 

data/spec/browsernizer/router_spec.rb

@@ -6,6 +6,9 @@ describe Browsernizer::Router do
 
   subject do
     Browsernizer::Router.new(app) do |config|
+      config.supported do |browser|
+        true if browser.user_agent.include?('Spec')
+      end
       config.supported "Firefox", false
       config.supported "Chrome", "7.1"
       config.supported do |browser|
@@ -22,11 +25,11 @@ describe Browsernizer::Router do
   end
 
   context "All Good" do
-    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"
+    it "propagates request with updated env" do
+      expect(app).to receive(:call) do |env|
+        expect(env['browsernizer']['supported']).to be_true
+        expect(env['browsernizer']['browser']).to eq("Chrome")
+        expect(env['browsernizer']['version']).to eq("7.1.1")
       end
       subject.call(default_env)
     end
@@ -35,9 +38,9 @@ describe Browsernizer::Router do
 
   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
+      it "propagates request with updated env" do
+        expect(app).to receive(:call) do |env|
+          expect(env['browsernizer']['supported']).to be_false
         end
         subject.call(@env)
       end
@@ -49,14 +52,14 @@ describe Browsernizer::Router do
       end
 
       it "prevents propagation" do
-        app.should_not_receive(:call)
+        expect(app).not_to receive(:call)
         subject.call(@env)
       end
 
       it "redirects to proper location" do
         response = subject.call(@env)
-        response[0].should == 307
-        response[1]["Location"].should == "/browser.html"
+        expect(response[0]).to eq(307)
+        expect(response[1]["Location"]).to eq("/browser.html")
       end
 
       context "Excluded path" do
@@ -67,7 +70,7 @@ describe Browsernizer::Router do
           })
         end
         it "propagates request" do
-          app.should_receive(:call).with(@env)
+          expect(app).to receive(:call).with(@env)
           subject.call(@env)
         end
       end
@@ -78,9 +81,9 @@ describe Browsernizer::Router do
             "PATH_INFO" => "/browser.html"
           })
         end
-        it "propagates requrest with updated env" do
-          app.should_receive(:call).with do |env|
-            env['browsernizer']['supported'].should be_false
+        it "propagates request with updated env" do
+          expect(app).to receive(:call) do |env|
+            expect(env['browsernizer']['supported']).to be_false
           end
           subject.call(@env)
         end
@@ -115,6 +118,21 @@ describe Browsernizer::Router do
     it_behaves_like "unsupported browser"
   end
 
+  context "Supported by proc" do
+    before do
+      @env = default_env.merge({
+        "HTTP_USER_AGENT" => firefox_agent("10.0.1") + ' Spec'
+      })
+    end
+
+    it "propagates request" do
+      expect(app).to receive(:call) do |env|
+        expect(env['browsernizer']['supported']).to be_true
+      end
+      subject.call(@env)
+    end
+  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

metadata

@@ -1,49 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: browsernizer
 version: !ruby/object:Gem::Version
-  version: 0.2.2
-  prerelease: 
+  version: 0.2.3
 platform: ruby
 authors:
 - Milovan Zogovic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70242799782200 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70242799782200
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70242799781760 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70242799781760
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: browser
-  requirement: &70242799781200 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70242799781200
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 0.1.4
 description: Rack middleware for redirecting unsupported user agents to "please upgrade"
   page
 email:
@@ -52,7 +60,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG
 - Gemfile
 - LICENSE
@@ -74,33 +82,26 @@ files:
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2510847936117129641
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2510847936117129641
 requirements: []
 rubyforge_project: browsernizer
-rubygems_version: 1.8.11
+rubygems_version: 2.4.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Want friendly "please upgrade your browser" page? This gem is for you.
 test_files:
 - spec/browsernizer/browser_spec.rb