browser 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec8732c321a4cf1e50c785d07a242a87e03d599e
-  data.tar.gz: 7c2632f4db32249d9b3411b7d8c99c24d3ae2ade
+  metadata.gz: fc44c2633f9e5ef71751d4dcc64143b13b69e21a
+  data.tar.gz: 825edef676789f295746227c52962c6af234295c
 SHA512:
-  metadata.gz: aa5e391f8d1ad5deed626581151df145f55ad6f2509592bb591ccf41f3446c0f4a249aa4e38dcfad53612c8a0caec7aafb94f685b1413bc3697bca8c9fd9777e
-  data.tar.gz: ce44b976d82b7d8ac431fc5333eaf43b5a7141658308b7c549cf56d13ccd64a20fb35738dd84078f1a83cf277ec6e14621971cc5fa2fc1fc25157768353122bb
+  metadata.gz: 5086cdd5c553f0daaa49eb8e7aa70050fcb57dc7ed27406658278bf7b845658495c7ebe685e155ea15e1a1aa9baf9edb430a404d6c6119e395521c56d5aef7a2
+  data.tar.gz: 98a3c39a62ad4b09630944d0927fec468478361516187fbb8cd1f75d377f62bf65313de5f8679e5f2f1d7bd8ed0a2ae672778f17ec49b21a2c1f1f23e0fb28af

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v2.2.0
+
+- `Browser::Platform#windows?` can now compare versions.
+- `Browser::Platform#mac?` can now compare versions.
+- Detect QQ Browser.
+- Fix issue with Mac user agents that didn't include the version.
+
 ## v2.1.0
 
 - Add PrivacyAwareBot, ltx71, Squider and Traackr to bots.

data/README.md

@@ -121,6 +121,12 @@ browser.platform.windows_x64_inclusive?
 browser.platform.windows_xp?
 ```
 
+### What's being detected?
+
+- For a list of platform detections, check [lib/browser/platform.rb](https://github.com/fnando/browser/blob/master/lib/browser/platform.rb)
+- For a list of device detections, check [lib/browser/device.rb](https://github.com/fnando/browser/blob/master/lib/browser/device.rb)
+- For a list of bot detections, check [bots.yml](https://github.com/fnando/browser/blob/master/bots.yml)
+
 ### What defines a modern browser?
 
 The current rules that define a modern browser are pretty loose:

data/lib/browser.rb

@@ -3,6 +3,7 @@ require "set"
 require "yaml"
 require "pathname"
 
+require "browser/version"
 require "browser/detect_version"
 require "browser/accept_language"
 require "browser/base"
@@ -19,60 +20,15 @@ require "browser/uc_browser"
 require "browser/nokia"
 require "browser/micro_messenger"
 require "browser/weibo"
+require "browser/qq"
 
 require "browser/bot"
 require "browser/middleware"
-require "browser/middleware/context"
 require "browser/rails" if defined?(::Rails)
 
 require "browser/platform"
-require "browser/platform/base"
-require "browser/platform/ios"
-require "browser/platform/linux"
-require "browser/platform/windows"
-require "browser/platform/mac"
-require "browser/platform/windows_phone"
-require "browser/platform/windows_mobile"
-require "browser/platform/firefox_os"
-require "browser/platform/blackberry"
-require "browser/platform/android"
-require "browser/platform/other"
-require "browser/platform/chrome_os"
-require "browser/platform/adobe_air"
-
 require "browser/device"
-require "browser/device/base"
-require "browser/device/unknown"
-require "browser/device/ipad"
-require "browser/device/ipod_touch"
-require "browser/device/iphone"
-require "browser/device/playstation3"
-require "browser/device/playstation4"
-require "browser/device/psp"
-require "browser/device/psvita"
-require "browser/device/kindle"
-require "browser/device/kindle_fire"
-require "browser/device/wii"
-require "browser/device/wiiu"
-require "browser/device/blackberry_playbook"
-require "browser/device/surface"
-require "browser/device/tv"
-require "browser/device/xbox_one"
-require "browser/device/xbox_360"
-
-require "browser/meta/base"
-require "browser/meta/generic_browser"
-require "browser/meta/id"
-require "browser/meta/ie"
-require "browser/meta/ios"
-require "browser/meta/mobile"
-require "browser/meta/modern"
-require "browser/meta/platform"
-require "browser/meta/proxy"
-require "browser/meta/safari"
-require "browser/meta/webkit"
-require "browser/meta/tablet"
-require "browser/meta/device"
+require "browser/meta"
 
 module Browser
   EMPTY_STRING = "".freeze
@@ -94,6 +50,7 @@ module Browser
       InternetExplorer,
       Firefox,
       Weibo,                # must be placed before Chrome and Safari
+      QQ,                   # must be placed before Chrome and Safari
       Chrome,
       Safari,
       MicroMessenger,

data/lib/browser/device.rb

@@ -1,4 +1,23 @@
 # frozen_string_literal: true
+require "browser/device/base"
+require "browser/device/unknown"
+require "browser/device/ipad"
+require "browser/device/ipod_touch"
+require "browser/device/iphone"
+require "browser/device/playstation3"
+require "browser/device/playstation4"
+require "browser/device/psp"
+require "browser/device/psvita"
+require "browser/device/kindle"
+require "browser/device/kindle_fire"
+require "browser/device/wii"
+require "browser/device/wiiu"
+require "browser/device/blackberry_playbook"
+require "browser/device/surface"
+require "browser/device/tv"
+require "browser/device/xbox_one"
+require "browser/device/xbox_360"
+
 module Browser
   class Device
     attr_reader :ua

data/lib/browser/meta.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+require "browser/meta/base"
+require "browser/meta/generic_browser"
+require "browser/meta/id"
+require "browser/meta/ie"
+require "browser/meta/ios"
+require "browser/meta/mobile"
+require "browser/meta/modern"
+require "browser/meta/platform"
+require "browser/meta/proxy"
+require "browser/meta/safari"
+require "browser/meta/webkit"
+require "browser/meta/tablet"
+require "browser/meta/device"

data/lib/browser/middleware.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require "uri"
+require "browser/middleware/context"
 
 module Browser
   class Middleware

data/lib/browser/platform.rb

@@ -1,4 +1,18 @@
 # frozen_string_literal: true
+require "browser/platform/base"
+require "browser/platform/ios"
+require "browser/platform/linux"
+require "browser/platform/windows"
+require "browser/platform/mac"
+require "browser/platform/windows_phone"
+require "browser/platform/windows_mobile"
+require "browser/platform/firefox_os"
+require "browser/platform/blackberry"
+require "browser/platform/android"
+require "browser/platform/other"
+require "browser/platform/chrome_os"
+require "browser/platform/adobe_air"
+
 module Browser
   class Platform
     include DetectVersion
@@ -54,12 +68,12 @@ module Browser
       id == :linux
     end
 
-    def mac?
-      id == :mac
+    def mac?(expected_version = nil)
+      id == :mac && detect_version?(version, expected_version)
     end
 
-    def windows?
-      id == :windows
+    def windows?(expected_version = nil)
+      id == :windows && detect_version?(version, expected_version)
     end
 
     def firefox_os?

data/lib/browser/platform/mac.rb

@@ -3,7 +3,7 @@ module Browser
   class Platform
     class Mac < Base
       def version
-        ua[/Mac OS X\s*([0-9_\.]+)?/, 1].gsub("_", ".")
+        (ua[/Mac OS X\s*([0-9_\.]+)?/, 1] || "0").gsub("_", ".")
       end
 
       def name

data/lib/browser/qq.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+module Browser
+  class QQ < Base
+    def id
+      :qq
+    end
+
+    def name
+      "QQ Browser"
+    end
+
+    def full_version
+      ua[%r[(?:Mobile MQQBrowser)/([\d.]+)]i, 1] ||
+        ua[%r[(?:QQ)/([\d.]+)]i, 1] ||
+        "0.0"
+    end
+
+    def match?
+      ua =~ /QQ/i
+    end
+  end
+end

data/lib/browser/version.rb

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

data/test/ua.yml

@@ -122,3 +122,5 @@ YANDEX_BROWSER: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_1) AppleWebKit/537
 MICRO_MESSENGER: 'Mozilla/5.0 (iPhone; CPU iPhone OS 9_3_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Mobile/13E238 MicroMessenger/6.3.15 NetType/3G+ Language/zh_CN'
 WEIBO_IOS: 'Mozilla/5.0 (iPhone; CPU iPhone OS 8_4 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Mobile/12H143 Weibo (iPhone7,2__weibo__5.7.1__iphone__os8.4)'
 WEIBO_ANDROID: 'Mozilla/5.0 (Linux; Android 5.0.2; vivo X5M Build/LRX22G) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/37.0.0.0 Mobile Safari/537.36 Weibo (vivo-vivo X5M__weibo__5.7.1__android__android5.0.2)'
+QQ_BROWSER_IOS: 'Mozilla/5.0 (iPhone; CPU iPhone OS 9_3_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Mobile/13E238 QQ/6.3.3.432 V1_IPH_SQ_6.3.3_1_APP_A Pixel/640 Core/UIWebView NetType/WIFI Mem/47'
+QQ_BROWSER_ANDROID: 'Mozilla/5.0 (Linux; Android 5.1.1; SM-N9108V Build/LMY47X) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/37.0.0.0 Mobile MQQBrowser/6.2 TBS/036222 Safari/537.36 V1_AND_SQ_6.2.0_320_YYB_D QQ/6.2.0.2655 NetType/WIFI WebP/0.3.0 Pixel/1440'

data/test/unit/platform_test.rb

@@ -22,12 +22,25 @@ class PlatformTest < Minitest::Test
     assert_equal :other, platform.id
   end
 
+  test "implements to_s" do
+    platform = Browser::Platform.new(Browser["IOS9"])
+    assert_equal "ios", platform.to_s
+  end
+
+  test "implements ==" do
+    platform = Browser::Platform.new(Browser["IOS9"])
+
+    assert platform == :ios
+    refute platform == :android
+  end
+
   test "detect other" do
     platform = Browser::Platform.new("Other")
 
     assert_equal "Other", platform.name
     assert_equal :other, platform.id
     assert_equal "0", platform.version
+    assert platform.other?
   end
 
   test "detect ios (iPhone)" do
@@ -73,6 +86,12 @@ class PlatformTest < Minitest::Test
     assert_equal :mac, platform.id
     assert platform.mac?
     assert_equal "10.6.4", platform.version
+    assert platform.mac?(["=10.6.4"])
+  end
+
+  test "return stub version for Mac user agent without version" do
+    platform = Browser::Platform.new("Macintosh")
+    assert_equal "0", platform.version
   end
 
   test "detect firefox os" do

data/test/unit/qq_test.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+require "test_helper"
+
+class QQTest < Minitest::Test
+  test "detects QQ browser for iOS" do
+    browser = Browser.new(Browser["QQ_BROWSER_IOS"])
+
+    assert_equal "6.3.3.432", browser.full_version
+    assert_equal "QQ Browser", browser.name
+    assert_equal :qq, browser.id
+  end
+
+  test "detects QQ browser for Android" do
+    browser = Browser.new(Browser["QQ_BROWSER_ANDROID"])
+
+    assert_equal "6.2", browser.full_version
+    assert_equal "QQ Browser", browser.name
+    assert_equal :qq, browser.id
+  end
+end

data/test/unit/weibo_test.rb

@@ -4,6 +4,8 @@ require "test_helper"
 class MicroMessengerTest < Minitest::Test
   test "detects weibo iOS" do
     browser = Browser.new(Browser["WEIBO_IOS"])
+
+    assert_equal :weibo, browser.id
     assert browser.weibo?
     assert_equal "Weibo", browser.name
     assert_equal "5.7.1", browser.full_version
@@ -11,6 +13,8 @@ class MicroMessengerTest < Minitest::Test
 
   test "detects weibo Android" do
     browser = Browser.new(Browser["WEIBO_ANDROID"])
+
+    assert_equal :weibo, browser.id
     assert browser.weibo?
     assert_equal "Weibo", browser.name
     assert_equal "5.7.1", browser.full_version

data/test/unit/windows_test.rb

@@ -23,6 +23,7 @@ class WindowsTest < Minitest::Test
 
     assert browser.platform.windows?
     assert_equal browser.platform.version, "5.0"
+    assert browser.platform.windows?(["=5.0"])
   end
 
   test "detects windows_2000_sp1" do
@@ -30,6 +31,7 @@ class WindowsTest < Minitest::Test
 
     assert browser.platform.windows?
     assert_equal browser.platform.version, "5.01"
+    assert browser.platform.windows?(["=5.01"])
   end
 
   test "detects windows_xp" do
@@ -38,6 +40,7 @@ class WindowsTest < Minitest::Test
     assert browser.platform.windows?
     assert browser.platform.windows_xp?
     assert_equal browser.platform.version, "5.1"
+    assert browser.platform.windows?(["=5.1"])
   end
 
   test "detects windows_xp (64-bit)" do
@@ -47,6 +50,7 @@ class WindowsTest < Minitest::Test
     assert browser.platform.windows_xp?
     assert browser.platform.windows_x64?
     assert_equal browser.platform.version, "5.2"
+    assert browser.platform.windows?(["=5.2"])
   end
 
   test "detects windows_vista" do
@@ -55,6 +59,7 @@ class WindowsTest < Minitest::Test
     assert browser.platform.windows?
     assert browser.platform.windows_vista?
     assert_equal browser.platform.version, "6.0"
+    assert browser.platform.windows?(["=6.0"])
   end
 
   test "detects windows7" do
@@ -63,6 +68,7 @@ class WindowsTest < Minitest::Test
     assert browser.platform.windows?
     assert browser.platform.windows7?
     assert_equal browser.platform.version, "6.1"
+    assert browser.platform.windows?(["=6.1"])
   end
 
   test "detects windows8" do
@@ -72,6 +78,7 @@ class WindowsTest < Minitest::Test
     assert browser.platform.windows8?
     refute browser.platform.windows8_1?
     assert_equal browser.platform.version, "6.2"
+    assert browser.platform.windows?(["=6.2"])
   end
 
   test "detects windows8.1" do
@@ -81,6 +88,7 @@ class WindowsTest < Minitest::Test
     assert browser.platform.windows8?
     assert browser.platform.windows8_1?
     assert_equal browser.platform.version, "6.3"
+    assert browser.platform.windows?(["=6.3"])
   end
 
   test "detects windows10" do
@@ -89,6 +97,7 @@ class WindowsTest < Minitest::Test
     assert browser.platform.windows?
     assert browser.platform.windows10?
     assert_equal browser.platform.version, "10.0"
+    assert browser.platform.windows?(["=10.0"])
   end
 
   test "returns name" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: browser
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2016-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -191,6 +191,7 @@ files:
 - lib/browser/firefox.rb
 - lib/browser/generic.rb
 - lib/browser/internet_explorer.rb
+- lib/browser/meta.rb
 - lib/browser/meta/base.rb
 - lib/browser/meta/device.rb
 - lib/browser/meta/generic_browser.rb
@@ -226,6 +227,7 @@ files:
 - lib/browser/platform/windows.rb
 - lib/browser/platform/windows_mobile.rb
 - lib/browser/platform/windows_phone.rb
+- lib/browser/qq.rb
 - lib/browser/rails.rb
 - lib/browser/safari.rb
 - lib/browser/testing.rb
@@ -261,6 +263,7 @@ files:
 - test/unit/opera_test.rb
 - test/unit/platform_test.rb
 - test/unit/proxy_test.rb
+- test/unit/qq_test.rb
 - test/unit/safari_test.rb
 - test/unit/uc_browser_test.rb
 - test/unit/weibo_test.rb
@@ -319,6 +322,7 @@ test_files:
 - test/unit/opera_test.rb
 - test/unit/platform_test.rb
 - test/unit/proxy_test.rb
+- test/unit/qq_test.rb
 - test/unit/safari_test.rb
 - test/unit/uc_browser_test.rb
 - test/unit/weibo_test.rb