browserino 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ffc66c9e3aa3d291234c23f01ccffaae0384be2
-  data.tar.gz: 92c2d7b5580f8ff7dc6923d65f79b5a563bb8fb2
+  metadata.gz: 73da860bb3eb32ad2dc1eb37512027bb88d7e543
+  data.tar.gz: 0a96818c4f592bb6e08271cf782d6b8c9446acc7
 SHA512:
-  metadata.gz: 0250cbb22fc938da833a6785158789354f68f409ae03148ecf926c8ae9a30a71ea365e5c5a40e415b7fd1328943c2a66c750e605e2b48f10994c4152f75c4f64
-  data.tar.gz: 9c19e483f50275de5dd1f6c972a3c40bc2187b57d88b173c17ae49dc47920ca858d061b0b3a4417cec1d74081022cc0abae7990c612cd8877f4ea73cf3cb8000
+  metadata.gz: 2a981d94ecdd13a05fd56c13040daead3bc787d038d513bc32d2e1b0dcf64d9d15a7a129420ae6cbf2d2381d23f9f52b3512b4b0df6777fdc0212aeed2e7a727
+  data.tar.gz: 72837977011f86c73ff3431fd7c42b02311fcba52d1e293b8a286d8883855deacc8c1d9e9822fd139a4a68487600b0affa8dd8e0514f7cd12e28ec199f012a97

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 ## CHANGELOG
 _dates are in dd-mm-yyyy format_  
 
+#### 03-01-2016 VERSION 2.0.0
+
+- **IMPORTANT** Changed behaviour of all dynamic methods to include version as an argument rather than in the method name.
+- **IMPORTANT** Changed the behaviour of version checking to be more strict
+- Changed tests to reflect new behaviour
+- Added convenience methods `#win?`, `#osx?` and `#bb?`
+
 #### 03-01-2016 VERSION 1.6.0
 
 - Added more tests

data/README.md

@@ -10,6 +10,13 @@ This gem aims to provide information about the browser that your visitor is usin
 _dates are in dd-mm-yyyy format_  
 _older changes can be found in the [CHANGELOG.md](https://github.com/SidOfc/browserino/blob/master/CHANGELOG.md)_
 
+#### 06-01-2016 VERSION 2.3.0
+
+- Added `#compat?` method to test if IE is in compatibility mode
+- Extended `#browser_version` to now also take an argument
+- Added `#locale` method
+- Empty UA's are identified as bots through `#bot?`
+
 #### 04-01-2016 VERSION 2.2.0
 
 - Added more bots
@@ -23,13 +30,6 @@ _older changes can be found in the [CHANGELOG.md](https://github.com/SidOfc/brow
 - Added dynamic method support for bots
 - Added support for the seamonkey browser
 
-#### 03-01-2016 VERSION 2.0.0
-
-- **IMPORTANT** Changed behaviour of all dynamic methods to include version as an argument rather than in the method name.
-- **IMPORTANT** Changed the behaviour of version checking to be more strict
-- Changed tests to reflect new behaviour
-- Added convenience methods `#win?`, `#osx?` and `#bb?`
-
 ## Installation
 
 *supports ruby 1.9.3+*  
@@ -75,55 +75,107 @@ On this object there are a few method calls you can do to retrieve information.
 ```ruby
 require 'browserino'
 
-agent = Browserino::parse('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_3) AppleWebKit/537.75.14 (KHTML, like Gecko) Version/7.0.3 Safari/7046A194A')
+agent = Browserino::parse('user-agent')
+
+agent.browser_name
+# => 'safari'
 
-agent.browser_name # => 'safari'
-agent.browser_version # => 7.0.3
+# always returns the real version (also with IE in compat)
+agent.browser_version
+# => '7.0.3'
 
-agent.engine_name # => 'webkit'
-agent.engine_version # => 537.75.14
+# if a user is running IE in compat mode this will return the compat version
+agent.browser_version compat: true
+# => '7.0'
+
+agent.engine_name
+# => 'webkit'
+
+agent.engine_version
+# => '537.75.14'
+
+agent.system_name
+# => 'macintosh'
 
-agent.system_name # => 'macintosh'
 # or optionally, the full name (guessed from OS version)
-agent.system_name full: true # => ['macintosh', 'mavericks']
-agent.system_version # => 10.9.3
-agent.system_architecture # => 'x32' or 'x64' if known
+agent.system_name full: true
+# => ['macintosh', 'mavericks']
+
+agent.system_version
+# => '10.9.3'
+
+agent.system_architecture
+# => 'x32'
+
 # or through convenience methods:
-agent.x32? # => true for 32bit UA's
-agent.x64? # => true for 64bit UA's
+agent.x32?
+# => true
+
+agent.x64?
+# => false
+
+# get the locale, either 'aa' or 'aa-bb' format
+agent.locale
+# => 'en'
+# or if the UA supplies the information
+# => 'en-us'
+
+
+# name of bot if the UA was identified as bot
+agent.bot_name
+# => 'googlebot'
 
-agent.bot_name # => name of bot if the UA was identified as bot
-agent.bot? # => returns true if the agent is a bot
-agent.bot? :googlebot # => returns true if the agent is the specified bot
+# returns true if the agent is a bot
+agent.bot?
+# => true
 
-agent.known? # => true if browser_name or bot_name present
-agent.mobile? # => true if agent is a mobile device
+# returns true if the agent is the specified bot
+agent.bot? :googlebot
+# => true
+
+# check IE compatibility mode
+agent.compat?
+# => true
+
+# true if browser_name or bot_name present
+agent.known?
+# => true
+
+# true if agent is a mobile device
+agent.mobile?
+# => true
 
 # methods to convert object into a String, Array or hash
-agent.to_s # => 'safari safari7 webkit webkit537 macintosh macintosh10'
+agent.to_s
+# => 'safari safari7 webkit webkit537 macintosh macintosh10 en-us'
+
 # to_s can split version numbers from words if a seperator is supplied
-agent.to_s '-' # => 'safari safari-7 webkit webkit-537 macintosh macintosh-10'
-
-agent.to_a # => [
-#                 [:browser_name, 'safari'],
-#                 [:browser_version, '7.0.3'],
-#                 [:engine_name, 'webkit'],
-#                 [:engine_version, '537.75.14'],
-#                 [:system_name, 'macintosh'],
-#                 [:system_version, '10'],
-#                 [:system_architecture, nil],
-#                 [:bot_name, nil]
-#               ]
-agent.to_h # => {
-#                 browser_name: 'safari',
-#                 browser_version: '7.0.3',
-#                 engine_name: 'webkit',
-#                 engine_version: '537.75.14',
-#                 system_name: 'macintosh',
-#                 system_version: '10',
-#                 system_architecture: nil,
-#                 bot_name: nil
-#               }
+agent.to_s '-'
+# => 'safari safari-7 webkit webkit-537 macintosh macintosh-10 en-us'
+
+agent.to_a
+# => [
+#      [:browser_name, 'safari'],
+#      [:browser_version, '7.0.3'],
+#      [:engine_name, 'webkit'],
+#      [:engine_version, '537.75.14'],
+#      [:system_name, 'macintosh'],
+#      [:system_version, '10'],
+#      [:system_architecture, nil],
+#      [:bot_name, nil]
+#    ]
+
+agent.to_h
+# => {
+#      browser_name: 'safari',
+#      browser_version: '7.0.3',
+#      engine_name: 'webkit',
+#      engine_version: '537.75.14',
+#      system_name: 'macintosh',
+#      system_version: '10',
+#      system_architecture: nil,
+#      bot_name: nil
+#    }
 ```
 
 It is now also possible to call methods to determine a specific OS or browser if it's supported, a `noMethodError` will be thrown otherwise

data/bin/console

@@ -3,7 +3,7 @@
 require "bundler/setup"
 require "browserino"
 require "pry"
-ua = 'msnbot/2.1'
+ua = 'Mozilla/5.0 (BlackBerry; U; BlackBerry 9800; en-US) AppleWebKit/534.8+ (KHTML, like Gecko) Version/6.0.0.450 Mobile Safari/534.8+'
 @agent = Browserino::parse(ua)
 
 puts "> @agent variable available parsed with: '#{ua}'\n\n"

data/lib/browserino/agent.rb

@@ -15,6 +15,7 @@ module Browserino
         system_name: OperatingSystem::name(cleansed_ua),
         system_version: OperatingSystem::version(cleansed_ua),
         system_architecture: OperatingSystem::architecture(cleansed_ua),
+        locale: OperatingSystem::locale(cleansed_ua),
         bot_name: nil
       }
 
@@ -31,9 +32,13 @@ module Browserino
       end
     end
 
-    def browser_version
-      with_valid(@info[:browser_version]) do |v|
-        v.to_s.downcase.gsub('_', '.')
+    def browser_version(opts = {})
+      if ie? && engine_version && !opts[:compat]
+        (engine_version.to_f + 4.0).to_s
+      else
+        with_valid(@info[:browser_version]) do |v|
+          v.to_s.downcase.gsub('_', '.')
+        end
       end
     end
 
@@ -73,6 +78,10 @@ module Browserino
       end
     end
 
+    def locale
+      with_valid(@info[:locale]) { |v| v.to_s.downcase }
+    end
+
     def bot_name
       with_valid(@info[:bot_name]) do |v|
         v.to_s.downcase.gsub(/_/, ' ')
@@ -83,6 +92,10 @@ module Browserino
       @ua
     end
 
+    def compat?
+      allow_inverted_return (ie? && browser_version != browser_version(compat: true))
+    end
+
     def known?
       allow_inverted_return (browser_name != @unknown || bot_name != @unknown)
     end
@@ -112,9 +125,9 @@ module Browserino
     end
 
     def bot?(name = nil)
-      is_bot = (bot_name.nil? ? false : true)
+      is_bot = ((bot_name.nil? ? false : true) ? true : ua.strip.empty?)
       is_name = (name.nil? ? true : (name.to_s.downcase.gsub(/_/, ' ') == bot_name))
-      allow_inverted_return(is_bot && is_name)
+      allow_inverted_return (is_bot && is_name)
     end
 
     def method_missing(method_sym, *args, &block)

data/lib/browserino/alias.rb

@@ -16,6 +16,7 @@ module Browserino
       'x64' => ['64', 'x86_64', 'amd64', 'wow64'],
       'x32' => ['32', 'i686', 'i383', 'x86_32']
     },
