aua 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 151b1188bb70816f5c6d7fb672f076e2078f6c85
-  data.tar.gz: 444d7b614e154e29215f8d2f040f215611c42bfd
+  metadata.gz: 6689e944b498fc72ad1241de2f9223cb76e8250d
+  data.tar.gz: ad1a27023be7348159a1f551e3f4f58209c414d3
 SHA512:
-  metadata.gz: f01a7678393ff7c60341aec8e265bbad4fad94241df54ef608ddf44c19a8e63e0817bc97ff65cbd33d850a375c7eb5da127c9184050c3f74d8dea2247e2e3627
-  data.tar.gz: e66bd417b312cd54968bc35a38d176d62ac70b1531750b1b652045cb2bbd415f3e8de612b6ed48ce77cc0ec28b2936e93450ab850ba3e97aa56339ee94d74faa
+  metadata.gz: 05d6889cb302b6089f8f8bbecd1150ce0ab8a9a09e2f42d090e42d58145784285a3cbaf50a808d6181a191d99564d2030538962ed1080775c536c8aa922e688e
+  data.tar.gz: d8edad5f3cc8236cce92405b9e5c52761d18e683dbaa8e6a115350cc6eef052574582244f814460c0ae8ee7cc18e0a4b6e21b52b88866059b88202880173c07c

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 rvm:
+  - 2.1.1
   - 2.0.0
-  - 1.9.3
-  - 1.8.7
+  - 1.9.3

data/CHANGES.md

@@ -1,6 +1,12 @@
 ### dev
 
