device_detector 0.3.1 → 0.4.0

data/spec/device_detector/device_spec.rb

@@ -0,0 +1,64 @@
+require 'spec_helper'
+
+describe DeviceDetector::Device do
+
+  subject(:device) { DeviceDetector::Device.new(user_agent) }
+
+  describe '#name' do
+
+    context '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]' }
+
+      it 'finds an Apple iPhone 6' do
+        expect(device.name).to eq('iPhone 6')
+      end
+    end
+
+    context 'when models are NOT nested' do
+      let(:user_agent) { 'AIRNESS-AIR99/REV 2.2.1/Teleca Q03B1' }
+
+      it 'finds an Airness AIR99' do
+        expect(device.name).to eq('AIR99')
+      end
+    end
+
+    context 'when it cannot find a device name' do
+      let(:user_agent) { 'UNKNOWN MODEL NAME' }
+
+      it 'returns nil' do
+        expect(device.name).to eq(nil)
+      end
+    end
+
+  end
+
+  describe '#type' do
+
+    context '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]' }
+
+      it 'finds device of Apple iPhone 6' do
+        expect(device.type).to eq('smartphone')
+      end
+    end
+
+    context 'when models are NOT nested' do
+      let(:user_agent) { 'AIRNESS-AIR99/REV 2.2.1/Teleca Q03B1' }
+
+      it 'finds the device of Airness AIR99' do
+        expect(device.type).to eq('feature phone')
+      end
+    end
+
+    context 'when it cannot find a device type' do
+      let(:user_agent) { 'UNKNOWN MODEL TYPE' }
+
+      it 'returns nil' do
+        expect(device.type).to eq(nil)
+      end
+
+    end
+
+  end
+
+end

data/spec/device_detector/model_extractor_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+describe DeviceDetector::ModelExtractor do
+
+  subject(:extractor) { DeviceDetector::ModelExtractor.new(user_agent, regex_meta) }
+
+  describe '#call' do
+
+    context 'when matching against dynamic model' do
+
+      let(:regex_meta) do
+        {
+          'regex'  => '(?:Apple-)?iPhone ?(3GS?|4S?|5[CS]?|6(:? Plus)?)?',
+          'model'  => 'iPhone $1',
+          'device' => 'smartphone'
+        }
+      end
+
+      context 'when no dynamic match is found' 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) Version/8.0 Mobile/12B466 Safari/600.1.4' }
+        let(:device_name) { 'iPhone' }
+
+        it 'returns the textual portion without trailing whitespace' do
+          expect(extractor.call).to eq(device_name)
+        end
+
+      end
+
+      context 'when a dynamic match is found' do
+        let(:user_agent) { 'Mozilla/5.0 (iPhone 5S; CPU iPhone OS 8_1_3 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Version/8.0 Mobile/12B466 Safari/600.1.4' }
+        let(:device_name) { 'iPhone 5S' }
+
+        it 'returns the full device name' do
+          expect(extractor.call).to eq(device_name)
+        end
+
+      end
+
+    end
+
+    context 'when matching against static model' do
+
+      let(:user_agent) { 'Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Mobile/12A365 Weibo (iPhone7,2)' }
+      let(:device_name) { 'iPhone 6' }
+      let(:regex_meta) do
+        {
+          'regex'  => '(?:Apple-)?iPhone7[C,]2',
+          'model'  => 'iPhone 6',
+          'device' => 'smartphone'
+        }
+      end
+
+      it 'returns the model name' do
+        expect(extractor.call).to eq(device_name)
+      end
+
+    end
+
+  end
+
+end

data/spec/device_detector/version_extractor_spec.rb

@@ -27,6 +27,7 @@ RSpec.describe DeviceDetector::VersionExtractor do
     context 'regex with dynamic matching' do
 
       let(:user_agent) { 'Mozilla/5.0 (X11; U; Linux i686; nl; rv:1.8.1b2) Gecko/20060821 BonEcho/2.0b2 (Debian-1.99+2.0b2+dfsg-1)' }
+      let(:version) { 'BonEcho (2.0)' }
       let(:regex_meta) do
         {
           'regex' => '(BonEcho|GranParadiso|Lorentz|Minefield|Namoroka|Shiretoko)/(\d+[\.\d]+)',
@@ -36,7 +37,12 @@ RSpec.describe DeviceDetector::VersionExtractor do
       end
 
       it 'returns the correct version' do
-        expect(extractor.call).to eq('BonEcho (2.0)')
+        expect(extractor.call).to eq(version)
+      end
+
+      it 'removes trailing white spaces' do
+        regex_meta['version'] = regex_meta['version'] + '   '
+        expect(extractor.call).to eq(version)
       end
 
     end

data/spec/device_detector_spec.rb

@@ -6,60 +6,86 @@ RSpec.describe DeviceDetector do
 
   context 'known user agent' 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' }
+    context 'desktop chrome browser' do
 
-    describe '#name' 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
+          expect(client.name).to eq('Chrome')
+        end
 
-      it 'returns the name' do
-        expect(client.name).to eq('Chrome')
       end
 
-    end
+      describe '#full_version' do
 
-    describe '#full_version' do
+        it 'returns the full version' do
+          expect(client.full_version).to eq('30.0.1599.69')
+        end
 
-      it 'returns the full version' do
-        expect(client.full_version).to eq('30.0.1599.69')
       end
 
-    end
+      describe '#os_name' do
 
-    describe '#os_name' do
+        it 'returns the operating system name' do
+          expect(client.os_name).to eq('Mac')
+        end
 
-      it 'returns the operating system name' do
-        expect(client.os_name).to eq('Mac')
       end
 
-    end
+      describe '#os_full_version' do
 
-    describe '#os_full_version' do
+        it 'returns the operating system full version' do
+          expect(client.os_full_version).to eq('10_8_5')
+        end
 
-      it 'returns the operating system full version' do
-        expect(client.os_full_version).to eq('10_8_5')
       end
 
-    end
+      describe '#known?' do
 
-    describe '#known?' do
+        it 'returns true' do
+          expect(client.known?).to eq(true)
+        end
 
-      it 'returns true' do
-        expect(client.known?).to eq(true)
       end
 
-    end
+      describe '#bot?' do
 
-    describe '#bot?' do
+        it 'returns false' do
+          expect(client.bot?).to eq(false)
+        end
+
+      end
+
+      describe '#bot_name' do
+
+        it 'returns nil' do
+          expect(client.bot_name).to be_nil
+        end
 
-      it 'returns false' do
-        expect(client.bot?).to eq(false)
       end
 
     end
 
-    describe '#bot_name' do
+    context '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
+          expect(client.device_name).to eq('iPhone 5S')
+        end
+
+      end
+
+      describe '#device_type' do
+
+        it 'returns the device type' do
+          expect(client.device_type).to eq('smartphone')
+        end
 
-      it 'returns nil' do
-        expect(client.bot_name).to be_nil
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: device_detector
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Mati Sójka
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -62,7 +62,10 @@ files:
 - lib/device_detector.rb
 - lib/device_detector/bot.rb
 - lib/device_detector/client.rb
+- lib/device_detector/device.rb
 - lib/device_detector/memory_cache.rb
+- lib/device_detector/metadata_extractor.rb
+- lib/device_detector/model_extractor.rb
 - lib/device_detector/os.rb
 - lib/device_detector/parser.rb
 - lib/device_detector/version.rb
@@ -70,13 +73,16 @@ files:
 - regexes/bots.yml
 - regexes/browser_engines.yml
 - regexes/browsers.yml
+- regexes/devices/mobiles.yml
 - regexes/feed_readers.yml
 - regexes/libraries.yml
 - regexes/mediaplayers.yml
 - regexes/mobile_apps.yml
 - regexes/oss.yml
 - regexes/pim.yml
+- spec/device_detector/device_spec.rb
 - spec/device_detector/memory_cache_spec.rb
+- spec/device_detector/model_extractor_spec.rb
 - spec/device_detector/version_extractor_spec.rb
 - spec/device_detector_spec.rb
 - spec/spec_helper.rb
@@ -100,12 +106,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Universal Device Detection
 test_files:
+- spec/device_detector/device_spec.rb
 - spec/device_detector/memory_cache_spec.rb
+- spec/device_detector/model_extractor_spec.rb
 - spec/device_detector/version_extractor_spec.rb
 - spec/device_detector_spec.rb
 - spec/spec_helper.rb