useragent_parser 0.2.1 → 0.2.2

data/config/regexes.yaml

@@ -183,6 +183,10 @@ user_agent_parsers:
   - regex: '(Outlook-Express)/(\d+)\.(\d+)'
     family_replacement: 'Windows Live Mail'
 
+  # Android Mobile Safari
+  - regex: '(Version)\/(\d+)\.(\d+) Mobile Safari\/\d+'
+    family_replacement: 'Mobile Safari'
+
   #### END SPECIAL CASES TOP ####
 
   #### MAIN CASES - this catches > 50% of all browsers ####
@@ -403,19 +407,19 @@ os_parsers:
   - regex: '(XBLWP7)'
     os_replacement: 'Windows Phone OS'
 
-  - regex: '(Windows NT 6\.1)'
+  - regex: '(Windows NT) (6)\.(1)'
     os_replacement: 'Windows 7'
 
-  - regex: '(Windows NT 6\.0)'
+  - regex: '(Windows NT) (6)\.(0)'
     os_replacement: 'Windows Vista'
 
   - regex: '(Windows 98|Windows XP|Windows ME|Windows 95|Windows CE|Windows 7|Windows NT 4\.0|Windows Vista|Windows 2000)'
 
   # is this a spoof or is nt 6.2 out and about in some capacity?
-  - regex: '(Windows NT 6\.2)'
+  - regex: '(Windows NT) (6)\.(2)'
     os_replacement: 'Windows 8'
 
-  - regex: '(Windows NT 5\.0)'
+  - regex: '(Windows NT) (5)\.(0)'
     os_replacement: 'Windows 2000'
 
   - regex: '(Windows Phone OS) (\d+)\.(\d+)'
@@ -423,7 +427,7 @@ os_parsers:
   - regex: '(Windows ?Mobile)'
     os_replacement: 'Windows Mobile'
 
-  - regex: '(WinNT4.0)'
+  - regex: '(WinNT)(4)\.(0)'
     os_replacement: 'Windows NT 4.0'
 
   - regex: '(Win98)'
@@ -876,6 +880,9 @@ referrer_parsers:
   - regex: '(mail\.yahoo\.net)'
     referrer_replacement: 'Yahoo! Mail'
 
+  - regex: '(mm\.web\.de)'
+    referrer_replacement: 'WEB.DE'
+
   - regex: '(email\.freenet\.de)'
     referrer_replacement: 'WEB.DE'
 

data/lib/useragent_parser/user_agent.rb

@@ -46,14 +46,30 @@ module UseragentParser
       @browser_version ||= "#{browser_major_version}.#{browser_minor_version}.#{browser_patch_version}".gsub(/\.+$/, '').strip
     end
 
-    def os_version
-      @os_version ||= "#{os_major_version}.#{os_minor_version}.#{os_patch_version}".gsub(/\.+$/, '').strip
+    def os_version(options = {})
+      return @os_family if os_platform == 'Windows'
+      if options.fetch(:minor_only, false)
+        @os_release ||= os_release
+      else
+        @os_version ||= "#{os_major_version}.#{os_minor_version}.#{os_patch_version}".gsub(/\.+$/, '').strip
+      end
     end
 
     def os
       @os ||= os_name
     end
 
+    def os_family
+      @os_platform ||= os_platform
+    end
+
+    def os_family_aggregated
+      case os_family
+      when 'Windows', 'Windows NT' then 'Windows'
+      else os_family
+      end
+    end
+
     def browser
       @browser ||= browser_name
     end
@@ -131,7 +147,7 @@ module UseragentParser
       return ios_mail_names if is_ios_mail?
       return outlook_names if is_outlook?
       return 'AOL Desktop' if @browser_family == 'AOL'
-      email_name
+      nil
     end
 
     def apple_mail_names
@@ -147,7 +163,16 @@ module UseragentParser
     end
 
     def ios_mail_names
-      @device
+      prefix = "Apple Mobile Mail"
+      case @os_major_version
+      when '1' then "#{prefix} 1"
+      when '2' then "#{prefix} 2"
+      when '3' then "#{prefix} 3"
+      when '4' then "#{prefix} 4"
+      when '5' then "#{prefix} 5"
+      when '6' then "#{prefix} 6"
+      else "#{prefix}"
+      end
     end
 
     def outlook_names
@@ -165,6 +190,15 @@ module UseragentParser
     end
 
     def os_name
+      case os_platform
+      when 'Windows' then os_names_win_prefixed
+      when 'Windows NT' then os_names_winnt_prefixed
+      when 'Mac OS X' then os_names_osx_prefixed
+      else "#{os_family} #{os_version}".strip
+      end
+    end
+
+    def os_name_unprefixed
       case os_family
       when 'Windows' then os_names_win
       when 'Windows NT' then os_names_winnt
@@ -173,42 +207,63 @@ module UseragentParser
       end
     end
 
+    def os_platform
+      case @os_family
+      when 'Windows 98', 'Windows XP', 'Windows ME', 'Windows 95', 'Windows NT 4.0', 'Windows Vista', 'Windows 2000', 'Windows 7', 'Windows 8' then 'Windows'
+      else @os_family
+      end
+    end
+
     def os_release
       @release ||= "#{os_major_version}.#{os_minor_version}".gsub(/\.$/, '')
     end
 
+    def os_names_win_prefixed
+      "Microsoft #{@os_family} #{os_release}"
+    end
+
     def os_names_win
-      "Microsoft Windows #{os_version}"
+      require 'pp'
+      pp self
+      pp 'HERE!'
+
+      os_version
+    end
+
+    def os_names_winnt_prefixed
+      "Microsoft Windows #{os_names_winnt}"
     end
 
     def os_names_winnt
-      prefix = "Microsoft Windows"
       case os_release
-      when "3.1" then "#{prefix} NT 3.1"
-      when "3.5" then "#{prefix} NT 3.5"
-      when "4.0" then "#{prefix} NT 4.0"
-      when "5.0" then "#{prefix} 2000"
-      when "5.1" then "#{prefix} XP"
-      when "5.2" then "#{prefix} XP 64bit / Server 2003"
-      when "6.0" then "#{prefix} Vista / Server 2008"
-      when "6.1" then "#{prefix} 7 / Server 2008 R2"
-      when "6.2" then "#{prefix} 8"
-      else "#{prefix} #{os_version}"
+      when "3.1" then "NT 3.1"
+      when "3.5" then "NT 3.5"
+      when "4.0" then "NT 4.0"
+      when "5.0" then "2000"
+      when "5.1" then "XP"
+      when "5.2" then "XP 64bit / Server 2003"
+      when "6.0" then "Vista / Server 2008"
+      when "6.1" then "7 / Server 2008 R2"
+      when "6.2" then "8"
+      else "NT #{os_release}"
       end
     end
 
+    def os_names_osx_prefixed
+      "Apple Mac OS X #{os_version} (#{os_names_osx})"
+    end
+
     def os_names_osx
-      prefix = "Apple Mac OS X"
       case os_release
-      when "10.0" then "#{prefix} #{os_version} (Cheetah)"
-      when "10.1" then "#{prefix} #{os_version} (Puma)"
-      when "10.2" then "#{prefix} #{os_version} (Jaguar)"
-      when "10.3" then "#{prefix} #{os_version} (Panther)"
-      when "10.4" then "#{prefix} #{os_version} (Tiger)"
-      when "10.5" then "#{prefix} #{os_version} (Leopard)"
-      when "10.6" then "#{prefix} #{os_version} (Snow Leopard)"
-      when "10.7" then "#{prefix} #{os_version} (Lion)"
-      else "#{prefix} #{os_version}"
+      when "10.0" then "Cheetah"
+      when "10.1" then "Puma"
+      when "10.2" then "Jaguar"
+      when "10.3" then "Panther"
+      when "10.4" then "Tiger"
+      when "10.5" then "Leopard"
+      when "10.6" then "Snow Leopard"
+      when "10.7" then "Lion"
+      else "Unknown"
       end
     end
   end

data/lib/useragent_parser/version.rb

@@ -1,3 +1,3 @@
 module UseragentParser
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/fixtures/test_referrers.yaml

@@ -42,5 +42,8 @@ test_cases:
   - referrer_string: 'http://www.example.com'
     family: 'Other'
 
+  - referrer_string: 'https://mm.web.de/msg?6&folderId=1269567206893714944&index=3'
+    family: 'WEB.DE'
+
   - referrer_string: ''
     family:

data/spec/fixtures/test_user_agent_parser.yaml

@@ -388,3 +388,9 @@ test_cases:
     minor: '0'
     patch:
 
+  - user_agent_string: 'Mozilla/5.0 (Linux; U; Android 2.3.5; de-de; HTC Desire HD A9191 Build/GRJ90) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1'
+    family: 'Mobile Safari'
+    major: '4'
+    minor: '0'
+    patch:
+

data/spec/fixtures/test_user_agent_parser_os.yaml

@@ -30,8 +30,8 @@ test_cases:
 
   - user_agent_string: 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.17) Gecko/20110414 Thunderbird/3.1.10 ThunderBrowse/3.3.5'
     family: 'Windows 7'
-    major:
-    minor:
+    major: '6'
+    minor: '1'
     patch:
     patch_minor:
 
@@ -93,8 +93,8 @@ test_cases:
 
   - user_agent_string: 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/534+ (KHTML, like Gecko) FireWeb/1.0.0.0'
     family: 'Windows 7'
-    major:
-    minor:
+    major: '6'
+    minor: '1'
     patch:
     patch_minor:
 
@@ -227,8 +227,8 @@ test_cases:
 
   - user_agent_string: 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.3a1) Gecko/20100208 MozillaDeveloperPreview/3.7a1 (.NET CLR 3.5.30729)'
     family: 'Windows 7'
-    major:
-    minor:
+    major: '6'
+    minor: '1'
     patch:
     patch_minor:
 
@@ -315,8 +315,8 @@ test_cases:
   - user_agent_string: 'Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0; Trident/4.0; chromeframe; SLCC1; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729)'
     js_ua: "{'js_user_agent_string': 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US) AppleWebKit/530.1 (KHTML, like Gecko) Chrome/2.0.169.1 Safari/530.1'}"
     family: 'Windows Vista'
-    major:
-    minor:
+    major: '6'
+    minor: '0'
     patch:
     patch_minor:
 

data/spec/user_agent_spec.rb

@@ -144,26 +144,34 @@ describe UseragentParser::UserAgent do
     end
 
     describe "Apple Mobile Mail" do
-      it "should recognize an iPad" do
-        UseragentParser.parse_with_referrer('Mozilla/5.0 (iPad; U; CPU OS 3_2_2 like Mac OS X; de-de) AppleWebKit/531.21.10 (KHTML, like Gecko)').email_version.should == 'iPad'
+      it "should recognize iOS 2" do
+        UseragentParser.parse_with_referrer('Mozilla/5.0 (iPhone; U; CPU iPhone OS 2_1 like Mac OS X; de-de) AppleWebKit/525.18.1 (KHTML, like Gecko)').email_version.should == 'Apple Mobile Mail 2'
       end
 
-      it "should recognize an iPod" do
-        UseragentParser.parse_with_referrer('Mozilla/5.0 (iPod; U; CPU iPhone OS 4_0 like Mac OS X; de-de) AppleWebKit/532.9 (KHTML, like Gecko)').email_version.should == 'iPod'
+      it "should recognize iOS 3" do
+        UseragentParser.parse_with_referrer('Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_1_3 like Mac OS X; de-de) AppleWebKit/528.18 (KHTML, like Gecko)').email_version.should == 'Apple Mobile Mail 3'
       end
 
-      it "should recognize an iPhone" do
-        UseragentParser.parse_with_referrer('Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0_1 like Mac OS X; de-de) AppleWebKit/532.9 (KHTML, like Gecko)').email_version.should == 'iPhone'
+      it "should recognize iOS 4" do
+        UseragentParser.parse_with_referrer('Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_2_1 like Mac OS X; de-de) AppleWebKit/533.17.9 (KHTML, like Gecko)').email_version.should == 'Apple Mobile Mail 4'
+      end
+
+      it "should recognize iOS 5" do
+        UseragentParser.parse_with_referrer('Mozilla/5.0 (iPad; CPU OS 5_1_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko)').email_version.should == 'Apple Mobile Mail 5'
+      end
+
+      it "should recognize iOS 2" do
+        UseragentParser.parse_with_referrer('Mozilla/5.0 (iPad; CPU OS 6_0 like Mac OS X) AppleWebKit/535.8 (KHTML, like Gecko)').email_version.should == 'Apple Mobile Mail 6'
       end
 
       it "should not mistake Mobile Safari for Apple Mail" do
-        # TODO
+        UseragentParser.parse_with_referrer('Mozilla/5.0 (iPad; CPU OS 6_0 like Mac OS X) AppleWebKit/535.8 (KHTML, like Gecko)', 'http://example.com').email_version.should be_nil
       end
     end
 
     describe "AOL" do
       it "should recognize the Webmail interface" do
-        UseragentParser.parse_with_referrer('Mozilla/5.0 (Windows; U; Windows NT 6.1; de; rv:1.9.2.13) Gecko/20101203 AskTbFXTV5/3.9.1.14019 Firefox/3.6.13', 'http://mail.aol.com/33222-111/aol-1/de-de/Lite/MsgRead.aspx?folder=Spam&uid=1.28305313&seq=0&searchIn=none&searchQuery=&start=0&sort=received').email_version.should == 'AOL Webmail'
+        UseragentParser.parse_with_referrer('Mozilla/5.0 (Windows; U; Windows NT 6.1; de; rv:1.9.2.13) Gecko/20101203 AskTbFXTV5/3.9.1.14019 Firefox/3.6.13', 'http://mail.aol.com/33222-111/aol-1/de-de/Lite/MsgRead.aspx?folder=Spam&uid=1.28305313&seq=0&searchIn=none&searchQuery=&start=0&sort=received').email.should == 'AOL Webmail'
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: useragent_parser
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors: