browser 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e4f0f94511f5a4e169815e5b034e4fa3a53099d
-  data.tar.gz: 90fb62dfa2b9ba5198ede34f771aa4f0a13e752d
+  metadata.gz: 3a1b14e0741db49c503fcd83bf58203f643538b7
+  data.tar.gz: a556e47aed22b522f909d3b5a4b715d73a131287
 SHA512:
-  metadata.gz: 6de159fbcda822346be969345f46b7fca93231c624b163cda8b3f23e75589f2e8b2613d329a5d26feae03d3e554b70ceb54730261c9f371303ec60283f3e98f4
-  data.tar.gz: fac02f1cab7ed3d2afd41c5dcd7ba0d3e67a809eb1e5fdaf6b365490ebdc089b15665ec57ff5b44ef5685eef1c9137c806de357e10e0f9e866007611133a56d3
+  metadata.gz: 561cc37a9c7184d528cbcb72106d0542fa4f568489354b747a6c8351a72b1ddb3129e2742aa8d38eac6625bc5758bdefef7ca413202e04f10f7ce6586717a78d
+  data.tar.gz: a15cc2f64759a2ed6078afdafe49966d464166e0997c9e3c887eb744a6fa0a8d370ea732cf7e87c4edf82b1f778b9d4eb3ec23bb5274ed2652511608b12763d0

data/README.md

