useragent 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70923abee7e8ba999ee2cd327e6eda2af9f0d721
-  data.tar.gz: caeb5dea87e448b5d41d0d3946d1e6bb95e42cf7
+  metadata.gz: 51aa24d6a524743862c56ab432b88b4e3cf47de9
+  data.tar.gz: de584ebbb72e57c6d7e2754b576bf395551a7eb5
 SHA512:
-  metadata.gz: 5acfcce5871ad92a637be4d463ca721c4688db4c873eaa8afb5f2bb8526fb22ceed31274a332fd6908310d537d2a2cfda30c3b23662b5562dd086b2ec8934481
-  data.tar.gz: c6e856cff6f0b873bcc95bf78925a950500f3509e1c2c3303b1a88f894f1f0cdf7a831e48f622b5334e2a0f236851fd60af53768fa9b67481ec9391c30aeec91
+  metadata.gz: deb3a0828a300e60e5a440e15922da7c18f4219b55fb23dbf516ce1dd7e2f695f4f4d2a7cdb061da3ba157e0706133789c9d77cb46d91985267014889ecb6734
+  data.tar.gz: 741f86b6dfa3d46ceaf09c5fc5ae4e0d3c1d0f55d385c4730f3bbb8b0467cc1a5e85443e86eb1fb0b567189041adda2c4e9b6a048f9ac9bc95145c8fd09da183

data/README.md

@@ -1,6 +1,7 @@
 # UserAgent
 
 [![Build Status](https://travis-ci.org/gshutler/useragent.svg?branch=master)](https://travis-ci.org/gshutler/useragent)
+[![Gem Version](https://badge.fury.io/rb/useragent.svg)](http://badge.fury.io/rb/useragent)
 
 UserAgent is a Ruby library that parses and compares HTTP User Agents.
 

data/lib/user_agent/browsers.rb

@@ -4,6 +4,10 @@ require 'user_agent/browsers/gecko'
 require 'user_agent/browsers/internet_explorer'
 require 'user_agent/browsers/opera'
 require 'user_agent/browsers/webkit'
+require 'user_agent/browsers/windows_media_player'
+require 'user_agent/browsers/itunes'
+require 'user_agent/browsers/apple_core_media'
+require 'user_agent/browsers/libavformat'
 
 class UserAgent
   module Browsers
@@ -14,7 +18,7 @@ class UserAgent
     }.freeze
 
     def self.all
-      [InternetExplorer, Opera, Chrome, Webkit, Gecko]
+      [InternetExplorer, Opera, Chrome, ITunes, Webkit, Gecko, WindowsMediaPlayer, AppleCoreMedia, Libavformat]
     end
 
     def self.extend(array)

data/lib/user_agent/browsers/apple_core_media.rb

@@ -0,0 +1,56 @@
+class UserAgent
+  module Browsers
+    # CoreMedia is a framework on iOS and is used by various iOS apps to playback media.
+    class AppleCoreMedia < Base
+      def self.extend?(agent)
+        agent.detect { |useragent| useragent.product == 'AppleCoreMedia' }
+      end
+
+      def browser
+        "AppleCoreMedia"
+      end
+
+      def application
+         self.reject { |agent| agent.comment.nil? || agent.comment.empty? }.first
+      end
+
+      def platform
+        if application.nil?
+          nil
+        elsif application.comment[0] =~ /Windows/
+          'Windows'
+        else
+          application.comment[0]
+        end
+      end
+
+      def security
+        Security[application.comment[1]]
+      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
+        else
+          nil
+        end
+      end
+
+      def localization
+        if application.nil?
+          nil
+        else
+          application.comment[3]
+        end
+      end
+    end
+  end
+end

data/lib/user_agent/browsers/base.rb

@@ -44,7 +44,7 @@ class UserAgent
         nil
       end
 
-      def respond_to?(symbol)
+      def respond_to?(symbol, include_all = false)
         detect_product(symbol) ? true : super
       end
 

data/lib/user_agent/browsers/itunes.rb

@@ -0,0 +1,77 @@
+class UserAgent
+  module Browsers
+    # The user agent for iTunes
+    # 
+    # Some user agents:
+    # iTunes/10.6.1 (Macintosh; Intel Mac OS X 10.7.3) AppleWebKit/534.53.11
+    # iTunes/12.0.1 (Macintosh; OS X 10.10) AppleWebKit/0600.1.25
+    # iTunes/11.1.5 (Windows; Microsoft Windows 7 x64 Business Edition Service Pack 1 (Build 7601)) AppleWebKit/537.60.15
+    # iTunes/12.0.1 (Windows; Microsoft Windows 8 x64 Home Premium Edition (Build 9200)) AppleWebKit/7600.1017.0.24
+    # iTunes/12.0.1 (Macintosh; OS X 10.10.1) AppleWebKit/0600.1.25 
+    class ITunes < Webkit
+      def self.extend?(agent)
+        agent.detect { |useragent| useragent.product == "iTunes" }
+      end
+
+      # @return ["iTunes"] Always return iTunes as the browser
+      def browser
+        "iTunes"
+      end
+
+      # @return [Version] The version of iTunes in use
+      def version
+        self.iTunes.version
+      end
+
+      # @return [nil] nil - not included in the user agent
+      def security
+        nil
+      end
+
+      # @return [nil, Version] The WebKit version in use if we have it
+      def build
+        webkit ? super : nil
+      end  
+
+      # Parses the operating system in use.
+      # 
+      # @return [String] The operating system
+      def os
+        full_os = self.full_os
+
+        if application && application.comment[0] =~ /Windows/
+          if full_os =~ /Windows 8\.1/
+            "Windows 8.1"
+          elsif full_os =~ /Windows 8/
+            "Windows 8"
+          elsif full_os =~ /Windows 7/
+            "Windows 7"
+          elsif full_os =~ /Windows Vista/
+            "Windows Vista"
+          elsif full_os =~ /Windows XP/
+            "Windows XP"
+          else
+            "Windows"
+          end
+        else
+          super
+        end
+      end
+
+      # Parses the operating system in use.
+      # 
+      # @return [String] The operating system
+      def full_os
+        if application && application.comment && application.comment.length > 1
+          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
+  end
+end

data/lib/user_agent/browsers/libavformat.rb

@@ -0,0 +1,36 @@
+class UserAgent
+  module Browsers
+    # The user agent utilized by ffmpeg or other projects utilizing libavformat
+    class Libavformat < Base
+      def self.extend?(agent)
+        agent.detect do |useragent|
+          useragent.product == "Lavf" || (useragent.product == "NSPlayer" && agent.version == "4.1.0.3856")
+        end
+      end
+
+      # @return ["libavformat"] To make it easy to pick it out, all of the UAs that Lavf uses have this browser.
+      def browser
+        "libavformat"
+      end
+
+      # @return [nil, Version] If the product is NSPlayer, we don't have a version
+      def version
+        if detect_product("NSPlayer")
+          nil
+        else
+          super
+        end
+      end
+
+      # @return [nil] Lavf doesn't return us anything here
+      def os
+        nil
+      end
+
+      # @return [nil] Lavf doesn't return us anything here
+      def platform
+        nil
+      end
+    end
+  end
+end

data/lib/user_agent/browsers/windows_media_player.rb

@@ -0,0 +1,177 @@
+class UserAgent
+  module Browsers
+    # The user agent used by Windows Media Player or applications which utilize the
+    # Windows Media SDK.
+    # 
+    # @note Both VLC and libavformat impersonate Windows Media Player when they think they
+    #       are using MMS (Microsoft Media Services/Windows Media Server).
+    class WindowsMediaPlayer < Base
+      def self.extend?(agent)
+        agent.detect do |useragent|
+          (useragent.product == "NSPlayer" || useragent.product == "Windows-Media-Player" || useragent.product == "WMFSDK") &&
+            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
+        end
+      end
+
+      # The Windows Media Format SDK version
+      # 
+      # @return [Version, nil] The WMFSDK version
+      def wmfsdk_version
+        (respond_to?("WMFSDK") && self.send("WMFSDK").version) || nil
+      end
+
+      # Check if the client supports the WMFSDK version passed in.
+      # 
+      # @param [String] version
+      #   The WMFSDK version to check for. For example, "9.0", "11.0", "12.0"
+      # @return [true, false] Is this media player compatible with the passed WMFSDK version?
+      def has_wmfsdk?(version)
+        if wmfsdk_version && wmfsdk_version.to_s =~ /\A#{version}/
+          return true
+        else
+          return false
+        end
+      end
+
+      # @return ["Windows Media Player"] All of the user agents we parse are Windows Media Player
+      def browser
+        "Windows Media Player"
+      end
+
+      # @return ["Windows"] All of the user agents we parse are on Windows
+      def platform
+        "Windows"
+      end
+
+      # @return [true, false] Is this Windows Media Player 6.4 (NSPlayer 4.1) or Media Player 6.0 (NSPlayer 3.2)?
+      def classic?
+        version.to_a[0] <= 4
+      end
+
+      # Check if our parsed OS is a mobile OS
+      # 
+      # @return [true, false] Is this a mobile Windows Media Player?
+      def mobile?
+        ["Windows Phone 8", "Windows Phone 8.1"].include?(os)
+      end
+
+      # Parses the Windows Media Player version to figure out the host OS version
+      # 
+      # User agents I have personally found:
+      # 
+      # Windows 95 with Windows Media Player 6.4::
+      #   NSPlayer/4.1.0.3857
+      # 
+      # Windows 98 SE with Windows Media Player 6.01::
+      #   NSPlayer/3.2.0.3564
+      # 
+      # Womdpws 98 SE with Windows Media Player 6.4::
+      #   NSPlayer/4.1.0.3857
+      #   NSPlayer/4.1.0.3925
+      # 
+      # Windows 98 SE with Windows Media Player 7.1::
+      #   NSPlayer/7.1.0.3055
+      # 
+      # Windows 98 SE with Windows Media Player 9.0::
+      #   Windows-Media-Player/9.00.00.2980
+      #   NSPlayer/9.0.0.2980 WMFSDK/9.0
+      # 
+      # Windows 2000 with Windows Media Player 6.4::
+      #   NSPlayer/4.1.0.3938
+      # 
+      # Windows 2000 with Windows Media Player 7.1 (downgraded from WMP9)::
+      #   NSPlayer/9.0.0.3268
+      #   NSPlayer/9.0.0.3268 WMFSDK/9.0
+      #   NSPlayer/9.0.0.3270 WMFSDK/9.0
+      #   NSPlayer/9.0.0.2980
+      # 
+      # Windows 2000 with Windows Media Player 9.0::
+      #   NSPlayer/9.0.0.3270 WMFSDK/9.0
+      #   Windows-Media-Player/9.00.00.3367
+      # 
+      # Windows XP with Windows Media Player 6.4:: 
+      #   NSPlayer/4.1.0.3936
+      # 
+      # Windows XP with Windows Media Player 9::
+      #   NSPlayer/9.0.0.4503
+      #   NSPlayer/9.0.0.4503 WMFSDK/9.0
+      #   Windows-Media-Player/9.00.00.4503
+      # 
+      # Windows XP with Windows Media Player 10::
+      #   NSPlayer/10.0.0.3802
+      #   NSPlayer/10.0.0.3802 WMFSDK/10.0
+      #   Windows-Media-Player/10.00.00.3802
+      # 
+      # Windows XP with Windows Media Player 11::
+      #   NSPlayer/11.0.5721.5262
+      #   NSPlayer/11.0.5721.5262 WMFSDK/11.0
+      #   Windows-Media-Player/11.0.5721.5262
+      # 
+      # Windows Vista with Windows Media Player 11::
+      #   NSPlayer/11.00.6002.18392 WMFSDK/11.00.6002.18392
+      #   NSPlayer/11.0.6002.18005
+      #   NSPlayer/11.0.6002.18049 WMFSDK/11.0
+      #   Windows-Media-Player/11.0.6002.18311
+      # 
+      # Windows 8.1 with Windows Media Player 12::
+      #   NSPlayer/12.00.9600.17031 WMFSDK/12.00.9600.17031
+      # 
+      # Windows 10 with Windows Media Player 12::
+      #   Windows-Media-Player/12.0.9841.0
+      #   NSPlayer/12.00.9841.0000 WMFSDK/12.00.9841.0000
+      # 
+      # Windows Phone 8.1 (Podcasts app)::
+      #   NSPlayer/12.00.9651.0000 WMFSDK/12.00.9651.0000
+      def os
+        # WMP 6.4
+        if classic?
+          case version.to_a[3]
+          when 3564, 3925 then  "Windows 98"
+          when 3857 then        "Windows 9x"
+          when 3936 then        "Windows XP"
+          when 3938 then        "Windows 2000"
+          else "Windows"
+          end
+
+        # WMP 7/7.1
+        elsif version.to_a[0] == 7
+          case version.to_a[3]
+          when 3055 then "Windows 98"
+          else "Windows"
+          end
+
+        # WMP 8 was also known as "Windows Media Player for Windows XP"
+        elsif version.to_a[0] == 8
+          "Windows XP"
+
+        # WMP 9/10
+        elsif version.to_a[0] == 9 || version.to_a[0] == 10
+          case version.to_a[3]
+          when 2980 then              "Windows 98/2000"
+          when 3268, 3367, 3270 then  "Windows 2000"
+          when 3802, 4503 then        "Windows XP"
+          else "Windows"
+          end
+
+        # WMP 11/12
+        elsif version.to_a[0] == 11 || version.to_a[0] == 12
+          case version.to_a[2]
+          when 9841, 9858, 9860,
+               9879 then              "Windows 10"
+          when 9651 then              "Windows Phone 8.1"
+          when 9600 then              "Windows 8.1"
+          when 9200 then              "Windows 8"
+          when 7600, 7601 then        "Windows 7"
+          when 6000, 6001, 6002 then  "Windows Vista"
+          when 5721 then              "Windows XP"
+          else                        "Windows"
+          end
+        else
+          "Windows"
+        end
+      end
+    end
+  end
+end

data/lib/user_agent/operating_systems.rb

@@ -16,10 +16,21 @@ class UserAgent
     }.freeze
 
     def self.normalize_os(os)
-      Windows[os] || normalize_mac_os_x(os) || os
+      Windows[os] || normalize_mac_os_x(os) || normalize_ios(os) || os
     end
 
     private
+      def self.normalize_ios(os)
+        if os =~ /CPU OS\s*([0-9_\.]+)?\slike Mac OS X/
+          if $1.nil?
+            "iOS"
+          else
+            version = $1.gsub('_', '.')
+            "iOS #{version}"
+          end
+        end
+      end
+
       def self.normalize_mac_os_x(os)
         if os =~ /(?:Intel|PPC) Mac OS X\s*([0-9_\.]+)?/
           if $1.nil?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: useragent
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Joshua Peek
@@ -50,12 +50,16 @@ files:
 - README.md
 - lib/user_agent.rb
 - lib/user_agent/browsers.rb
+- lib/user_agent/browsers/apple_core_media.rb
 - lib/user_agent/browsers/base.rb
 - lib/user_agent/browsers/chrome.rb
 - lib/user_agent/browsers/gecko.rb
 - lib/user_agent/browsers/internet_explorer.rb
+- lib/user_agent/browsers/itunes.rb
+- lib/user_agent/browsers/libavformat.rb
 - lib/user_agent/browsers/opera.rb
 - lib/user_agent/browsers/webkit.rb
+- lib/user_agent/browsers/windows_media_player.rb
 - lib/user_agent/comparable.rb
 - lib/user_agent/operating_systems.rb
 - lib/user_agent/version.rb