woothee 1.8.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe0f7e098f6e8054dd12b42b4f231446d2adfdfcda1da42a482c254876f49f73
-  data.tar.gz: ac9e99c0039bd8fd2b0ac04cc2bd60cb6bb1c8b55b81198b1703ca27c02d3400
+  metadata.gz: 7da31dd82c1e3c4a91f0e9bda7493bac91723b7edd135850037e4621c64e72bb
+  data.tar.gz: 132ada5aa4675a16c5f86cedf5284f4c763423382223633b06f6a40e7f816d47
 SHA512:
-  metadata.gz: 5c7c421028759196c13b46f92910df256b24523ddd6f462493dcf59c77ce8c7573af7c9b5afea2bfaca176d9788ea5feee2362c99b478e66b5e4cb91edfb563f
-  data.tar.gz: 6bc3c434f0a18776606c12fed9d82c4351da0257b506547aa212fa036bf1144797b26f40f81a54a5a9eb49f34a7cca34951fa769b3fa91e9d83bb58a542dfb47
+  metadata.gz: 26226d7627431f61366f857fcc11c6284ea20673ecb7bf9b2150ac34677f3463c1b30317fa5c7d9376894e523147f6f730bd4ad6825f6a4f33e7029561434c5b
+  data.tar.gz: 846226ded8f8b35f8331e31ca32b43a5feffe478fe362852bd13ba113bb8665ee4db024c1662f918a4e4ee314a988b52d5898e0ca681ebb737aaefd0ffb9fc04

data/.github/workflows/ci.yaml

@@ -0,0 +1,26 @@
+name: ci
+
+on:
+  pull_request:
+    branches: '*'
+  push:
+    branches:
+      - master
+      - main
+      - 'release-*'
+
+jobs:
+  mri:
+    strategy:
+      matrix:
+        os: [ubuntu]
+        ruby: ['2.7', '3.0', 'head', 'jruby-head']
+    runs-on: ${{ matrix.os }}-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - run: git submodule update --init
+      - run: bundle install
+      - run: make test

data/lib/woothee/browser.rb

@@ -43,7 +43,7 @@ module Woothee::Browser
     version = Woothee::VALUE_UNKNOWN
 
     # Edge
-    if ua =~ /Edge\/([.0-9]+)/o
+    if ua =~ /(?:Edge|Edg|EdgiOS|EdgA)\/([.0-9]+)/o
       version = $1
       update_map(result, Woothee::DataSet.get('Edge'))
       update_version(result, version)
@@ -74,6 +74,14 @@ module Woothee::Browser
       return true
     end
 
+    # Google Search App
+    if ua =~ /GSA\/([.0-9]+)/o
+      version = $1
+      update_map(result, Woothee::DataSet.get("GSA"))
+      update_version(result, version)
+      return true
+    end
+
     # Safari
     if ua =~ /Version\/([.0-9]+)/o
       version = $1
@@ -173,4 +181,18 @@ module Woothee::Browser
     update_map(result, Woothee::DataSet.get('Vivaldi'))
     update_version(result, version)
   end
+
+  def self.challenge_samsungbrowser(ua, result)
+    return false if ua.index('SamsungBrowser/').nil?
+
+    version = Woothee::VALUE_UNKNOWN
+    if ua =~ /SamsungBrowser\/([.0-9]+)/o
+      version = $1
+    end
+
+    update_map(result, Woothee::DataSet.get('SamsungBrowser'))
+    update_version(result, version)
+    true
+  end
+
 end

data/lib/woothee/crawler.rb

@@ -18,6 +18,14 @@ module Woothee::Crawler
         return true
       end
     end
+    if ua.index('compatible; AdsBot-Google-Mobile;')
+      update_map(result, Woothee::DataSet.get('AdsBotGoogleMobile'))
+      return true
+    end
+    if ua.index('AdsBot-Google')
+      update_map(result, Woothee::DataSet.get('AdsBotGoogle'))
+      return true
+    end
     if ua.index('Googlebot-Image/')
       update_map(result, Woothee::DataSet.get('GoogleBot'))
       return true

data/lib/woothee/dataset.rb

@@ -35,7 +35,7 @@ end
 
 module Woothee::DataSet
   DATASET = {}
-  # GENERATED from dataset.yaml at Sun Jul 22 00:57:28 JST 2018 by tell_k
+  # GENERATED from dataset.yaml at Sun Jan  9 00:14:17 JST 2022 by yuji_developer
   obj = {:label => 'MSIE', :name => 'Internet Explorer', :type => :browser}
   obj[:vendor] = 'Microsoft'
   DATASET[obj[:label]] = obj
