device_detector 1.0.5 → 1.0.6

data/spec/device_detector/concrete_user_agent_spec.rb

@@ -1,66 +1,57 @@
 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
         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' }
+    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
         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
         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
         value(client.name).must_equal 'Chrome'
@@ -71,14 +62,14 @@ describe DeviceDetector do
       end
 
       it 'recognizes the device type' do
-        value(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
         value(client.name).must_equal 'Chrome'
@@ -89,47 +80,44 @@ describe DeviceDetector do
       end
 
       it 'recognizes the device type' do
-        value(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
-      value(client.name).must_equal "Android Browser"
+      value(client.name).must_equal 'Android Browser'
     end
 
     it 'recognizes the device name' do
-      value(client.device_name).must_equal "GALAXY S5"
+      value(client.device_name).must_equal 'Galaxy S5'
     end
 
     it 'recognizes the device type' do
-      value(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
-      value(client.name).must_equal "Android Browser"
+      value(client.name).must_equal 'Android Browser'
     end
 
     it 'recognizes the device name' do
-      value(client.device_name).must_equal "A398t+"
+      value(client.device_name).must_equal 'A398t+'
     end
 
     it 'recognizes the device type' do
-      value(client.device_type).must_equal "smartphone"
+      value(client.device_type).must_equal 'smartphone'
     end
-
   end
-
 end

data/spec/device_detector/detector_fixtures_spec.rb

@@ -27,10 +27,12 @@ describe DeviceDetector do
         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'
+              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'
+                assert_equal str_or_nil(f['client']['name']), detector.name,
+                             'failed client name detection'
               end
 
               os_family = str_or_nil(f['os_family'])
@@ -49,9 +51,11 @@ describe DeviceDetector do
                 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
+                if short_name.nil? && f['os']['name']
+                  short_name = DeviceDetector::OS::OPERATING_SYSTEMS[f['os']['name']]
+                end
+
+                unless short_name.nil?
                   assert_equal short_name, os.short_name, 'failed os short name detection'
                 end
 

data/spec/device_detector/device_spec.rb

@@ -9,7 +9,9 @@ describe DeviceDetector::Device do
 
   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
         value(device.name).must_equal 'iPhone 6'
@@ -35,7 +37,9 @@ describe DeviceDetector::Device do
 
   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
         value(device.type).must_equal 'smartphone'
@@ -59,7 +63,9 @@ describe DeviceDetector::Device do
     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
         value(device.type).must_equal 'smartphone'
@@ -69,27 +75,33 @@ describe DeviceDetector::Device do
 
   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
-        value(device.name).must_equal 'GALAXY S5'
+        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
-        value(device.name).must_equal 'GALAXY Camera'
+        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
         value(device.name).must_equal 'Model S'
@@ -109,7 +121,9 @@ describe DeviceDetector::Device do
     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
         value(device.name).must_equal 'iPod Touch'
@@ -119,7 +133,9 @@ describe DeviceDetector::Device do
     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
         value(device.name).must_equal 'NetCast 4.0'