device_detector 0.5.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f0bf4f5cd10e7dd06b4825842c96ab9ce0d5236
-  data.tar.gz: dd414ed24f7701367f5e5cf05b3502a7a9a82461
+  metadata.gz: 89802f3d1a2276198bb17c6889848941b692e962
+  data.tar.gz: e4ee7d45dd2e0307a5e547f1f77e0e5f4f99e725
 SHA512:
-  metadata.gz: 4ffd8b88962d13e6f550cd279001cd9dafb06e40e791a23c85b6dc130155805612c4560db1b5eba45c357cb45d91e0ac9fde920060c29b8a1627af77ae602e5b
-  data.tar.gz: d16742dca52e42f7deed6714e9f71bcee501c2538423af8d54edb90da52f2a6104bc6291b631c6c1bc6a35ea1be7a8457e326ed31526ae9dac03f6a05eeeea3b
+  metadata.gz: 5c52585792a08a2bd4e9ee96439af347898113872f888119e60f0096239fec438d058c6782c89c4ed52e42cc1414d0776219b2b350730888b71ccf19e05cab65
+  data.tar.gz: 988d986ea34e7a9fa96efdf3414ea97eba1931d4b74e7db18b794dca732b2787907c8323f91f54d6102b7cb345367961881d812e6137690fd979ae208b3f3f52

data/.travis.yml

@@ -5,7 +5,6 @@ rvm:
   - 2.1.0
   - 2.2.0
   - ruby-head
-  - jruby-head
   - rbx-2
 script:
-  bundle exec rspec
+  bundle exec rake test

data/CHANGELOG.md

