device_detector 1.0.2 → 1.0.6

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
 ###############
 
@@ -20,7 +20,7 @@ Sony:
 
 Asus:
   - 'MAAU'
-  - 'NP0[6789]'
+  - 'NP0[26789]'
   - 'ASJB'
   - 'ASU2(JS)?'
 
@@ -69,3 +69,7 @@ HP:
 
 Hyrican:
   - 'MANM(JS)?'
+
+Ordissimo:
+  - 'Ordissimo'
+  - 'webissimo3'

data/spec/device_detector/concrete_user_agent_spec.rb

@@ -1,136 +1,123 @@
 require_relative '../spec_helper'
 
 describe DeviceDetector do
-
   subject { DeviceDetector.new(user_agent) }
 
-  alias :client :subject
+  alias_method :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]' }
+    let(:user_agent) do
+      '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]'
+    end
 
     describe '#device_name' do
-
       it 'returns device name' do
-        client.device_name.must_equal 'iPhone 5S'
+        value(client.device_name).must_equal 'iPhone 5S'
       end
-
     end
 
     describe '#device_type' do
-
       it 'returns the device type' do
-        client.device_type.must_equal 'smartphone'
+        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' }
+    let(:user_agent) do
+      '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'
+    end
 
     describe '#os_name' do
-
       it 'returns the OS name' do
-        client.os_name.must_equal 'Ubuntu'
+        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' }
+    let(:user_agent) do
+      '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'
+    end
 
     describe '#full_version' do
-
       it 'returns the correct OS version' do
-        client.os_full_version.must_equal '10.10.1'
+        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' }
+      let(:user_agent) do
+        'Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.103 Safari/537.36'
+      end
 
       it 'returns the correct client name' do
-        client.name.must_equal 'Chrome'
+        value(client.name).must_equal 'Chrome'
       end
 
       it 'recognizes the device name' do
-        client.device_name.must_be_nil
+        value(client.device_name).must_be_nil
       end
 
       it 'recognizes the device type' do
-        client.device_type.must_equal "desktop"
+        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' }
+      let(:user_agent) do
+        'Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36'
+      end
 
       it 'returns the correct client name' do
-        client.name.must_equal 'Chrome'
+        value(client.name).must_equal 'Chrome'
       end
 
       it 'recognizes the device name' do
-        client.device_name.must_be_nil
+        value(client.device_name).must_be_nil
       end
 
       it 'recognizes the device type' do
-        client.device_type.must_equal "desktop"
+        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' }
+    let(:user_agent) do
+      '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'
+    end
 
     it 'returns the correct client name' do
-      client.name.must_equal "Android Browser"
+      value(client.name).must_equal 'Android Browser'
     end
 
     it 'recognizes the device name' do
-      client.device_name.must_equal "GALAXY S5"
+      value(client.device_name).must_equal 'Galaxy S5'
     end
 
     it 'recognizes the device type' do
-      client.device_type.must_equal "smartphone"
+      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' }
+    let(:user_agent) do
+      'Lenovo-A398t+_TD/S100 Linux/3.4.5 Android/4.1.2 Release/09.10.2013 Browser/AppleWebKit534.30 Mobile Safari/534.30'
+    end
 
     it 'returns the correct client name' do
-      client.name.must_equal "Android Browser"
+      value(client.name).must_equal 'Android Browser'
     end
 
     it 'recognizes the device name' do
-      client.device_name.must_equal "A398t+"
+      value(client.device_name).must_equal 'A398t+'
     end
 
     it 'recognizes the device type' do
-      client.device_type.must_equal "smartphone"
+      value(client.device_type).must_equal 'smartphone'
     end
-
   end
-
 end
-

data/spec/device_detector/detector_fixtures_spec.rb

@@ -1,71 +1,73 @@
 require_relative '../spec_helper'
 
 describe DeviceDetector do
-
-  fixture_dir = File.expand_path('../../fixtures/detector', __FILE__)
+  fixture_dir = File.expand_path('../fixtures/detector', __dir__)
   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}"
+        raise "Failed to parse #{fixture_file}, reason: #{e}"
       end
 
       def str_or_nil(string)
+        return nil if string.nil?
         return nil if string == ''
-        string
+
+        string.to_s
       end
 
       fixtures.each do |f|
-
-        user_agent = f["user_agent"]
+        user_agent = f['user_agent']
         detector = DeviceDetector.new(user_agent)
         os = detector.send(:os)
 
         describe user_agent do
-          it "should be detected" do
+          it 'should be detected' do
             if detector.bot?
-              assert_equal str_or_nil(f["bot"]["name"]), detector.bot_name, "failed bot name detection"
+              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"
+              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"
+              os_family = str_or_nil(f['os_family'])
+              if os_family != 'Unknown'
                 if os_family.nil?
