browser 1.1.0 → 2.0.0.rc1

data/browser.gemspec

@@ -1,38 +1,24 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "browser/version"
+require "./lib/browser/version"
 
 Gem::Specification.new do |s|
-  s.name        = "browser"
-  s.version     = Browser::Version::STRING
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Nando Vieira"]
-  s.email       = ["fnando.vieira@gmail.com"]
-  s.homepage    = "http://github.com/fnando/browser"
-  s.summary     = "Do some browser detection with Ruby."
-  s.description = s.summary
-  s.license     = 'MIT'
+  s.required_ruby_version = ">= 2.0"
+  s.name                  = "browser"
+  s.version               = Browser::VERSION
+  s.platform              = Gem::Platform::RUBY
+  s.authors               = ["Nando Vieira"]
+  s.email                 = ["fnando.vieira@gmail.com"]
+  s.homepage              = "http://github.com/fnando/browser"
+  s.summary               = "Do some browser detection with Ruby."
+  s.description           = s.summary
+  s.license               = "MIT"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables   = `git ls-files -- exe/*`
+                    .split("\n")
+                    .map {|f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.post_install_message = [
-    "",
-    "#################### WARNING ##############################"     ,
-    "#                                                         #"     ,
-    "#   Internet Explorer detection has changed on v1.0.0+.   #"     ,
-    "#   If this is important for you, please read             #"     ,
-    "#   https://github.com/fnando/browser#internet-explorer   #"     ,
-    "#                                                         #"     ,
-    "#   iOS webviews and web apps aren't detect as Safari     #"     ,
-    "#   anymore, so be aware of that if that's your case.     #"     ,
-    "#                                                         #"     ,
-    "###########################################################"     ,
-    "\n"
-  ].join("\n")
-
   s.add_development_dependency "bundler", ">= 0"
   s.add_development_dependency "rake"
   s.add_development_dependency "rails"

data/languages.yml

@@ -5,59 +5,59 @@
 "be": "Byelorussian"
 "ca": "Catalan"
 "zh": "Chinese"
-"zh-cn": "Chinese/China"
-"zh-tw": "Chinese/Taiwan"
-"zh-hk": "Chinese/Hong Kong"
-"zh-sg": "Chinese/singapore"
+"zh-CN": "Chinese/China"
+"zh-TW": "Chinese/Taiwan"
+"zh-HK": "Chinese/Hong Kong"
+"zh-SG": "Chinese/singapore"
 "hr": "Croatian"
 "cs": "Czech"
 "da": "Danish"
 "nl": "Dutch"
-"nl-nl": "Dutch/Netherlands"
-"nl-be": "Dutch/Belgium"
+"nl-NL": "Dutch/Netherlands"
+"nl-BE": "Dutch/Belgium"
 "en": "English"
-"en-gb": "English/United Kingdom"
-"en-us": "English/United States"
-"en-au": "English/Australian"
-"en-ca": "English/Canada"
-"en-nz": "English/New Zealand"
-"en-ie": "English/Ireland"
-"en-za": "English/South Africa"
-"en-jm": "English/Jamaica"
-"en-bz": "English/Belize"
-"en-tt": "English/Trinidad"
+"en-GB": "English/United Kingdom"
+"en-US": "English/United States"
+"en-AU": "English/Australian"
+"en-CA": "English/Canada"
+"en-NZ": "English/New Zealand"
+"en-IE": "English/Ireland"
+"en-ZA": "English/South Africa"
+"en-JM": "English/Jamaica"
+"en-BZ": "English/Belize"
+"en-TT": "English/Trinidad"
 "et": "Estonian"
 "fo": "Faeroese"
 "fa": "Farsi"
 "fi": "Finnish"
 "fr": "French"
-"fr-be": "French/Belgium"
-"fr-fr": "French/France"
-"fr-ch": "French/Switzerland"
-"fr-ca": "French/Canada"
-"fr-lu": "French/Luxembourg"
+"fr-BE": "French/Belgium"
+"fr-FR": "French/France"
+"fr-CH": "French/Switzerland"
+"fr-CA": "French/Canada"
+"fr-LU": "French/Luxembourg"
 "gl": "Galician"
 "de": "German"
-"de-at": "German/Austria"
-"de-de": "German/Germany"
-"de-ch": "German/Switzerland"
-"de-lu": "German/Luxembourg"
-"de-li": "German/Liechtenstein"
+"de-AT": "German/Austria"
+"de-DE": "German/Germany"
+"de-CH": "German/Switzerland"
+"de-LU": "German/Luxembourg"
+"de-LI": "German/Liechtenstein"
 "el": "Greek"
 "he": "Hebrew"
-"he-il": "Hebrew/Israel"
+"he-IL": "Hebrew/Israel"
 "hi": "Hindi"
 "hu": "Hungarian"
-"ie-ee": "Internet Explorer/Easter Egg"
+"ie-EE": "Internet Explorer/Easter Egg"
 "is": "Icelandic"
 "id": "Indonesian"
 "in": "Indonesian"
 "ga": "Irish"
 "it": "Italian"
-"it-ch": "Italian/ Switzerland"
+"it-CH": "Italian/ Switzerland"
 "ja": "Japanese"
 "km": "Khmer"
-"km-kh": "Khmer/Cambodia"
+"km-KH": "Khmer/Cambodia"
 "ko": "Korean"
 "lv": "Latvian"
 "lt": "Lithuanian"
@@ -67,41 +67,41 @@
 "no": "Norwegian"
 "pl": "Polish"
 "pt": "Portuguese"
-"pt-br": "Portuguese/Brazil"
+"pt-BR": "Portuguese/Brazil"
 "rm": "Rhaeto-Romanic"
 "ro": "Romanian"
-"ro-mo": "Romanian/Moldavia"
+"ro-MO": "Romanian/Moldavia"
 "ru": "Russian"
-"ru-mo": "Russian /Moldavia"
+"ru-MO": "Russian /Moldavia"
 "gd": "Scots Gaelic"
 "sr": "Serbian"
 "sk": "Slovack"
 "sl": "Slovenian"
 "sb": "Sorbian"
 "es": "Spanish"
-"es-do": "Spanish"
-"es-ar": "Spanish/Argentina"
-"es-co": "Spanish/Colombia"
-"es-mx": "Spanish/Mexico"
-"es-es": "Spanish/Spain"
-"es-gt": "Spanish/Guatemala"
-"es-cr": "Spanish/Costa Rica"
-"es-pa": "Spanish/Panama"
-"es-ve": "Spanish/Venezuela"
-"es-pe": "Spanish/Peru"
-"es-ec": "Spanish/Ecuador"
-"es-cl": "Spanish/Chile"
-"es-uy": "Spanish/Uruguay"
-"es-py": "Spanish/Paraguay"
-"es-bo": "Spanish/Bolivia"
-"es-sv": "Spanish/El salvador"
-"es-hn": "Spanish/Honduras"
-"es-ni": "Spanish/Nicaragua"
-"es-pr": "Spanish/Puerto Rico"
+"es-DO": "Spanish"
+"es-AR": "Spanish/Argentina"
+"es-CO": "Spanish/Colombia"
+"es-MX": "Spanish/Mexico"
+"es-ES": "Spanish/Spain"
+"es-GT": "Spanish/Guatemala"
+"es-CR": "Spanish/Costa Rica"
+"es-PA": "Spanish/Panama"
+"es-VE": "Spanish/Venezuela"
+"es-PE": "Spanish/Peru"
+"es-EC": "Spanish/Ecuador"
+"es-CL": "Spanish/Chile"
+"es-UY": "Spanish/Uruguay"
+"es-PY": "Spanish/Paraguay"
+"es-BO": "Spanish/Bolivia"
+"es-SV": "Spanish/El salvador"
+"es-HN": "Spanish/Honduras"
+"es-NI": "Spanish/Nicaragua"
+"es-PR": "Spanish/Puerto Rico"
 "sx": "Sutu"
 "sv": "Swedish"
-"sv-se": "Swedish/Sweden"
-"sv-fi": "Swedish/Finland"
+"sv-SE": "Swedish/Sweden"
+"sv-FI": "Swedish/Finland"
 "ts": "Thai"
 "tn": "Tswana"
 "tr": "Turkish"

data/lib/browser.rb

@@ -2,20 +2,60 @@ require "set"
 require "yaml"
 require "pathname"
 
+require "browser/detect_version"
+require "browser/accept_language"
+require "browser/base"
+require "browser/safari"
+require "browser/chrome"
+require "browser/internet_explorer"
+require "browser/firefox"
+require "browser/edge"
+require "browser/opera"
+require "browser/blackberry"
+require "browser/generic"
+require "browser/phantom_js"
+require "browser/uc_browser"
+require "browser/nokia"
+
+require "browser/bot"
 require "browser/middleware"
 require "browser/middleware/context"
 require "browser/rails" if defined?(::Rails)
 
-require "browser/methods/ie"
-require "browser/methods/blackberry"
-require "browser/methods/platform"
-require "browser/methods/mobile"
-require "browser/methods/devices"
-require "browser/methods/consoles"
-require "browser/methods/language"
-require "browser/methods/bots"
-require "browser/methods/tv"
-require "browser/methods/proxy"
+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"
@@ -28,58 +68,13 @@ require "browser/meta/platform"
 require "browser/meta/proxy"
 require "browser/meta/safari"
 require "browser/meta/webkit"
+require "browser/meta/tablet"
+require "browser/meta/device"
 
-class Browser
-  include IE
-  include BlackBerry
-  include Platform
-  include Mobile
-  include Devices
-  include Consoles
-  include Language
-  include Bots
-  include Tv
-  include Proxy
-
-  # Set browser's UA string.
-  attr_accessor :user_agent
-  alias_method :ua, :user_agent
-  alias_method :ua=, :user_agent=
-
-  NAMES = {
-    edge: "Microsoft Edge",   # Must come before everything
-    ie: "Internet Explorer",  # Must come before android
-    chrome: "Chrome",         # Must come before android
-    firefox: "Firefox",       # Must come before android
-    uc_browser: "UC Browser", # Must come before android
-    android: "Android",
-    blackberry_running_safari: "Safari",
-    blackberry: "BlackBerry",
-    core_media: "Apple CoreMedia",
-    ipad: "iPad",             # Must come before safari
-    iphone: "iPhone",         # Must come before safari
-    ipod: "iPod Touch",       # Must come before safari
-    nintendo: "Nintendo",
-    opera: "Opera",
-    phantom_js: "PhantomJS",
-    psp: "PlayStation Portable",
-    playstation: "PlayStation",
-    quicktime: "QuickTime",
-    safari: "Safari",
-    xbox: "Xbox",
-    nokia: "Nokia S40 Ovi Browser",
-
-    # This must be last item, since Ruby 1.9+ has ordered keys.
-    other: "Other",
-  }
-
-  VERSIONS = {
-    edge: %r[Edge/([\d.]+)],
-    chrome: %r[(?:Chrome|CriOS)/([\d.]+)],
-    default: %r[(?:Version|MSIE|Firefox|QuickTime|BlackBerry[^/]+|CoreMedia v|PhantomJS|AdobeAIR)[/ ]?([a-z0-9.]+)]i,
-    opera: %r[(?:Opera/.*? Version/([\d.]+)|Chrome/.*?OPR/([\d.]+))],
-    ie: %r[(?:MSIE |Trident/.*?; rv:)([\d.]+)]
-  }
+module Browser
+  def self.root
+    @root ||= Pathname.new(File.expand_path("../..", __FILE__))
+  end
 
   # Define the rules which define a modern browser.
   # A rule must be a proc/lambda or any object that implements the method
@@ -89,156 +84,41 @@ class Browser
   #
   #   # Only Chrome Canary is considered modern.
   #   Browser.modern_rules.clear
-  #   Browser.modern_rules << -> b { b.chrome? && b.version >= '37' }
+  #   Browser.modern_rules << -> b { b.chrome? && b.version >= "37" }
   #
   def self.modern_rules
     @modern_rules ||= []
   end
 
-  self.modern_rules.tap do |rules|
-    rules << -> b { b.webkit? }
-    rules << -> b { b.firefox? && b.version.to_i >= 17 }
-    rules << -> b { b.ie? && b.version.to_i >= 9 && !b.compatibility_view? }
-    rules << -> b { b.edge? && !b.compatibility_view? }
-    rules << -> b { b.opera? && b.version.to_i >= 12 }
-    rules << -> b { b.firefox? && b.tablet? && b.android? && b.version.to_i >= 14 }
-  end
-
-  # Create a new browser instance and set
-  # the UA and Accept-Language headers.
-  #
-  #   browser = Browser.new({
-  #     :ua => "Safari",
-  #     :accept_language => "pt-br"
-  #   })
-  #
-  def initialize(options = {}, &block)
-    self.user_agent = (options[:user_agent] || options[:ua]).to_s
-    self.accept_language = options[:accept_language].to_s
-
-    yield self if block
-  end
-
-  # Get readable browser name.
-  def name
-    NAMES[id]
-  end
-
-  # Get the browser identifier.
-  def id
-    NAMES.keys
-      .find {|id| respond_to?("#{id}?", true) ? send("#{id}?") : id }
-  end
-
-  # Return major version.
-  def version
-    if ie?
-      ie_version
-    else
-      full_version.to_s.split(".").first
-    end
-  end
-
-  # Return the full version.
-  def full_version
-    if ie?
-      ie_full_version
-    else
-      _, *v = *ua.match(VERSIONS.fetch(id, VERSIONS[:default]))
-      v.compact.first || "0.0"
-    end
-  end
-
-  # Return true if browser is modern (Webkit, Firefox 17+, IE9+, Opera 12+).
-  def modern?
-    self.class.modern_rules.any? {|rule| rule === self }
-  end
-
-  # Detect if browser is WebKit-based.
-  def webkit?
-    ua =~ /AppleWebKit/i && !edge?
-  end
-
-  # Detect if browser is QuickTime
-  def quicktime?
-    !!(ua =~ /QuickTime/i)
-  end
-
-  # Detect if browser is Apple CoreMedia.
-  def core_media?
-    !!(ua =~ /CoreMedia/)
-  end
-
-  # Detect if browser is PhantomJS
-  def phantom_js?
-    !!(ua =~ /PhantomJS/)
-  end
-
-  # Detect if browser is Safari.
-  def safari?
-    !!((ua =~ /Safari/) && ua !~ /Android|Chrome|CriOS|PhantomJS/)
-  end
-
-  def safari_webapp_mode?
-    !!((ipad? || iphone?) && ua =~ /AppleWebKit/)
-  end
-
-  # Detect if browser is Firefox.
-  def firefox?
-    !!(ua =~ /Firefox/)
-  end
-
-  # Detect if browser is Chrome.
-  def chrome?
-    !!(ua =~ /Chrome|CriOS/ && !opera? && !edge?)
-  end
-
-  # Detect if browser is Opera.
-  def opera?
-    !!(ua =~ /(Opera|OPR)/)
-  end
-
-  # Detect if browser is Silk.
-  def silk?
-    !!(ua =~ /Silk/)
-  end
-
-  # Detect if browser is Yandex.
-  def yandex?
-    !!(ua =~ /YaBrowser/)
-  end
-
-  # Detect if browser is UCBrowser.
-  def uc_browser?
-    !!(ua =~ /UCBrowser/)
-  end
-
-  def known?
-    id != :other
-  end
-
-  # 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
-  end
-
-  alias_method :to_a, :meta
-
-  # Return meta representation as string.
-  def to_s
-    meta.to_a.join(" ")
+  modern_rules.tap do |rules|
+    rules << -> (b) { b.webkit? }
+    rules << -> (b) { b.firefox? && b.version.to_i >= 17 }
+    rules << -> (b) { b.ie? && b.version.to_i >= 9 && !b.compatibility_view? }
+    rules << -> (b) { b.edge? && !b.compatibility_view? }
+    rules << -> (b) { b.opera? && b.version.to_i >= 12 }
+    rules << -> (b) { b.firefox? && b.device.tablet? && b.platform.android? && b.version.to_i >= 14 } # rubocop:disable Metrics/LineLength
+  end
+
+  def self.new(user_agent, **kwargs)
+    [
+      Nokia,
+      UCBrowser,
+      PhantomJS,
+      BlackBerry,
+      Opera,
+      Edge,
+      InternetExplorer,
+      Firefox,
+      Chrome,
+      Safari,
+      Generic,
+    ]
+      .map {|klass| klass.new(user_agent, **kwargs) }
+      .find(&:match?)
   end
 
   private
 
-  def detect_version?(actual_version, expected_version)
-    return true unless expected_version
-    actual_version.to_s.start_with?(expected_version.to_s)
-  end
-
   def deprecate(message)
     offender = caller[1].to_s[/^(.*?\.rb:\d+).*?$/, 1]
     $stderr << "\n#{message} (called from #{offender})\n"