browser 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72b5d1c89680820ed248d00b2dcded4666971ab0
-  data.tar.gz: 4b86b3e6f15c553d1e969693983ca1db9c7528fe
+  metadata.gz: f0828232944387c4f17fbb21c8898d3d310d76d6
+  data.tar.gz: ada9777fb56e976f0cbe2712b47922f5567c4dea
 SHA512:
-  metadata.gz: 82c72769220e2ce3ceebfb88c501992626919c2b67e09a4d76e1e07cda3d77a40c003157e479e6b97cbca68b7673a2f9f213989e0c04fc265515e6ebaf165ac6
-  data.tar.gz: 13ce0ee867206cbf455a63c9cdc42466ad33e2654d315784913e5b3fc0e70946bda5fc8b59409dd45917cdc7ac219f54fc82b35f249b9fe819d3a504e89ebcba
+  metadata.gz: d3bd6be62efd9948c33f9ead9efbb721a416a3273c403d6c81494f8fb0479e7abf531de4e92668e8ecf4426832466013de4f9225de3d3ead056b6772dbd1b813
+  data.tar.gz: 3d01aa934c168838d056632917f8e8a58cd4d9e810b28f9a27d8d4ddd79db52049718eab57e937201fe5d4305e71b8638ef3c92ab1342342b5beb74b46dee87b

data/.travis.yml

@@ -2,17 +2,12 @@ language: ruby
 sudo: false
 cache: bundler
 rvm:
-  - '2.3.1'
-  - '2.2.2'
-  - '2.1'
+  - '2.4.1'
+  - '2.3.4'
+  - '2.2.7'
 gemfile:
   - Gemfile
-  - gemfiles/rails3.gemfile
   - gemfiles/rails4.gemfile
-matrix:
- exclude:
-   - rvm: '2.1'
-     gemfile: Gemfile
 script: bundle exec rake
 notifications:
   email: false

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## v2.4.0
+
+- Add Google Drive API, Proximic Spider, NewRelic pinger and SocialRank bots.
+- Add Pinboard in-app browser to the bot exception list.
+- All browser detection methods can now compare versions.
+- All platform detection methods can now compare versions (except `#linux?` and `#firefox_os?`).
+- Add `browser/aliases`, so you can have methods on the base object (e.g. `browser.mobile?`). See README for instructions.
+- Remove official support for Rails 3 and Ruby 2.1.
+
 ## v2.3.0
 
 - Add AWS ELB bot.

data/README.md

@@ -116,11 +116,22 @@ browser.platform.windows_touchscreen_desktop?
 browser.platform.windows_vista?
 browser.platform.windows_wow64?
 browser.platform.windows_x64?