@@ -0,0 +1,21 @@
+# Change Log
+
+## [0.7.0]
+- [Issue #8](https://github.com/podigee/device_detector/issues/8) Fixed Mac OS X full version format. Thanks to [aaronchi](https://github.com/aaronchi) for reporting.
+
+## [0.6.0]
+
+- [Issue #7](https://github.com/podigee/device_detector/issues/7) Fixed missing name extraction from regexp. Thanks to [janxious](https://github.com/janxious) for reporting.
+- Optimized performance of name and version extraction, by using the built-in memory cache
+- Move specs from RSpec to the more lightweight Minitest
+
+## [0.5.1]
+
+- Added the minimum required Ruby version (>= 1.9.3)
+
+## [0.5.0]
+
+- Added rake task for automatic generation of supported and detectable clients and devices
+- Updated detection rules
+- Fixed device type detection, when type is specified on top level of a nested regex
+

data/README.md

@@ -4,7 +4,7 @@
 
 DeviceDetector is a precise and fast user agent parser and device detector written in Ruby, backed by the largest and most up-to-date user agent database.
 
-DeviceDetector will parse any user agent and detect the browser, operating system, device used (desktop, tablet, mobile, tv, cars, console, etc.), brand and model.
+DeviceDetector will parse any user agent and detect the browser, operating system, device used (desktop, tablet, mobile, tv, cars, console, etc.), brand and model. DeviceDetector detects thousands of user agent strings, even from rare and obscure browsers and devices.
 
 The DeviceDetector is optimized for speed of detection, by providing optimized code and in-memory caching.
 
@@ -62,15 +62,76 @@ client.known? # => will return false if user_agent is unknown
 ### Memory cache
 
 `DeviceDetector` will cache up 5,000 user agent strings to boost parsing performance.
-You can tune the amount of keys that will get saved in the cache:
+You can tune the amount of keys that will get saved in the cache. You have to call this code **before** you initialize the Detector.
 
 ```ruby
-# You have to call this code **before** you initialize the Detector
 DeviceDetector.configure do |config|
-  config.max_cache_keys = 20_000 # increment this if you have enough RAM, proceed with care
+  config.max_cache_keys = 5_000 # increment this if you have enough RAM, proceed with care
 end
 ```
 
+If you have a Rails application, you can create an initializer, for example `config/initializers/device_detector.rb`.
+
+## Benchmarks
+
+We have measured the parsing speed of almost 200,000 non-unique user agent strings and compared the speed of DeviceDetector with the two most popular user agent parsers in the Ruby community, Browser and UserAgent.
+
+### Testing machine specs
+
+- MacBook Pro 15", Late 2013
+- 2.6 GHz Intel Core i7
+- 16 GB 1600 MHz DDR3
+
+### Gem versions
+
+- DeviceDetector - 0.5.1
+- Browser - 0.8.0
+- UserAgent - 0.13.1
+
+### Code
+
+```ruby
+require 'device_detector'
+require 'browser'
+require 'user_agent'
+require 'benchmark'
+
+user_agent_strings = File.read('./tmp/user_agent_strings.txt').split("\n")
+
+## Benchmarks
+
+Benchmark.bm(15) do |x|
+  x.report('device_detector') {
+    user_agent_strings.each { |uas| DeviceDetector.new(uas).name }
+  }
+  x.report('browser') {
+    user_agent_strings.each { |uas| Browser.new(ua: uas).name }
+  }
+  x.report('useragent') {
+    user_agent_strings.each { |uas| UserAgent.parse(uas).browser }
+  }
+end
+```
+
+### Results
+
+```
+                      user     system      total        real
+device_detector   1.180000   0.010000   1.190000 (  1.198721)
+browser           2.240000   0.010000   2.250000 (  2.245493)
+useragent         4.490000   0.020000   4.510000 (  4.500673)
+
+                      user     system      total        real
+device_detector   1.190000   0.020000   1.210000 (  1.201447)
+browser           2.250000   0.010000   2.260000 (  2.261001)
+useragent         4.440000   0.010000   4.450000 (  4.451693)
+
+                      user     system      total        real
+device_detector   1.210000   0.020000   1.230000 (  1.228617)
+browser           2.220000   0.010000   2.230000 (  2.222565)
+useragent         4.450000   0.000000   4.450000 (  4.452741)
+```
+
 ## Detectable clients, bots and devices
 
 Updated on 2015-03-17

data/Rakefile

@@ -1,13 +1,12 @@
-require 'bundler/gem_tasks'
+require 'rake'
+require 'rake/testtask'
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
+Rake::TestTask.new do |t|
+  t.pattern = 'spec/**/*_spec.rb'
+  t.libs.push 'spec'
 end
 
-task default: :spec
+task default: :test
 
 task :detectable_names do
   require 'device_detector'

data/device_detector.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 1.9.3'
 
-  spec.add_development_dependency 'rspec' ,'~> 3.1', '>= 3.1.0'
+  spec.add_development_dependency 'minitest'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'pry', '~> 0.10'
 end

data/lib/device_detector.rb

@@ -7,6 +7,7 @@ require 'device_detector/version'
 require 'device_detector/metadata_extractor'
 require 'device_detector/version_extractor'
 require 'device_detector/model_extractor'
+require 'device_detector/name_extractor'
 require 'device_detector/memory_cache'
 require 'device_detector/parser'
 require 'device_detector/bot'

data/lib/device_detector/device.rb

@@ -30,8 +30,8 @@ class DeviceDetector
       ]
     end
 
-    def self.parse_regexes(regexes, device = nil)
-      regexes.map { |base, nest|
+    def parse_regexes(raw_regexes, device = nil)
+      raw_regexes.map { |base, nest|
 
         if !nest.nil? && nest.key?('models')
           default_device = nest['device']

data/lib/device_detector/metadata_extractor.rb

@@ -30,7 +30,7 @@ class DeviceDetector
     end
 
     def regex
-      Regexp.new(regex_meta['regex'])
+      @regex ||= regex_meta['regex']
     end
 
   end

data/lib/device_detector/name_extractor.rb

@@ -0,0 +1,19 @@
+class DeviceDetector
+  class NameExtractor < MetadataExtractor
+
+    def call
+      if /\$[0-9]/ =~ metadata_string
+        extract_metadata
+      else
+        metadata_string
+      end
+    end
+
+    private
+
+    def metadata_string
+      regex_meta['name']
+    end
+
+  end
+end

data/lib/device_detector/os.rb

@@ -1,6 +1,15 @@
 class DeviceDetector
   class OS < Parser
 
+    def full_version
+      raw_version = super
+
+      # This solution won't scale, but for now it will do
+      if raw_version && name == 'Mac'
+        raw_version.split('_').join('.')
+      end
+    end
+
     private
 
     def filenames

data/lib/device_detector/parser.rb

@@ -4,11 +4,15 @@ class DeviceDetector
     ROOT = File.expand_path('../../..', __FILE__)
 
     def name
-      regex_meta['name']
+      from_cache(['name', self.class.name, user_agent]) do
+        NameExtractor.new(user_agent, regex_meta).call
+      end
     end
 
     def full_version
-      VersionExtractor.new(user_agent, regex_meta).call
+      from_cache(['full_version', self.class.name, user_agent]) do
+        VersionExtractor.new(user_agent, regex_meta).call
+      end
     end
 
     private
@@ -18,13 +22,13 @@ class DeviceDetector
     end
 
     def matching_regex
-      DeviceDetector.cache.get_or_set([self.class.name, user_agent]) do
+      from_cache([self.class.name, user_agent]) do
         regexes.find { |r| user_agent =~ r['regex'] }
       end
     end
 
     def regexes
-      self.class.regexes_for(filepaths)
+      @regexes ||= regexes_for(filepaths)
     end
 
     def filenames
@@ -37,34 +41,30 @@ class DeviceDetector
       end
     end
 
-    class << self
+    def regexes_for(filepaths)
+      from_cache(['regexes', self.class]) do
+        raw_regexes = load_regexes
+        parsed_regexes = raw_regexes.map { |r| parse_regexes(r) }
 
-      # This is a performance optimization.
-      # We cache the regexes on the class for better performance
-      # Thread-safety shouldn't be an issue, as we do only perform reads
-      def regexes_for(filepaths)
-        @regexes ||=
-          begin
-            regexes = load_regexes(filepaths)
-            parsed_regexes = regexes.map { |r| parse_regexes(r) }
-
-            parsed_regexes.flatten
-          end
+        parsed_regexes.flatten
       end
+    end
 
-      def load_regexes(filepaths)
-        raw_files = filepaths.map { |path| File.read(path) }
+    def load_regexes
+      raw_files = filepaths.map { |path| File.read(path) }
 
-        raw_files.map { |f| YAML.load(f) }
-      end
+      raw_files.map { |f| YAML.load(f) }
+    end
 
-      def parse_regexes(regexes)
-        regexes.map do |meta|
-          meta['regex'] = Regexp.new(meta['regex'])
-          meta
-        end
+    def parse_regexes(raw_regexes)
+      raw_regexes.map do |meta|
+        meta['regex'] = Regexp.new(meta['regex']) if meta['regex'].is_a? String
+        meta
       end
+    end
 
+    def from_cache(key)
+      DeviceDetector.cache.get_or_set(key) { yield }
     end
 
   end

data/lib/device_detector/version.rb

@@ -1,3 +1,3 @@
 class DeviceDetector
-  VERSION = '0.5.1'
+  VERSION = '0.7.0'
 end

data/spec/device_detector/concrete_user_agent_spec.rb

@@ -0,0 +1,60 @@
+require '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
+        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'
+      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
+        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
+        client.os_full_version.must_equal '10.10.1'
+      end
+
+    end
+
+  end
+
+end
+

data/spec/device_detector/device_spec.rb

@@ -2,31 +2,33 @@ require 'spec_helper'
 
 describe DeviceDetector::Device do
 
-  subject(:device) { DeviceDetector::Device.new(user_agent) }
+  subject { DeviceDetector::Device.new(user_agent) }
+
+  alias :device :subject
 
   describe '#name' do
 
-    context 'when models are nested' 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]' }
 
       it 'finds an Apple iPhone 6' do
-        expect(device.name).to eq('iPhone 6')
+        device.name.must_equal 'iPhone 6'
       end
     end
 
-    context 'when models are NOT nested' do
+    describe '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')
+        device.name.must_equal 'AIR99'
       end
     end
 
-    context 'when it cannot find a device name' do
+    describe 'when it cannot find a device name' do
       let(:user_agent) { 'UNKNOWN MODEL NAME' }
 
       it 'returns nil' do
-        expect(device.name).to eq(nil)
+        device.name.must_be_nil
       end
     end
 
@@ -34,52 +36,52 @@ describe DeviceDetector::Device do
 
   describe '#type' do
 
-    context 'when models are nested' 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]' }
 
       it 'finds device of Apple iPhone 6' do
