browser_sniffer 1.0.0 → 1.0.1

data/browser_sniffer.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.description = readme.description
   spec.summary = readme.summary
   spec.homepage = "https://github.com/Shopify/browser_sniffer"
-  spec.license = "GPLv2 & MIT"
+  spec.licenses = %W[GPLv2 MIT]
 
   spec.files = files
   spec.executables = files.executables
@@ -20,4 +20,4 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-end
+end

data/lib/browser_sniffer/patterns.rb

@@ -96,7 +96,7 @@ class BrowserSniffer
         /(mozilla)\/((\d+)?[\w\.]+).+rv\:.+gecko\/\d+/i, # Mozilla
       ], [:name, :version, :major, [:type, :firefox]], [
         # Other
-        /(uc\s?browser|polaris|lynx|dillo|icab|doris|amaya|w3m|netsurf)[\/\s]?((\d+)?[\w\.]+)/i, # UCBrowser/Polaris/Lynx/Dillo/iCab/Doris/Amaya/w3m/NetSurf
+        /(uc\s?browser|polaris|lynx|dillo|icab|doris|amaya|w3m|netsurf|word|excel)[\/\s]?((\d+)?[\w\.]+)/i, # UCBrowser/Polaris/Lynx/Dillo/iCab/Doris/Amaya/w3m/NetSurf/Word/Excel
         /(links)\s\(((\d+)?[\w\.]+)/i, # Links
         /(gobrowser)\/?((\d+)?[\w\.]+)*/i, # GoBrowser
         /(ice\s?browser)\/v?((\d+)?[\w\._]+)/i, # ICE Browser
@@ -136,7 +136,7 @@ class BrowserSniffer
         /(htc)[;_\s-]+([\w\s_]+(?=\))|\w+)*/i, # HTC
         /(zte)-(\w+)*/i, # ZTE
         /(alcatel|geeksphone|huawei|lenovo|nexian|panasonic|(?=;\s)sony)[_\s-]?([\w-]+)*/i # Alcatel/GeeksPhone/Huawei/Lenovo/Nexian/Panasonic/Sony
-      ], [:vendor, [:model, lambda {|str| str.gsub(/_/, ' ') }], [:type, :handheld]], [
+      ], [:vendor, [:model, lambda {|str| str && str.gsub(/_/, ' ') }], [:type, :handheld]], [
         /\s((milestone|droid[2x]?))[globa\s]*\sbuild\//i, # Motorola
         /(mot)[\s-]?(\w+)*/i
       ], [[:vendor, 'Motorola'], :model, [:type, :handheld]], [
@@ -226,9 +226,9 @@ class BrowserSniffer
         /\s([frentopc-]{0,4}bsd|dragonfly)\s?([\w\.]+)*/i # FreeBSD/NetBSD/OpenBSD/PC-BSD/DragonFly
       ], [:name, :version],[
         /(ip[honead]+)(?:.*os\s*([\w]+)*\slike\smac|;\sopera)/i # iOS
-      ], [[:name, 'iOS'], [:version, lambda {|str| str.gsub(/_/, '.') }], [:type, :ios]], [
+      ], [[:name, 'iOS'], [:version, lambda {|str| str && str.gsub(/_/, '.') }], [:type, :ios]], [
         /(mac\sos\sx)\s?([\w\s\.]+\w)*/i # Mac OS
-      ], [:name, [:version, lambda {|str| str.gsub(/_/, '.') }], [:type, :mac]], [
+      ], [:name, [:version, lambda {|str| str && str.gsub(/_/, '.') }], [:type, :mac]], [
         # Other
         /(haiku)\s(\w+)/i, # Haiku
         /(aix)\s((\d)(?=\.|\)|\s)[\w\.]*)*/i, # AIX

data/lib/browser_sniffer/version.rb

@@ -1,3 +1,3 @@
 class BrowserSniffer
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/test/browser_sniffer_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class BrowserSnifferTest < ActiveSupport::TestCase
+class BrowserSnifferTest < MiniTest::Unit::TestCase
   AGENTS = {
     :ipad_old => {
       :user_agent => "Mozilla/5.0(iPad; U; CPU iPhone OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B314 Safari/531.21.10",
@@ -130,6 +130,7 @@ class BrowserSnifferTest < ActiveSupport::TestCase
       :os => :linux,
       :os_version => '2.6.22',
       :browser => nil,
+      :browser_name => 'Kindle',
       :major_browser_version => 2
     },
     :nokia_classic => {
@@ -351,6 +352,7 @@ class BrowserSnifferTest < ActiveSupport::TestCase
       :os => :ios,
       :os_version => '4.3.3',
       :browser => nil,
+      :browser_name => 'WebKit',
       :major_browser_version => 533
     },
     :ipod_os_4_3_3 => {
@@ -391,13 +393,27 @@ class BrowserSnifferTest < ActiveSupport::TestCase
       :os_version => '5.0',
       :browser => :safari,
       :major_browser_version => 5
+    },
+    :excel_mac => {
+      :user_agent => "Mozilla/5.0 (Macintosh; Intel Mac OS X) Excel/14.34.0",
+      :form_factor => :desktop,
+      :ios? => false,
+      :android? => false,
+      :desktop? => true,
+      :engine => nil,
+      :major_engine_version => nil,
+      :os => :mac,
+      :os_version => nil,
+      :browser => nil,
+      :browser_name => 'Excel',
+      :major_browser_version => 14
     }
   }
 
   AGENTS.each do |agent, attributes|
-    test "sniff #{agent} correctly" do
+    define_method "test_sniff_#{agent}_corrently" do
       sniffer = BrowserSniffer.new(attributes[:user_agent])
-      attributes.except(:user_agent).each do |attribute, value|
+      attributes.reject{|attr| attr == :user_agent}.each do |attribute, value|
         assert_equal value, sniffer.send(attribute), "#{attribute.to_s} did not match"
       end
     end

data/test/test_helper.rb

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'test/unit'
-require 'active_support/all'
 
 require "#{File.dirname(__FILE__)}/../init"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browser_sniffer
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,7 +66,8 @@ files:
 - test/test_helper.rb
 homepage: https://github.com/Shopify/browser_sniffer
 licenses:
-- GPLv2 & MIT
+- GPLv2
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -85,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -639204093017043880
+      hash: 2435126936972094184
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25