@@ -60,12 +60,18 @@ module Woothee::DataSet
   obj = {:label => 'Sleipnir', :name => 'Sleipnir', :type => :browser}
   obj[:vendor] = 'Fenrir Inc.'
   DATASET[obj[:label]] = obj
+  obj = {:label => 'GSA', :name => 'Google Search App', :type => :browser}
+  obj[:vendor] = 'Google'
+  DATASET[obj[:label]] = obj
   obj = {:label => 'Webview', :name => 'Webview', :type => :browser}
   obj[:vendor] = 'OS vendor'
   DATASET[obj[:label]] = obj
   obj = {:label => 'YaBrowser', :name => 'Yandex Browser', :type => :browser}
   obj[:vendor] = 'Yandex'
   DATASET[obj[:label]] = obj
+  obj = {:label => 'SamsungBrowser', :name => 'SamsungBrowser', :type => :browser}
+  obj[:vendor] = 'Samsung'
+  DATASET[obj[:label]] = obj
   obj = {:label => 'Win', :name => 'Windows UNKNOWN Ver', :type => :os}
   obj[:category] = :pc
   DATASET[obj[:label]] = obj
@@ -345,6 +351,12 @@ module Woothee::DataSet
   obj = {:label => 'VariousCrawler', :name => 'misc crawler', :type => :full}
   obj[:category] = :crawler
   DATASET[obj[:label]] = obj
+  obj = {:label => 'AdsBotGoogleMobile', :name => 'AdsBot-Google-Mobile', :type => :full}
+  obj[:category] = :crawler
+  DATASET[obj[:label]] = obj
+  obj = {:label => 'AdsBotGoogle', :name => 'AdsBot-Google', :type => :full}
+  obj[:category] = :crawler
+  DATASET[obj[:label]] = obj
 
   DATASET.freeze
 

data/lib/woothee/os.rb

@@ -83,17 +83,17 @@ module Woothee::OS
   end
 
   def self.challenge_linux(ua, result)
-    return false if ua.index('Linux').nil?
-
     data = nil
     os_version = nil
     if ua.index('Android')
       data = Woothee::DataSet.get('Android')
-      if ua =~ /Android[- ](\d+\.\d+(?:\.\d+)?)/
+      if ua =~ /Android[- ](\d+(?:\.\d+(?:\.\d+)?)?)/
         os_version = $1
       end
-    else
+    elsif ua.index('Linux')
       data = Woothee::DataSet.get('Linux')
+    else
+      return false
     end
     update_category(result, data[Woothee::KEY_CATEGORY])
     update_os(result, data[Woothee::KEY_NAME])

data/lib/woothee/version.rb

@@ -1,3 +1,3 @@
 module Woothee
-  VERSION = "1.8.0"
+  VERSION = "1.13.0"
 end

data/lib/woothee.rb

@@ -75,6 +75,8 @@ module Woothee
 
     return true if Woothee::Browser.challenge_yandexbrowser(useragent, result)
 
+    return true if Woothee::Browser.challenge_samsungbrowser(useragent, result)
+
     return true if Woothee::Browser.challenge_safari_chrome(useragent, result)
 
     return true if Woothee::Browser.challenge_firefox(useragent, result)

data/woothee.gemspec

@@ -12,8 +12,6 @@ Gem::Specification.new do |gem|
   gem.version     = Woothee::VERSION
   gem.authors     = ["TAGOMORI Satoshi"]
   gem.email       = "tagomoris@gmail.com"
-  gem.has_rdoc    = false
-  #gem.platform    = Gem::Platform::RUBY
   gem.files       = `git ls-files`.split("\n")
   gem.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: woothee
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.13.0
 platform: ruby
 authors:
 - TAGOMORI Satoshi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-07-23 00:00:00.000000000 Z
+date: 2022-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -44,9 +44,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yaml"
 - ".gitignore"
 - ".gitmodules"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - Makefile
@@ -70,7 +70,7 @@ files:
 homepage: https://github.com/woothee/woothee-ruby
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -85,9 +85,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Cross-language UserAgent classifier library, ruby implementation
 test_files:

data/.travis.yml

@@ -1,14 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - "2.2"
-  - "2.3.3"
-  - "2.4.1"
-  - "jruby-19mode"
-before_script:
-  - git submodule update --init
-  - gem update bundler
-  - bundle install
-  - bundle update
-script:
-  - make