@@ -2,7 +2,8 @@
 
 [![Travis-CI](https://travis-ci.org/fnando/browser.png)](https://travis-ci.org/fnando/browser)
 [![CodeClimate](https://codeclimate.com/github/fnando/browser.png)](https://codeclimate.com/github/fnando/browser)
-[![Gem Version](https://badge.fury.io/rb/browser.svg)](http://badge.fury.io/rb/browser)
+[![Gem](https://img.shields.io/gem/v/browser.svg)](https://rubygems.org/gems/browser)
+[![Gem](https://img.shields.io/gem/dt/browser.svg)](https://rubygems.org/gems/browser)
 
 Do some browser detection with Ruby. Includes ActionController integration.
 
@@ -58,7 +59,6 @@ browser.device.id
 browser.device.name
 browser.device.blackberry_playbook?
 browser.device.console?
-browser.device.ios?
 browser.device.ipad?
 browser.device.iphone?
 browser.device.ipod_touch?
@@ -97,7 +97,7 @@ browser.platform.ios?     # detect iOS
 browser.platform.ios?(9)  # detect specific iOS version
 browser.platform.ios_app?
 browser.platform.ios_webview?
-browser.platform.ios_webview? # request performed by ios' app webview 
+browser.platform.ios_webview? # request performed by ios' app webview
 browser.platform.linux?
 browser.platform.mac?
 browser.platform.other?
@@ -284,6 +284,10 @@ The class constructor now has a different signature. Change the instantiation fr
 - `ua`: must be a string representing the user agent.
 - `options`: must be a hash (for now it only accepts the `accept_language` option).
 
+##### `NoMethodError: undefined method 'user_agent'`
+
+`.ua` can now be used to retrieve the full User Agent string.
+
 ## Development
 
 ### Writing code

data/Rakefile

@@ -8,6 +8,7 @@ Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.test_files = FileList["test/**/*_test.rb"]
   t.verbose = true
+  t.warning = false
   t.ruby_opts = %w[-rubygems]
 end
 

data/lib/browser.rb

@@ -79,6 +79,24 @@ module Browser
     @root ||= Pathname.new(File.expand_path("../..", __FILE__))
   end
 
+  # Hold the list of browser matchers.
+  # Order is important.
+  def self.matchers
+    @matchers ||= [
+      Nokia,
+      UCBrowser,
+      PhantomJS,
+      BlackBerry,
+      Opera,
+      Edge,
+      InternetExplorer,
+      Firefox,
+      Chrome,
+      Safari,
+      Generic
+    ]
+  end
+
   # Define the rules which define a modern browser.
   # A rule must be a proc/lambda or any object that implements the method
   # === and accepts the browser object.
@@ -103,19 +121,7 @@ module Browser
   end
 
   def self.new(user_agent, **kwargs)
-    [
-      Nokia,
-      UCBrowser,
-      PhantomJS,
-      BlackBerry,
-      Opera,
-      Edge,
-      InternetExplorer,
-      Firefox,
-      Chrome,
-      Safari,
-      Generic,
-    ]
+    matchers
       .map {|klass| klass.new(user_agent || EMPTY_STRING, **kwargs) }
       .find(&:match?)
   end

data/lib/browser/base.rb

@@ -15,10 +15,7 @@ module Browser
 
     # Return a meta info about this browser.
     def meta
-      Meta.constants.each_with_object(Set.new) do |meta_name, meta|
-        meta_class = Meta.const_get(meta_name)
-        meta.merge(meta_class.new(self).to_a)
-      end.to_a
+      Meta.get(self)
     end
 
     alias_method :to_a, :meta

data/lib/browser/detect_version.rb

@@ -5,6 +5,7 @@ module Browser
 
     def detect_version?(actual_version, expected_version)
       return true unless expected_version
+      return false if expected_version && !actual_version
 
       expected_version = parse_version(expected_version)
       actual_version = parse_version(actual_version)

data/lib/browser/device.rb

@@ -3,30 +3,38 @@ module Browser
   class Device
     attr_reader :ua
 
+    # Hold the list of device matchers.
+    # Order is important.
+    def self.matchers
+      @matchers ||= [
+        XboxOne,
+        Xbox360,
+        Surface,
+        TV,
+        BlackBerryPlaybook,
+        WiiU,
+        Wii,
+        KindleFire,
+        Kindle,
+        PlayStation4,
+        PlayStation3,
+        PSVita,
+        PSP,
+        Iphone,
+        Ipad,
+        IpodTouch,
+        Unknown
+      ]
+    end
+
     def initialize(ua)
       @ua = ua
     end
 
     def subject
-      @subject ||= [
-        XboxOne.new(ua),
-        Xbox360.new(ua),
-        Surface.new(ua),
-        TV.new(ua),
-        BlackBerryPlaybook.new(ua),
-        WiiU.new(ua),
-        Wii.new(ua),
-        KindleFire.new(ua),
-        Kindle.new(ua),
-        PlayStation4.new(ua),
-        PlayStation3.new(ua),
-        PSVita.new(ua),
-        PSP.new(ua),
-        Iphone.new(ua),
-        Ipad.new(ua),
-        IpodTouch.new(ua),
-        Unknown.new(ua)
-      ].find(&:match?)
+      @subject ||= self.class.matchers
+                   .map {|matcher| matcher.new(ua) }
+                   .find(&:match?)
     end
 
     def id

data/lib/browser/meta/base.rb

@@ -1,6 +1,29 @@
 # frozen_string_literal: true
 module Browser
   module Meta
+    def self.rules
+      @rules ||= [
+        Device,
+        GenericBrowser,
+        Id,
+        IE,
+        IOS,
+        Mobile,
+        Modern,
+        Platform,
+        Proxy,
+        Safari,
+        Tablet,
+        Webkit
+      ]
+    end
+
+    def self.get(browser)
+      rules.each_with_object(Set.new) do |rule, meta|
+        meta.merge(rule.new(browser).to_a)
+      end.to_a
+    end
+
     class Base
       # Set the browser instance.
       attr_reader :browser

data/lib/browser/platform.rb

@@ -5,25 +5,33 @@ module Browser
 
     attr_reader :ua
 
+    # Hold the list of platform matchers.
+    # Order is important.
+    def self.matchers
+      @matchers ||= [
+        AdobeAir,
+        ChromeOS,
+        WindowsMobile,
+        WindowsPhone,
+        Android,
+        BlackBerry,
+        IOS,
+        Mac,
+        FirefoxOS,
+        Windows,
+        Linux,
+        Other
+      ]
+    end
+
     def initialize(ua)
       @ua = ua
     end
 
     def subject
-      @subject ||= [
-        AdobeAir.new(ua),
-        ChromeOS.new(ua),
-        WindowsMobile.new(ua),
-        WindowsPhone.new(ua),
-        Android.new(ua),
-        BlackBerry.new(ua),
-        IOS.new(ua),
-        Mac.new(ua),
-        FirefoxOS.new(ua),
-        Windows.new(ua),
-        Linux.new(ua),
-        Other.new(ua)
-      ].find(&:match?)
+      @subject ||= self.class.matchers
+                   .map {|matcher| matcher.new(ua) }
+                   .find(&:match?)
     end
 
     def adobe_air?

data/lib/browser/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Browser
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

data/test/browser_test.rb

@@ -100,29 +100,6 @@ class BrowserTest < Minitest::Test
     assert_equal "0", browser.version
   end
 
-  test "sets meta" do
-    browser = Browser.new(Browser["CHROME"])
-    assert_kind_of Array, browser.meta
-  end
-
-  test "returns string representation" do
-    browser = Browser.new(Browser["CHROME"])
-    meta = browser.to_s
-
-    assert meta.include?("chrome")
-    assert meta.include?("webkit")
-    assert meta.include?("mac")
-    assert meta.include?("modern")
-  end
-
-  test "returns string representation for mobile" do
-    browser = Browser.new(Browser["BLACKBERRY"])
-    meta = browser.to_s
-
-    assert meta.include?("blackberry")
-    assert meta.include?("mobile")
-  end
-
   test "detects unknown id" do
     browser = Browser.new("Unknown")
     assert_equal :generic, browser.id

data/test/ua.yml

@@ -27,6 +27,7 @@ CHROME_OS: 'Mozilla/5.0 (X11; CrOS x86_64 3701.81.0) AppleWebKit/537.31 (KHTML,
 COREMEDIA: 'Apple Mac OS X v10.6.4 CoreMedia v1.0.0.10F569'
 CUSTOM_APP: "Our App 0.0.1 (Linux; Android 4.0.3; HTC Ruby Build/IML74K; en_CA)"
 FIREFOX: 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) Gecko/20121223 Ubuntu/9.25 (jaunty) Firefox/3.8'
+FIREFOX_ANDROID: 'Mozilla/5.0 (Android; Mobile; rv:40.0) Gecko/40.0 Firefox/40.0'
 FIREFOX_IOS: 'Mozilla/5.0 (iPhone; CPU iPhone OS 9_2 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) FxiOS/1.2 Mobile/13C75 Safari/601.1.46'
 FIREFOX_MODERN: 'Mozilla/5.0 (X11; Ubuntu; Linux armv7l; rv:17.0) Gecko/20100101 Firefox/17.0'
 FIREFOX_OS: 'Mozilla/5.0 (Mobile; rv:18.0) Gecko/18.0 Firefox/18.0'

data/test/unit/android_test.rb

@@ -90,4 +90,11 @@ class AndroidTest < Minitest::Test
     browser = Browser.new(Browser["ANDROID_NEXUS_PLAYER"])
     assert browser.platform.android?
   end
+
+  test "detect firefox for android without android version" do
+    browser = Browser.new(Browser["FIREFOX_ANDROID"])
+
+    assert browser.platform.android?
+    refute browser.platform.android?(5)
+  end
 end

data/test/unit/device_test.rb

@@ -2,6 +2,26 @@
 require "test_helper"
 
 class DeviceTest < Minitest::Test
+  class CustomDevice < Browser::Device::Base
+    def match?
+      ua =~ /Custom/
+    end
+
+    def id
+      :custom
+    end
+  end
+
+  test "extend matchers" do
+    Browser::Device.matchers.unshift(CustomDevice)
+    device = Browser::Device.new("Custom")
+    assert_equal :custom, device.id
+
+    Browser::Device.matchers.shift
+    device = Browser::Device.new("Custom")
+    assert_equal :unknown, device.id
+  end
+
   test "detect generic device" do
     device = Browser::Device.new("")
 

data/test/unit/meta_test.rb

@@ -0,0 +1,47 @@
+require "test_helper"
+
+class MetaTest < Minitest::Test
+  class CustomRule < Browser::Meta::Base
+    def meta
+      "custom" if browser.ua =~ /Custom/
+    end
+  end
+
+  test "extend rules" do
+    Browser::Meta.rules.unshift(CustomRule)
+
+    browser = Browser.new("Custom")
+    assert browser.meta.include?("custom")
+
+    browser = Browser.new("Safari")
+    refute browser.meta.include?("custom")
+
+    Browser::Meta.rules.shift
+
+    browser = Browser.new("Custom")
+    refute browser.meta.include?("custom")
+  end
+
+  test "sets meta" do
+    browser = Browser.new(Browser["CHROME"])
+    assert_kind_of Array, browser.meta
+  end
+
+  test "returns string representation" do
+    browser = Browser.new(Browser["CHROME"])
+    meta = browser.to_s
+
+    assert meta.include?("chrome")
+    assert meta.include?("webkit")
+    assert meta.include?("mac")
+    assert meta.include?("modern")
+  end
+
+  test "returns string representation for mobile" do
+    browser = Browser.new(Browser["BLACKBERRY"])
+    meta = browser.to_s
+
+    assert meta.include?("blackberry")
+    assert meta.include?("mobile")
+  end
+end

data/test/unit/platform_test.rb

@@ -2,6 +2,26 @@
 require "test_helper"
 
 class PlatformTest < Minitest::Test
+  class CustomPlatform < Browser::Platform::Base
+    def match?
+      ua =~ /Custom/
+    end
+
+    def id
+      :custom
+    end
+  end
+
+  test "extend matchers" do
+    Browser::Platform.matchers.unshift(CustomPlatform)
+    platform = Browser::Platform.new("Custom")
+    assert_equal :custom, platform.id
+
+    Browser::Platform.matchers.shift
+    platform = Browser::Platform.new("Custom")
+    assert_equal :other, platform.id
+  end
+
   test "detect other" do
     platform = Browser::Platform.new("Other")
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: browser
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2016-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -238,6 +238,7 @@ files:
 - test/unit/ios_app_test.rb
 - test/unit/ios_test.rb
 - test/unit/kindle_test.rb
+- test/unit/meta_test.rb
 - test/unit/nokia_test.rb
 - test/unit/opera_test.rb
 - test/unit/platform_test.rb
@@ -292,6 +293,7 @@ test_files:
 - test/unit/ios_app_test.rb
 - test/unit/ios_test.rb
 - test/unit/kindle_test.rb
+- test/unit/meta_test.rb
 - test/unit/nokia_test.rb
 - test/unit/opera_test.rb
 - test/unit/platform_test.rb