-    bot_name: {}
+    bot_name: {},
+    locale: {}
   }
 end

data/lib/browserino/operating_system.rb

@@ -11,5 +11,9 @@ module Browserino
     def self.architecture(ua)
       Browserino::extract_match(ua.match(PATTERNS[:operating_system][:architecture]), :architecture) || UNKNOWN
     end
+
+    def self.locale(ua)
+      Browserino::extract_match(ua.match(PATTERNS[:operating_system][:locale]), :locale) || UNKNOWN
+    end
   end
 end

data/lib/browserino/patterns.rb

@@ -28,12 +28,12 @@ module Browserino
 
       edge: {
         name: /(?<name>edge)/i,
-        version: /(?:edge\/)(?<version>[\d\.b]+)/i
+        version: /(?:edge\/)(?<version>[\d\.]+)/i
       },
 
       ie: {
         name: /(?<name>msie|trident)/i,
-        version: /(?:(?:ms)?ie\s|rv\:)(?<version>[\d\.b]+)/i
+        version: /(?:(?:ms)?ie\s|rv\:)(?<version>[\d\.]+)/i
       },
 
       seamonkey: {
@@ -66,7 +66,11 @@ module Browserino
       yandexbot: { name: /(?<name>yandexbot)/i },
       sosospider: { name: /(?<name>sosospider)/i },
       exabot: { name: /(?<name>exabot)/i },
-      sogou_spider: { name: /(?<name>sogou\s?spider)/i }
+      sogou_spider: { name: /(?<name>sogou\s?spider)/i },
+      nutch: { name: /(?<name>nutch)/i },
+      scrapy: { name: /(?<name>scrapy)/i },
+      dataparksearch: { name: /(?<name>dataparksearch)/i },
+      beslistbot: { name: /(?<name>beslistbot)/i }
     },
 
     engine: {
@@ -78,7 +82,8 @@ module Browserino
       name: /(?<name>windows|macintosh|android|ios|blackberry|linux|ubuntu|x11)/i,
       version: /(?:nt|mac\sos\sx|android|(cpu\s|i)os|blackberry)\s?(?<version>[\d\._]+)/i,
       architecture: /(?<architecture>((?:x|x86_|amd|wow)64)|i(3|6)86)/i,
-      mobile: /bolt|nokia|samsung|mobi(?:le)?|android|ip(?:[ao]d|hone)|bb\d+|blackberry|iemobile|fennec|bada|meego|vodafone|t\-mobile|opera\sm(?:ob|in)i/i
+      mobile: /bolt|nokia|samsung|mobi(?:le)?|android|ip(?:[ao]d|hone)|bb\d+|blackberry|iemobile|fennec|bada|meego|vodafone|t\-mobile|opera\sm(?:ob|in)i/i,
+      locale: /\s(?<locale>\w{2}(?:\-\w{2})?)[;\)]/
     }
   }
 end

data/lib/browserino/version.rb

@@ -1,3 +1,3 @@
 module Browserino
-  VERSION = "2.2.0"
+  VERSION = "2.3.0"
 end

data/lib/browserino.rb

@@ -20,7 +20,7 @@ require "browserino/operating_system"
 # require_relative "../spec/user_agents_browsers"
 
 module Browserino
-  def self.parse(ua, unknown_alt = Browserino::UNKNOWN)
+  def self.parse(ua, unknown_alt = UNKNOWN)
     Agent.new(ua, unknown_alt)
   end
 
@@ -29,12 +29,10 @@ module Browserino
   def self.cleanse(ua)
     #make iphone / ipad / ipod consistent
     ua = ua.gsub(/ip((a|o)d|hone)/i, 'ios')
-    #strip legacy mozilla version
     ua = ua.gsub(/(Mozilla\/[\d\.]+)/i, '')
-    #strip fake opera version
     ua = ua.gsub(/9\.80/i, '')
-    #strip webkit if presto engine is used
     ua = ua.gsub(/(?:apple)?webkit\/[\d\.]+/i, '') if /presto/i =~ ua
+    ua = ua.gsub(/(?:ms)?ie/i, '') if /rv\:/i =~ ua
     ua = ua.gsub(/linux/i, '') if /android/i =~ ua
     ua
   end
@@ -55,15 +53,15 @@ module Browserino
       tmp = browsers.shift
       name = tmp if (ua.match(patterns[tmp][:name]))
     end
-    name ||= Browserino::UNKNOWN
+    name ||= UNKNOWN
   end
 
   def self.extract_match(match, sym, trim = true)
-    if match && match.names.map(&:to_sym).include?(sym)
+    if match && match.names.include?(sym.to_s)
       match[sym].strip! if trim
       match[sym].to_s.downcase
     else
-      Browserino::UNKNOWN
+      UNKNOWN
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: browserino
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Sidney Liebrand
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-04 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler