useragent 0.13.3 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7beed7c3e58f48ae8eafe07647b5a697dda925e2
-  data.tar.gz: 849a89b1d719abca31f254653e12de26dc77ea85
+  metadata.gz: 93997836a30bc37117159c86a311f712ee84ff89
+  data.tar.gz: e53d51405082ca07154a69c1ef87d255e8ff3289
 SHA512:
-  metadata.gz: c90119ee052cc6b902fa4560c7e0282ddb06b597672d1280eb6ab9cd2f65783df79a56ed63e27a8b85319047c8c4f7823c038586d0eaaef0faa3c36de80faedd
-  data.tar.gz: d3754eb53dd810b258085a5afeaf108a6ee6de076b1cb0ab8a50a8c1ef5f241d5dc5be99993496fe6ad0efc95aa85f43c0cc487a2366ccac37cafc0bfeee69e7
+  metadata.gz: 785ed3e80709b62585e0a8e677346dae0ee862cecfb768ab30e39aa89e8f6ebe0c6f11d88e88784b6f75dbe5d8a6c5b09a73248bdf5f027d1d50385bbdfe4287
+  data.tar.gz: 6a1b843c8ec68301bfe840d9df7d91261bb7ea74360e108a97cc7e0a1c5f84633a80e709a986ad46793dc24b4a9c6ec7df1974dcd200d6739cf4a2df2f2571e5

data/lib/user_agent/browsers/chrome.rb

@@ -36,6 +36,8 @@ class UserAgent
           nil
         elsif application.comment[0] =~ /Windows/
           'Windows'
+        elsif application.comment.any? { |c| c =~ /CrOS/ }
+          'ChromeOS'
         else
           application.comment[0]
         end

data/lib/user_agent/browsers/webkit.rb

@@ -2,7 +2,7 @@ class UserAgent
   module Browsers
     class Webkit < Base
       def self.extend?(agent)
-        agent.detect { |useragent| useragent.product == 'AppleWebKit' }
+        agent.detect { |useragent| useragent.product =~ /\AAppleWebKit\z/i }
       end
 
       def browser
@@ -54,10 +54,10 @@ class UserAgent
 
       # Prior to Safari 3, the user agent did not include a version number
       def version
-        str = if os =~ /CPU (?:iPhone |iPod )?OS ([\d_]+) like Mac OS X/ && browser == "Safari"
-          $1.gsub(/_/, '.')
-        elsif product = detect_product('Version')
+        str = if product = detect_product('Version')
           product.version
+        elsif os =~ /iOS ([\d\.]+)/ && browser == "Safari"
+          $1.gsub(/_/, '.')
         else
           BuildVersions[build.to_s]
         end
@@ -76,13 +76,15 @@ class UserAgent
           'Windows'
         elsif application.comment[0] == 'BB10'
           'BlackBerry'
+        elsif application.comment.any? { |c| c =~ /Android/ }
+          'Android'
         else
           application.comment[0]
         end
       end
 
       def webkit
-        detect { |useragent| useragent.product == "AppleWebKit" }
+        detect { |useragent| useragent.product =~ /\AAppleWebKit\z/i }
       end
 
       def security
@@ -97,6 +99,8 @@ class UserAgent
             OperatingSystems.normalize_os(application.comment[1])
           elsif application.comment[1] =~ /Android/
             OperatingSystems.normalize_os(application.comment[1])
+          elsif (os_string = application.comment.detect { |c| c =~ OperatingSystems::IOS_VERSION_REGEX })
+            OperatingSystems.normalize_os(os_string)
           else
             OperatingSystems.normalize_os(application.comment[2])
           end

data/lib/user_agent/operating_systems.rb

@@ -1,5 +1,7 @@
 class UserAgent
   module OperatingSystems
+    IOS_VERSION_REGEX = /CPU (?:iPhone |iPod )?OS ([\d_]+) like Mac OS X/
+
     Windows = {
       "Windows NT 6.3"  => "Windows 8.1",
       "Windows NT 6.2"  => "Windows 8",
@@ -16,12 +18,23 @@ class UserAgent
     }.freeze
 
     def self.normalize_os(os)
-      Windows[os] || normalize_mac_os_x(os) || normalize_ios(os) || os
+      Windows[os] || normalize_mac_os_x(os) || normalize_ios(os) || normalize_chrome_os(os) || os
     end
 
     private
+      def self.normalize_chrome_os(os)
+        if os =~ /CrOS\s([^\s]+)\s(\d+(\.\d+)*)/
+          if $2.nil?
+            "ChromeOS"
+          else
+            version = $2
+            "ChromeOS #{version}"
+          end
+        end
+      end
+
       def self.normalize_ios(os)
-        if os =~ /CPU OS\s*([0-9_\.]+)?\slike Mac OS X/
+        if os =~ IOS_VERSION_REGEX
           if $1.nil?
             "iOS"
           else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: useragent
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.14.0
 platform: ruby
 authors:
 - Joshua Peek
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-21 00:00:00.000000000 Z
+date: 2015-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: HTTP User Agent parser