-[full changelog](http://github.com/yolk/aua/compare/v0.2.2...master)
+[full changelog](http://github.com/yolk/aua/compare/v0.2.4...master)
+
+### 0.2.4 / 2015-08-05
+
+[full changelog](http://github.com/yolk/aua/compare/v0.2.3...v0.2.4)
+
+* Added Windows 10 / WindowsPhone 10 / Edge (MSIE 12.0)
 
 ### 0.2.2 / 2012-03-29
 

data/README.md

@@ -1,6 +1,8 @@
 Aua
 =============
 
+[![Gem Version](https://badge.fury.io/rb/aua.png)](http://badge.fury.io/rb/aua) [![Build Status](https://travis-ci.org/yolk/aua.png)](https://travis-ci.org/yolk/aua)
+
 aua = a user agent (parser).
 
 Installation
@@ -12,11 +14,11 @@ Installation
 Basic Usage
 -------
 
-    Aua.parse("Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; de; rv:1.9.2.13) Gecko/20101203 Firefox/3.6.13")
+    Aua.parse("Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:22.0) Gecko/20100101 Firefox/22.0")
 
 BlaBla
 -------
 
-Copyright (c) 2011 Yolk Sebastian Munz & Julia Soergel GbR
+Copyright (c) 2011-2013 Yolk Sebastian Munz & Julia Soergel GbR
 
 Beyond that, the implementation is licensed under the MIT License.

data/aua.gemspec

@@ -8,6 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Sebastian Munz"]
   s.email       = ["sebastian@yo.lk"]
+  s.license     = 'MIT'
   s.homepage    = "https://github.com/yolk/aua"
   s.summary     = %q{aua = a user agent (parser).}
   s.description = %q{aua = a user agent (parser).}
@@ -19,7 +20,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency 'rspec',       '>= 2.4'
+  s.add_development_dependency 'rspec',       '~>2.4'
   s.add_development_dependency 'guard-rspec', '>=3.0'
   s.add_development_dependency 'growl',       '>=1.0'
   s.add_development_dependency 'rb-fsevent',  '>=0.9'

data/lib/aua/agents/chrome.rb

@@ -1,6 +1,6 @@
 module Aua::Agents::Chrome
   def self.extend?(agent)
-    agent.products.include?("Safari") && agent.products.include?("Chrome")
+    agent.products.include?("Safari") && agent.products.include?("Chrome") && !agent.products.include?("Edge")
   end
 
   def type

data/lib/aua/agents/feed_reader.rb

@@ -1,5 +1,5 @@
 module Aua::Agents::FeedReader
-  KNOWN_CLIENTS = %w(hawkReader Fever Superfeedr Feedly Reeder AppleSyndication Netvibes Windows-RSS-Platform Vienna NewsGatorOnline NewsFire NetNewsWire MWFeedParser SimplePie MagpieRSS Feedfetcher-Google Apple-PubSub)
+  KNOWN_CLIENTS = %w(FreeRSSReader FeeddlerRSS FeeddlerPro hawkReader Fever Superfeedr Feedly FeedlyApp Reeder AppleSyndication Netvibes Windows-RSS-Platform Vienna NewsGatorOnline NewsFire NetNewsWire MWFeedParser SimplePie MagpieRSS Feedfetcher-Google Apple-PubSub Feedbin FeedDemon)
 
   def self.extend?(agent)
     KNOWN_CLIENTS.include?(agent.app) ||

data/lib/aua/agents/msie.rb

@@ -1,7 +1,7 @@
 module Aua::Agents::Msie
 
   def self.extend?(agent)
-    agent.app_comments_string =~ PATTERN
+    agent.app_comments_string =~ PATTERN || agent.products[-1] == "Edge"
   end
 
   PATTERN = /(MSIE |Trident\/)([\d.]+)/
@@ -19,8 +19,11 @@ module Aua::Agents::Msie
 
   def version
     @version ||= begin
-      app_comments_string =~ PATTERN
-      $1 == "Trident\/" ? TRIDENT_VERSION_MAP[$2] || $2 : $2
+      if app_comments_string =~ PATTERN
+        $1 == "Trident\/" ? TRIDENT_VERSION_MAP[$2] || $2 : $2
+      else
+        version_of("Edge")
+      end
     end
   end
 end

data/lib/aua/agents/others.rb

@@ -1,5 +1,5 @@
 module Aua::Agents::Others
-  KNOWN_CLIENTS = %w(1PasswordThumbs 1PasswordThumbs1)
+  KNOWN_CLIENTS = %w(1PasswordThumbs 1PasswordThumbs1 Flint)
 
   def self.extend?(agent)
     KNOWN_CLIENTS.include?(agent.app) ||

data/lib/aua/agents/search_bot.rb

@@ -8,7 +8,8 @@ module Aua::Agents::SearchBot
     agent.app_comments[1] == "Yahoo! Slurp" ||
     agent.raw =~ PATTERN_BAIDU ||
     agent.raw =~ PATTERN_GOOGLE ||
-    agent.app == "msnbot"
+    agent.app == "msnbot" ||
+    agent.app == "FLUX-Toolchain"
   end
 
   def type
@@ -21,6 +22,7 @@ module Aua::Agents::SearchBot
       return :YahooSlurp if app_comments[1] == "Yahoo! Slurp"
       return :Baiduspider if raw =~ PATTERN_BAIDU
       return $1 ? :GooglebotMobile : :Googlebot if raw =~ PATTERN_GOOGLE
+      return :DWDSCrawler if app == "FLUX-Toolchain"
       app.to_sym
     end
   end

data/lib/aua/operating_systems/mac.rb

@@ -35,7 +35,21 @@ module Aua::OperatingSystems::Mac
     '10.4.0' => '10.6.4',
     '10.4.1' => '10.6.4',
     '10.5.0' => '10.6.5',
-    '10.6.0' => '10.6.6'
+    '10.6.0' => '10.6.6',
+    '10.7.0' => '10.6.7',
+    '10.8.0' => '10.6.8',
+
+    '11.0' => '10.7',
+    '11.0.0' => '10.7',
+    '11.4.2' => '10.7.5',
+
+    '12.0' => '10.8',
+    '12.0.0' => '10.8',
+    '12.5' => '10.8.5',
+    '12.5.0' => '10.8.5',
+
+    '13.0' => '10.9',
+    '13.0.0' => '10.9.0'
   }
 
   def platform

data/lib/aua/operating_systems/windows.rb

@@ -7,6 +7,8 @@ module Aua::OperatingSystems::Windows
   end
 
   VERSIONS = {
+    "10.0"    => "10",
+    "NT 10.0" => "10",
     "NT 6.3"  => "8.1",
     "NT 6.2"  => "8",
     "NT 6.1"  => "7",
@@ -22,17 +24,24 @@ module Aua::OperatingSystems::Windows
     "9x 4.90" => "ME"
   }
 
-  PATTERN = /Win(dows)?\s?([\d\sA-Zx\.]+)/
+  PATTERN = /Win(dows)?(\sPhone)?\s?([\d\sA-Zx\.]+)/
+  PHONE_PATTERN = /Windows Phone/
 
   def platform
     :Windows
   end
 
   def os_name
-    :Windows
+    @os_name ||= windows_phone? ? :WindowsPhone : :Windows
   end
 
   def os_version
-    @os_version ||= comments_string =~ PATTERN && VERSIONS[$2] || $2
+    @os_version ||= comments_string =~ PATTERN && VERSIONS[$3] || $3
+  end
+
+  private
+
+  def windows_phone?
+    !!(comments_string =~ PHONE_PATTERN)
   end
 end

data/lib/aua/version.rb

@@ -1,3 +1,3 @@
 class Aua
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/spec/aua_spec.rb

@@ -15,7 +15,7 @@ describe Aua do
       mspr = ((sec/runs*1_000/EXAMPLES.size)*10_000).to_i/10_000.0
       puts "#{sec} sec #{mspr} ms/string #{(EXAMPLES.size*runs/sec).to_i} strings/sec"
       mspr.should < 0.2
-    end
+    end unless ENV["TRAVIS"]
 
     context "when parsing blank string" do
       let(:user_agent) { Aua.parse("") }
@@ -215,6 +215,10 @@ describe Aua do
         { :type => :Browser, :name => :OperaMobile, :version => "10.1", :os_name => :Linux, :os_version => "Maemo", :platform => :X11 },
 
       # MSIE
+      "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.71 Safari/537.36 Edge/12.0" =>
+        { :type => :Browser, :name => :MSIE, :version => "12.0", :os_name => :Windows, :os_version => "10", :platform => :Windows },
+      "Mozilla/5.0 (Windows Phone 10.0; Android 4.2.1; DEVICE INFO) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.71 Mobile Safari/537.36 Edge/12.0" =>
+        { :type => :Browser, :name => :MSIE, :version => "12.0", :os_name => :WindowsPhone, :os_version => "10", :platform => :Windows },
       "Mozilla/5.0 (Windows NT 6.3; Trident/7.0; rv 11.0) like Gecko" =>
         { :type => :Browser, :name => :MSIE, :version => "11.0", :os_name => :Windows, :os_version => "8.1", :platform => :Windows },
       "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; WOW64; Trident/6.0)" =>
@@ -349,6 +353,8 @@ describe Aua do
         { :type => :Others, :name => :MSWord, :version => "12.25.0", :os_name => :MacOSX, :os_version => nil, :platform => :Macintosh },
       "Microsoft Office/14.0 (Windows NT 6.1; Microsoft Outlook 14.0.5128; Pro; ms-office; MSOffice 14)" =>
         { :type => :Others, :name => :MSOffice, :version => "14.0", :os_name => :Windows, :os_version => "7", :platform => :Windows },
+      "Flint/165 CFNetwork/520.5.1 Darwin/11.4.2 (x86_64) (MacBookPro10%2C1)" =>
+        { :type => :Others, :name => :"Flint", :version => "165", :os_name => :MacOSX, :os_version => "10.7.5", :platform => :Macintosh },
 
       # HttpCheckers
       "check_http/v2053 (nagios-plugins 1.4.13)" =>
@@ -371,12 +377,22 @@ describe Aua do
         { :type => :FeedReader, :name => :Superfeedr, :version => "2.0", :os_name => nil, :os_version => nil, :platform => nil  },
       "Feedly/1.0 (+http://www.feedly.com/fetcher.html; like FeedFetcher-Google)" =>
         { :type => :FeedReader, :name => :Feedly, :version => "1.0", :os_name => nil, :os_version => nil, :platform => nil },
+      "FeedlyApp/1.0 (http://www.feedly.com)" =>
+        { :type => :FeedReader, :name => :FeedlyApp, :version => "1.0", :os_name => nil, :os_version => nil, :platform => nil },
+      "Feedbin" =>
+        { :type => :FeedReader, :name => :Feedbin, :version => nil, :os_name => nil, :os_version => nil, :platform => nil },
+      "Feedbin - 1 subscribers" =>
+        { :type => :FeedReader, :name => :Feedbin, :version => nil, :os_name => nil, :os_version => nil, :platform => nil },
       "Windows-RSS-Platform/2.0 (MSIE 9.0; Windows NT 6.1)" =>
         { :type => :FeedReader, :name => :"Windows-RSS-Platform", :version => "2.0", :os_name => :Windows, :os_version => "7", :platform => :Windows },
       "Vienna/2.5.0.2501" =>
         { :type => :FeedReader, :name => :Vienna, :version => "2.5.0.2501", :os_name => nil, :os_version => nil, :platform => nil },
       "NewsGatorOnline/2.0 (http://www.newsgator.com; 1 subscribers)" =>
         { :type => :FeedReader, :name => :NewsGatorOnline, :version => "2.0", :os_name => nil, :os_version => nil, :platform => nil },
+      "FeedDemon/2.7 (http://www.newsgator.com/; Microsoft Windows XP)" =>
+        { :type => :FeedReader, :name => :FeedDemon, :version => "2.7", :os_name => :Windows, :os_version => "XP", :platform => :Windows },
+      "FeedDemon/4.0 (http://www.feeddemon.com/; Microsoft Windows XP)" =>
+        { :type => :FeedReader, :name => :FeedDemon, :version => "4.0", :os_name => :Windows, :os_version => "XP", :platform => :Windows },
       "NewsFire/84 CFNetwork/454.11.5 Darwin/10.4.1 (i386) (iMac11%2C3)" =>
         { :type => :FeedReader, :name => :NewsFire, :version => "84", :os_name => :MacOSX, :os_version => "10.6.4", :platform => :Macintosh },
       "NetNewsWire/3.2b24 (Mac OS X; http://www.newsgator.com/Individuals/NetNewsWire/)" =>
@@ -401,6 +417,12 @@ describe Aua do
         { :type => :FeedReader, :name => :TumblrRSSSyndication, :version => "1.0", :os_name => nil, :os_version => nil, :platform => nil },
       "Reeder/1010.69.00 CFNetwork/520.3.2 Darwin/11.3.0 (x86_64) (MacBookPro6%2C2)" =>
         { :type => :FeedReader, :name => :Reeder, :version => "1010.69.00", :os_name => :Darwin, :os_version => "11.3.0", :platform => :Darwin },
+      "FeeddlerPro 1.12.5 (iPad; iPhone OS 6.1.3; de_DE)" =>
+        { :type => :FeedReader, :name => :FeeddlerPro, :version => nil, :os_name => nil, :os_version => nil, :platform => nil },
+      "FeeddlerRSS 1.12.5 (iPad; iPhone OS 6.1.3; de_DE)" =>
+        { :type => :FeedReader, :name => :FeeddlerRSS, :version => nil, :os_name => nil, :os_version => nil, :platform => nil },
+      "FreeRSSReader/1.9.5 CFNetwork/672.0.2 Darwin/14.0.0" =>
+        { :type => :FeedReader, :name => :FreeRSSReader, :version => "1.9.5", :os_name => :Darwin, :os_version => "14.0.0", :platform => :Darwin },
 
       # SearchBots
       "Mozilla/5.0 (compatible; bingbot/2.0; +http://www.bing.com/bingbot.htm)" =>
@@ -419,6 +441,8 @@ describe Aua do
         { :type => :SearchBot, :name => :Googlebot, :version => "2.1", :os_name => nil, :os_version => nil, :platform => nil },
       "DoCoMo/2.0 N905i(c100;TB;W24H16) (compatible; Googlebot-Mobile/2.1; +http://www.google.com/bot.html)" =>
         { :type => :SearchBot, :name => :GooglebotMobile, :version => "2.1", :os_name => nil, :os_version => nil, :platform => nil },
+      "FLUX-Toolchain/0.5 +http://odo.dwds.de/dwds-crawler.html" =>
+        { :type => :SearchBot, :name => :DWDSCrawler, :version => nil, :os_name => nil, :os_version => nil, :platform => nil },
 
       # Engine Fallbacks
       "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_6; en-au) AppleWebKit/533.19.4 (KHTML, like Gecko)" =>

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: aua
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Sebastian Munz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-18 00:00:00.000000000 Z
+date: 2015-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: growl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
 description: aua = a user agent (parser).
@@ -73,8 +73,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - Guardfile
@@ -110,7 +110,8 @@ files:
 - spec/aua_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/yolk/aua
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -118,17 +119,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: aua
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: aua = a user agent (parser).