device_detector 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9dafeb69d5740bff28a730522bfcb0487ed419b8
-  data.tar.gz: e82f903f97d49b743d6572bd6a5f4c50b6ab5c61
+  metadata.gz: 81f8d553f5a16ebe349f683f2a37c34c0cdb59f5
+  data.tar.gz: d12f646a552f2b167d28a8c20fdc71de66108964
 SHA512:
-  metadata.gz: 9ee6f2f50425f367ca9a1823d3f133d410d77d854fe9b88d991a1f07f2fd2c9ea35799c530ace6220d87b74b839b581b48bc6d9d186f9bff9da618439fe498f8
-  data.tar.gz: e047fd31175b2c09e17ac6fa0d7bdee576c579f675059c0cf3144e257c4d3e1c524d18aa286cfe1610d63611b3d7449fc5465685797b686d1a287a6a7d394d5c
+  metadata.gz: 2185e70c4be666e91f66146fe929ce58438b499a8c10c1d4c8595e888cd14cae1c8b87c493237f9518f179ac5c17c5afd55e34713fe0e6385dd2dace85781a4b
+  data.tar.gz: d3c90c155ba23d60f779cb86711eb56b97fd10aa2e0337f9311ddab5ce27a095d5c2daac05efcd12203ee778a4f5db57d6d1f3abaf254dce2f3215750457989b

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change Log
 
+## [0.8.2]
+- Added device brand support. Thanks to [dnswus](https://github.com/dnswus).
+
+## [0.8.1]
+- Added Instacast detection rules
+- Updated test fixtures
+
+## [0.8.0]
+- Added a better and more robust device detection. Thanks to [skaes](https://github.com/skaes).
+- Added test fixture from the piwik project.
+
 ## [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.
 

data/lib/device_detector.rb

@@ -40,6 +40,10 @@ class DeviceDetector
     device.name
   end
 
+  def device_brand
+    device.brand
+  end
+
   def device_type
     t = device.type
 

data/lib/device_detector/device.rb

@@ -28,6 +28,10 @@ class DeviceDetector
       hbbtv? ? 'tv' : regex_meta[:device]
     end
 
+    def brand
+      regex_meta[:brand]
+    end
+
     private
 
     # The order of files needs to be the same as the order of device
@@ -50,7 +54,7 @@ class DeviceDetector
         if regex && regex[:models]
           model_regex = regex[:models].find { |m| user_agent =~ m[:regex]}
           if model_regex
-            regex = regex.merge(:regex_model => model_regex[:regex], :model => model_regex[:model])
+            regex = regex.merge(:regex_model => model_regex[:regex], :model => model_regex[:model], :brand => model_regex[:brand])
             regex[:device] = model_regex[:device] if model_regex.key?(:device)
             regex.delete(:models)
           end
@@ -80,6 +84,7 @@ class DeviceDetector
           meta[:models].each do |model|
             fail "invalid model spec: #{model.inspect}" unless model[:regex].is_a? String
             model[:regex] = build_regex(model[:regex])
+            model[:brand] = brand.to_s unless model[:brand]
           end
         end
         meta[:path] = path

data/lib/device_detector/version.rb

@@ -1,3 +1,3 @@
 class DeviceDetector
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 end

data/spec/device_detector/device_spec.rb

@@ -82,6 +82,7 @@ describe DeviceDetector::Device do
       it 'identifies the device' do
         device.name.must_equal 'GALAXY S5'
         device.type.must_equal 'smartphone'
+        device.brand.must_equal 'Samsung'
       end
 
     end
@@ -93,6 +94,7 @@ describe DeviceDetector::Device do
       it 'identifies the device' do
         device.name.must_equal 'GALAXY Camera'
         device.type.must_equal 'camera'
+        device.brand.must_equal 'Samsung'
       end
 
     end
@@ -104,6 +106,7 @@ describe DeviceDetector::Device do
       it 'identifies the device' do
         device.name.must_equal 'Model S'
         device.type.must_equal 'car browser'
+        device.brand.must_be_nil
       end
 
     end
@@ -115,6 +118,7 @@ describe DeviceDetector::Device do
       it 'identifies the device' do
         device.name.must_equal 'Wii'
         device.type.must_equal 'console'
+        device.brand.must_be_nil
       end
 
     end
@@ -126,6 +130,7 @@ describe DeviceDetector::Device do
       it 'identifies the device' do
         device.name.must_equal 'iPod Touch'
         device.type.must_equal 'portable media player'
+        device.brand.must_equal 'Apple'
       end
 
     end
@@ -137,6 +142,7 @@ describe DeviceDetector::Device do
       it 'identifies the device' do
         device.name.must_equal 'NetCast 4.0'
         device.type.must_equal 'tv'
+        device.brand.must_equal 'LG'
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: device_detector
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Mati Sójka
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-21 00:00:00.000000000 Z
+date: 2015-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest