aua 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a7bcaf6c058128a7d6ed3c50af05a00e77cf8df8
-  data.tar.gz: b4f3630969d17792efd3e20c29b2babbc6fb5daa
+SHA256:
+  metadata.gz: 900211a4adb2fb31f00f974c4812046e9d66053577a29caa24bc9a98325e6dbc
+  data.tar.gz: b4c9cc887f15d7e093c5e81a3b9961331cd674a882cc413bdd526717e86d536f
 SHA512:
-  metadata.gz: 1ac1172e83f9030041c332fc8642556fd96ced32e82924c60d82e6f2aa2395cab839a562cb0288c81793e996f8fc6482e0637b57c3644414d4cafcc2bd100d02
-  data.tar.gz: c6eb775b39b6f190a0e9a4c3a18e0fd2b900b32b37661ab1462ecb26de12943ef906aa8de253497083852d473fb7ad61a28f5abe37ad006c1f52587003b29407
+  metadata.gz: 4516385abff4eca5f276517463be74287c42e38a065258b3e0c3a2db7cf20f700e747c4b3feba2ee6eacb604fc49564c795dbb1b90f180180dfa60c60ea45449
+  data.tar.gz: af95f1e46838ad354fde9339a964a75a4619c433f1475c7d317027d1d22eda95d9848ea791130a268ee0aa08d61ba300b16844a76f81f077b82650f9bcb732e4

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/bin/_guard-core

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application '_guard-core' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("guard", "_guard-core")

data/bin/guard

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'guard' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("guard", "guard")

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/msie.rb

@@ -1,7 +1,7 @@
 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.]+)/
@@ -26,4 +26,4 @@ module Aua::Agents::Msie
       end
     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.6"
+  VERSION = "0.3.0"
 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" =>
@@ -220,13 +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 => :MSIE, :version => "12", :os_name => :Windows, :os_version => "10", :platform => :Windows },
+        { :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", :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", :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)" =>
@@ -282,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" =>
@@ -572,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,75 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: aua
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Sebastian Munz
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2021-11-21 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
-executables: []
+executables:
+- _guard-core
+- guard
 extensions: []
 extra_rdoc_files: []
 files:
@@ -82,10 +70,13 @@ files:
 - README.md
 - Rakefile
 - aua.gemspec
+- bin/_guard-core
+- bin/guard
 - lib/aua.rb
 - 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 +104,7 @@ homepage: https://github.com/yolk/aua
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -128,9 +119,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.0.3
+signing_key:
 specification_version: 4
 summary: aua = a user agent (parser).
 test_files: