useragent 0.16.6 → 0.16.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bbbd675e80901dfed7674e9a04561b3bcec4527
-  data.tar.gz: fed38ba57c850d1a20779fa534f9d0fd0c05933c
+  metadata.gz: 29ec5687df8a0fadd9e1ddc9257131aa1193e7b6
+  data.tar.gz: a6431baf15ed2cf458c4b69d9b8ad946aaa155dd
 SHA512:
-  metadata.gz: d305a8d8cde309eb2b7072728b844ea10737b2cc96501e9fad8b55c1c031d709fcef24cdc3bb18d36f3711d3a47d0dc0f2d574c7fc5ba77065c421e2b33783d3
-  data.tar.gz: 720838b4801bf39f4dd838289a7687cf7710c27c70d875621d26937f1d1b9798ced57d419b52fae34c0ceca09bfe0c6c4b7162f798be0c484d8f862935cdbbcb
+  metadata.gz: 76df2579cec51deb068e072ed2333ff2a2646c9238a8f1d9104b18231d52f6b27151eab69dd45de5402b308d12b302e0c9909a9cbfe87beab6c886c222e5b8e9
+  data.tar.gz: ba7a59272edf01fa33acc3b8aff2fbb2f61b8b7a165e526216fe5eee39b2f79875e282f094928aec15931adba35a96b8b545ad0dcc242dc2c003bf88122b0293

data/lib/user_agent.rb

@@ -51,6 +51,10 @@ class UserAgent
 
   include Comparable
 
+  def detect_comment(&block)
+    comment && comment.detect(&block)
+  end
+
   # Any comparison between two user agents with different products will
   # always return false.
   def <=>(other)

data/lib/user_agent/browsers/base.rb

@@ -57,8 +57,7 @@ class UserAgent
           true
         elsif os =~ /Android/
           true
-        elsif application && application.comment &&
-            application.comment.detect { |k, v| k =~ /^IEMobile/ }
+        elsif application && application.detect_comment { |c| c =~ /^IEMobile/ }
           true
         else
           false
@@ -119,7 +118,13 @@ class UserAgent
         end
 
         def detect_comment(comment)
-          detect { |useragent| useragent.comment && useragent.comment.include?(comment) }
+          detect { |useragent| useragent.detect_comment { |c| c == comment } }
+        end
+
+        def detect_comment_match(regexp)
+          comment_match = nil
+          detect { |useragent| useragent.detect_comment { |c| comment_match = c.match(regexp) } }
+          comment_match
         end
     end
   end

data/lib/user_agent/browsers/edge.rb

@@ -26,14 +26,10 @@ class UserAgent
       private
 
       def os_comment
-        if os_agent = detect { |useragent| comment_os_match(useragent) }
-          comment_os_match(os_agent).to_s
+        if comment_match = detect_comment_match(OS_REGEXP)
+          comment_match.to_s
         end
       end
-
-      def comment_os_match(useragent)
-        useragent.comment && useragent.comment.join("; ").match(OS_REGEXP)
-      end
     end
   end
 end

data/lib/user_agent/browsers/webkit.rb

@@ -1,8 +1,11 @@
 class UserAgent
   module Browsers
     class Webkit < Base
+      WEBKIT_PRODUCT_REGEXP = /\AAppleWebKit\z/i
+      WEBKIT_VERSION_REGEXP = /\A(?<webkit>AppleWebKit)\/(?<version>[\d\.]+)/i
+
       def self.extend?(agent)
-        agent.detect { |useragent| useragent.product =~ /\AAppleWebKit\z/i }
+        agent.detect { |useragent| useragent.product =~ WEBKIT_PRODUCT_REGEXP || useragent.detect_comment { |c| c =~ WEBKIT_VERSION_REGEXP } }
       end
 
       def browser
@@ -84,7 +87,11 @@ class UserAgent
       end
 
       def webkit
-        detect { |useragent| useragent.product =~ /\AAppleWebKit\z/i }
+        if product_match = detect { |useragent| useragent.product =~ WEBKIT_PRODUCT_REGEXP }
+          product_match
+        elsif comment_match = detect_comment_match(WEBKIT_VERSION_REGEXP)
+          UserAgent.new(comment_match[:webkit], comment_match[:version])
+        end
       end
 
       def security

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: useragent
 version: !ruby/object:Gem::Version
-  version: 0.16.6
+  version: 0.16.7
 platform: ruby
 authors:
 - Joshua Peek