-        expect(device.type).to eq('smartphone')
+        device.type.must_equal 'smartphone'
       end
     end
 
-    context 'when models are NOT nested' do
+    describe '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')
+        device.type.must_equal 'feature phone'
       end
     end
 
-    context 'when it cannot find a device type' do
+    describe 'when it cannot find a device type' do
       let(:user_agent) { 'UNKNOWN MODEL TYPE' }
 
       it 'returns nil' do
-        expect(device.type).to eq(nil)
+        device.type.must_be_nil
       end
 
     end
 
-    context 'device not specified in nested block' do
+    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)' }
 
       it 'falls back to top-level device' do
-        expect(device.type).to eq('smartphone')
+        device.type.must_equal 'smartphone'
       end
 
     end
 
   end
 
-  context 'concrete device types' 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)' }
 
       it 'identifies the device' do
-        expect(device.name).to eq('GALAXY S5')
-        expect(device.type).to eq('smartphone')
+        device.name.must_equal 'GALAXY S5'
+        device.type.must_equal 'smartphone'
       end
 
     end
@@ -89,8 +91,8 @@ describe DeviceDetector::Device 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' }
 
       it 'identifies the device' do
-        expect(device.name).to eq('GALAXY Camera')
-        expect(device.type).to eq('camera')
+        device.name.must_equal 'GALAXY Camera'
+        device.type.must_equal 'camera'
       end
 
     end
@@ -100,8 +102,8 @@ describe DeviceDetector::Device do
       let(:user_agent) { 'Mozilla/5.0 (X11; Linux) AppleWebKit/534.34 (KHTML, like Gecko) QtCarBrowser Safari/534.34' }
 
       it 'identifies the device' do
-        expect(device.name).to eq('Model S')
-        expect(device.type).to eq('car browser')
+        device.name.must_equal 'Model S'
+        device.type.must_equal 'car browser'
       end
 
     end
@@ -111,8 +113,8 @@ describe DeviceDetector::Device do
       let(:user_agent) { 'Opera/9.30 (Nintendo Wii; U; ; 2047-7;en)' }
 
       it 'identifies the device' do
-        expect(device.name).to eq('Wii')
-        expect(device.type).to eq('console')
+        device.name.must_equal 'Wii'
+        device.type.must_equal 'console'
       end
 
     end
@@ -122,8 +124,8 @@ describe DeviceDetector::Device 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' }
 
       it 'identifies the device' do
-        expect(device.name).to eq('iPod Touch')
-        expect(device.type).to eq('portable media player')
+        device.name.must_equal 'iPod Touch'
+        device.type.must_equal 'portable media player'
       end
 
     end
@@ -133,8 +135,8 @@ describe DeviceDetector::Device do
       let(:user_agent) { 'Mozilla/5.0 (Linux; NetCast; U) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.33 Safari/537.31 SmartTV/5.0' }
 
       it 'identifies the device' do
-        expect(device.name).to eq('NetCast')
-        expect(device.type).to eq('tv')
+        device.name.must_equal 'NetCast'
+        device.type.must_equal 'tv'
       end
 
     end

data/spec/device_detector/memory_cache_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-RSpec.describe DeviceDetector::MemoryCache do
+describe DeviceDetector::MemoryCache do
 
   let(:subject) { DeviceDetector::MemoryCache.new(config) }
 
@@ -8,26 +8,26 @@ RSpec.describe DeviceDetector::MemoryCache do
 
   describe '#set' do
 
-    context 'string key' do
+    describe 'string key' do
 
       let(:key) { 'string' }
 
       it 'sets the value under the key' do
         subject.set(key, 'value')
 
-        expect(subject.data[key]).to eq('value')
+        subject.data[key].must_equal 'value'
       end
 
     end
 
-    context 'array key' do
+    describe 'array key' do
 
       let(:key) { ['string1', 'string2'] }
 
       it 'sets the value under the key' do
         subject.set(key, 'value')
 
-        expect(subject.data[String(key)]).to eq('value')
+        subject.data[String(key)].must_equal 'value'
       end
 
     end
@@ -36,26 +36,26 @@ RSpec.describe DeviceDetector::MemoryCache do
 
   describe '#get' do
 
-    context 'string key' do
+    describe 'string key' do
 
       let(:key) { 'string' }
 
       it 'gets the value for the key' do
         subject.data[key] = 'value'
 
-        expect(subject.get(key)).to eq('value')
+        subject.get(key).must_equal 'value'
       end
 
     end
 
-    context 'array key' do
+    describe 'array key' do
 
       let(:key) { ['string1', 'string2'] }
 
       it 'gets the value for the key' do
         subject.data[String(key)] = 'value'
 
-        expect(subject.get(key)).to eq('value')
+        subject.get(key).must_equal 'value'
       end
 
     end
@@ -66,7 +66,7 @@ RSpec.describe DeviceDetector::MemoryCache do
 
     let(:key) { 'string' }
 
-    context 'value already present' do
+    describe 'value already present' do
 
       it 'gets the value for the key from cache' do
         subject.data[key] = 'value'
@@ -76,13 +76,13 @@ RSpec.describe DeviceDetector::MemoryCache do
           block_called = true
         end
 
-        expect(value).to eq('value')
-        expect(block_called).to eq(false)
+        value.must_equal 'value'
+        block_called.must_equal false
       end
 
     end
 
-    context 'value not yet present' do
+    describe 'value not yet present' do
 
       it 'evaluates the block and sets the result' do
         block_called = false
@@ -90,8 +90,8 @@ RSpec.describe DeviceDetector::MemoryCache do
           block_called = true
         end
 
-        expect(block_called).to eq(true)
-        expect(subject.data[key]).to eq(true)
+        block_called.must_equal true
+        subject.data[key].must_equal true
       end
 
     end
@@ -108,7 +108,7 @@ RSpec.describe DeviceDetector::MemoryCache do
       subject.set('3', 'baz')
       subject.set('4', 'boz')
 
-      expect(subject.data.keys.size).to eq(3)
+      subject.data.keys.size.must_equal 3
     end
 
   end

data/spec/device_detector/model_extractor_spec.rb

@@ -2,11 +2,13 @@ require 'spec_helper'
 
 describe DeviceDetector::ModelExtractor do
 
-  subject(:extractor) { DeviceDetector::ModelExtractor.new(user_agent, regex_meta) }
+  subject { DeviceDetector::ModelExtractor.new(user_agent, regex_meta) }
+
+  alias :extractor :subject
 
   describe '#call' do
 
-    context 'when matching against dynamic model' do
+    describe 'when matching against dynamic model' do
 
       let(:regex_meta) do
         {
@@ -16,29 +18,29 @@ describe DeviceDetector::ModelExtractor do
         }
       end
 
-      context 'when no dynamic match is found' do
+      describe '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)
+          extractor.call.must_equal device_name
         end
 
       end
 
-      context 'when a dynamic match is found' do
+      describe '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)
+          extractor.call.must_equal device_name
         end
 
       end
 
     end
 
-    context 'when matching against static model' do
+    describe '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' }
@@ -51,7 +53,7 @@ describe DeviceDetector::ModelExtractor do
       end
 
       it 'returns the model name' do
-        expect(extractor.call).to eq(device_name)
+        extractor.call.must_equal device_name
       end
 
     end

data/spec/device_detector/version_extractor_spec.rb

@@ -1,12 +1,14 @@
 require 'spec_helper'
 
-RSpec.describe DeviceDetector::VersionExtractor do
+describe DeviceDetector::VersionExtractor do
 
-  subject(:extractor) { DeviceDetector::VersionExtractor.new(user_agent, regex_meta) }
+  subject { DeviceDetector::VersionExtractor.new(user_agent, regex_meta) }
+
+  alias :extractor :subject
 
   describe '#call' do
 
-    context 'extractor without version' do
+    describe 'extractor without version' do
 
       let(:user_agent) { 'Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1; Trident/4.0; Avant Browser; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0)' }
 
@@ -19,12 +21,12 @@ RSpec.describe DeviceDetector::VersionExtractor do
       end
 
       it 'returns nil' do
-        expect(extractor.call).to eq('')
+        extractor.call.must_equal ''
       end
 
     end
 
-    context 'regex with dynamic matching' do
+    describe '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)' }
@@ -37,17 +39,17 @@ RSpec.describe DeviceDetector::VersionExtractor do
       end
 
       it 'returns the correct version' do
-        expect(extractor.call).to eq(version)
+        extractor.call.must_equal version
       end
 
       it 'removes trailing white spaces' do
         regex_meta['version'] = regex_meta['version'] + '   '
-        expect(extractor.call).to eq(version)
+        extractor.call.must_equal version
       end
 
     end
 
-    context 'extractor with fixed version' do
+    describe 'extractor with fixed version' do
 
       let(:user_agent) { 'Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0; Trident/4.0)' }
       let(:regex_meta) do
@@ -58,18 +60,18 @@ RSpec.describe DeviceDetector::VersionExtractor do
       end
 
       it 'returns the correct version' do
-        expect(extractor.call).to eq('8.0')
+        extractor.call.must_equal '8.0'
       end
 
     end
 
-    context 'unknown user agent' do
+    describe 'unknown user agent' do
 
       let(:user_agent) { 'garbage' }
       let(:regex_meta) { {} }
 
       it 'returns nil' do
-        expect(extractor.call).to be_nil
+        extractor.call.must_be_nil
       end
 
     end

data/spec/device_detector_spec.rb

@@ -1,19 +1,21 @@
 require 'spec_helper'
 
-RSpec.describe DeviceDetector do
+describe DeviceDetector do
 
-  subject(:client) { DeviceDetector.new(user_agent) }
+  subject { DeviceDetector.new(user_agent) }
 
-  context 'known user agent' do
+  alias :client :subject
 
-    context 'desktop chrome browser' do
+  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
-          expect(client.name).to eq('Chrome')
+          client.name.must_equal 'Chrome'
         end
 
       end
@@ -21,7 +23,7 @@ RSpec.describe DeviceDetector do
       describe '#full_version' do
 
         it 'returns the full version' do
-          expect(client.full_version).to eq('30.0.1599.69')
+          client.full_version.must_equal '30.0.1599.69'
         end
 
       end
@@ -29,7 +31,7 @@ RSpec.describe DeviceDetector do
       describe '#os_name' do
 
         it 'returns the operating system name' do
-          expect(client.os_name).to eq('Mac')
+          client.os_name.must_equal 'Mac'
         end
 
       end
@@ -37,7 +39,7 @@ RSpec.describe DeviceDetector do
       describe '#os_full_version' do
 
         it 'returns the operating system full version' do
-          expect(client.os_full_version).to eq('10_8_5')
+          client.os_full_version.must_equal '10.8.5'
         end
 
       end
@@ -45,7 +47,7 @@ RSpec.describe DeviceDetector do
       describe '#known?' do
 
         it 'returns true' do
-          expect(client.known?).to eq(true)
+          client.known?.must_equal true
         end
 
       end
@@ -53,7 +55,7 @@ RSpec.describe DeviceDetector do
       describe '#bot?' do
 
         it 'returns false' do
-          expect(client.bot?).to eq(false)
+          client.bot?.must_equal false
         end
 
       end
@@ -61,29 +63,7 @@ RSpec.describe DeviceDetector do
       describe '#bot_name' do
 
         it 'returns nil' do
-          expect(client.bot_name).to be_nil
-        end
-
-      end
-
-    end
-
-    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')
+          client.bot_name.must_be_nil
         end
 
       end
@@ -92,14 +72,14 @@ RSpec.describe DeviceDetector do
 
   end
 
-  context 'unknown user agent' do
+  describe 'unknown user agent' do
 
     let(:user_agent) { 'garbage123' }
 
     describe '#name' do
 
       it 'returns nil' do
-        expect(client.name).to be_nil
+        client.name.must_be_nil
       end
 
     end
@@ -107,7 +87,7 @@ RSpec.describe DeviceDetector do
     describe '#full_version' do
 
       it 'returns nil' do
-        expect(client.full_version).to be_nil
+        client.full_version.must_be_nil
       end
 
     end
@@ -115,7 +95,7 @@ RSpec.describe DeviceDetector do
     describe '#os_name' do
 
       it 'returns nil' do
