device_detector 1.0.1 → 1.0.2

data/regexes/device/televisions.yml

@@ -293,4 +293,4 @@ Videoweb:
     - regex: '(tv2n)'
       model: '$1'
     - regex: '(videowebtv)'
-      model: 'VideoWeb TV'
+      model: 'VideoWeb TV'

data/regexes/oss.yml

@@ -65,6 +65,13 @@
   name: 'Windows IoT'
   version: '10'
 
+##########
+# KaiOS
+##########
+- regex: 'KAIOS(?:/(\d+[\.\d]+))?'
+  name: 'KaiOS'
+  version: '$1'
+
 ##########
 # Custom Android Roms
 ##########
@@ -84,10 +91,14 @@
   name: 'MocorDroid'
   version: '$1'
 
+- regex: 'Fire OS(?:/(\d+[\.\d]*))?'
+  name: 'Fire OS'
+  version: '$1'
+
 ##########
 # Android
 ##########
-- regex: '(?:(?:Orca-)?Android|Adr)[ /](?:[a-z]+ )?(\d+[\.\d]+)'
+- regex: '(?:(?:Orca-)?Android|Adr)[ /](?:[a-z]+ )?(\d+[\.\d]*)'
   name: 'Android'
   version: '$1'
   
@@ -96,6 +107,10 @@
   name: 'Android'
   version: ''
 
+- regex: '(?:TwitterAndroid).*[ /](?:[a-z]+ )?(\d+[\.\d]*)'
+  name: 'Android'
+  version: '$1'
+
 - regex: 'BeyondPod|AntennaPod|Podkicker|DoggCatcher|Player FM|okhttp|Podcatcher Deluxe'
   name: 'Android'
   version: ''
@@ -249,12 +264,59 @@
 - regex: 'Windows'
   name: 'Windows'
   version: ''
-  
-  
+
+
+##########
+# Haiku OS
+##########
+- regex: 'Haiku'
+  name: 'Haiku OS'
+  version: ''
+
   
 ##########
 # iOS
 ##########
+- regex: 'CFNetwork/889'
+  name: 'iOS'
+  version: '11.1'
+
+- regex: 'CFNetwork/887.*(x86_64)'
+  name: 'Mac'
+  version: '10.13'
+
+- regex: 'CFNetwork/887'
+  name: 'iOS'
+  version: '11.0'
+
+- regex: 'CFNetwork/811.*(x86_64)'
+  name: 'Mac'
+  version: '10.12'
+
+- regex: 'CFNetwork/811'
+  name: 'iOS'
+  version: '10.3'
+
+- regex: 'CFNetwork/808\.3'
+  name: 'iOS'
+  version: '10.3'
+
+- regex: 'CFNetwork/808\.2'
+  name: 'iOS'
+  version: '10.2'
+
+- regex: 'CFNetwork/808\.1'
+  name: 'iOS'
+  version: '10.1'
+
+- regex: 'CFNetwork/808\.0'
+  name: 'iOS'
+  version: '10.0'
+
+- regex: 'CFNetwork/808'
+  name: 'iOS'
+  version: '10'
+
 - regex: 'CFNetwork/758\.4\.3'
   name: 'iOS'
   version: '9.3.2'
@@ -355,7 +417,7 @@
   name: 'iOS'
   version: '$1'
 
-- regex: 'Podcasts/(?:[\d\.]+)|Instacast(?:HD)?/(?:\d\.[\d\.abc]+)|Pocket Casts, iOS|Overcast|Castro|Podcat|i[cC]atcher'
+- regex: 'Podcasts/(?:[\d\.]+)|Instacast(?:HD)?/(?:\d\.[\d\.abc]+)|Pocket Casts, iOS|Overcast|Castro|Podcat|i[cC]atcher|RSSRadio/'
   name: 'iOS'
   version: ''
 
@@ -368,6 +430,10 @@
 # Mac
 ##########
 
+- regex: 'CFNetwork/807'
+  name: 'Mac'
+  version: '10.12'
+
 - regex: 'CFNetwork/760'
   name: 'Mac'
   version: '10.11'
@@ -408,7 +474,7 @@
   name: 'Mac'
   version: '10.2'
 
-- regex: 'Mac OS X(?: (?:Version )?(\d+(?:[_\.]\d+)+))?'
+- regex: 'Mac[ +]OS[ +]X(?:[ /](?:Version )?(\d+(?:[_\.]\d+)+))?'
   name: 'Mac'
   version: '$1'
   
@@ -458,14 +524,6 @@
   version: ''
 
 
-##########
-# Haiku OS
-##########
-- regex: 'Haiku'
-  name: 'Haiku OS'
-  version: ''
-
-
 ##########
 # BeOS
 ##########

data/spec/device_detector/memory_cache_spec.rb

@@ -1,15 +1,14 @@
+# frozen_string_literal: true
+
 require_relative '../spec_helper'
 
 describe DeviceDetector::MemoryCache do
-
   let(:subject) { DeviceDetector::MemoryCache.new(config) }
 
   let(:config) { {} }
 
   describe '#set' do
-
     describe 'string key' do
-
       let(:key) { 'string' }
 
       it 'sets the value under the key' do
@@ -18,26 +17,63 @@ describe DeviceDetector::MemoryCache do
         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
+        assert_nil subject.set(key, nil)
+      end
     end
 
     describe 'array key' do
-
-      let(:key) { ['string1', 'string2'] }
+      let(:key) { %w[string1 string2] }
 
       it 'sets the value under the key' do
         subject.set(key, 'value')
 
         subject.data[String(key)].must_equal 'value'
       end
+    end
+
+    describe 'nil value' do
+      let(:key) { 'string' }
+      let(:internal_value) { DeviceDetector::MemoryCache::STORES_NIL_VALUE }
+
+      it 'sets the value under the key' do
+        subject.set(key, nil)
 
+        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
+        assert_nil subject.get(key)
+      end
     end
 
+    describe 'false value' do
+      let(:key) { 'string' }
+
+      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
+      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
+      end
+    end
   end
 
   describe '#get' do
-
     describe 'string key' do
-
       let(:key) { 'string' }
 
       it 'gets the value for the key' do
@@ -45,29 +81,23 @@ describe DeviceDetector::MemoryCache do
 
         subject.get(key).must_equal 'value'
       end
-
     end
 
     describe 'array key' do
-
-      let(:key) { ['string1', 'string2'] }
+      let(:key) { %w[string1 string2] }
 
       it 'gets the value for the key' do
         subject.data[String(key)] = 'value'
 
         subject.get(key).must_equal 'value'
       end
-
     end
-
   end
 
   describe '#get_or_set' do
-
     let(:key) { 'string' }
 
     describe 'value already present' do
-
       it 'gets the value for the key from cache' do
         subject.data[key] = 'value'
 
@@ -80,10 +110,13 @@ describe DeviceDetector::MemoryCache do
         block_called.must_equal false
       end
 
+      it 'returns the value' do
+        subject.data[key] = 'value2'
+        subject.get_or_set(key, 'value').must_equal 'value2'
+      end
     end
 
     describe 'value not yet present' do
-
       it 'evaluates the block and sets the result' do
         block_called = false
         subject.get_or_set(key) do
@@ -94,12 +127,13 @@ describe DeviceDetector::MemoryCache do
         subject.data[key].must_equal true
       end
 
+      it 'returns the value' do
+        subject.get_or_set(key, 'value').must_equal 'value'
+      end
     end
-
   end
 
   describe 'cache purging' do
-
     let(:config) { { max_cache_keys: 3 } }
 
     it 'purges the cache when key size arrives at max' do
@@ -110,7 +144,5 @@ describe DeviceDetector::MemoryCache do
 
       subject.data.keys.size.must_equal 3
     end
-
   end
-
 end

data/spec/device_detector_spec.rb

@@ -1,218 +1,189 @@
+# frozen_string_literal: true
+
 require_relative 'spec_helper'
 
 describe DeviceDetector do
-
   subject { DeviceDetector.new(user_agent) }
 
-  alias :client :subject
+  alias_method :client, :subject
 
   describe 'known user agent' do
-
     describe 'desktop chrome browser' do
-
       let(:user_agent) { 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.69' }
 
       describe '#name' do
-
         it 'returns the name' do
           client.name.must_equal 'Chrome'
         end
-
       end
 
       describe '#full_version' do
-
         it 'returns the full version' do
           client.full_version.must_equal '30.0.1599.69'
         end
+      end
 
+      describe '#os_family' do
+        it 'returns the operating system name' do
+          client.os_family.must_equal 'Mac'
+        end
       end
 
       describe '#os_name' do
-
         it 'returns the operating system name' do
           client.os_name.must_equal 'Mac'
         end
-
       end
 
       describe '#os_full_version' do
-
         it 'returns the operating system full version' do
           client.os_full_version.must_equal '10.8.5'
         end
-
       end
 
       describe '#known?' do
-
         it 'returns true' do
           client.known?.must_equal true
         end
-
       end
 
       describe '#bot?' do
-
         it 'returns false' do
           client.bot?.must_equal false
         end
-
       end
 
       describe '#bot_name' do
-
         it 'returns nil' do
           client.bot_name.must_be_nil
         end
+      end
+    end
 
+    describe 'ubuntu linux' do
+      let(:user_agent) do
+        'Mozilla/5.0 (X11; Ubuntu; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.101 Safari/537.36'
+      end
+
+      describe '#os_family' do
+        it 'returns the operating system name' do
+          client.os_family.must_equal 'GNU/Linux'
+        end
       end
 
+      describe '#os_name' do
+        it 'returns the operating system name' do
+          client.os_name.must_equal 'Ubuntu'
+        end
+      end
     end
 
     describe 'firefox mobile phone' do
-
-      let(:user_agent) {'Mozilla/5.0 (Android 7.0; Mobile; rv:53.0) Gecko/53.0 Firefox/53.0'}
+      let(:user_agent) { 'Mozilla/5.0 (Android 7.0; Mobile; rv:53.0) Gecko/53.0 Firefox/53.0' }
 
       it 'detects smartphone' do
         client.device_type.must_equal 'smartphone'
       end
-
     end
 
     describe 'firefox mobile tablet' do
-
-      let(:user_agent) {'Mozilla/5.0 (Android 6.0.1; Tablet; rv:47.0) Gecko/47.0 Firefox/47.0'}
+      let(:user_agent) { 'Mozilla/5.0 (Android 6.0.1; Tablet; rv:47.0) Gecko/47.0 Firefox/47.0' }
 
       it 'detects tablet' do
         client.device_type.must_equal 'tablet'
       end
-
     end
-
   end
 
   describe 'unknown user agent' do
-
     let(:user_agent) { 'garbage123' }
 
     describe '#name' do
-
       it 'returns nil' do
         client.name.must_be_nil
       end
-
     end
 
     describe '#full_version' do
-
       it 'returns nil' do
         client.full_version.must_be_nil
       end
-
     end
 
     describe '#os_name' do
-
       it 'returns nil' do
         client.os_name.must_be_nil
       end
-
     end
 
     describe '#os_full_version' do
-
       it 'returns nil' do
         client.os_full_version.must_be_nil
       end
-
     end
 
     describe '#known?' do
-
       it 'returns false' do
         client.known?.must_equal false
       end
-
     end
 
     describe '#bot?' do
-
       it 'returns false' do
         client.bot?.must_equal false
       end
-
     end
 
     describe '#bot_name' do
-
       it 'returns nil' do
         client.bot_name.must_be_nil
       end
-
     end
-
   end
 
   describe 'bot' do
-
     let(:user_agent) { 'Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)' }
 
     describe '#name' do
-
       it 'returns nil' do
         client.name.must_be_nil
       end
-
     end
 
     describe '#full_version' do
-
       it 'returns nil' do
         client.full_version.must_be_nil
       end
-
     end
 
     describe '#os_name' do
-
       it 'returns nil' do
         client.os_name.must_be_nil
       end
-
     end
 
     describe '#os_full_version' do
-
       it 'returns nil' do
         client.os_full_version.must_be_nil
       end
-
     end
 
     describe '#known?' do
-
       it 'returns false' do
         client.known?.must_equal false
       end
-
     end
 
     describe '#bot?' do
-
       it 'returns true' do
         client.bot?.must_equal true
       end
-
     end
 
     describe '#bot_name' do
-
       it 'returns the name of the bot' do
         client.bot_name.must_equal 'Googlebot'
       end
-
     end
-
   end
 end