useragent 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0120f69b4e121786db5270652b47b8533658243
-  data.tar.gz: e2cff433dd5079b86067608f059db2a044ff1e48
+  metadata.gz: 2658435598c1604bdebca0e0d989073e2e01a788
+  data.tar.gz: 7a8ecbe3137b1c26dff955a319955e5ef47e2007
 SHA512:
-  metadata.gz: 11de96864692a2eac9e6df71bf87d61ddba15875bc6673513c8f901447bb3e96bd1e5837f3fce4fd5c3264c02c40d0ee010ee3af6d113cf09d276057e94bda5f
-  data.tar.gz: 1146610d2c06d901ddd4bb51728253e2d18e6c4fe75cf26be0ebebd707c08cf4e161fa56ae436867f8f82f333a359eb3ea06b9d4e92e1ce389cbd1458fb79ef4
+  metadata.gz: 191b834bc118d29098f5b22b5c980d74fb8d5b63f41092804a16fe0c987d0bf00981a5db18153e3bc3b4afd220d8524097be4c8bed15206db511838c98df7546
+  data.tar.gz: 153c59ccf82db939f2215dd1df088fedf9d557767d2d3085504f3421ae2c1a94b651afa1a468cc9d7e346ed307d45bfd561198b860b0eb285fcaaeda46c78ac6

data/lib/user_agent/browsers.rb

@@ -1,4 +1,5 @@
 require 'user_agent/browsers/all'
+require 'user_agent/browsers/chrome'
 require 'user_agent/browsers/gecko'
 require 'user_agent/browsers/internet_explorer'
 require 'user_agent/browsers/opera'
@@ -13,7 +14,7 @@ class UserAgent
     }.freeze
 
     def self.all
-      [InternetExplorer, Webkit, Opera, Gecko]
+      [InternetExplorer, Chrome, Webkit, Opera, Gecko]
     end
 
     def self.extend(array)

data/lib/user_agent/browsers/all.rb

@@ -52,16 +52,8 @@ class UserAgent
         detect_product(method) || super
       end
 
-      def webkit?
-        false
-      end
-
       def mobile?
-        if browser == 'webOS'
-          true
-        elsif platform == 'Symbian'
-          true
-        elsif detect_product('Mobile') || detect_comment('Mobile')
+        if detect_product('Mobile') || detect_comment('Mobile')
           true
         elsif os =~ /Android/
           true
@@ -88,6 +80,8 @@ class UserAgent
         # list will be rejected.
         elsif comment = application.comment
           comment.any? { |c| c =~ /bot/i }
+        elsif product = application.product
+          product.include?('bot')
         else
           false
         end

data/lib/user_agent/browsers/opera.rb

@@ -2,11 +2,14 @@ class UserAgent
   module Browsers
     module Opera
       def self.extend?(agent)
-        agent.application && agent.application.product == "Opera"
+        agent.first.product == 'Opera' ||
+          (agent.application && agent.application.product == 'Opera')
       end
 
       def version
-        if product = detect_product('Version')
+        if mini?
+          application.comment[1][/Opera Mini\/([\d\.]+)/, 1]
+        elsif product = detect_product('Version')
           product.version
         else
           super
@@ -35,10 +38,6 @@ class UserAgent
         end
       end
 
-      def mini?
-        /Opera Mini/ === application
-      end
-
       def mobile?
         mini?
       end
@@ -62,6 +61,11 @@ class UserAgent
           application.comment[2]
         end
       end
+
+      private
+        def mini?
+          /Opera Mini/ === application
+        end
     end
   end
 end

data/lib/user_agent/browsers/webkit.rb

@@ -5,16 +5,10 @@ class UserAgent
         agent.detect { |useragent| useragent.product == 'AppleWebKit' }
       end
 
-      def webkit?
-        true
-      end
-
       def browser
-        if detect_product('Chrome') || detect_product("CriOS")
-          'Chrome'
-        elsif os =~ /Android/
+        if os =~ /Android/
           'Android'
-        elsif platform == 'webOS' || platform == 'BlackBerry'  || platform == 'Symbian'
+        elsif platform == 'BlackBerry'
           platform
         else
           'Safari'
@@ -64,12 +58,6 @@ class UserAgent
           $1.gsub(/_/, '.')
         elsif product = detect_product('Version')
           product.version
-        elsif browser == 'Chrome'
-          if detect_product("chrome")
-            chrome.version
-          elsif detect_product("crios")
-            crios.version
-          end
         else
           BuildVersions[build.to_s]
         end
@@ -84,10 +72,6 @@ class UserAgent
       def platform
         if application.nil?
           nil
-        elsif application.comment[0] =~ /Symbian/
-          'Symbian'
-        elsif application.comment[0] =~ /webOS/
-          'webOS'
         elsif application.comment[0] =~ /Windows/
           'Windows'
         elsif application.comment[0] == 'BB10'
@@ -106,11 +90,7 @@ class UserAgent
       end
 
       def os
-        if platform == 'webOS'
-          "Palm #{last.product} #{last.version}"
-        elsif platform == 'Symbian'
-          application.comment[0]
-        elsif application
+        if application
           if application.comment[0] =~ /Windows NT/
             OperatingSystems.normalize_os(application.comment[0])
           elsif application.comment[2].nil?
@@ -128,8 +108,6 @@ class UserAgent
       def localization
         if application.nil?
           nil
-        elsif platform == 'webOS'
-          application.comment[2]
         else
           application.comment[3]
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: useragent
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Joshua Peek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-18 00:00:00.000000000 Z
+date: 2013-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -59,7 +59,8 @@ files:
 - LICENSE
 - README.rdoc
 homepage: http://github.com/josh/useragent
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []