browser 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84af323f06390a6a105eff4988f6f61eb139520a
-  data.tar.gz: 4a0bc068dd755041f5aa64f8fd20baab667d8fee
+  metadata.gz: bf057ec168032438df5564a7a443ae8856607637
+  data.tar.gz: 85337b0813ccc98e8d6970e2470b7ed9b0413abc
 SHA512:
-  metadata.gz: 97d05cf42b15c8e93d81d1d1b3940b04dfa6178b9df3b992fd64d81887e31a256fc56124eed717dfb74c8a63c11683911baf2e21d0d843a686e4ceb0cf38e564
-  data.tar.gz: b5ab3a5f147fd46beafea02aeade8388ef0ee93504a4641cd851cff13f7ef0b2329befcd0faede8a6a1f650c48510a51a7ef8bcc9948f3c2bcf93ce22e4a4506
+  metadata.gz: 0d8f6c9fdcbbee23131bab3aa4dc79f84413f1ff58a5e750a113293a06782fd01305f7da5a0e7287c9cf2944d6fdfbfb699016cc3e926f12a37e8514e21207af
+  data.tar.gz: 6dc8e034081314899bc389bce63f05fe1e1394d1c4f80f13d6720af9b5d3eb3d9864f9b9c9308b4c9344075bf29d81c92fb8a3c8eeaad57bf0bf5a38e1cebf53

data/CONTRIBUTING.md

@@ -0,0 +1,44 @@
+# Contributing
+
+## Issues
+
+If you want to request a feature or report a bug, please use the following template.
+
+```markdown
+## Description
+
+[Add feature/bug description here]
+
+## How to reproduce
+
+[Add steps on how to reproduce this issue]
+
+## What do you expect
+
+[Describe what do you expect to happen]
+
+## What happened instead
+
+[Describe the actual results]
+
+## Gem version:
+
+Browser version: [Add browser gem version here]
+
+## Report
+
+Visit <http://user-agent.herokuapp.com> and paste the URL here.
+```
+
+## Writing code
+
+Once you've made your great commits (include tests, please):
+
+1. [Fork](http://help.github.com/forking/) browser
+2. Create a topic branch - `git checkout -b my_branch`
+3. Push to your branch - `git push origin my_branch`
+4. [Create an Issue](http://github.com/fnando/browser/issues) with a link to your branch
+5. That's it!
+
+Please respect the indentation rules and code style.
+And use 2 spaces, not tabs. And don't touch the versioning thing.

data/README.md

@@ -44,6 +44,7 @@ browser.phantom_js?
 browser.quicktime?
 browser.core_media?
 browser.silk?
+browser.known?          # has the browser been successfully detected?
 browser.meta            # an array with several attributes
 browser.to_s            # the meta info joined by space
 ```
@@ -120,33 +121,6 @@ Rails.configuration.middleware.use Browser::Middleware do
 end
 ```
 
-## Issues
-
-If you want to request a feature or report a bug, please use the following template.
-
-```markdown
-## Description
-
-[Add feature/bug description here]
-
-## How to reproduce
-
-[Add steps on how to reproduce this issue]
-
-## What do you expect
-
-[Describe what do you expect to happen]
-
-## What happened instead
-
-[Describe the actual results]
-
-## Environment
-
-- User agent: [Get the UA - <http://user-agent.herokuapp.com>]
-- Gem version: [Add browser gem version here]
-```
-
 ## Maintainer
 
 * Nando Vieira - http://nandovieira.com.br

data/bots.yml

@@ -1,4 +1,5 @@
 360Spider: "360Spider"
+AddThis: "AddThis"
 ADmantX: "ADmantX Platform Semantic Analyzer"
 AdsBot-Google: "Google Adwords"
 AhrefsBot: "Ahrefs backlinks research tool"
@@ -9,7 +10,7 @@ AppEngine-Google: "Google App Engine"
 Ask Jeeves: "Ask Jeeves"
 AsyncHttpClient: "Java http and WebSocket client library"
 awe.sm: "Awe.sm URL expander"
-Baidu: "Chinese search engine"
+Baidu: "baidu"
 Baiduspider: "Chinese search engine"
 bingbot: "Microsoft bing bot"
 bitlybot: "bit.ly bot"
@@ -23,6 +24,7 @@ ColdFusion: "ColdFusion http library"
 Crowsnest: "Crowsnest"
 Crowsnest: "crowsnest.tv news portal bot"
 curl: "curl unix CLI http client"
+DAP/NetHTTP: "DAP/NetHTTP"
 developers.google.com/+/web/snippet/: "Google Plus"
 DigitalPersona Fingerprint Software: "HP Fingerprint scanner"
 DotBot: "Dot Bot"
@@ -56,6 +58,7 @@ InAGist: "URL resolver"
 Insieve Bot: "Insieve Bot"
 InsieveBot: "InsieveBot"
 Instapaper: "Instapaper"
+Insitesbot: "Insitesbot"
 IstellaBot: "IstellaBot"
 jack: "jack"
 Jakarta Commons-HttpClient: "Jakarta Commons-HttpClient"
@@ -88,6 +91,7 @@ MFE_expand: "Mcafee spider"
 MJ12bot: "Majestic-12 spider"
 MojeekBot: "Mojeek UK search crawler"
 msnbot: "Microsoft bot"
+netState: "netEstate NE Crawler"
 Netvibes: "Personalized dashboard bot"
 NewRelicPinger: "NewRelic monitor"
 newsme: "Link analyzer"
@@ -112,6 +116,7 @@ QuickLook: "QuickLook"
 Readability: "Readability"
 RebelMouse: "RebelMouse"
 redditbot: "Reddit Bot"
+RelateIQ: "RelateIQ"
 Riddler: "Riddler Bot"
 rogerbot: "SeoMoz spider"
 Ruby/1.9.3: "Ruby/1.9.3"
@@ -128,6 +133,7 @@ Slurp: "Yahoo spider"
 Sogou: "Chinese search engine"
 spider: "generic web spider"
 Spinn3r: "Spinn3r aggregator"
+StatusCake: "StatusCake"
 Test Certificate Info: "C http library?"
 trendictionbot: "trendiction search"
 TurnitinBot: "TurnitinBot"

data/lib/browser.rb

@@ -66,7 +66,7 @@ class Browser
 
   VERSIONS = {
     chrome: %r[(?:Chrome|CriOS)/([\d.]+)],
-    default: %r[(?:Version|MSIE|Firefox|QuickTime|BlackBerry[^/]+|CoreMedia v|PhantomJS)[/ ]?([a-z0-9.]+)]i,
+    default: %r[(?:Version|MSIE|Firefox|QuickTime|BlackBerry[^/]+|CoreMedia v|PhantomJS|AdobeAIR)[/ ]?([a-z0-9.]+)]i,
     opera: %r[(?:Opera/.*? Version/([\d.]+)|Chrome/.*?OPR/([\d.]+))],
     ie: %r[(?:MSIE |Trident/.*?; rv:)([\d.]+)]
   }
@@ -184,6 +184,10 @@ class Browser
     !!(ua =~ /Silk/)
   end
 
+  def known?
+    id != :other
+  end
+
   # Return a meta info about this browser.
   def meta
     Meta.constants.each_with_object(Set.new) do |meta_name, meta|

data/lib/browser/methods/bots.rb

@@ -13,11 +13,23 @@ class Browser
     end
 
     def bot?
-      Browser::Bots.detect_empty_ua? && ua.strip == "" || BOTS.any? {|key, _| ua.include?(key) }
+      bot_with_empty_ua? || BOTS.any? {|key, _| ua.include?(key) }
+    end
+
+    def bot_name
+      return unless bot?
+      return "Generic Bot" if bot_with_empty_ua?
+      BOTS.find {|key, description| ua.include?(key) }.first
     end
 
     def search_engine?
       SEARCH_ENGINES.any? {|key, _| ua.include?(key) }
     end
+
+    private
+
+    def bot_with_empty_ua?
+      Browser::Bots.detect_empty_ua? && ua.strip == ""
+    end
   end
 end

data/lib/browser/methods/consoles.rb

@@ -1,15 +1,25 @@
 class Browser
   module Consoles
-    # Detect if browser is Xbox.
+    # Detect if browser is running under Xbox.
     def xbox?
       !!(ua =~ /xbox/i)
     end
 
-    # Detect if browser is PlayStation.
+    # Detect if browser is running under Xbox One.
+    def xbox_one?
+      !!(ua =~ /xbox one/i)
+    end
+
+    # Detect if browser is running under PlayStation.
     def playstation?
       !!(ua =~ /playstation/i)
     end
 
+    # Detect if browser is running under PlayStation 4.
+    def playstation4?
+      !!(ua =~ /playstation 4/i)
+    end
+
     # Detect if browser is Nintendo.
     def nintendo?
       !!(ua =~ /nintendo/i)
@@ -22,7 +32,12 @@ class Browser
 
     # Detect if browser is running from PSP.
     def psp?
-      !!(ua =~ /(PSP|Playstation Vita)/)
+      !!(ua =~ /(PSP)/ || psp_vita?)
+    end
+
+    # Detect if browser is running from PSP Vita.
+    def psp_vita?
+      !!(ua =~ /Playstation Vita/)
     end
   end
 end

data/lib/browser/methods/mobile.rb

@@ -15,10 +15,20 @@ class Browser
       !!(ua =~ /(BlackBerry)/)
     end
 
+    # Detect if browser is Adobe AIR.
+    def adobe_air?
+      !!(ua =~ /adobeair/i)
+    end
+
     private
 
+    # Regex taken from http://detectmobilebrowsers.com
     def detect_mobile?
-      ua =~ /(Mobi(le)?|Symbian|MIDP|Windows CE)/ || blackberry? || psp? || opera_mini?
+      !!(
+        psp? ||
+        /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.match(ua) ||
+        /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.match(ua[0..3])
+      )
     end
   end
 end

data/lib/browser/methods/platform.rb

@@ -30,7 +30,7 @@ class Browser
       ios? && !!(ua =~ /OS 7/)
     end
 
-    # Detect if is iOS7.
+    # Detect if is iOS8.
     def ios8?
       ios? && !!(ua =~ /OS 8/)
     end
@@ -62,7 +62,7 @@ class Browser
 
     # Detect if current platform is Macintosh.
     def mac?
-      ua =~ /Mac OS X/ && !ios?
+      !!(ua =~ /Mac OS X/ && !ios?)
     end
 
     # Detect if current platform is Windows.

data/lib/browser/version.rb

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

data/test/browser_spec.rb

@@ -491,6 +491,7 @@ describe Browser do
 
     assert_equal "PlayStation Portable", @browser.name
     assert @browser.psp?
+    refute @browser.psp_vita?
     assert @browser.mobile?
   end
 
@@ -499,6 +500,7 @@ describe Browser do
 
     assert_equal "PlayStation Portable", @browser.name
     assert @browser.psp?
+    assert @browser.psp_vita?
     assert @browser.mobile?
   end
 
@@ -829,6 +831,7 @@ describe Browser do
 
     assert @browser.console?
     assert @browser.playstation?
+    refute @browser.playstation4?
   end
 
   it "detects playstation 4" do
@@ -836,6 +839,7 @@ describe Browser do
 
     assert @browser.console?
     assert @browser.playstation?
+    assert @browser.playstation4?
   end
 
   it "detects xbox 360" do
@@ -843,6 +847,7 @@ describe Browser do
 
     assert @browser.console?
     assert @browser.xbox?
+    refute @browser.xbox_one?
   end
 
   it "detects xbox one" do
@@ -850,6 +855,7 @@ describe Browser do
 
     assert @browser.console?
     assert @browser.xbox?
+    assert @browser.xbox_one?
   end
 
   it "removes duplicate items" do
@@ -884,22 +890,44 @@ describe Browser do
   end
 
   it "doesn't consider empty UA as bot" do
-    @browser.ua = ''
+    @browser.ua = ""
     refute @browser.bot?
   end
 
   it "allows setting empty string as bots" do
     Browser::Bots.detect_empty_ua!
-    @browser.ua = ''
+    @browser.ua = ""
+
     assert @browser.bot?
   end
 
-  it "doesn't consider mozilla as a bot when considerint empty UA" do
+  it "doesn't detect mozilla as a bot when considering empty UA" do
     Browser::Bots.detect_empty_ua!
     @browser.ua = "Mozilla"
+
     refute @browser.bot?
   end
 
+  it "returns bot name" do
+    @browser.ua = $ua["GOOGLE_BOT"]
+    assert_equal @browser.bot_name, "Googlebot"
+
+    @browser.ua = $ua["FACEBOOK_BOT"]
+    assert_equal @browser.bot_name, "facebookexternalhit"
+  end
+
+  it "returns bot name (empty string ua detection enabled)" do
+    Browser::Bots.detect_empty_ua!
+    @browser.ua = ""
+
+    assert_equal @browser.bot_name, "Generic Bot"
+  end
+
+  it "returns nil for non-bots" do
+    @browser.ua = $ua["CHROME"]
+    assert_equal @browser.bot_name, nil
+  end
+
   it "detects chrome os" do
     @browser.ua = $ua["CHROME_OS"]
     assert @browser.chrome_os?
@@ -923,4 +951,24 @@ describe Browser do
       assert @browser.search_engine?, "#{$ua[key]} should be a search engine"
     end
   end
+
+  it "knows a supported browser" do
+    @browser.ua = "Chrome"
+    assert @browser.known?
+  end
+
+  it "does not know an unsupported browser" do
+    @browser.ua = "Fancy new browser"
+    refute @browser.known?
+  end
+
+  it "detects adobe air" do
+    @browser.ua = $ua["ADOBE_AIR"]
+
+    assert @browser.adobe_air?
+    assert @browser.webkit?
+    assert_equal @browser.version, "13"
+    assert_equal @browser.full_version, "13.0"
+    assert_equal @browser.name, "Other"
+  end
 end

data/test/ua.yml

@@ -1,3 +1,4 @@
+ADOBE_AIR: 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X; de) AppleWebKit/533.19.4 (KHTML, like Gecko) AdobeAIR/13.0'
 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'
 ANDROID_WITH_SAFARI: 'Mozilla/5.0 (Linux; U; Android 4.3; en-us; SCH-I535 Build/JSS15J) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30'
 ASK: 'Mozilla/2.0 (compatible; Ask Jeeves/Teoma; +http://sp.ask.com/docs/about/tech_crawling.html)'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: browser
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-14 00:00:00.000000000 Z
+date: 2014-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,6 +90,7 @@ files:
 - ".gitignore"
 - ".hound.yml"
 - ".travis.yml"
+- CONTRIBUTING.md
 - Gemfile
 - README.md
 - Rakefile