-        expect(client.os_name).to be_nil
+        client.os_name.must_be_nil
       end
 
     end
@@ -123,7 +103,7 @@ RSpec.describe DeviceDetector do
     describe '#os_full_version' do
 
       it 'returns nil' do
-        expect(client.os_full_version).to be_nil
+        client.os_full_version.must_be_nil
       end
 
     end
@@ -131,7 +111,7 @@ RSpec.describe DeviceDetector do
     describe '#known?' do
 
       it 'returns false' do
-        expect(client.known?).to eq(false)
+        client.known?.must_equal false
       end
 
     end
@@ -139,7 +119,7 @@ RSpec.describe DeviceDetector do
     describe '#bot?' do
 
       it 'returns false' do
-        expect(client.bot?).to eq(false)
+        client.bot?.must_equal false
       end
 
     end
@@ -147,21 +127,21 @@ RSpec.describe DeviceDetector do
     describe '#bot_name' do
 
       it 'returns nil' do
-        expect(client.bot_name).to be_nil
+        client.bot_name.must_be_nil
       end
 
     end
 
   end
 
-  context 'bot' do
+  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
-        expect(client.name).to be_nil
+        client.name.must_be_nil
       end
 
     end
@@ -169,7 +149,7 @@ RSpec.describe DeviceDetector do
     describe '#full_version' do
 
       it 'returns nil' do
-        expect(client.full_version).to be_nil
+        client.full_version.must_be_nil
       end
 
     end
@@ -177,7 +157,7 @@ RSpec.describe DeviceDetector do
     describe '#os_name' do
 
       it 'returns nil' do
-        expect(client.os_name).to be_nil
+        client.os_name.must_be_nil
       end
 
     end
@@ -185,7 +165,7 @@ RSpec.describe DeviceDetector do
     describe '#os_full_version' do
 
       it 'returns nil' do
-        expect(client.os_full_version).to be_nil
+        client.os_full_version.must_be_nil
       end
 
     end
@@ -193,7 +173,7 @@ RSpec.describe DeviceDetector do
     describe '#known?' do
 
       it 'returns false' do
-        expect(client.known?).to eq(false)
+        client.known?.must_equal false
       end
 
     end
@@ -201,7 +181,7 @@ RSpec.describe DeviceDetector do
     describe '#bot?' do
 
       it 'returns true' do
-        expect(client.bot?).to eq(true)
+        client.bot?.must_equal true
       end
 
     end
@@ -209,7 +189,7 @@ RSpec.describe DeviceDetector do
     describe '#bot_name' do
 
       it 'returns the name of the bot' do
-        expect(client.bot_name).to eq('Googlebot')
+        client.bot_name.must_equal 'Googlebot'
       end
 
     end

data/spec/spec_helper.rb

@@ -1,13 +1,5 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'minitest/spec'
+require 'minitest/autorun'
 
-require 'rspec'
-require 'device_detector'
-require 'pry'
+require './lib/device_detector'
 
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
-
-RSpec.configure do |config|
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: device_detector
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Mati Sójka
@@ -9,28 +9,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -55,6 +63,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -67,6 +76,7 @@ files:
 - lib/device_detector/memory_cache.rb
 - lib/device_detector/metadata_extractor.rb
 - lib/device_detector/model_extractor.rb
+- lib/device_detector/name_extractor.rb
 - lib/device_detector/os.rb
 - lib/device_detector/parser.rb
 - lib/device_detector/version.rb
@@ -86,6 +96,7 @@ files:
 - regexes/mobile_apps.yml
 - regexes/oss.yml
 - regexes/pim.yml
+- spec/device_detector/concrete_user_agent_spec.rb
 - spec/device_detector/device_spec.rb
 - spec/device_detector/memory_cache_spec.rb
 - spec/device_detector/model_extractor_spec.rb
@@ -117,6 +128,7 @@ signing_key:
 specification_version: 4
 summary: Precise and fast user agent parser and device detector
 test_files:
+- spec/device_detector/concrete_user_agent_spec.rb
 - spec/device_detector/device_spec.rb
 - spec/device_detector/memory_cache_spec.rb
 - spec/device_detector/model_extractor_spec.rb