-                  assert_nil os.family, "failed os family detection"
+                  assert_nil os.family, 'failed os family detection'
                 else
-                  assert_equal os_family, os.family, "failed os family detection"
+                  assert_equal os_family, os.family, 'failed os family detection'
                 end
 
-                name = str_or_nil(f["os"]["name"])
+                name = str_or_nil(f['os']['name'])
                 if name.nil?
-                  assert_nil os.name, "failed os name detection"
+                  assert_nil os.name, 'failed os name detection'
                 else
-                  assert_equal name, os.name, "failed os name detection"
+                  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"
+                short_name = str_or_nil(f['os']['short_name'])
+                if short_name.nil? && f['os']['name']
+                  short_name = DeviceDetector::OS::OPERATING_SYSTEMS[f['os']['name']]
                 end
 
-                os_version = str_or_nil(f["os"]["version"])
+                unless short_name.nil?
+                  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"
+                  assert_nil os.full_version, 'failed os version detection'
                 else
-                  assert_equal os_version, os.full_version, "failed os version detection"
+                  assert_equal os_version, os.full_version, 'failed os version detection'
                 end
               end
-              if f["device"]
-                expected_type = str_or_nil(f["device"]["type"])
+              if f['device']
+                expected_type = str_or_nil(f['device']['type'])
                 actual_type = detector.device_type
 
                 if expected_type != actual_type
@@ -74,27 +76,24 @@ describe DeviceDetector do
                   # detector.device_type
                 end
                 if expected_type.nil?
-                  assert_nil actual_type, "failed device type detection"
+                  assert_nil actual_type, 'failed device type detection'
                 else
-                  assert_equal expected_type, actual_type, "failed device type detection"
+                  assert_equal expected_type, actual_type, 'failed device type detection'
                 end
 
-                model = str_or_nil(f["device"]["model"])
+                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"
+                  assert_nil detector.device_name, 'failed device name detection'
                 else
-                  assert_equal model, detector.device_name, "failed device name detection"
+                  assert_equal model, detector.device_name, 'failed device name detection'
                 end
               end
             end
           end
         end
       end
-
     end
-
   end
-
 end

data/spec/device_detector/device_spec.rb

@@ -1,18 +1,20 @@
+# frozen_string_literal: true
+
 require_relative '../spec_helper'
 
 describe DeviceDetector::Device do
-
   subject { DeviceDetector::Device.new(user_agent) }
 
-  alias :device :subject
+  alias_method :device, :subject
 
   describe '#name' do
-
     describe 'when models are nested' do
-      let(:user_agent) { 'Mozilla/5.0 (iPhone; CPU iPhone OS 8_1_3 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Mobile/12B466 [FBDV/iPhone7,2]' }
+      let(:user_agent) do
+        'Mozilla/5.0 (iPhone; CPU iPhone OS 8_1_3 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Mobile/12B466 [FBDV/iPhone7,2]'
+      end
 
       it 'finds an Apple iPhone 6' do
-        device.name.must_equal 'iPhone 6'
+        value(device.name).must_equal 'iPhone 6'
       end
     end
 
@@ -20,7 +22,7 @@ describe DeviceDetector::Device do
       let(:user_agent) { 'AIRNESS-AIR99/REV 2.2.1/Teleca Q03B1' }
 
       it 'finds an Airness AIR99' do
-        device.name.must_equal 'AIR99'
+        value(device.name).must_equal 'AIR99'
       end
     end
 
@@ -28,19 +30,19 @@ describe DeviceDetector::Device do
       let(:user_agent) { 'UNKNOWN MODEL NAME' }
 
       it 'returns nil' do
-        device.name.must_be_nil
+        value(device.name).must_be_nil
       end
     end
-
   end
 
   describe '#type' do
-
     describe 'when models are nested' do
-      let(:user_agent) { 'Mozilla/5.0 (iPhone; CPU iPhone OS 8_1_3 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Mobile/12B466 [FBDV/iPhone7,2]' }
+      let(:user_agent) do
+        'Mozilla/5.0 (iPhone; CPU iPhone OS 8_1_3 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Mobile/12B466 [FBDV/iPhone7,2]'
+      end
 
       it 'finds device of Apple iPhone 6' do
-        device.type.must_equal 'smartphone'
+        value(device.type).must_equal 'smartphone'
       end
     end
 
@@ -48,7 +50,7 @@ describe DeviceDetector::Device do
       let(:user_agent) { 'AIRNESS-AIR99/REV 2.2.1/Teleca Q03B1' }
 
       it 'finds the device of Airness AIR99' do
-        device.type.must_equal 'feature phone'
+        value(device.type).must_equal 'feature phone'
       end
     end
 
@@ -56,96 +58,90 @@ describe DeviceDetector::Device do
       let(:user_agent) { 'UNKNOWN MODEL TYPE' }
 
       it 'returns nil' do
-        device.type.must_be_nil
+        value(device.type).must_be_nil
       end
-
     end
 
     describe 'device not specified in nested block' do
-
-      let(:user_agent) { 'Mozilla/5.0 (Linux; Android 4.4.2; es-us; SAMSUNG SM-G900F Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko)' }
+      let(:user_agent) do
+        'Mozilla/5.0 (Linux; Android 4.4.2; es-us; SAMSUNG SM-G900F Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko)'
+      end
 
       it 'falls back to top-level device' do
-        device.type.must_equal 'smartphone'
+        value(device.type).must_equal 'smartphone'
       end
-
     end
-
   end
 
   describe 'concrete device types' do
-
     describe 'mobiles' do
-
-      let(:user_agent) { 'Mozilla/5.0 (Linux; Android 4.4.2; es-us; SAMSUNG SM-G900F Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko)' }
+      let(:user_agent) do
+        'Mozilla/5.0 (Linux; Android 4.4.2; es-us; SAMSUNG SM-G900F Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko)'
+      end
 
       it 'identifies the device' do
-        device.name.must_equal 'GALAXY S5'
-        device.type.must_equal 'smartphone'
-        device.brand.must_equal 'Samsung'
+        value(device.name).must_equal 'Galaxy S5'
+        value(device.type).must_equal 'smartphone'
+        value(device.brand).must_equal 'Samsung'
       end
-
     end
 
     describe 'cameras' do
-
-      let(:user_agent) { 'Mozilla/5.0 (Linux; U; Android 4.0; xx-xx; EK-GC100 Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30' }
+      let(:user_agent) do
+        'Mozilla/5.0 (Linux; U; Android 4.0; xx-xx; EK-GC100 Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30'
+      end
 
       it 'identifies the device' do
-        device.name.must_equal 'GALAXY Camera'
-        device.type.must_equal 'camera'
-        device.brand.must_equal 'Samsung'
+        value(device.name).must_equal 'Galaxy Camera'
+        value(device.type).must_equal 'camera'
+        value(device.brand).must_equal 'Samsung'
       end
-
     end
 
     describe 'car browsers' do
-
-      let(:user_agent) { 'Mozilla/5.0 (X11; Linux) AppleWebKit/534.34 (KHTML, like Gecko) QtCarBrowser Safari/534.34' }
+      let(:user_agent) do
+        'Mozilla/5.0 (X11; Linux) AppleWebKit/534.34 (KHTML, like Gecko) QtCarBrowser Safari/534.34'
+      end
 
       it 'identifies the device' do
-        device.name.must_equal 'Model S'
-        device.type.must_equal 'car browser'
-        device.brand.must_be_nil
+        value(device.name).must_equal 'Model S'
+        value(device.type).must_equal 'car browser'
+        value(device.brand).must_equal 'Tesla'
       end
-
     end
 
     describe '(gaming) consoles' do
-
       let(:user_agent) { 'Opera/9.30 (Nintendo Wii; U; ; 2047-7;en)' }
 
       it 'identifies the device' do
-        device.name.must_equal 'Wii'
-        device.type.must_equal 'console'
-        device.brand.must_be_nil
+        value(device.name).must_equal 'Wii'
+        value(device.type).must_equal 'console'
+        value(device.brand).must_be_nil
       end
-
     end
 
     describe 'portable media players' do
-
-      let(:user_agent) { 'Mozilla/5.0 (iPod touch; CPU iPhone OS 7_0_6 like Mac OS X) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11B651 Safari/9537.53' }
+      let(:user_agent) do
+        'Mozilla/5.0 (iPod touch; CPU iPhone OS 7_0_6 like Mac OS X) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11B651 Safari/9537.53'
+      end
 
       it 'identifies the device' do
-        device.name.must_equal 'iPod Touch'
-        device.type.must_equal 'portable media player'
-        device.brand.must_equal 'Apple'
+        value(device.name).must_equal 'iPod Touch'
+        value(device.type).must_equal 'portable media player'
+        value(device.brand).must_equal 'Apple'
       end
-
     end
 
     describe 'televisions' do
-
-      let(:user_agent) { 'Mozilla/5.0 (Unknown; Linux armv7l) AppleWebKit/537.1+ (KHTML, like Gecko) Safari/537.1+ HbbTV/1.1.1 ( ;LGE ;NetCast 4.0 ;03.10.81 ;1.0M ;)' }
+      let(:user_agent) do
+        'Mozilla/5.0 (Unknown; Linux armv7l) AppleWebKit/537.1+ (KHTML, like Gecko) Safari/537.1+ HbbTV/1.1.1 ( ;LGE ;NetCast 4.0 ;03.10.81 ;1.0M ;)'
+      end
 
       it 'identifies the device' do
-        device.name.must_equal 'NetCast 4.0'
-        device.type.must_equal 'tv'
-        device.brand.must_equal 'LG'
+        value(device.name).must_equal 'NetCast 4.0'
+        value(device.type).must_equal 'tv'
+        value(device.brand).must_equal 'LG'
       end
-
     end
   end
-
 end

data/spec/device_detector/memory_cache_spec.rb

@@ -14,12 +14,12 @@ describe DeviceDetector::MemoryCache do
       it 'sets the value under the key' do
         subject.set(key, 'value')
 
-        subject.data[key].must_equal 'value'
+        value(subject.data[key]).must_equal 'value'
       end
 
       it 'returns the value' do
-        subject.set(key, 'value').must_equal 'value'
-        subject.set(key, false).must_equal false
+        value(subject.set(key, 'value')).must_equal 'value'
+        value(subject.set(key, false)).must_equal false
         assert_nil subject.set(key, nil)
       end
     end
@@ -30,7 +30,7 @@ describe DeviceDetector::MemoryCache do
       it 'sets the value under the key' do
         subject.set(key, 'value')
 
-        subject.data[String(key)].must_equal 'value'
+        value(subject.data[String(key)]).must_equal 'value'
       end
     end
 
@@ -41,14 +41,14 @@ describe DeviceDetector::MemoryCache do
       it 'sets the value under the key' do
         subject.set(key, nil)
 
-        subject.data[String(key)].must_equal internal_value
+        value(subject.data[String(key)]).must_equal internal_value
         assert_nil subject.get(key)
       end
 
       it 'sets the value under the key' do
         subject.get_or_set(key, nil)
 
-        subject.data[String(key)].must_equal internal_value
+        value(subject.data[String(key)]).must_equal internal_value
         assert_nil subject.get(key)
       end
     end
@@ -59,15 +59,15 @@ describe DeviceDetector::MemoryCache do
       it 'sets the value under the key' do
         subject.set(key, false)
 
-        subject.data[String(key)].must_equal false
-        subject.get(key).must_equal false
+        value(subject.data[String(key)]).must_equal false
+        value(subject.get(key)).must_equal false
       end
 
       it 'sets the value under the key' do
         subject.get_or_set(key, false)
 
-        subject.data[String(key)].must_equal false
-        subject.get(key).must_equal false
+        value(subject.data[String(key)]).must_equal false
+        value(subject.get(key)).must_equal false
       end
     end
   end
@@ -79,7 +79,7 @@ describe DeviceDetector::MemoryCache do
       it 'gets the value for the key' do
         subject.data[key] = 'value'
 
-        subject.get(key).must_equal 'value'
+        value(subject.get(key)).must_equal 'value'
       end
     end
 
@@ -89,7 +89,7 @@ describe DeviceDetector::MemoryCache do
       it 'gets the value for the key' do
         subject.data[String(key)] = 'value'
 
-        subject.get(key).must_equal 'value'
+        value(subject.get(key)).must_equal 'value'
       end
     end
   end
@@ -106,13 +106,13 @@ describe DeviceDetector::MemoryCache do
           block_called = true
         end
 
-        value.must_equal 'value'
-        block_called.must_equal false
+        value(value).must_equal 'value'
+        value(block_called).must_equal false
       end
 
       it 'returns the value' do
         subject.data[key] = 'value2'
-        subject.get_or_set(key, 'value').must_equal 'value2'
+        value(subject.get_or_set(key, 'value')).must_equal 'value2'
       end
     end
 
@@ -123,12 +123,12 @@ describe DeviceDetector::MemoryCache do
           block_called = true
         end
 
-        block_called.must_equal true
-        subject.data[key].must_equal true
+        value(block_called).must_equal true
+        value(subject.data[key]).must_equal true
       end
 
       it 'returns the value' do
-        subject.get_or_set(key, 'value').must_equal 'value'
+        value(subject.get_or_set(key, 'value')).must_equal 'value'
       end
     end
   end
@@ -142,7 +142,7 @@ describe DeviceDetector::MemoryCache do
       subject.set('3', 'baz')
       subject.set('4', 'boz')
 
-      subject.data.keys.size.must_equal 3
+      value(subject.data.keys.size).must_equal 3
     end
   end
 end