useragent 0.16.3 → 0.16.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c20bcc2861b91b9daa438d2a1c436dc5b8904623
-  data.tar.gz: 05f1418f81ef79ea1388800f2f2b10d6e365035b
+  metadata.gz: e43d6316204c15aaad84fa02b020866075b39fa8
+  data.tar.gz: b716e6cfe14f3be5bbdfbaa3c9c750203cec9d86
 SHA512:
-  metadata.gz: 1b57837939d11ece3dc65209dca3d667390737a44f700af5d2533c2127731a5ed4a18dd7243a491a67a95bf38ddbf2a38cb98dad62e508a17d2bd4c0bc625298
-  data.tar.gz: 0ea1c78533a067e7833bdd57d3e652b12a634b61aea529d1ab3cec8a1c0c5c08d69d82a76cd1c22f5830613e61cc1e02e16f74f1ee8a5090396caff6cde5fbee
+  metadata.gz: 1ba86b3534c32e44b16c1b894f40b4be839e629fa81cd73dec2055f3ce95991fb0cb02a7055591eb3f6a7781713fb4122eb04133f43239672e73a8b1a81a1e01
+  data.tar.gz: b708812c912e47f4ae9bfedaf385bdd59dc42011a100a33868514bc68399713a561843d195472c6a253e1e599b507dac78684f4b83a6d66380bae5da39859a10

data/lib/user_agent/browsers/apple_core_media.rb

@@ -11,13 +11,13 @@ class UserAgent
       end
 
       def application
-         self.reject { |agent| agent.comment.nil? || agent.comment.empty? }.first
+        self.reject { |agent| agent.comment.nil? || agent.comment.empty? }.first
       end
 
       def platform
-        if application.nil?
-          nil
-        elsif application.comment[0] =~ /Windows/
+        return unless application
+
+        if application.comment[0] =~ /Windows/
           'Windows'
         else
           application.comment[0]
@@ -29,27 +29,23 @@ class UserAgent
       end
 
       def os
-        if application
-          if application.comment[0] =~ /Windows NT/
-            OperatingSystems.normalize_os(application.comment[0])
-          elsif application.comment[2].nil?
-            OperatingSystems.normalize_os(application.comment[1])
-          elsif application.comment[1] =~ /Android/
-            OperatingSystems.normalize_os(application.comment[1])
-          else
-            OperatingSystems.normalize_os(application.comment[2])
-          end
+        return unless application
+
+        if application.comment[0] =~ /Windows NT/
+          OperatingSystems.normalize_os(application.comment[0])
+        elsif application.comment[2].nil?
+          OperatingSystems.normalize_os(application.comment[1])
+        elsif application.comment[1] =~ /Android/
+          OperatingSystems.normalize_os(application.comment[1])
         else
-          nil
+          OperatingSystems.normalize_os(application.comment[2])
         end
       end
 
       def localization
-        if application.nil?
-          nil
-        else
-          application.comment[3]
-        end
+        return unless application
+
+        application.comment[3]
       end
     end
   end

data/lib/user_agent/browsers/base.rb

@@ -88,7 +88,7 @@ class UserAgent
       end
 
       def to_h
