aua 0.2.5 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5f0331d20167670922477dea635073e93cde5963
-  data.tar.gz: add2fdf9d9a138c4d3392ef8b93b6b5039e81b49
+SHA256:
+  metadata.gz: 33204404b125f9d2e59019fb1526b6ce535c7c8636a112d78d18b9a4d64daf37
+  data.tar.gz: d41eae4a2a53c1acdb0a309f7dc4b4b084dcd1e7109a685a1dee6bade847014f
 SHA512:
-  metadata.gz: 81e291279385ab2fbd0e55d9c44b0e023656ae60bcd564249b03157a8121f7f28e7935473cd4c15b0dfbff1634fea0e5918dc6d7412a763db1dd51e6aa8dc86a
-  data.tar.gz: 7f153e8e0751c762fb96a4cc9d1de0cbdc9e5b5f73faeb4bcb8940cfbbac1727bfc71bd20c7059a0edd834795ad39ded7840eb67bef895597bcb496471c0f6aa
+  metadata.gz: 8466a797c13044f64e21cb1f39a646a4fa1a1fe0bd116b31630760d21f13cd5fe92fb89803490ecc149e6a6d4e63e35a4c04577b5ae7e8eb88229e9923cd306d
+  data.tar.gz: 395b4ad416c5801e02c1b21a1af2b9ca3fa4c43a272752c0b1c43b1f58067eaee27731397608b666df26cb89d925a45d28b905d7bc349290c41d2688c8ba7cea

data/CHANGES.md

@@ -1,6 +1,13 @@
 ### dev
 
-[full changelog](http://github.com/yolk/aua/compare/v0.2.5...master)
+[full changelog](http://github.com/yolk/aua/compare/v0.2.6...master)
+
+### 0.2.6 / 2015-08-05
+
+[full changelog](http://github.com/yolk/aua/compare/v0.2.5...v0.2.6)
+
+* Show only major version for MSIE 12 (Edge)
+* Small fixes: Konqueror + Vienna RSS
 
 ### 0.2.5 / 2015-08-05
 

data/Gemfile

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

data/Guardfile

@@ -1,5 +1,5 @@
-guard 'rspec' do
+guard :rspec, cmd: "bundle exec rspec" do
   watch(/^spec\/(.*)_spec\.rb/)   { "spec" }
   watch(/^lib\/(.*)\.rb/)         { "spec" } # { |m| "spec/#{m[1]}_spec.rb" }
   watch(/^spec\/spec_helper\.rb/) { "spec" }
-end
+end

data/aua.gemspec

@@ -20,8 +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 'guard-rspec', '>=3.0'
-  s.add_development_dependency 'growl',       '>=1.0'
-  s.add_development_dependency 'rb-fsevent',  '>=0.9'
+  s.add_development_dependency 'rspec',       '>0'
+  s.add_development_dependency 'rspec-its', '>0'
+  s.add_development_dependency 'guard-rspec', '>0'
 end

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?("Edge")
+    agent.products.include?("Safari") && agent.products.include?("Chrome")
   end
 
   def type
@@ -32,4 +32,4 @@ module Aua::Agents::Chrome
       @version ||= version_of("chromeframe")
     end
   end
-end
+end

data/lib/aua/agents/edge.rb

@@ -0,0 +1,25 @@
+module Aua::Agents::Edge
+  def self.extend?(agent)
+    agent.products.include?("Safari") && agent.products.include?("Chrome") && (
+      agent.products.include?("Edge") ||
+      agent.products.include?("Edg") ||
+      agent.products.include?("EdgA")
+    )
+  end
+
+  def type
+    :Browser
+  end
+
+  def name
+    :Edge
+  end
+
+  def version
+    @version ||= version_of("Edg") || version_of("Edge") || version_of("EdgA")
+  end
+
+  def major_version
+    @major_version ||= (version || "").split('.', 2)[0]
+  end
+end

data/lib/aua/agents/feed_reader.rb

@@ -3,7 +3,8 @@ module Aua::Agents::FeedReader
 
   def self.extend?(agent)
     KNOWN_CLIENTS.include?(agent.app) ||
-    (agent.app == "Tumblr" && agent.products.include?("RSS") && agent.products.include?("syndication"))
+    (agent.app == "Tumblr" && agent.products.include?("RSS") && agent.products.include?("syndication")) ||
+    agent.products.include?("Vienna")
   end
 
   def type
@@ -12,10 +13,11 @@ module Aua::Agents::FeedReader
 
   def name
     return :TumblrRSSSyndication if app == "Tumblr"
+    return :Vienna if products.include?("Vienna")
     app.to_sym
   end
 
   def version
-    @version ||= versions[0] || versions[1]
+    @version ||= version_of(name) || versions[0] || versions[1]
   end
 end

data/lib/aua/agents/konqueror.rb

@@ -1,7 +1,8 @@
 module Aua::Agents::Konqueror
   def self.extend?(agent)
     agent.products.include?("KHTML") &&
-    agent.app_comments[1] =~ PATTERN
+    (agent.app_comments[1] =~ PATTERN ||
+    agent.products.include?("Konqueror"))
   end
 
   PATTERN = /Konqueror\/([\d\.]+)/
@@ -15,6 +16,6 @@ module Aua::Agents::Konqueror
   end
 
   def version
-    @version ||= app_comments[1] =~ PATTERN && $1
+    @version ||= app_comments[1] =~ PATTERN && $1 || version_of("Konqueror")
   end
 end

data/lib/aua/agents/msie.rb

@@ -1,11 +1,14 @@
 module Aua::Agents::Msie
 
   def self.extend?(agent)
-    agent.app_comments_string =~ PATTERN || agent.products[-1] == "Edge"
+    agent.app_comments_string =~ PATTERN
   end
 
   PATTERN = /(MSIE |Trident\/)([\d.]+)/
   TRIDENT_VERSION_MAP = {
+    "4.0" => "8.0",
+    "5.0" => "9.0",
+    "6.0" => "10.0",
     "7.0" => "11.0"
   }
 
@@ -18,12 +21,8 @@ module Aua::Agents::Msie
   end
 
   def version
-    @version ||= begin
-      if app_comments_string =~ PATTERN
-        $1 == "Trident\/" ? TRIDENT_VERSION_MAP[$2] || $2 : $2
-      else
-        version_of("Edge")
-      end
+    @version ||= if app_comments_string =~ PATTERN
+      $1 == "Trident\/" ? TRIDENT_VERSION_MAP[$2] || $2 : $2
     end
   end
-end
+end

data/lib/aua/agents.rb

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

data/lib/aua/operating_systems/android.rb

@@ -1,7 +1,7 @@
 module Aua::OperatingSystems::Android
 
   def self.extend?(agent)
-    agent.platform_string == "Linux" && agent.comments.first && agent.comments.first[2] && agent.comments.first[2].match(PATTERN)
+    agent.platform_string == "Linux" && agent.comments.first && agent.comments.first.any?{|c| c.match(PATTERN) }
   end
 
   PATTERN = /^Android\s([\d\.]+)$/
@@ -15,14 +15,14 @@ module Aua::OperatingSystems::Android
   end
 
   def os_version
-    @os_version ||= comments.first[2] =~ PATTERN && $1
+    @os_version ||= comments.first.any?{|c| c.match(PATTERN) } && $1
   end
 
   def name
-    @name ||= :AndroidWebkit
+    @name ||= super || :AndroidWebkit
   end
 
   def version
-    @version ||= version_of("Version")
+    @version ||= super || version_of("Version")
   end
-end
+end

data/lib/aua/version.rb

@@ -1,3 +1,3 @@
 class Aua
-  VERSION = "0.2.5"
+  VERSION = "0.3.2"
 end

data/spec/aua_spec.rb

@@ -43,6 +43,10 @@ describe Aua do
 
     EXAMPLES = {
       # Firefox
+      "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:94.0) Gecko/20100101 Firefox/94.0" =>
+      { :type => :Browser, :name => :Firefox, :version => "94.0", :major_version => "94.0", :os_name => :MacOSX, :os_version => "10.15", :os_major_version => "10.15", :platform => :Macintosh },
+      "Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0" =>
+        { :type => :Browser, :name => :Firefox, :version => "91.0", :major_version => "91.0", :os_name => :Windows, :os_version => "10", :os_major_version => "10", :platform => :Windows },
       "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:22.0) Gecko/20100101 Firefox/22.0" =>
         { :type => :Browser, :name => :Firefox, :version => "22.0", :major_version => "22.0", :os_name => :MacOSX, :os_version => "10.8", :os_major_version => "10.8", :platform => :Macintosh },
       "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; de; rv:1.9.2.13) Gecko/20101203 Firefox/3.6.13" =>
@@ -157,6 +161,10 @@ describe Aua do
         { :type => :Browser, :name => :Konqueror, :version => "4.3", :os_name => :Linux, :os_version => nil, :platform => :X11 },
       "Mozilla/5.0 (compatible; Konqueror/4.0; Windows) KHTML/4.0.83 (like Gecko)" =>
         { :type => :Browser, :name => :Konqueror, :version => "4.0", :os_name => :Windows, :os_version => nil, :platform => :Windows },
+      "Mozilla/5.0 (X11; Linux x86_64) KHTML/5.8.0 (like Gecko) Konqueror/5.8" =>
+        { :type => :Browser, :name => :Konqueror, :version => "5.8", :os_name => :Linux, :os_version => nil, :platform => :X11 },
+      "Mozilla/5.0 (X11; Linux x86_64) KHTML/4.14.3 (like Gecko) Konqueror/4.14 Fedora/4.14.3-8.fc21" =>
+        { :type => :Browser, :name => :Konqueror, :version => "4.14", :os_name => :Linux, :os_version => "Fedora", :platform => :X11 },
 
       # Chrome
       "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.71 Safari/537.36" =>
@@ -216,11 +224,19 @@ describe Aua do
       "Opera/9.80 (Linux armv7l; Maemo; Opera Mobi/4; U; de) Presto/2.5.28 Version/10.1" =>
         { :type => :Browser, :name => :OperaMobile, :version => "10.1", :os_name => :Linux, :os_version => "Maemo", :platform => :X11 },
 
-      # MSIE
+      # Edge
+      "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.45 Safari/537.36 Edg/96.0.1054.29" =>
+        { :type => :Browser, :name => :Edge, :version => "96.0.1054.29", :major_version => "96", :os_name => :Windows, :os_version => "10", :platform => :Windows },
+      "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.85 Mobile Safari/537.36 EdgA/90.0.818.46" =>
+        { :type => :Browser, :name => :Edge, :version => "90.0.818.46", :major_version => "90", :os_name => :Android, :os_version => "6.0", :platform => :Android },
+      "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.135 Safari/537.36 Edge/12.10240" =>
+        { :type => :Browser, :name => :Edge, :version => "12.10240", :major_version => "12", :os_name => :Windows, :os_version => "10", :platform => :Windows },
       "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 },
+        { :type => :Browser, :name => :Edge, :version => "12.0", :major_version => "12", :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 },
+        { :type => :Browser, :name => :Edge, :version => "12.0", :major_version => "12", :os_name => :WindowsPhone, :os_version => "10", :platform => :Windows },
+
+      # MSIE
       "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)" =>
@@ -276,11 +292,11 @@ describe Aua do
 
       # Android
       "Mozilla/5.0 (Linux; U; Android 1.1; en-gb; dream) AppleWebKit/525.10+ (KHTML, like Gecko) Version/3.0.4 Mobile Safari/523.12.2" =>
-        { :type => :Browser, :name => :AndroidWebkit, :version => "3.0.4", :os_name => :Android, :os_version => "1.1", :platform => :Android },
+        { :type => :Browser, :name => :MobileSafari, :version => "3.0.4", :os_name => :Android, :os_version => "1.1", :platform => :Android },
       "Mozilla/5.0 (Linux; U; Android 0.5; en-us) AppleWebKit/522+ (KHTML, like Gecko) Safari/419.3" =>
-        { :type => :Browser, :name => :AndroidWebkit, :version => nil, :os_name => :Android, :os_version => "0.5", :platform => :Android },
+        { :type => :Browser, :name => :Safari, :version => "2.0.4", :os_name => :Android, :os_version => "0.5", :platform => :Android },
       "Mozilla/5.0 (Linux; U; Android 2.1; en-us; Nexus One Build/ERD62) AppleWebKit/530.17 (KHTML, like Gecko) Version/4.0 Mobile Safari/530.17" =>
-        { :type => :Browser, :name => :AndroidWebkit, :version => "4.0", :os_name => :Android, :os_version => "2.1", :platform => :Android },
+        { :type => :Browser, :name => :MobileSafari, :version => "4.0", :os_name => :Android, :os_version => "2.1", :platform => :Android },
 
       # Palm (Pre)
       "Mozilla/5.0 (webOS/1.3; U; en-US) AppleWebKit/525.27.1 (KHTML, like Gecko) Version/1.0 Safari/525.27.1 Desktop/1.0" =>
@@ -425,6 +441,8 @@ describe Aua do
         { :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 },
+      "Mozilla/5.0 Vienna/3.0.6" =>
+        { :type => :FeedReader, :name => :Vienna, :version => "3.0.6", :os_name => nil, :os_version => nil, :platform => nil },
 
       # SearchBots
       "Mozilla/5.0 (compatible; bingbot/2.0; +http://www.bing.com/bingbot.htm)" =>
@@ -564,4 +582,4 @@ describe Aua do
     its(:os_version)  { should eql(nil) }
     its(:platform)    { should eql(nil) }
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'rspec'
+require 'rspec/its'
 require File.dirname(__FILE__) + '/../lib/aua.rb'
 
 if File.exist?(File.dirname(__FILE__) + '/../../aua-mite/')
@@ -10,4 +11,4 @@ end
 RSpec.configure do |config|
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
-end
+end

metadata

@@ -1,71 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: aua
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.2
 platform: ruby
 authors:
 - Sebastian Munz
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2021-12-07 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'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '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
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
 description: aua = a user agent (parser).
 email:
 - sebastian@yo.lk
@@ -86,6 +72,7 @@ files:
 - lib/aua/agents.rb
 - lib/aua/agents/api_clients.rb
 - lib/aua/agents/chrome.rb
+- lib/aua/agents/edge.rb
 - lib/aua/agents/engine_fallback.rb
 - lib/aua/agents/feed_reader.rb
 - lib/aua/agents/firefox.rb
@@ -113,7 +100,7 @@ homepage: https://github.com/yolk/aua
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -128,9 +115,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: aua
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: aua = a user agent (parser).
 test_files: