browser 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1376f80279d81e3c05481520af650c371bf08fb4
-  data.tar.gz: 0e395d31bdfe73b696b4b6a414946d93efca202d
+  metadata.gz: d33f512a1af14cd694c0268b45aa9b197f5011fd
+  data.tar.gz: 73de6e2670165e5b7de2b1966ad67a7863afe55a
 SHA512:
-  metadata.gz: 128e49d7d296d6bdd2fa6ab3ea250637dd3b570d4feb9585c8632b6a41c71e8e411e179d24354e228b5584842dbd685a4a9a75510f05831e2bbf6ca773c376d6
-  data.tar.gz: ce47534aba74621bc089c9d30f6aaf7611cf996ed4cfef04570eb2582c84e3e99bd7b0129dae9a928fe01f704227392f3a482c1bff27dcfa17b9fe09bf5fd19d
+  metadata.gz: 69b2e09e88e616b7942e63285d704459002d39264f604ae46397ac8b198c5fcd2fe18663730076709b406b55986b13d7e041913bc584c0e5f132db59df3abf6a
+  data.tar.gz: 45c8ae00d05cc760f415e56a68ab7689a1f3d62f292f72ad5316f931769c56bca9b6a8ec10b09dec68cfe17c8b9bbcb31a364e11fd216ba3a01817ed6df9085a

data/.gitignore

@@ -2,3 +2,4 @@ pkg
 coverage
 doc
 log
+*.lock

data/.travis.yml

@@ -2,7 +2,7 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - jruby-19mode
+  - 2.1.0
 gemfile:
   - Gemfile
   - gemfiles/rails3.gemfile

data/README.md

@@ -23,6 +23,7 @@ browser.version
 browser.safari?
 browser.opera?
 browser.chrome?
+browser.chrome_os?
 browser.mobile?
 browser.tablet?
 browser.console?
@@ -33,6 +34,7 @@ browser.modern?     # Webkit, Firefox 17+, IE 9+ and Opera 12+
 browser.platform    # return :mac, :windows, :linux or :other
 browser.mac?
 browser.windows?
+browser.windows_x64?
 browser.linux?
 browser.blackberry?
 browser.bot?

data/bots.yml

@@ -0,0 +1,128 @@
+AdsBot-Google: "Google Adwords"
+AhrefsBot: "Ahrefs backlinks research tool"
+alexa: "Alexa Crawler"
+Apache-HttpClient: "Java http library"
+ApacheBench: "ApacheBench (ab)"
+AppEngine-Google: "Google App Engine"
+AsyncHttpClient: "Java http and WebSocket client library"
+awe.sm: "Awe.sm URL expander"
+Baidu: "Chinese search engine"
+Baiduspider: "Chinese search engine"
+bingbot: "Microsoft bing bot"
+bitlybot: "bit.ly bot"
+bot@linkfluence.net: "Linkfluence bot"
+Butterfly: "Topsy Labs"
+buzztalk: "buzztalk"
+check_http: "Nagios monitor"
+CMRadar/0.1: "CMRadar/0.1"
+ColdFusion: "ColdFusion http library"
+Crowsnest: "crowsnest.tv news portal bot"
+Crowsnest: "Crowsnest"
+curl: "curl unix CLI http client"
+developers.google.com/+/web/snippet/: "Google Plus"
+DigitalPersona Fingerprint Software: "HP Fingerprint scanner"
+Embedly: "Embedly"
+EOAAgent: "EOAAgent"
+EventMachine HttpClient: "Ruby http library"
+EvriNid: "Evri bot"
+ExaleadCloudView: "ExaleadCloudView"
+facebookexternalhit: "facebook bot"
+FeedBurner: "RSS bot"
+Feedfetcher-Google: "Google Feedfetcher"
+FlipboardProxy: "FlipboardProxy"
+Genieo: "Genieo Web filter bot"
+getprismatic.com: "getprismatic.com"
+Gigabot: "Gigabot spider"
+Go http package: "Go http library"
+Google Web Preview: "Google Instant Previews crawler"
+Googlebot: "Google spider"
+Hatena::Bookmark: "Hatena::Bookmark"
+heritrix: "heritrix"
+HTMLParser: "HTMLParser"
+HTTP_Request2: "HTTP_Request2"
+HTTPClient: "HTTPClient"
+https://developers.google.com/+/web/snippet: "Google+ Snippet Fetcher"
+HubSpot Connect: "HubSpot Connect"
+ia_archiver(OS-Wayback): "ia_archiver(OS-Wayback)"
+iCoreService: "iCoreService"
+InAGist: "URL resolver"
+Insieve Bot: "Insieve Bot"
+InsieveBot: "InsieveBot"
+Instapaper: "Instapaper"
+jack: "jack"
+Jakarta Commons: "Jakarta Commons HttpClient"
+Jakarta Commons-HttpClient: "Jakarta Commons-HttpClient"
+Java: "Generic Java http library"
+Jetslide: "Jetslide"
+JS-Kit: "URL resolver"
+Kimengi: "nineconnections.com bot"
+Kimengi/nineconnections.com: "Kimengi/nineconnections.com"
+knows.is: "knows.is"
+kraken: "kraken"
+Laconica: "Laconica"
+libwww-perl: "Perl client-server library loved by script kids"
+LinkedInBot: "LinkedIn"
+LinksCrawler: "LinksCrawler"
+Lipperhey: "Lipperhey"
+LongURL: "URL expander service"
+Lumibot: "Lumibot"
+lwp-trivial: "Another Perl library loved by script kids"
+Mediapartners-Google: "Google Adsense bot"
+MetaURI: "URI meta information extractor bot"
+MetaURI: "MetaURI"
+MFE_expand: "Mcafee spider"
+MJ12bot: "Majestic-12 spider"
+msnbot: "Microsoft bot"
+Netvibes: "Personalized dashboard bot"
+NewRelicPinger: "NewRelic monitor"
+newsme: "Link analyzer"
+newsme: "newsme"
+NING: "NING - Yet Another Twitter Swarmer"
+Nutch: "Apache search spider"
+Panopta: "Monitoring service"
+PaperLiBot: "PaperLi content curation service"
+PaperLiBot: "PaperLi is another content curation service"
+peerindex: "peerindex"
+PercolateCrawler: "PercolateCrawler"
+PhantomJS: "PhantomJS"
+Pingdom: "Pingdom monitoring"
+PycURL: "Python http library"
+Python-httplib2: "Python-httplib2"
+python-requests: "Python http library"
+python-requests: "python-requests"
+Python-urllib: "Python http library"
+QuickLook: "QuickLook"
+Readability: "Readability"
+RebelMouse: "RebelMouse"
+redditbot: "Reddit Bot"
+rogerbot: "SeoMoz spider"
+Ruby: "Ruby"
+Ruby/1.9.3: "Ruby/1.9.3"
+SemrushBot: "SEO analysis bot"
+ShortLinkTranslate: "Link shortener"
+ShowyouBot: "Showyou iOS app spider"
+Siege: "Joe Dog Siege"
+SiteUptime: "Site monitoring services"
+Slurp: "Yahoo spider"
+Sogou: "Chinese search engine"
+spider: "generic web spider"
+Test Certificate Info: "C http library?"
+TweetmemeBot: "TweetMeMe Crawler"
+Twikle: "Social web search bot"
+TwitJobSearch: "TwitJobSearch"
+Twitmunin: "Twitmunin"
+Twitterbot: "Twitter URL expander"
+Twurly: "Twurly"
+Typhoeus: "Typhoeus"
+UnwindFetch: "Gnip URL expander"
+UnwindFetchor: "Gnip crawler"
+VB Project: "Visual Basic"
+vkShare: "VKontake Sharer"
+Webscout: "Webscout"
+Wget: "wget unix CLI http client"
+WordPress: "WordPress spider"
+YandexBot: "Yandex spider"
+YOURLS: "YOURLS"
+zelist.ro: "feed parser"
+ZIBB: "ZIBB spider"
+ZyBorg: "Zyborg? Hmmm...."

data/browser.gemspec

@@ -17,7 +17,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "pry-meta"
+  s.add_development_dependency "bundler", ">= 0"
+  s.add_development_dependency "rake"
   s.add_development_dependency "rails"
   s.add_development_dependency "rack-test"
+  s.add_development_dependency "pry-meta"
+  s.add_development_dependency "turn"
 end

data/lib/browser.rb

@@ -1,4 +1,5 @@
 require "set"
+require "yaml"
 
 require "browser/middleware"
 require "browser/middleware/context"
@@ -11,6 +12,7 @@ require "browser/methods/devices"
 require "browser/methods/consoles"
 require "browser/methods/language"
 require "browser/methods/bots"
+require "browser/methods/tv"
 
 require "browser/meta/base"
 require "browser/meta/generic_browser"
@@ -31,6 +33,7 @@ class Browser
   include Consoles
   include Language
   include Bots
+  include Tv
 
   # Set browser's UA string.
   attr_accessor :user_agent
@@ -54,7 +57,7 @@ class Browser
     :playstation => "PlayStation",
     :quicktime   => "QuickTime",
     :safari      => "Safari",
-    :xbox      => "Xbox",
+    :xbox        => "Xbox",
 
     # This must be last item, since Ruby 1.9+ has ordered keys.
     :other      => "Other",

data/lib/browser/methods/bots.rb

@@ -1,71 +1,6 @@
 class Browser
   module Bots
-    # This initial list of bots was humbly borrowed from the split (https://github.com/andrew/split)
-    # gem.
-    BOTS = {
-      # Indexers
-      "AdsBot-Google" => "Google Adwords",
-      "Baidu"         => "Chinese search engine",
-      "Baiduspider"   => "Chinese search engine",
-      "bingbot"       => "Microsoft bing bot",
-      "Butterfly"     => "Topsy Labs",
-      "Gigabot"       => "Gigabot spider",
-      "Googlebot"     => "Google spider",
-      "MJ12bot"       => "Majestic-12 spider",
-      "msnbot"        => "Microsoft bot",
-      "rogerbot"      => "SeoMoz spider",
-      "PaperLiBot"    => "PaperLi is another content curation service",
-      "Slurp"         => "Yahoo spider",
-      "Sogou"         => "Chinese search engine",
-      "spider"        => "generic web spider",
-      "UnwindFetchor" => "Gnip crawler",
-      "WordPress"     => "WordPress spider",
-      "YandexBot"     => "Yandex spider",
-      "ZIBB"          => "ZIBB spider",
-
-      # HTTP libraries
-      "Apache-HttpClient" => "Java http library",
-      "AppEngine-Google" => "Google App Engine",
-      "curl" => "curl unix CLI http client",
-      "ColdFusion" => "ColdFusion http library",
-      "EventMachine HttpClient" => "Ruby http library",
-      "Go http package" => "Go http library",
-      "Java" => "Generic Java http library",
-      "libwww-perl" => "Perl client-server library loved by script kids",
-      "lwp-trivial" => "Another Perl library loved by script kids",
-      "Python-urllib" => "Python http library",
-      "PycURL" => "Python http library",
-      "Test Certificate Info" => "C http library?",
-      "Wget" => "wget unix CLI http client",
-
-      # URL expanders / previewers
-      "awe.sm" => "Awe.sm URL expander",
-      "bitlybot" => "bit.ly bot",
-      "bot@linkfluence.net" => "Linkfluence bot",
-      "facebookexternalhit" => "facebook bot",
-      "Feedfetcher-Google" => "Google Feedfetcher",
-      "https://developers.google.com/+/web/snippet" => "Google+ Snippet Fetcher",
-      "LongURL" => "URL expander service",
-      "NING" => "NING - Yet Another Twitter Swarmer",
-      "redditbot" => "Reddit Bot",
-      "ShortLinkTranslate" => "Link shortener",
-      "TweetmemeBot" => "TweetMeMe Crawler",
-      "Twitterbot" => "Twitter URL expander",
-      "UnwindFetch" => "Gnip URL expander",
-      "vkShare" => "VKontake Sharer",
-
-      # Uptime monitoring
-      "check_http" => "Nagios monitor",
-      "NewRelicPinger" => "NewRelic monitor",
-      "Panopta" => "Monitoring service",
-      "Pingdom" => "Pingdom monitoring",
-      "SiteUptime" => "Site monitoring services",
-
-      # ???
-      "DigitalPersona Fingerprint Software" => "HP Fingerprint scanner",
-      "ShowyouBot" => "Showyou iOS app spider",
-      "ZyBorg" => "Zyborg? Hmmm...."
-    }
+    BOTS = YAML.load_file(File.expand_path("../../../../bots.yml", __FILE__))
 
     def bot?
       ua.empty? || BOTS.any? {|key, description| ua.include?(key) }

data/lib/browser/methods/consoles.rb

@@ -19,5 +19,10 @@ class Browser
     def console?
       xbox? || playstation? || nintendo?
     end
+
+    # Detect if browser is running from PSP.
+    def psp?
+      !!(ua =~ /(PSP|Playstation Vita)/)
+    end
   end
 end

data/lib/browser/methods/devices.rb

@@ -29,14 +29,13 @@ class Browser
       !!(ua =~ /Kindle/ || silk?)
     end
 
-    # Detect if browser is running from PSP.
-    def psp?
-      !!(ua =~ /PSP/)
-    end
-
     # Detect if browser if a Blackberry Playbook tablet
     def playbook?
       !!(ua =~ /PlayBook/ and ua =~ /RIM Tablet/)
     end
+
+    def windows_touchscreen_desktop?
+      windows? && !!(ua =~ /Touch/)
+    end
   end
 end

data/lib/browser/methods/mobile.rb

@@ -12,7 +12,7 @@ class Browser
 
     # Detect if browser is BlackBerry
     def blackberry?
-      !!(ua =~ /BlackBerry/)
+      !!(ua =~ /(BlackBerry)/)
     end
 
     private

data/lib/browser/methods/platform.rb

@@ -10,7 +10,7 @@ class Browser
       ipod? || ipad? || iphone?
     end
 
-    # Detect if is iOS5.
+    # Detect if is iOS4.
     def ios4?
       ios? && !!(ua =~ /OS 4/)
     end
@@ -30,6 +30,31 @@ class Browser
       ios? && !!(ua =~ /OS 7/)
     end
 
+    # Detect if is BlackBerry 4.
+    def blackberry4?
+      blackberry? && !!(ua =~ %r[BlackBerry\d+/4])
+    end
+
+    # Detect if is BlackBerry 5.
+    def blackberry5?
+      blackberry? && !!(ua =~ %r[BlackBerry\d+/5])
+    end
+
+    # Detect if is BlackBerry 6.
+    def blackberry6?
+      blackberry? && !!(ua =~ %r[Version/6])
+    end
+
+    # Detect if is BlackBerry 7.
+    def blackberry7?
+      blackberry? && !!(ua =~ %r[Version/7])
+    end
+
+    # Detect if is BlackBerry 10.
+    def blackberry10?
+      !!(ua =~ /BB10/)
+    end
+
     # Detect if current platform is Macintosh.
     def mac?
       !!(ua =~ /Mac OS X/)
@@ -63,12 +88,22 @@ class Browser
       !!(ua =~ /Windows Phone/)
     end
 
+    # Detect if current platform is Windows in 64-bit architecture.
+    def windows_x64?
+      windows? && !!(ua =~ /(Win64|x64)/) && !!(ua =~ /x64/)
+    end
+
+    # Detect if current platform is ChromeOS
+    def chrome_os?
+      !!(ua =~ /CrOS/)
+    end
+
     # Return the platform.
     def platform
       case
-      when linux?   then :linux
-      when mac?     then :mac
-      when windows? then :windows
+      when linux?     then :linux
+      when mac?       then :mac
+      when windows?   then :windows
       else
         :other
       end

data/lib/browser/methods/tv.rb

@@ -0,0 +1,8 @@
+class Browser
+  module Tv
+    # Detect if browser is Television
+    def tv?
+      !!(ua =~ /tv/i)
+    end
+  end
+end

data/lib/browser/version.rb

@@ -1,8 +1,8 @@
 class Browser
   module Version
     MAJOR = 0
-    MINOR = 3
-    PATCH = 2
+    MINOR = 4
+    PATCH = 0
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/test/browser_test.rb

@@ -14,7 +14,9 @@ class BrowserTest < Test::Unit::TestCase
   IE9_COMPAT            = "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0; Trident/5.0)"
   IE10                  = "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/6.0; EIE10;ENUSMSN)"
   IE10_COMPAT           = "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.1; Trident/6.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0; .NET4.0C; EIE10;ENUSMSN)"
+  IE10_X64_WINX64       = "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; Win64; x64; Trident/6.0)"
   IE11                  = "Mozilla/5.0 (Windows NT 6.1; Trident/7.0; rv:11.0) like Gecko"
+  IE11_TOUCH_SCREEN     = "Mozilla/5.0 (Windows NT 6.3; Win64; x64; Trident/7.0; Touch; rv:11.0) like Gecko"
   OPERA                 = "Opera/9.80 (Macintosh; Intel Mac OS X 10.7.4; U; en) Presto/2.10.229 Version/11.64"
   OPERA_NEXT            = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.37 Safari/537.36 OPR/15.0.1147.44 (Edition Next)"
   FIREFOX               = "Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) Gecko/20121223 Ubuntu/9.25 (jaunty) Firefox/3.8"
@@ -22,10 +24,17 @@ class BrowserTest < Test::Unit::TestCase
   FIREFOX_TABLET        = "Mozilla/5.0 (Android; Tablet; rv:14.0) Gecko/14.0 Firefox/14.0"
   CHROME                = "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_4; en-US) AppleWebKit/533.4 (KHTML, like Gecko) Chrome/5.0.375.99 Safari/533.4"
   MOBILE_CHROME         = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 5_1_1 like Mac OS X; en) AppleWebKit/534.46.0 (KHTML, like Gecko) CriOS/19.0.1084.60 Mobile/9B206 Safari/7534.48.3"
+  CHROME_OS             = "Mozilla/5.0 (X11; CrOS x86_64 3701.81.0) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.57 Safari/537.31."
   ANDROID               = "Android SDK 1.5r3: Mozilla/5.0 (Linux; U; Android 1.5; de-; sdk Build/CUPCAKE) AppleWebkit/528.5+ (KHTML, like Gecko) Version/3.1.2 Mobile Safari/525.20.1"
   TABLOID               = "Mozilla/5.0 (Linux; U; Android 3.0; en-us; Xoom Build/HRI39) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13"
   BLACKBERRY            = "BlackBerry7100i/4.1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 VendorID/103"
+  BLACKBERRY4           = "BlackBerry8100/4.2.1 Profile/MIDP-2.0 Configuration/CLDC-1.1 VendorID/103"
+  BLACKBERRY5           = "BlackBerry9000/5.0.0.93 Profile/MIDP-2.0 Configuration/CLDC-1.1 VendorID/179"
+  BLACKBERRY6           = "Mozilla/5.0 (BlackBerry; U; BlackBerry AAAA; en-US) AppleWebKit/534.11+ (KHTML, like Gecko) Version/6.0.0.141 Mobile Safari/534.11+"
+  BLACKBERRY7           = "Mozilla/5.0 (BlackBerry; U; BlackBerry AAAA; en-US) AppleWebKit/534.11+ (KHTML, like Gecko) Version/7.0.0.1 Mobile Safari/534.11+"
+  BLACKBERRY10          = "Mozilla/5.0 (BB10; Touch) AppleWebKit/537.10+ (KHTML, like Gecko) Version/10.0.9.1675 Mobile Safari/537.10+"
   PSP                   = "Mozilla/4.0 (PSP (PlayStation Portable); 2.00)"
+  PSP_VITA              = "Mozilla/5.0 (Playstation Vita 1.61) AppleWebKit/531.22.8 (KHTML, like Gecko) Silk/3.2"
   QUICKTIME             = "QuickTime/7.6.8 (qtver=7.6.8;os=Windows NT 5.1Service Pack 3)"
   COREMEDIA             = "Apple Mac OS X v10.6.4 CoreMedia v1.0.0.10F569"
   XOOM                  = "Mozilla/5.0 (Linux; U; Android 3.0; en-us; Xoom Build/HRI39) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13"
@@ -59,6 +68,7 @@ class BrowserTest < Test::Unit::TestCase
   GOOGLE_BOT            = "Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)"
   MSN_BOT               = "msnbot-media/1.1 (+http://search.msn.com/msnbot.htm)"
   FACEBOOK_BOT          = "facebookexternalhit/1.1 (+http://www.facebook.com/externalhit_uatext.php)"
+  SMART_TV              = "Mozilla/5.0 (SmartHub; SMART-TV; U; Linux/SmartTV) AppleWebKit/531.2+ (KHTML, like Gecko) WebBrowser/1.0 SmartTV Safari/531.2+"
 
   def setup
     @browser = Browser.new
@@ -418,6 +428,66 @@ class BrowserTest < Test::Unit::TestCase
     assert_equal "4", @browser.version
   end
 
+  def test_detect_blackberry4
+    @browser.ua = BLACKBERRY4
+
+    assert_equal "BlackBerry", @browser.name
+    assert @browser.blackberry4?
+    assert ! @browser.tablet?
+    assert @browser.mobile?
+    assert ! @browser.modern?
+    assert_equal "4.2.1", @browser.full_version
+    assert_equal "4", @browser.version
+  end
+
+  def test_detect_blackberry5
+    @browser.ua = BLACKBERRY5
+
+    assert_equal "BlackBerry", @browser.name
+    assert @browser.blackberry5?
+    assert ! @browser.tablet?
+    assert @browser.mobile?
+    assert ! @browser.modern?
+    assert_equal "5.0.0.93", @browser.full_version
+    assert_equal "5", @browser.version
+  end
+
+  def test_detect_blackberry6
+    @browser.ua = BLACKBERRY6
+
+    assert_equal "BlackBerry", @browser.name
+    assert @browser.blackberry6?
+    assert ! @browser.tablet?
+    assert @browser.mobile?
+    assert @browser.modern?
+    assert_equal "534.11", @browser.full_version
+    assert_equal "534", @browser.version
+  end
+
+  def test_detect_blackberry7
+    @browser.ua = BLACKBERRY7
+
+    assert_equal "BlackBerry", @browser.name
+    assert @browser.blackberry7?
+    assert ! @browser.tablet?
+    assert @browser.mobile?
+    assert @browser.modern?
+    assert_equal "534.11", @browser.full_version
+    assert_equal "534", @browser.version
+  end
+
+  def test_detect_blackberry10
+    @browser.ua = BLACKBERRY10
+
+    assert_equal "Safari", @browser.name
+    assert @browser.blackberry10?
+    assert ! @browser.tablet?
+    assert @browser.mobile?
+    assert @browser.modern?
+    assert_equal "10.0.9.1675", @browser.full_version
+    assert_equal "10", @browser.version
+  end
+
   def test_detect_quicktime
     @browser.ua = QUICKTIME
 
@@ -456,6 +526,14 @@ class BrowserTest < Test::Unit::TestCase
     assert @browser.mobile?
   end
 
+  def test_detect_psp_vita
+    @browser.ua = PSP_VITA
+
+    assert_equal "PlayStation Portable", @browser.name
+    assert @browser.psp?
+    assert @browser.mobile?
+  end
+
   def test_detect_other_mobiles
     @browser.ua = "Symbian OS"
     assert @browser.mobile?
@@ -683,6 +761,26 @@ class BrowserTest < Test::Unit::TestCase
     assert ! @browser.tablet?
   end
 
+  def test_windows_x64
+    @browser.ua = IE10_X64_WINX64
+    assert @browser.windows_x64?
+  end
+
+  def test_detect_ie11_touch_desktop_pc
+    @browser.ua = IE11_TOUCH_SCREEN
+
+    assert_equal "Internet Explorer", @browser.name
+    assert @browser.ie?
+    assert @browser.ie11?
+    assert @browser.modern?
+    assert ! @browser.compatibility_view?
+    assert ! @browser.windows_rt?
+    assert @browser.windows_touchscreen_desktop?
+    assert @browser.windows8?
+    assert_equal "11.0", @browser.full_version
+    assert_equal "11", @browser.version
+  end
+
   def test_kindle_monochrome
     @browser.ua = KINDLE
 
@@ -800,4 +898,14 @@ class BrowserTest < Test::Unit::TestCase
     @browser.ua = CHROME
     assert ! @browser.bot?
   end
+
+  def test_chrome_os
+    @browser.ua = CHROME_OS
+    assert @browser.chrome_os?
+  end
+
+  def test_tv
+    @browser.ua = SMART_TV
+    assert @browser.tv?
+  end
 end

data/test/test_helper.rb

@@ -2,3 +2,8 @@ ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
 require "bundler/setup"
 require "test/unit"
 require "browser"
+require "turn"
+require "turn/reporter"
+
+Turn.config.format = :dot
+$RUBY_IGNORE_CALLERS += [%r[/gems/], %r[minitest/unit.rb]]

metadata

@@ -1,55 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: browser
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-07 00:00:00.000000000 Z
+date: 2014-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: pry-meta
+  name: bundler
+  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: '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: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   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: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   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: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-meta
+  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: '0'
+- !ruby/object:Gem::Dependency
+  name: turn
+  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: '0'
 description: Do some browser detection with Ruby.
@@ -59,16 +101,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
+- bots.yml
 - browser.gemspec
 - config.ru
 - gemfiles/rails3.gemfile
-- gemfiles/rails3.gemfile.lock
 - lib/browser.rb
 - lib/browser/action_controller.rb
 - lib/browser/meta/base.rb
@@ -88,6 +129,7 @@ files:
 - lib/browser/methods/language.rb
 - lib/browser/methods/mobile.rb
 - lib/browser/methods/platform.rb
+- lib/browser/methods/tv.rb
 - lib/browser/middleware.rb
 - lib/browser/middleware/context.rb
 - lib/browser/middleware/context/additions.rb
@@ -107,19 +149,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Do some browser detection with Ruby.
 test_files: []
-has_rdoc: 

data/Gemfile.lock

@@ -1,106 +0,0 @@
-PATH
-  remote: .
-  specs:
-    browser (0.3.2)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (4.0.2)
-      actionpack (= 4.0.2)
-      mail (~> 2.5.4)
-    actionpack (4.0.2)
-      activesupport (= 4.0.2)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    activemodel (4.0.2)
-      activesupport (= 4.0.2)
-      builder (~> 3.1.0)
-    activerecord (4.0.2)
-      activemodel (= 4.0.2)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.2)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.2)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    arel (4.0.1)
-    atomic (1.1.14)
-    awesome_print (1.2.0)
-    builder (3.1.4)
-    coderay (1.1.0)
-    erubis (2.7.0)
-    hike (1.2.3)
-    i18n (0.6.9)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    method_source (0.8.2)
-    mime-types (1.25.1)
-    minitest (4.7.5)
-    multi_json (1.8.2)
-    polyglot (0.3.3)
-    pry (0.9.12.4)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    pry-meta (0.0.5)
-      awesome_print
-      pry
-      pry-nav
-      pry-remote
-    pry-nav (0.2.3)
-      pry (~> 0.9.10)
-    pry-remote (0.1.7)
-      pry (~> 0.9)
-      slop (~> 3.0)
-    rack (1.5.2)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (4.0.2)
-      actionmailer (= 4.0.2)
-      actionpack (= 4.0.2)
-      activerecord (= 4.0.2)
-      activesupport (= 4.0.2)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.2)
-      sprockets-rails (~> 2.0.0)
-    railties (4.0.2)
-      actionpack (= 4.0.2)
-      activesupport (= 4.0.2)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (10.1.0)
-    slop (3.4.7)
-    sprockets (2.10.1)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.1)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (~> 2.8)
-    thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
-    tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.38)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  browser!
-  pry-meta
-  rack-test
-  rails

data/gemfiles/rails3.gemfile.lock

@@ -1,111 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    browser (0.3.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (3.2.14)
-      actionpack (= 3.2.14)
-      mail (~> 2.5.4)
-    actionpack (3.2.14)
-      activemodel (= 3.2.14)
-      activesupport (= 3.2.14)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.14)
-      activesupport (= 3.2.14)
-      builder (~> 3.0.0)
-    activerecord (3.2.14)
-      activemodel (= 3.2.14)
-      activesupport (= 3.2.14)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.14)
-      activemodel (= 3.2.14)
-      activesupport (= 3.2.14)
-    activesupport (3.2.14)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    awesome_print (1.1.0)
-    builder (3.0.4)
-    coderay (1.0.9)
-    erubis (2.7.0)
-    hike (1.2.3)
-    i18n (0.6.5)
-    journey (1.0.4)
-    json (1.8.0)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    method_source (0.8.2)
-    mime-types (1.25)
-    multi_json (1.8.0)
-    polyglot (0.3.3)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    pry-meta (0.0.5)
-      awesome_print
-      pry
-      pry-nav
-      pry-remote
-    pry-nav (0.2.3)
-      pry (~> 0.9.10)
-    pry-remote (0.1.7)
-      pry (~> 0.9)
-      slop (~> 3.0)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (3.2.14)
-      actionmailer (= 3.2.14)
-      actionpack (= 3.2.14)
-      activerecord (= 3.2.14)
-      activeresource (= 3.2.14)
-      activesupport (= 3.2.14)
-      bundler (~> 1.0)
-      railties (= 3.2.14)
-    railties (3.2.14)
-      actionpack (= 3.2.14)
-      activesupport (= 3.2.14)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.1.0)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    slop (3.4.6)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    thor (0.18.1)
-    tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  browser!
-  pry-meta
-  rack-test
-  rails (~> 3.2.13)