-        return nil unless application
+        return unless application
 
         hash = {
           :browser => browser,

data/lib/user_agent/browsers/chrome.rb

@@ -31,9 +31,9 @@ class UserAgent
       end
 
       def platform
-        if application.nil?
-          nil
-        elsif application.comment[0] =~ /Windows/
+        return unless application
+
+        if application.comment[0] =~ /Windows/
           'Windows'
         elsif application.comment.any? { |c| c =~ /CrOS/ }
           'ChromeOS'
@@ -49,27 +49,23 @@ class UserAgent
       end
 
       def os
-        if application
-          if application.comment[0] =~ /Windows NT/
-            OperatingSystems.normalize_os(application.comment[0])
-          elsif application.comment[2].nil?
-            OperatingSystems.normalize_os(application.comment[1])
-          elsif application.comment[1] =~ /Android/
-            OperatingSystems.normalize_os(application.comment[1])
-          else
-            OperatingSystems.normalize_os(application.comment[2])
-          end
+        return unless application
+
+        if application.comment[0] =~ /Windows NT/
+          OperatingSystems.normalize_os(application.comment[0])
+        elsif application.comment[2].nil?
+          OperatingSystems.normalize_os(application.comment[1])
+        elsif application.comment[1] =~ /Android/
+          OperatingSystems.normalize_os(application.comment[1])
         else
-          nil
+          OperatingSystems.normalize_os(application.comment[2])
         end
       end
 
       def localization
-        if application.nil?
-          nil
-        else
-          application.comment[3]
-        end
+        return unless application
+
+        application.comment[3]
       end
     end
   end

data/lib/user_agent/browsers/internet_explorer.rb

@@ -2,6 +2,7 @@ class UserAgent
   module Browsers
     class InternetExplorer < Base
       TRIDENT_ENGINES = {
+        "Trident/8.0" => "11.0",
         "Trident/7.0" => "11.0",
         "Trident/6.0" => "10.0",
         "Trident/5.0" => "9.0",

data/lib/user_agent/browsers/itunes.rb

@@ -30,8 +30,8 @@ class UserAgent
 
       # @return [nil, Version] The WebKit version in use if we have it
       def build
-        webkit ? super : nil
-      end  
+        super if webkit
+      end
 
       # Parses the operating system in use.
       # 
@@ -66,10 +66,8 @@ class UserAgent
           full_os = application.comment[1]
 
           full_os = "#{full_os})" if full_os =~ /\(Build [0-9][0-9][0-9][0-9]\z/ # The regex chops the ) off :(
-        
+
           full_os
-        else
-          nil
         end
       end
     end

data/lib/user_agent/browsers/libavformat.rb

@@ -15,11 +15,7 @@ class UserAgent
 
       # @return [nil, Version] If the product is NSPlayer, we don't have a version
       def version
-        if detect_product("NSPlayer")
-          nil
-        else
-          super
-        end
+        super unless detect_product("NSPlayer")
       end
 
       # @return [nil] Lavf doesn't return us anything here

data/lib/user_agent/browsers/opera.rb

@@ -24,9 +24,9 @@ class UserAgent
       end
 
       def platform
-        if application.comment.nil?
-          nil
-        elsif application.comment[0] =~ /Windows/
+        return unless application.comment
+
+        if application.comment[0] =~ /Windows/
           "Windows"
         else
           application.comment[0]
@@ -36,7 +36,7 @@ class UserAgent
       def security
         if application.comment.nil?
           :strong
-        elsif platform == "Macintosh"
+        elsif macintosh?
           Security[application.comment[2]]
         elsif mini?
           Security[application.comment[-2]]
@@ -50,9 +50,9 @@ class UserAgent
       end
 
       def os
-        if application.comment.nil?
-          nil
-        elsif application.comment[0] =~ /Windows/
+        return unless application.comment
+
+        if application.comment[0] =~ /Windows/
           OperatingSystems.normalize_os(application.comment[0])
         else
           application.comment[1]
@@ -60,9 +60,9 @@ class UserAgent
       end
 
       def localization
-        if application.comment.nil?
-          nil
-        elsif platform == "Macintosh"
+        return unless application.comment
+
+        if macintosh?
           application.comment[3]
         else
           application.comment[2]
@@ -73,6 +73,10 @@ class UserAgent
         def mini?
           /Opera Mini/ === application
         end
+
+        def macintosh?
+          platform == 'Macintosh'
+        end
     end
   end
 end

data/lib/user_agent/browsers/webkit.rb

@@ -66,13 +66,13 @@ class UserAgent
       end
 
       def application
-         self.reject { |agent| agent.comment.nil? || agent.comment.empty? }.first
+        self.reject { |agent| agent.comment.nil? || agent.comment.empty? }.first
       end
 
       def platform
-        if application.nil?
-          nil
-        elsif application.comment[0] =~ /Windows/
+        return unless application
+
+        if application.comment[0] =~ /Windows/
           'Windows'
         elsif application.comment[0] == 'BB10'
           'BlackBerry'
@@ -92,29 +92,25 @@ class UserAgent
       end
 
       def os
-        if application
-          if application.comment[0] =~ /Windows NT/
-            OperatingSystems.normalize_os(application.comment[0])
-          elsif application.comment[2].nil?
-            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
+        return unless application
+
+        if application.comment[0] =~ /Windows NT/
+          OperatingSystems.normalize_os(application.comment[0])
+        elsif application.comment[2].nil?
+          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
-          nil
+          OperatingSystems.normalize_os(application.comment[2])
         end
       end
 
       def localization
-        if application.nil?
-          nil
-        else
-          application.comment[3]
-        end
+        return unless application
+
+        application.comment[3]
       end
     end
   end

data/lib/user_agent/browsers/windows_media_player.rb

@@ -8,7 +8,7 @@ class UserAgent
     class WindowsMediaPlayer < Base
       def self.extend?(agent)
         agent.detect do |useragent|
-          (useragent.product == "NSPlayer" || useragent.product == "Windows-Media-Player" || useragent.product == "WMFSDK") &&
+          %w(NSPlayer Windows-Media-Player WMFSDK).include?(useragent.product) &&
             agent.version != "4.1.0.3856" && # 4.1.0.3856 is libavformat
             agent.version != "7.10.0.3059" && # used by VLC for mmsh support
             agent.version != "7.0.0.1956" # used by VLC for mmstu support

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: useragent
 version: !ruby/object:Gem::Version
-  version: 0.16.3
+  version: 0.16.4
 platform: ruby
 authors:
 - Joshua Peek
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2016-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake