device_detector 1.0.3 → 1.0.7

data/regexes/vendorfragments.yml

@@ -1,7 +1,7 @@
 ###############
 # Device Detector - The Universal Device Detection library for parsing User Agents
 #
-# @link http://piwik.org
+# @link https://matomo.org
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
@@ -69,3 +69,7 @@ HP:
 
 Hyrican:
   - 'MANM(JS)?'
+
+Ordissimo:
+  - 'Ordissimo'
+  - 'webissimo3'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: device_detector
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.7
 platform: ruby
 authors:
 - Mati Sójka
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-09 00:00:00.000000000 Z
+date: 2022-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -53,6 +53,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.85.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.85.1
 description: Precise and fast user agent parser and device detector, backed by the
   largest and most up-to-date agent and device database
 email:
@@ -61,16 +75,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- device_detector.gemspec
 - lib/device_detector.rb
 - lib/device_detector/bot.rb
+- lib/device_detector/browser.rb
 - lib/device_detector/client.rb
 - lib/device_detector/device.rb
 - lib/device_detector/memory_cache.rb
@@ -93,64 +103,12 @@ files:
 - regexes/device/car_browsers.yml
 - regexes/device/consoles.yml
 - regexes/device/mobiles.yml
+- regexes/device/notebooks.yml
 - regexes/device/portable_media_player.yml
+- regexes/device/shell_tv.yml
 - regexes/device/televisions.yml
 - regexes/oss.yml
 - regexes/vendorfragments.yml
-- spec/device_detector/bot_fixtures_spec.rb
-- spec/device_detector/client_fixtures_spec.rb
-- spec/device_detector/concrete_user_agent_spec.rb
-- spec/device_detector/detector_fixtures_spec.rb
-- spec/device_detector/device_fixtures_spec.rb
-- spec/device_detector/device_spec.rb
-- spec/device_detector/memory_cache_spec.rb
-- spec/device_detector/model_extractor_spec.rb
-- spec/device_detector/os_fixtures_spec.rb
-- spec/device_detector/version_extractor_spec.rb
-- spec/device_detector_spec.rb
-- spec/fixtures/client/browser.yml
-- spec/fixtures/client/feed_reader.yml
-- spec/fixtures/client/library.yml
-- spec/fixtures/client/mediaplayer.yml
-- spec/fixtures/client/mobile_app.yml
-- spec/fixtures/client/pim.yml
-- spec/fixtures/detector/bots.yml
-- spec/fixtures/detector/camera.yml
-- spec/fixtures/detector/car_browser.yml
-- spec/fixtures/detector/console.yml
-- spec/fixtures/detector/desktop.yml
-- spec/fixtures/detector/feature_phone.yml
-- spec/fixtures/detector/feed_reader.yml
-- spec/fixtures/detector/mediaplayer.yml
-- spec/fixtures/detector/mobile_apps.yml
-- spec/fixtures/detector/phablet.yml
-- spec/fixtures/detector/portable_media_player.yml
-- spec/fixtures/detector/smart_display.yml
-- spec/fixtures/detector/smartphone-1.yml
-- spec/fixtures/detector/smartphone-10.yml
-- spec/fixtures/detector/smartphone-11.yml
-- spec/fixtures/detector/smartphone-12.yml
-- spec/fixtures/detector/smartphone-2.yml
-- spec/fixtures/detector/smartphone-3.yml
-- spec/fixtures/detector/smartphone-4.yml
-- spec/fixtures/detector/smartphone-5.yml
-- spec/fixtures/detector/smartphone-6.yml
-- spec/fixtures/detector/smartphone-7.yml
-- spec/fixtures/detector/smartphone-8.yml
-- spec/fixtures/detector/smartphone-9.yml
-- spec/fixtures/detector/smartphone.yml
-- spec/fixtures/detector/tablet-1.yml
-- spec/fixtures/detector/tablet-2.yml
-- spec/fixtures/detector/tablet-3.yml
-- spec/fixtures/detector/tablet.yml
-- spec/fixtures/detector/tv.yml
-- spec/fixtures/detector/unknown.yml
-- spec/fixtures/device/camera.yml
-- spec/fixtures/device/car_browser.yml
-- spec/fixtures/device/console.yml
-- spec/fixtures/parser/oss.yml
-- spec/fixtures/parser/vendorfragments.yml
-- spec/spec_helper.rb
 homepage: http://podigee.github.io/device_detector
 licenses:
 - LGPL-3.0
@@ -170,63 +128,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Precise and fast user agent parser and device detector
-test_files:
-- spec/device_detector/bot_fixtures_spec.rb
-- spec/device_detector/client_fixtures_spec.rb
-- spec/device_detector/concrete_user_agent_spec.rb
-- spec/device_detector/detector_fixtures_spec.rb
-- spec/device_detector/device_fixtures_spec.rb
-- spec/device_detector/device_spec.rb
-- spec/device_detector/memory_cache_spec.rb
-- spec/device_detector/model_extractor_spec.rb
-- spec/device_detector/os_fixtures_spec.rb
-- spec/device_detector/version_extractor_spec.rb
-- spec/device_detector_spec.rb
-- spec/fixtures/client/browser.yml
-- spec/fixtures/client/feed_reader.yml
-- spec/fixtures/client/library.yml
-- spec/fixtures/client/mediaplayer.yml
-- spec/fixtures/client/mobile_app.yml
-- spec/fixtures/client/pim.yml
-- spec/fixtures/detector/bots.yml
-- spec/fixtures/detector/camera.yml
-- spec/fixtures/detector/car_browser.yml
-- spec/fixtures/detector/console.yml
-- spec/fixtures/detector/desktop.yml
-- spec/fixtures/detector/feature_phone.yml
-- spec/fixtures/detector/feed_reader.yml
-- spec/fixtures/detector/mediaplayer.yml
-- spec/fixtures/detector/mobile_apps.yml
-- spec/fixtures/detector/phablet.yml
-- spec/fixtures/detector/portable_media_player.yml
-- spec/fixtures/detector/smart_display.yml
-- spec/fixtures/detector/smartphone-1.yml
-- spec/fixtures/detector/smartphone-10.yml
-- spec/fixtures/detector/smartphone-11.yml
-- spec/fixtures/detector/smartphone-12.yml
-- spec/fixtures/detector/smartphone-2.yml
-- spec/fixtures/detector/smartphone-3.yml
-- spec/fixtures/detector/smartphone-4.yml
-- spec/fixtures/detector/smartphone-5.yml
-- spec/fixtures/detector/smartphone-6.yml
-- spec/fixtures/detector/smartphone-7.yml
-- spec/fixtures/detector/smartphone-8.yml
-- spec/fixtures/detector/smartphone-9.yml
-- spec/fixtures/detector/smartphone.yml
-- spec/fixtures/detector/tablet-1.yml
-- spec/fixtures/detector/tablet-2.yml
-- spec/fixtures/detector/tablet-3.yml
-- spec/fixtures/detector/tablet.yml
-- spec/fixtures/detector/tv.yml
-- spec/fixtures/detector/unknown.yml
-- spec/fixtures/device/camera.yml
-- spec/fixtures/device/car_browser.yml
-- spec/fixtures/device/console.yml
-- spec/fixtures/parser/oss.yml
-- spec/fixtures/parser/vendorfragments.yml
-- spec/spec_helper.rb
+test_files: []

data/.gitignore

@@ -1,14 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log

data/.travis.yml

@@ -1,14 +0,0 @@
-language: ruby
-dist: bionic
-rvm:
-  - 2.4
-  - 2.5
-  - 2.6
-before_install:
-  - gem update --system
-  - gem --version
-  - gem update bundler
-  - bundler --version
-cache: bundler
-script:
-  bundle exec rake test

data/Gemfile

@@ -1,8 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in device_detector.gemspec
-gemspec
-
-if RUBY_VERSION >= "2.0" && defined?(RUBY_ENGINE) && RUBY_ENGINE == "ruby"
-  gem 'byebug'
-end

data/Rakefile

@@ -1,96 +0,0 @@
-# frozen_string_literal: true
-
-require 'rake'
-require 'rake/testtask'
-
-$LOAD_PATH.unshift 'lib'
-require 'device_detector'
-
-Rake::TestTask.new do |t|
-  t.pattern = 'spec/**/*_spec.rb'
-  t.libs.push 'spec'
-end
-
-task default: :test
-
-task :detectable_names do
-  require 'Date'
-
-  bot_names = DeviceDetector::Bot.new.send(:regexes).map { |r| r[:name] }.uniq.sort_by(&:downcase)
-  bot_names.delete('$1')
-  client_names = DeviceDetector::Client.new.send(:regexes).map { |r| r[:name] }.uniq.sort_by(&:downcase)
-  client_names.delete('$1')
-  device = DeviceDetector::Device.new
-  device_paths = device.send(:filepaths)
-  device_regexes = device.send(:load_regexes, device_paths)
-  device_names = device_regexes.flat_map { |dn| dn[1].keys }.uniq.sort_by(&:downcase)
-
-  today = Date.today.strftime
-
-  puts '## Detectable clients, bots and devices'
-  puts
-  puts "Updated on #{today}"
-  puts
-  puts '### Bots'
-  puts
-  puts bot_names.join(', ')
-  puts
-  puts '### Clients'
-  puts
-  puts client_names.join(', ')
-  puts
-  puts '### Devices'
-  puts
-  puts device_names.join(', ')
-  puts
-end
-
-PIWIK_REPO_URL = 'https://github.com/matomo-org/device-detector'
-PIWIK_CHECKOUT_LOCATION = '/tmp/matomo_device_detector'
-
-def get_latest_piwik_checkout
-  if File.exist?(PIWIK_CHECKOUT_LOCATION)
-    system "cd #{PIWIK_CHECKOUT_LOCATION}; git reset --hard HEAD; git pull origin master"
-  else
-    system "git clone --depth 1 #{PIWIK_REPO_URL} #{PIWIK_CHECKOUT_LOCATION}"
-  end
-end
-
-desc 'update regex database from piwik project'
-task :update_regexes do
-  top = File.expand_path(__dir__)
-  get_latest_piwik_checkout
-  system "cp -R #{PIWIK_CHECKOUT_LOCATION}/regexes/* #{top}/regexes"
-end
-
-desc 'fix regexes that are broken because of a bug in ruby'
-task :fix_regexes do
-  # fix broken regexes: https://github.com/podigee/device_detector/issues/65
-
-  # modify regex to bypass ruby bug
-  system "sed -i '' 's/\|ImSmart \|ERGO \|X-Style Tab //g' regexes/device/mobiles.yml"
-
-  # remove fixtures that test that regex
-  system "sed -i '' '/X-Style Tab A101/,/^-/{d;};' spec/fixtures/**/*.yml"
-  system "sed -i '' '/ERGO A500 Best Build/,/^-/{d;};' spec/fixtures/**/*.yml"
-  system "sed -i '' '/ImSmart A501 Build.KOT49H/,/^-/{d;};' spec/fixtures/**/*.yml"
-end
-
-desc 'update fixtures from piwik project'
-task :update_fixtures do
-  top = File.expand_path(__dir__)
-  get_latest_piwik_checkout
-
-  fixture_mappings = [
-    { target_path: "#{top}/spec/fixtures/detector", source_path: 'Tests/fixtures/*.yml' },
-    { target_path: "#{top}/spec/fixtures/client", source_path: 'Tests/Parser/Client/fixtures/*.yml' },
-    { target_path: "#{top}/spec/fixtures/parser", source_path: 'Tests/Parser/fixtures/*.yml' },
-    { target_path: "#{top}/spec/fixtures/device", source_path: 'Tests/Parser/Devices/fixtures/*.yml' }
-  ]
-
-  fixture_mappings.each do |mapping|
-    source_path = mapping.fetch(:source_path)
-    target_path = mapping.fetch(:target_path)
-    system "cp -R #{PIWIK_CHECKOUT_LOCATION}/#{source_path} #{target_path}"
-  end
-end

data/device_detector.gemspec

@@ -1,26 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'device_detector/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = 'device_detector'
-  spec.version       = DeviceDetector::VERSION
-  spec.authors       = ['Mati Sójka', 'Ben Zimmer']
-  spec.email         = ['yagooar@gmail.com']
-  spec.summary       = %q{Precise and fast user agent parser and device detector}
-  spec.description   = %q{Precise and fast user agent parser and device detector, backed by the largest and most up-to-date agent and device database}
-  spec.homepage      = 'http://podigee.github.io/device_detector'
-  spec.license       = 'LGPL-3.0'
-
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = []
-  spec.test_files    = spec.files.grep(%r{^(spec)/})
-  spec.require_paths = ['lib']
-
-  spec.required_ruby_version = '>= 1.9.3'
-
-  spec.add_development_dependency 'minitest'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'pry', '>= 0.10'
-end

data/spec/device_detector/bot_fixtures_spec.rb

@@ -1,30 +0,0 @@
-require_relative '../spec_helper'
-
-describe DeviceDetector::Bot do
-
-  fixture_dir = File.expand_path('../../fixtures/parser', __FILE__)
-  fixture_files = Dir["#{fixture_dir}/bots.yml"]
-  fixture_files.each do |fixture_file|
-
-    describe File.basename(fixture_file) do
-
-      fixtures = YAML.load_file(fixture_file)
-
-      fixtures.each do |f|
-        user_agent = f["user_agent"]
-        bot = DeviceDetector::Bot.new(user_agent)
-
-        describe user_agent do
-          it "should be a bot" do
-            assert bot.bot?, "isn't a bot"
-          end
-
-          it "should have the expected name" do
-            assert_equal f["bot"]["name"], bot.name, "failed bot name detection"
-          end
-        end
-
-      end
-    end
-  end
-end

data/spec/device_detector/client_fixtures_spec.rb

@@ -1,31 +0,0 @@
-require_relative '../spec_helper'
-
-describe DeviceDetector::Client do
-
-  fixture_dir = File.expand_path('../../fixtures/client', __FILE__)
-  fixture_files = Dir["#{fixture_dir}/*.yml"]
-  fixture_files.each do |fixture_file|
-
-    describe File.basename(fixture_file) do
-
-      fixtures = YAML.load_file(fixture_file)
-      fixtures.each do |f|
-
-        user_agent = f["user_agent"]
-        client = DeviceDetector::Client.new(user_agent)
-
-        describe user_agent do
-
-          it "should be known" do
-            assert client.known?, "isn't known as a client"
-          end
-
-          it "should have the expected name" do
-            assert_equal f["client"]["name"], client.name, "failed client name detection"
-          end
-
-        end
-      end
-    end
-  end
-end

data/spec/device_detector/concrete_user_agent_spec.rb

@@ -1,135 +0,0 @@
-require_relative '../spec_helper'
-
-describe DeviceDetector do
-
-  subject { DeviceDetector.new(user_agent) }
-
-  alias :client :subject
-
-  describe 'mobile iPhone 5S' do
-
-    let(:user_agent) { 'Mozilla/5.0 (iPhone; CPU iPhone OS 8_1_2 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Mobile/12B440 [FBDV/iPhone6,1]' }
-
-    describe '#device_name' do
-
-      it 'returns device name' do
-        value(client.device_name).must_equal 'iPhone 5S'
-      end
-
-    end
-
-    describe '#device_type' do
-
-      it 'returns the device type' do
-        value(client.device_type).must_equal 'smartphone'
-      end
-
-    end
-
-  end
-
-  describe 'Ubuntu 10' do
-
-    let(:user_agent) { 'Mozilla/5.0 (X11; U; Linux i686; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Ubuntu/10.10 Chromium/10.0.648.133 Chrome/10.0.648.133 Safari/534.16' }
-
-    describe '#os_name' do
-
-      it 'returns the OS name' do
-        value(client.os_name).must_equal 'Ubuntu'
-      end
-
-    end
-
-  end
-
-  describe 'Mac OS X' do
-
-    let(:user_agent) { 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2227.1 Safari/537.36' }
-
-    describe '#full_version' do
-
-      it 'returns the correct OS version' do
-        value(client.os_full_version).must_equal '10.10.1'
-      end
-
-    end
-
-  end
-
-  describe 'Chrome on Windows' do
-
-    describe '32bit' do
-
-      let(:user_agent) { 'Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.103 Safari/537.36' }
-
-      it 'returns the correct client name' do
-        value(client.name).must_equal 'Chrome'
-      end
-
-      it 'recognizes the device name' do
-        value(client.device_name).must_be_nil
-      end
-
-      it 'recognizes the device type' do
-        value(client.device_type).must_equal "desktop"
-      end
-
-    end
-
-    describe '64bit' do
-
-      let(:user_agent) { 'Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36' }
-
-      it 'returns the correct client name' do
-        value(client.name).must_equal 'Chrome'
-      end
-
-      it 'recognizes the device name' do
-        value(client.device_name).must_be_nil
-      end
-
-      it 'recognizes the device type' do
-        value(client.device_type).must_equal "desktop"
-      end
-
-    end
-
-  end
-
-  describe 'recognize and ignore sprd- prefix' do
-
-    let(:user_agent) { 'sprd-Galaxy-S5/1.0 Linux/2.6.35.7 Android/4.4.4 Release/11.29.2014 Browser/AppleWebKit533.1 (KHTML, like Gecko) Mozilla/5.0 Mobile' }
-
-    it 'returns the correct client name' do
-      value(client.name).must_equal "Android Browser"
-    end
-
-    it 'recognizes the device name' do
-      value(client.device_name).must_equal "GALAXY S5"
-    end
-
-    it 'recognizes the device type' do
-      value(client.device_type).must_equal "smartphone"
-    end
-
-  end
-
-  describe 'remove TD suffix from model' do
-
-    let(:user_agent) { 'Lenovo-A398t+_TD/S100 Linux/3.4.5 Android/4.1.2 Release/09.10.2013 Browser/AppleWebKit534.30 Mobile Safari/534.30' }
-
-    it 'returns the correct client name' do
-      value(client.name).must_equal "Android Browser"
-    end
-
-    it 'recognizes the device name' do
-      value(client.device_name).must_equal "A398t+"
-    end
-
-    it 'recognizes the device type' do
-      value(client.device_type).must_equal "smartphone"
-    end
-
-  end
-
-end

data/spec/device_detector/detector_fixtures_spec.rb

@@ -1,100 +0,0 @@
-require_relative '../spec_helper'
-
-describe DeviceDetector do
-
-  fixture_dir = File.expand_path('../../fixtures/detector', __FILE__)
-  fixture_files = Dir["#{fixture_dir}/*.yml"]
-  fixture_files.each do |fixture_file|
-
-    describe File.basename(fixture_file) do
-
-      fixtures = nil
-      begin
-        fixtures = YAML.load(File.read(fixture_file))
-      rescue Psych::SyntaxError => e
-        fail "Failed to parse #{fixture_file}, reason: #{e}"
-      end
-
-      def str_or_nil(string)
-        return nil if string == ''
-        string
-      end
-
-      fixtures.each do |f|
-
-        user_agent = f["user_agent"]
-        detector = DeviceDetector.new(user_agent)
-        os = detector.send(:os)
-
-        describe user_agent do
-          it "should be detected" do
-            if detector.bot?
-              assert_equal str_or_nil(f["bot"]["name"]), detector.bot_name, "failed bot name detection"
-            else
-              if f["client"]
-                assert_equal str_or_nil(f["client"]["name"]), detector.name, "failed client name detection"
-              end
-
-              os_family = str_or_nil(f["os_family"])
-              if os_family != "Unknown"
-                if os_family.nil?
-                  assert_nil os.family, "failed os family detection"
-                else
-                  assert_equal os_family, os.family, "failed os family detection"
-                end
-
-                name = str_or_nil(f["os"]["name"])
-                if name.nil?
-                  assert_nil os.name, "failed os name detection"
-                else
-                  assert_equal name, os.name, "failed os name detection"
-                end
-
-                short_name = str_or_nil(f["os"]["short_name"])
-                if short_name.nil?
-                  assert_nil os.short_name, "failed os short name detection"
-                else
-                  assert_equal short_name, os.short_name, "failed os short name detection"
-                end
-
-                os_version = str_or_nil(f["os"]["version"])
-                if os_version.nil?
-                  assert_nil os.full_version, "failed os version detection"
-                else
-                  assert_equal os_version, os.full_version, "failed os version detection"
-                end
-              end
-              if f["device"]
-                expected_type = str_or_nil(f["device"]["type"])
-                actual_type = detector.device_type
-
-                if expected_type != actual_type
-                  # puts "\n", f.inspect, expected_type, actual_type, detector.device_name, regex_meta.inspect
-                  # debugger
-                  # detector.device_type
-                end
-                if expected_type.nil?
-                  assert_nil actual_type, "failed device type detection"
-                else
-                  assert_equal expected_type, actual_type, "failed device type detection"
-                end
-
-                model = str_or_nil(f["device"]["model"])
-                model = model.to_s unless model.nil?
-
-                if model.nil?
-                  assert_nil detector.device_name, "failed device name detection"
-                else
-                  assert_equal model, detector.device_name, "failed device name detection"
-                end
-              end
-            end
-          end
-        end
-      end
-
-    end
-
-  end
-
-end