-browser.platform.windows_x64?
 browser.platform.windows_x64_inclusive?
 browser.platform.windows_xp?
 ```
 
+### Aliases
+
+To add aliases like `mobile?` and `tablet?` to the base object (e.g `browser.mobile?`), require the `browser/aliases` file and extend the Browser::Base object like the following:
+
+```ruby
+require "browser/aliases"
+Browser::Base.include(Browser::Aliases)
+
+browser = Browser.new("Some user agent")
+browser.mobile? #=> false
+```
+
 ### 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)

data/Rakefile

@@ -22,7 +22,7 @@ desc "Run specs against all gemfiles"
 task "test:all" do
   %w[
     Gemfile
-    gemfiles/rails3.gemfile
+    gemfiles/rails4.gemfile
   ].each do |gemfile|
     puts "=> Running with Gemfile: #{gemfile}"
     system "BUNDLE_GEMFILE=#{gemfile} rake test"

data/bot_exceptions.yml

@@ -1 +1,3 @@
 - ruby build
+- pinterest/android
+- pinterest/ios

data/bots.yml

@@ -10,6 +10,7 @@ ahrefsbot: "Ahrefs backlinks research tool"
 alexa: "Alexa Crawler"
 apache-httpclient: "Java http library"
 apachebench: "ApacheBench (ab)"
+apis-google: APIs-Google
 appengine-google: "Google App Engine"
 applebot: "Apple Bot"
 archive.org_bot: "Internet Archive (archive.org)"
@@ -33,8 +34,8 @@ check_http: "Nagios monitor"
 cliqzbot: "Cliqzbot"
 cmradar/0.1: "CMRadar/0.1"
 coldfusion: "ColdFusion http library"
-comodo-webinspector-crawler: "Comodo"
 commoncrawl: "CCBot"
+comodo-webinspector-crawler: "Comodo"
 crowsnest: "Crowsnest"
 curabot: "cura.yt"
 curl: "curl unix CLI http client"
@@ -138,7 +139,8 @@ netcraft: "Netcraft"
 netstate: "netEstate NE Crawler"
 netvibes: "Personalized dashboard bot"
 netzcheckbot: "netzcheck"
-newrelicpinger: "NewRelic monitor"
+newrelicmonitor: "NewRelic monitor"
+newrelicpinger: "NewRelicPinger"
 newsme: "newsme"
 niki-bot: "niki-bot"
 ning: "NING - Yet Another Twitter Swarmer"
@@ -156,6 +158,7 @@ pingdom: "Pingdom monitoring"
 pinterest: "Pinterest"
 plukkie: "botje.com/plukkie.htm"
 privacyawarebot: "PrivacyAwareBot"
+proximic: "Proximic Spider"
 psbot-page: "Picsearch"
 publiclibraryarchive.org: "publiclibraryarchive.org"
 pycurl: "Python http library"
@@ -189,6 +192,7 @@ slack: "Slackbot-LinkExpanding"
 slackbot: "Slack Bot"
 slurp: "Yahoo spider"
 smtbot: "SimilarTech"
+socialrank: "SocialRankIOBot"
 sogou: "Chinese search engine"
 spbot: "OpenLinkProfiler"
 spider: "generic web spider"

data/lib/browser.rb

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
+
 require "browser/browser"
 require "browser/rails" if defined?(::Rails)

data/lib/browser/accept_language.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Browser
   class AcceptLanguage
     def self.languages
@@ -32,7 +33,10 @@ module Browser
     end
 
     def code
-      @code ||= part[/\A([^-;]+)/, 1]
+      @code ||= begin
+        code = part[/\A([^-;]+)/, 1]
+        code.downcase if code
+      end
     end
 
     def region

data/lib/browser/action_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "action_controller/railtie"
 
 module Browser

data/lib/browser/aliases.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require "browser"
+require "forwardable"
+
+module Browser
+  module Aliases
+    PLATFORM_ALIASES = %w[
+      adobe_air? android? blackberry? chrome_os? firefox_os? ios? ios_app?
+      ios_webview? linux? mac? windows10? windows7? windows8? windows8_1?
+      windows? windows_mobile? windows_phone? windows_rt?
+      windows_touchscreen_desktop? windows_vista? windows_wow64? windows_x64?
+      windows_x64_inclusive? windows_xp?
+    ].freeze
+
+    DEVICE_ALIASES = %w[
+      blackberry_playbook? console? ipad? iphone? ipod_touch? kindle?
+      kindle_fire? mobile? nintendo? nintendo_wii? nintendo_wiiu? playbook?
+      playstation3? playstation4? playstation? playstation_vita? ps3? ps4? psp?
+      psp_vita? silk? surface? tablet? tv? vita? wii? wiiu? xbox? xbox_360?
+      xbox_one?
+    ].freeze
+
+    def self.included(target)
+      target.class_eval do
+        extend Forwardable
+        def_delegators :platform, *PLATFORM_ALIASES
+        def_delegators :device, *DEVICE_ALIASES
+      end
+    end
+  end
+end

data/lib/browser/alipay.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Browser
   class Alipay < Base
     def id

data/lib/browser/base.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Browser
   class Base
     include DetectVersion
@@ -57,12 +58,12 @@ module Browser
     # Detect if browser is Microsoft Internet Explorer.
     def ie?(expected_version = nil)
       InternetExplorer.new(ua).match? &&
-        detect_version?(version, expected_version)
+        detect_version?(full_version, expected_version)
     end
 
     # Detect if browser is Microsoft Edge.
-    def edge?
-      Edge.new(ua).match?
+    def edge?(expected_version = nil)
+      Edge.new(ua).match? && detect_version?(full_version, expected_version)
     end
 
     def compatibility_view?
@@ -78,23 +79,26 @@ module Browser
     end
 
     # Detect if browser is WebKit-based.
-    def webkit?
-      ua =~ /AppleWebKit/i && !edge?
+    def webkit?(expected_version = nil)
+      ua =~ /AppleWebKit/i &&
+        !edge? &&
+        detect_version?(webkit_full_version, expected_version)
     end
 
     # Detect if browser is QuickTime
-    def quicktime?
-      ua =~ /QuickTime/i
+    def quicktime?(expected_version = nil)
+      ua =~ /QuickTime/i && detect_version?(full_version, expected_version)
     end
 
     # Detect if browser is Apple CoreMedia.
-    def core_media?
-      ua =~ /CoreMedia/
+    def core_media?(expected_version = nil)
+      ua =~ /CoreMedia/ && detect_version?(full_version, expected_version)
     end
 
     # Detect if browser is PhantomJS
-    def phantom_js?
-      PhantomJS.new(ua).match?
+    def phantom_js?(expected_version = nil)
+      PhantomJS.new(ua).match? &&
+        detect_version?(full_version, expected_version)
     end
 
     # Detect if browser is Safari.
@@ -107,53 +111,55 @@ module Browser
     end
 
     # Detect if browser is Firefox.
-    def firefox?
-      Firefox.new(ua).match?
+    def firefox?(expected_version = nil)
+      Firefox.new(ua).match? && detect_version?(full_version, expected_version)
     end
 
     # Detect if browser is Chrome.
-    def chrome?
-      Chrome.new(ua).match?
+    def chrome?(expected_version = nil)
+      Chrome.new(ua).match? && detect_version?(full_version, expected_version)
     end
 
     # Detect if browser is Opera.
-    def opera?
-      Opera.new(ua).match?
+    def opera?(expected_version = nil)
+      Opera.new(ua).match? && detect_version?(full_version, expected_version)
     end
 
     # Detect if browser is Yandex.
-    def yandex?
-      ua =~ /YaBrowser/
+    def yandex?(expected_version = nil)
+      ua =~ /YaBrowser/ && detect_version?(full_version, expected_version)
     end
 
     # Detect if browser is UCBrowser.
-    def uc_browser?
-      UCBrowser.new(ua).match?
+    def uc_browser?(expected_version = nil)
+      UCBrowser.new(ua).match? &&
+        detect_version?(full_version, expected_version)
     end
 
     # Detect if browser is Nokia S40 Ovi Browser.
-    def nokia?
-      Nokia.new(ua).match?
+    def nokia?(expected_version = nil)
+      Nokia.new(ua).match? && detect_version?(full_version, expected_version)
     end
 
     # Detect if browser is MicroMessenger.
-    def micro_messenger?
-      MicroMessenger.new(ua).match?
+    def micro_messenger?(expected_version = nil)
+      MicroMessenger.new(ua).match? &&
+        detect_version?(full_version, expected_version)
     end
 
     alias_method :wechat?, :micro_messenger?
 
-    def weibo?
-      Weibo.new(ua).match?
+    def weibo?(expected_version = nil)
+      Weibo.new(ua).match? && detect_version?(full_version, expected_version)
     end
 
-    def alipay?
-      Alipay.new(ua).match?
+    def alipay?(expected_version = nil)
+      Alipay.new(ua).match? && detect_version?(full_version, expected_version)
     end
 
     # Detect if browser is Opera Mini.
-    def opera_mini?
-      ua =~ /Opera Mini/
+    def opera_mini?(expected_version = nil)
+      ua =~ /Opera Mini/ && detect_version?(full_version, expected_version)
     end
 
     def webkit_full_version

data/lib/browser/blackberry.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Browser
   class BlackBerry < Base
     def id

data/lib/browser/bot.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Browser
   class Bot
     def self.detect_empty_ua!

data/lib/browser/browser.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "set"
 require "yaml"
 require "pathname"

data/lib/browser/chrome.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Browser
   class Chrome < Base
     def id

data/lib/browser/detect_version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Browser
   module DetectVersion
     private

data/lib/browser/device.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "browser/device/base"
 require "browser/device/unknown"
 require "browser/device/ipad"
@@ -39,8 +40,8 @@ module Browser
         PlayStation3,
         PSVita,
         PSP,
-        Iphone,
         Ipad,
+        Iphone,
         IpodTouch,
         Unknown
       ]

data/lib/browser/device/base.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Browser
   class Device
     class Base

data/lib/browser/device/blackberry_playbook.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Browser
   class Device
     class BlackBerryPlaybook < Base

data/lib/browser/device/ipad.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Browser
   class Device
     class Ipad < Base

data/lib/browser/device/iphone.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Browser
   class Device
     class Iphone < Base

data/lib/browser/device/ipod_touch.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Browser
   class Device
     class IpodTouch < Base

data/lib/browser/device/kindle.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Browser
   class Device
     class Kindle < Base

data/lib/browser/device/kindle_fire.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Browser
   class Device
     class KindleFire < Base

data/lib/browser/device/playstation3.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Browser
   class Device
     class PlayStation3 < Base

data/lib/browser/device/playstation4.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Browser
   class Device
     class PlayStation4 < Base