aua 0.2.2 → 0.2.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 151b1188bb70816f5c6d7fb672f076e2078f6c85
+  data.tar.gz: 444d7b614e154e29215f8d2f040f215611c42bfd
+SHA512:
+  metadata.gz: f01a7678393ff7c60341aec8e265bbad4fad94241df54ef608ddf44c19a8e63e0817bc97ff65cbd33d850a375c7eb5da127c9184050c3f74d8dea2247e2e3627
+  data.tar.gz: e66bd417b312cd54968bc35a38d176d62ac70b1531750b1b652045cb2bbd415f3e8de612b6ed48ce77cc0ec28b2936e93450ab850ba3e97aa56339ee94d74faa

data/.gitignore

@@ -1,3 +1,6 @@
 pkg/*
 *.gem
 .bundle
+.ruby-version
+Gemfile.lock
+tmp/*

data/.travis.yml

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

data/Gemfile

@@ -2,3 +2,5 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in aua.gemspec
 gemspec
+
+gem "rake"

data/Guardfile

@@ -1,4 +1,4 @@
-guard 'rspec', :version => 2 do
+guard 'rspec' do
   watch(/^spec\/(.*)_spec\.rb/)   { "spec" }
   watch(/^lib\/(.*)\.rb/)         { "spec" } # { |m| "spec/#{m[1]}_spec.rb" }
   watch(/^spec\/spec_helper\.rb/) { "spec" }

data/aua.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  
-  s.add_development_dependency 'rspec',       '>= 2.4.0'
-  s.add_development_dependency 'guard-rspec', '>=0.1.9'
-  s.add_development_dependency 'growl',       '>=1.0.3'
-  s.add_development_dependency 'rb-fsevent',  '>=0.3.9'
+
+  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'
 end

data/lib/aua.rb

@@ -9,11 +9,11 @@ class Aua
     @raw = string.to_s
     parse
   end
-  
+
   def self.parse(raw)
     new(raw)
   end
-  
+
   def parse
     string = @raw.dup
     @parts = []
@@ -21,13 +21,13 @@ class Aua
       @parts << [m[1] ? m[1].sub(/;$/,"") : m[1], m[2], m[4] ? m[4].split(/\s?;\s?/) : []]
       string = string.sub(m[0], '').strip
     end
-    
+
     Aua::Agents.extend_agent(self)
     Aua::OperatingSystems.extend_agent(self)
   end
 
   attr_reader :version, :os_name, :os_version, :parts, :raw, :platform
-  
+
   def name
     @name unless unknown?
     if simple?
@@ -36,25 +36,25 @@ class Aua
       raw
     end
   end
-  
+
   def type
     @type || :Unknown
   end
-  
+
   def version
     @version ||= name ? version_of(name) : nil
   end
-  
+
   MAJOR_VERSION = /^([\d]+)\.([\d]+[a-z]*)/
-  
+
   def major_version
     @major_version ||= (version || "") =~ MAJOR_VERSION ? "#{$1}.#{$2}" : version
   end
-  
+
   def os_major_version
     @os_major_version ||= (os_version || "") =~ MAJOR_VERSION ? "#{$1}.#{$2}" : os_version
   end
-  
+
   def products
     @products ||= parts.map{|p| p[0] }
   end
@@ -62,7 +62,7 @@ class Aua
   def versions
     @versions ||= parts.map{|p| p[1] != "" ? p[1] : nil }
   end
-  
+
   def app
     products[0]
   end
@@ -70,15 +70,15 @@ class Aua
   def comments
     @comments ||= parts.map{|p| p[2] }
   end
-  
+
   def app_comments
     @app_comments ||= (comments.first || []) + [""]*5
   end
-  
+
   def app_comments_string
     @app_comments_string ||= (comments.first || []).join(";")
   end
-  
+
   def comments_string
     @comments_string ||= comments.flatten.join(";")
   end
@@ -95,15 +95,15 @@ class Aua
   def os_string
     @os_string ||= comments.first && comments.first[2]
   end
-  
+
   def unknown?
     type == :Unknown
   end
-  
+
   def simple?
     products.size == 1 && versions.size <= 1 && comments == [[]]
   end
-  
+
   def to_s
     return "Unknown: #{raw}#{" (simple)" if simple?}" if unknown?
     "#{type} #{name}/#{version} #{os_name}/#{os_version} #{platform}"

data/lib/aua/agents.rb

@@ -4,13 +4,13 @@ class Aua
   module Agents
     extend StackBase
     extend self
-     
+
     def default
       @default ||= [HttpChecker, ApiClients, FeedReader, Firefox, Chrome::Frame, Chrome, Safari, Opera, Msie, SearchBot, Konqueror, Others, EngineFallback, OtherBrowsers]
     end
   end
 end
 
-Dir["#{File.dirname(__FILE__)}/agents/*.rb"].each do |agent| 
+Dir["#{File.dirname(__FILE__)}/agents/*.rb"].each do |agent|
   require(agent)
 end

data/lib/aua/agents/api_clients.rb

@@ -1,21 +1,21 @@
 module Aua::Agents::ApiClients
   KNOWN_CLIENTS = %w(facebookexternalhit Wget curl Zend_Http_Client Zendesk Python-httplib2 Python-urllib Ruby PEAR HTTP_Request2 NativeHost Java AppEngine-Google Twisted)
-  
+
   def self.extend?(agent)
     KNOWN_CLIENTS.include?(agent.app) ||
     agent.raw =~ PATTERN_YAHOO_PIPES ||
     agent.app =~ PATTERN_GERMAN_SYSTEM_PREFS ||
     agent.app =~ PATTERN_SYSTEM_UI_SEVER
   end
-  
+
   PATTERN_YAHOO_PIPES         = /^Yahoo Pipes ([\d\.]+)$/
   PATTERN_GERMAN_SYSTEM_PREFS = /^Systemeinstellungen/
   PATTERN_SYSTEM_UI_SEVER     = /^SystemUIServer/
-  
+
   def type
     :ApiClient
   end
-  
+
   def name
     @name ||= begin
       if raw =~ PATTERN_YAHOO_PIPES
@@ -35,12 +35,12 @@ module Aua::Agents::ApiClients
       end
     end
   end
-  
+
   def version
     @version ||= begin
       return $1 if raw =~ /^Yahoo Pipes ([\d\.]+)$/
       return comments.first[1] if name == :"AppEngine-Google" && comments.first[1]
-      versions.first 
+      versions.first
     end
   end
 end

data/lib/aua/agents/chrome.rb

@@ -2,11 +2,11 @@ module Aua::Agents::Chrome
   def self.extend?(agent)
     agent.products.include?("Safari") && agent.products.include?("Chrome")
   end
-  
+
   def type
     :Browser
   end
-  
+
   def name
     @name ||= begin
       return :Iron if products.include?("Iron")
@@ -14,7 +14,7 @@ module Aua::Agents::Chrome
       :Chrome
     end
   end
-  
+
   module Frame
     def self.extend?(agent)
       agent.products.include?("chromeframe")

data/lib/aua/agents/engine_fallback.rb

@@ -4,11 +4,11 @@ module Aua::Agents::EngineFallback
     (agent.products.include?("AppleWebKit") ||
     agent.products.include?("Gecko"))
   end
-  
+
   def type
     :Browser
   end
-  
+
   def name
     @name ||= begin
       return :AppleWebKit if products.include?("AppleWebKit")

data/lib/aua/agents/feed_reader.rb

@@ -1,21 +1,21 @@
 module Aua::Agents::FeedReader
-  KNOWN_CLIENTS = %w(Reeder AppleSyndication Netvibes Windows-RSS-Platform Vienna NewsGatorOnline NewsFire NetNewsWire MWFeedParser SimplePie MagpieRSS Feedfetcher-Google Apple-PubSub)
-  
+  KNOWN_CLIENTS = %w(hawkReader Fever Superfeedr Feedly Reeder AppleSyndication Netvibes Windows-RSS-Platform Vienna NewsGatorOnline NewsFire NetNewsWire MWFeedParser SimplePie MagpieRSS Feedfetcher-Google Apple-PubSub)
+
   def self.extend?(agent)
     KNOWN_CLIENTS.include?(agent.app) ||
     (agent.app == "Tumblr" && agent.products.include?("RSS") && agent.products.include?("syndication"))
   end
-  
+
   def type
     :FeedReader
   end
-  
+
   def name
     return :TumblrRSSSyndication if app == "Tumblr"
     app.to_sym
   end
-  
+
   def version
-    @version ||= versions.first 
+    @version ||= versions[0] || versions[1]
   end
 end

data/lib/aua/agents/firefox.rb

@@ -1,14 +1,14 @@
 module Aua::Agents::Firefox
   PATTERN =  /^(Firefox|(p|P)rism|SeaMonkey|Camino|Iceweasel|Thunderbird|Epiphany|Namoroka|Flock|Navigator|Netscape)/
-  
+
   def self.extend?(agent)
     agent.products.find{|product| product =~ PATTERN}
   end
-  
+
   def type
     :Browser
   end
-  
+
   def name
     @name ||= begin
       if products.include?("Prism")  || products.include?("prism")
@@ -28,7 +28,7 @@ module Aua::Agents::Firefox
       :Firefox
     end
   end
-  
+
   def version
     @version ||= begin
       return version_of("Namoroka") if products.include?("Namoroka")

data/lib/aua/agents/http_checker.rb

@@ -1,16 +1,16 @@
 module Aua::Agents::HttpChecker
   KNOWN_CLIENTS = %w(check_http NewRelicPinger W3C_Validator FeedValidator)
-  
+
   def self.extend?(agent)
     agent.app &&
     (KNOWN_CLIENTS.include?(agent.app) ||
     agent.app =~ /Pingdom\.com_bot_version_/)
   end
-  
+
   def type
     :HttpChecker
   end
-  
+
   def name
     @name ||= begin
       return :PingdomBot if app =~ /Pingdom\.com_bot_version_([\d\.]+)/
@@ -18,11 +18,11 @@ module Aua::Agents::HttpChecker
       app.to_sym
     end
   end
-  
+
   def version
     @version ||= begin
       return $1 if app =~ /Pingdom\.com_bot_version_([\d\.]+)/
-      versions.first 
+      versions.first
     end
   end
 end

data/lib/aua/agents/konqueror.rb

@@ -3,17 +3,17 @@ module Aua::Agents::Konqueror
     agent.products.include?("KHTML") &&
     agent.app_comments[1] =~ PATTERN
   end
-  
+
   PATTERN = /Konqueror\/([\d\.]+)/
-  
+
   def type
     :Browser
   end
-  
+
   def name
     @name ||= :Konqueror
   end
-  
+
   def version
     @version ||= app_comments[1] =~ PATTERN && $1
   end

data/lib/aua/agents/msie.rb

@@ -1,23 +1,26 @@
 module Aua::Agents::Msie
-  
+
   def self.extend?(agent)
     agent.app_comments_string =~ PATTERN
   end
-  
-  PATTERN = /MSIE ([\d.]+)/
-  
+
+  PATTERN = /(MSIE |Trident\/)([\d.]+)/
+  TRIDENT_VERSION_MAP = {
+    "7.0" => "11.0"
+  }
+
   def type
     :Browser
   end
-  
+
   def name
     :MSIE
   end
-  
+
   def version
     @version ||= begin
       app_comments_string =~ PATTERN
-      $1
+      $1 == "Trident\/" ? TRIDENT_VERSION_MAP[$2] || $2 : $2
     end
   end
 end

data/lib/aua/agents/opera.rb

@@ -2,15 +2,15 @@ module Aua::Agents::Opera
   def self.extend?(agent)
     agent.products.include?("Opera")
   end
-  
+
   PATTERN = /Opera ([\d.]+)/
   PATTERN_MINI = /Opera Mini\/([\d.]+)/
   PATTERN_MOBILE = /Opera Mobi\//
-  
+
   def type
     :Browser
   end
-  
+
   def name
     @name ||= begin
       return :OperaMobile if app_comments_string =~ PATTERN_MOBILE
@@ -18,7 +18,7 @@ module Aua::Agents::Opera
       :Opera
     end
   end
-  
+
   def version
     @version ||= begin
       return $1 if app_comments[1] =~ PATTERN_MINI

data/lib/aua/agents/other_browsers.rb

@@ -1,14 +1,14 @@
 module Aua::Agents::OtherBrowsers
   KNOWN_CLIENTS = %w(Raven)
-  
+
   def self.extend?(agent)
     KNOWN_CLIENTS.include?(agent.app)
   end
-  
+
   def type
     :Browser
   end
-  
+
   def name
     products[0].to_sym
   end