browser 0.9.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eddee2b6db8afdf0d9c36a8a74f9517b76c215c7
-  data.tar.gz: 74c6356881cef0f1caeb310286e10a5741cab185
+  metadata.gz: 56723cefb92ad8c20d18cb2a017daf3c4de241f7
+  data.tar.gz: 379fcae2f68d422e8684db80036c1942c8d6250c
 SHA512:
-  metadata.gz: e536d711e96ccb39895a5bdde0d6c7425c740fe2ab81201a8db257f56b1e26d586388d339ff12b49a09716e0876188a938becf50c20d96225a07008054eaa239
-  data.tar.gz: 18c18599e9891ada9c6dadeaf42181390037f53830c8fe541efeeb307646716ab80f37bc071cb112ca205416a48531cf39d14b0a1259bf1fdbc9709498ee8c27
+  metadata.gz: 289a8912aed75c7c481a4838eadca09a8110a5b6e6a4133283bd32ca3bba52a474514a5754da1d992d1857455bc2982f2de402c6daf039f9e95d51ebf7dc9c9e
+  data.tar.gz: cbd3e177f309122a566f8fd85d6f39f5ad117305bab74b3e03f9a410cbdbfc34bb18663fb392727157032a505c1eae6cf0cf7af349bdd525b8563fddc0727d01

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
+sudo: false
+cache: bundler
 rvm:
   - '2.2'
   - '2.1'
@@ -7,3 +9,5 @@ gemfile:
   - Gemfile
   - gemfiles/rails3.gemfile
 script: "bundle exec rake spec"
+notifications:
+  email: false

data/README.md

@@ -87,6 +87,34 @@ This adds a helper method called `browser`, that inspects your current user agen
 <% end %>
 ```
 
+### Internet Explorer
+
+Internet Explorer has a compatibility view mode that allows newer versions (IE8+) to run as an older version. Browser will always return the navigator version, ignoring the compatibility view version, when defined. If you need to get the engine's version, you have to use `Browser#msie_version` and `Browser#msie_full_version`.
+
+So, let's say an user activates compatibility view in a IE11 browser. This is what you'll get:
+
+```ruby
+browser.version
+#=> 11
+
+browser.full_version
+#=> 11.0
+
+browser.msie_version
+#=> 7
+
+browser.msie_full_version
+#=> 7.0
+
+browser.compatibility_view?
+#=> true
+
+browser.modern?
+#=> false
+```
+
+This behavior changed in `v1.0.0`; previously there wasn't a way of getting the real browser version.
+
 ### Bots
 
 Browser used to detect empty user agents as bots, but this behaviour has changed. If you want to bring this detection back, you can activate it through the following call:

data/browser.gemspec

@@ -18,6 +18,18 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.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   #"     ,
+    "#                                                         #"     ,
+    "###########################################################"     ,
+    "\n"
+  ].join("\n")
+
   s.add_development_dependency "bundler", ">= 0"
   s.add_development_dependency "rake"
   s.add_development_dependency "rails"

data/lib/browser.rb

@@ -90,8 +90,8 @@ class Browser
   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 }
-    rules << -> b { b.edge? }
+    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
@@ -124,13 +124,21 @@ class Browser
 
   # Return major version.
   def version
-    full_version.to_s.split(".").first
+    if ie?
+      ie_version
+    else
+      full_version.to_s.split(".").first
+    end
   end
 
   # Return the full version.
   def full_version
-    _, *v = *ua.match(VERSIONS.fetch(id, VERSIONS[:default]))
-    v.compact.first || "0.0"
+    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+).
@@ -177,11 +185,6 @@ class Browser
     ua =~ /Chrome|CriOS/ && !opera? && !edge?
   end
 
-  # Detect if browser is Microsoft Edge.
-  def edge?
-    !!(ua =~ /Windows.*?\bEdge\/\d+/)
-  end
-
   # Detect if browser is Opera.
   def opera?
     !!(ua =~ /(Opera|OPR)/)

data/lib/browser/methods/ie.rb

@@ -2,6 +2,38 @@ class Browser
   module IE
     TRIDENT_VERSION_REGEX = %r[Trident/([0-9.]+)]
     MODERN_IE = %r[Trident/.*?; rv:(.*?)]
+    MSIE = %r{MSIE ([\d.]+)|Trident/.*?; rv:([\d.]+)}
+    EDGE = %r{(Edge/[\d.]+|Trident/8)}
+
+    # https://msdn.microsoft.com/en-us/library/ms537503(v=vs.85).aspx#TriToken
+    TRIDENT_MAPPING = {
+      "4.0" => "8",
+      "5.0" => "9",
+      "6.0" => "10",
+      "7.0" => "11",
+      "8.0" => "12"
+    }
+
+    def ie_version
+      TRIDENT_MAPPING[trident_version] || msie_version
+    end
+
+    def ie_full_version
+      "#{ie_version}.0"
+    end
+
+    def msie_full_version
+      ua.match(MSIE) && ($1 || $2)
+    end
+
+    def msie_version
+      msie_full_version.split(".").first
+    end
+
+    # Return the trident version.
+    def trident_version
+      ua.match(TRIDENT_VERSION_REGEX) && $1
+    end
 
     # Detect if browser is Internet Explorer.
     def ie?
@@ -38,10 +70,14 @@ class Browser
       ie? && version == "11"
     end
 
+    # Detect if browser is Microsoft Edge.
+    def edge?
+      !!(ua =~ EDGE)
+    end
+
     # Detect if IE is running in compatibility mode.
     def compatibility_view?
-      match = ua.match(TRIDENT_VERSION_REGEX)
-      ie? && match && version.to_i < (match[1].to_i + 4)
+      ie? && trident_version && msie_version.to_i < (trident_version.to_i + 4)
     end
 
     private

data/lib/browser/version.rb

@@ -1,8 +1,8 @@
 class Browser
   module Version
-    MAJOR = 0
-    MINOR = 9
-    PATCH = 1
+    MAJOR = 1
+    MINOR = 0
+    PATCH = 0
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/test/browser_spec.rb

@@ -181,12 +181,13 @@ describe Browser do
 
     assert_equal "Internet Explorer", @browser.name
     assert @browser.ie?
-    assert @browser.ie7?
-    refute @browser.ie8?
+    assert @browser.ie8?
     refute @browser.modern?
     assert @browser.compatibility_view?
-    assert_equal "7.0", @browser.full_version
-    assert_equal "7", @browser.version
+    assert_equal "8.0", @browser.full_version
+    assert_equal "8", @browser.version
+    assert_equal "7.0", @browser.msie_full_version
+    assert_equal "7", @browser.msie_version
   end
 
   it "detects ie9" do
@@ -206,12 +207,13 @@ describe Browser do
 
     assert_equal "Internet Explorer", @browser.name
     assert @browser.ie?
-    assert @browser.ie7?
-    refute @browser.ie9?
+    assert @browser.ie9?
     refute @browser.modern?
     assert @browser.compatibility_view?
-    assert_equal "7.0", @browser.full_version
-    assert_equal "7", @browser.version
+    assert_equal "9.0", @browser.full_version
+    assert_equal "9", @browser.version
+    assert_equal "7.0", @browser.msie_full_version
+    assert_equal "7", @browser.msie_version
   end
 
   it "detects ie10" do
@@ -231,12 +233,13 @@ describe Browser do
 
     assert_equal "Internet Explorer", @browser.name
     assert @browser.ie?
-    assert @browser.ie7?
-    refute @browser.ie10?
+    assert @browser.ie10?
     refute @browser.modern?
     assert @browser.compatibility_view?
-    assert_equal "7.0", @browser.full_version
-    assert_equal "7", @browser.version
+    assert_equal "10.0", @browser.full_version
+    assert_equal "10", @browser.version
+    assert_equal "7.0", @browser.msie_full_version
+    assert_equal "7", @browser.msie_version
   end
 
   it "detects ie11" do
@@ -251,6 +254,20 @@ describe Browser do
     assert_equal "11", @browser.version
   end
 
+  it "detects ie11 in compatibility view" do
+    @browser.ua = $ua["IE11_COMPAT"]
+
+    assert_equal "Internet Explorer", @browser.name
+    assert @browser.ie?
+    assert @browser.ie11?
+    refute @browser.modern?
+    assert @browser.compatibility_view?
+    assert_equal "11.0", @browser.full_version
+    assert_equal "11", @browser.version
+    assert_equal "7.0", @browser.msie_full_version
+    assert_equal "7", @browser.msie_version
+  end
+
   it "detects Lumia 800" do
     @browser.ua = $ua["LUMIA800"]
 
@@ -826,6 +843,24 @@ describe Browser do
     refute @browser.mobile?
   end
 
+  it "detects Microsoft Edge in compatibility view" do
+    @browser.ua = $ua["MS_EDGE_COMPAT"]
+
+    assert_equal :edge, @browser.id
+    assert_equal "Microsoft Edge", @browser.name
+    assert_equal "12.0", @browser.full_version
+    assert_equal "12", @browser.version
+    assert_equal "7.0", @browser.msie_full_version
+    assert_equal "7", @browser.msie_version
+    assert @browser.edge?
+    assert @browser.compatibility_view?
+    refute @browser.modern?
+    refute @browser.webkit?
+    refute @browser.chrome?
+    refute @browser.safari?
+    refute @browser.mobile?
+  end
+
   it "detects Microsoft Edge Mobile" do
     @browser.ua = $ua["MS_EDGE_MOBILE"]
 

data/test/ua.yml

@@ -28,6 +28,7 @@ IE10_COMPAT: 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.1; Trident/6.0; SL
 IE10_X64_WINX64: 'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; Win64; x64; Trident/6.0)'
 IE11: 'Mozilla/5.0 (Windows NT 6.1; Trident/7.0; rv:11.0) like Gecko'
 IE11_TOUCH_SCREEN: 'Mozilla/5.0 (Windows NT 6.3; Win64; x64; Trident/7.0; Touch; rv:11.0) like Gecko'
+IE11_COMPAT: 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.3; WOW64; Trident/7.0; .NET4.0E; .NET4.0C; .NET CLR 3.5.30729; .NET CLR 2.0.50727; .NET CLR 3.0.30729)'
 IE6: 'Mozilla/5.0 (Windows; U; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 2.0.50727)'
 IE7: 'Mozilla/5.0 (Windows; U; MSIE 7.0; Windows NT 6.0; en-US)'
 IE8: 'Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.2; Trident/4.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0)'
@@ -35,6 +36,7 @@ IE8_COMPAT: 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0; Trident/4.0; SLC
 IE9: 'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)'
 IE9_COMPAT: 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0; Trident/5.0)'
 MS_EDGE: 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.71 Safari/537.36 Edge/12.0'
+MS_EDGE_COMPAT: 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.2; WOW64; Trident/8.0; .NET4.0C; .NET4.0E; Tablet PC 2.0; Microsoft Outlook 15.0.4433; ms-office; MSOffice 15)'
 MS_EDGE_MOBILE: 'Mozilla/5.0 (Windows Phone 10.0; Android 4.2.1; DEVICE INFO) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.71 Mobile Safari/537.36 Edge/12.0'
 IOS4: 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7'
 IOS5: 'Mozilla/5.0 (iPhone; CPU iPhone OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: browser
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-31 00:00:00.000000000 Z
+date: 2015-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,7 +150,16 @@ homepage: http://github.com/fnando/browser
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: |2+
+
+  #################### 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   #
+  #                                                         #
+  ###########################################################
+
 rdoc_options: []
 require_paths:
 - lib
@@ -166,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Do some browser detection with Ruby.