browserino 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acb8ac94ab2c1c344c35baadf3a9b4c2467895af
-  data.tar.gz: 805054e5d7704be888eee25548d813d8d448ff41
+  metadata.gz: 5ffc66c9e3aa3d291234c23f01ccffaae0384be2
+  data.tar.gz: 92c2d7b5580f8ff7dc6923d65f79b5a563bb8fb2
 SHA512:
-  metadata.gz: 1617ffc71a77a90e28bec8d4fb77a5e94491d0930449d0b68ae689a75f5168669e7c6dbaceee6ca8a905938a90a0e18044ef343bf79f156dbb356f3d6381994f
-  data.tar.gz: 37f7b4465efe6a522c3e1127b0b2911fbbe81ead5039d82ca73f0a35f33ba60723ad055a22fcf4af08df1eda4de43b2bc9b584adb54faf8f5d9964a3a688a396
+  metadata.gz: 0250cbb22fc938da833a6785158789354f68f409ae03148ecf926c8ae9a30a71ea365e5c5a40e415b7fd1328943c2a66c750e605e2b48f10994c4152f75c4f64
+  data.tar.gz: 9c19e483f50275de5dd1f6c972a3c40bc2187b57d88b173c17ae49dc47920ca858d061b0b3a4417cec1d74081022cc0abae7990c612cd8877f4ea73cf3cb8000

data/CHANGELOG.md

@@ -1,6 +1,18 @@
 ## CHANGELOG
 _dates are in dd-mm-yyyy format_  
 
+#### 03-01-2016 VERSION 1.6.0
+
+- Added more tests
+- Added more browsers to check: *(bolt, opera mini and ucbrowser)*
+- Added `#known?` method to check if the agent is known
+- Added a `#ua` method to return the User Agent string as given to `Browserino::parse()`
+- Added `#x64?` and `#x32?` convenience methods to check system architecture
+- Added `#mobile?` to check wether or not a user agent is mobile
+- Moved older changelogs to its own [CHANGELOG.md](https://github.com/SidOfc/browserino/blob/master/CHANGELOG.md) file
+- Changed `#to_s` to add dashes (`-`) between browser names if they have a space
+- `#to_s` now has an optional (`sep = ''`) parameter that allows info and version numbers to be seperated
+
 #### 31-12-2015 VERSION 1.5.3
 
 - Added blackberry support

data/README.md

@@ -10,6 +10,11 @@ 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)_
 
+#### 04-01-2016 VERSION 2.2.0
+
+- Added more bots
+- `#bot?` method can now take a bot name as argument to check for an exact bot
+
 #### 04-01-2016 VERSION 2.1.0
 
 - Small restructuring of test suite
@@ -25,18 +30,6 @@ _older changes can be found in the [CHANGELOG.md](https://github.com/SidOfc/brow
 - Changed tests to reflect new behaviour
 - Added convenience methods `#win?`, `#osx?` and `#bb?`
 
-#### 03-01-2016 VERSION 1.6.0
-
-- Added more tests
-- Added more browsers to check: *(bolt, opera mini and ucbrowser)*
-- Added `#known?` method to check if the agent is known
-- Added a `#ua` method to return the User Agent string as given to `Browserino::parse()`
-- Added `#x64?` and `#x32?` convenience methods to check system architecture
-- Added `#mobile?` to check wether or not a user agent is mobile
-- Moved older changelogs to its own [CHANGELOG.md](https://github.com/SidOfc/browserino/blob/master/CHANGELOG.md) file
-- Changed `#to_s` to add dashes (`-`) between browser names if they have a space
-- `#to_s` now has an optional (`sep = ''`) parameter that allows info and version numbers to be seperated
-
 ## Installation
 
 *supports ruby 1.9.3+*  
@@ -100,7 +93,8 @@ agent.x32? # => true for 32bit UA's
 agent.x64? # => true for 64bit UA's
 
 agent.bot_name # => name of bot if the UA was identified as bot
-agent.bot? # => returns true or false depending on if the agent is a bot
+agent.bot? # => returns true if the agent is a bot
+agent.bot? :googlebot # => returns true if the agent is the specified bot
 
 agent.known? # => true if browser_name or bot_name present
 agent.mobile? # => true if agent is a mobile device
@@ -117,7 +111,8 @@ agent.to_a # => [
 #                 [:engine_version, '537.75.14'],
 #                 [:system_name, 'macintosh'],
 #                 [:system_version, '10'],
-#                 [:system_architecture, nil]
+#                 [:system_architecture, nil],
+#                 [:bot_name, nil]
 #               ]
 agent.to_h # => {
 #                 browser_name: 'safari',
@@ -126,12 +121,13 @@ agent.to_h # => {
 #                 engine_version: '537.75.14',
 #                 system_name: 'macintosh',
 #                 system_version: '10',
-#                 system_architecture: nil
+#                 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
-The function uses the names of the `Browserino::Mapping.constants(true)` or `Browserino::PATTERNS[:browser].keys` output to identify wether or not to throw this exception.
+The function uses the names of the `Browserino::Mapping` constants and the `Browserino::PATTERNS` hashes `:browser` and `:bot` output to identify wether or not to throw this exception.
 Versions are also supported as an argument to the function, for operating systems versions could include a string, symbol or float / integer to indicate a version.
 _(examples given for windows, android and ios, for a full list of versions check the **maps** folder)_
 Browsers can also accept a float / integer to check for a specific version.
@@ -200,6 +196,7 @@ agent.edge?
 agent.ie?
 agent.firefox?
 agent.chrome?
+agent.seamonkey?
 agent.safari?
 
 # or with the .not method (v1.4.0+)
@@ -215,8 +212,14 @@ agent.msnbot?
 agent.yahoo_slurp?
 agent.googlebot?
 agent.bingbot?
+agent.baiduspider?
+agent.yandexbot?
+agent.sosospider?
+agent.exabot?
+agent.sogou_spider?
 
 # or with the .not method (v1.4.0+)
+
 agent.not.msnbot?
 agent.not.yahoo_slurp?
 # etc etc...
@@ -283,18 +286,25 @@ Valid browser names are defined by __/lib/browserino/patterns.rb__ (the keys are
 'yahoo_slurp'
 'msnbot'
 'bingbot'
+'baiduspider'
+'yandexbot'
+'sosospider'
+'exabot'
+'sogou_spider'
 ```
 
 #### system_name examples
 
-_The main reason for not having Linux distro's / versions is because of the fact that there are MANY different distro's with no real structured release system. The best I can do here is allow a `linux?` system to be found atleast_
-
 ```ruby
-['windows', '7'] # where the 'windows' part is the name of the OS and the '7' is the actual version release (e.g. NT 6.1)
-['macintosh', 'yosemite'] # same as above but OSX has different names ofcourse.
-['android', 'lollipop 22'] # etcetera...
-['linux', nil] # in every linux case, the version will be missing on system_name full: true
-[nil, nil] # when nothing about the agent could be found
+'windows'
+'win'
+'macintosh'
+'osx'
+'blackberry'
+'bb'
+'android'
+'ios'
+'linux' # => doesn't have versions
 ```
 
 #### system_architecture examples

data/lib/browserino/agent.rb

@@ -17,9 +17,11 @@ module Browserino
         system_architecture: OperatingSystem::architecture(cleansed_ua),
         bot_name: nil
       }
+
       if Browserino::PATTERNS[:bot].include? name
         info.merge!({browser_name: nil, browser_version: nil, bot_name: name})
       end
+
       @info = Browserino::check_for_aliases(info)
     end
 
@@ -109,8 +111,10 @@ module Browserino
       allow_inverted_return blackberry?(*arg)
     end
 
-    def bot?
-      allow_inverted_return (bot_name.nil? ? false : true)
+    def bot?(name = nil)
+      is_bot = (bot_name.nil? ? false : true)
+      is_name = (name.nil? ? true : (name.to_s.downcase.gsub(/_/, ' ') == bot_name))
+      allow_inverted_return(is_bot && is_name)
     end
 
     def method_missing(method_sym, *args, &block)

data/lib/browserino/browser.rb

@@ -2,9 +2,9 @@ module Browserino
   module Browser
     def self.version(ua, patterns)
       if patterns
-        MatchExtractor::extract(ua.match(patterns[:version]), :version)
+        Browserino::extract_match(ua.match(patterns[:version]), :version)
       else
-        Browserino::UNKNOWN
+        UNKNOWN
       end
     end
   end

data/lib/browserino/engine.rb

@@ -1,11 +1,11 @@
 module Browserino
   module Engine
     def self.name(ua)
-      MatchExtractor::extract(ua.match(Browserino::PATTERNS[:engine][:name]), :name) || Browserino::UNKNOWN
+      Browserino::extract_match(ua.match(PATTERNS[:engine][:name]), :name) || UNKNOWN
     end
 
     def self.version(ua)
-      MatchExtractor::extract(ua.match(Browserino::PATTERNS[:engine][:version]), :version) || Browserino::UNKNOWN
+      Browserino::extract_match(ua.match(PATTERNS[:engine][:version]), :version) || UNKNOWN
     end
   end
 end

data/lib/browserino/operating_system.rb

@@ -1,15 +1,15 @@
 module Browserino
   module OperatingSystem
     def self.name(ua)
-      MatchExtractor::extract(ua.match(Browserino::PATTERNS[:operating_system][:name]), :name) || Browserino::UNKNOWN
+      Browserino::extract_match(ua.match(PATTERNS[:operating_system][:name]), :name) || UNKNOWN
     end
 
     def self.version(ua)
-      MatchExtractor::extract(ua.match(Browserino::PATTERNS[:operating_system][:version]), :version) || Browserino::UNKNOWN
+      Browserino::extract_match(ua.match(PATTERNS[:operating_system][:version]), :version) || UNKNOWN
     end
 
     def self.architecture(ua)
-      MatchExtractor::extract(ua.match(Browserino::PATTERNS[:operating_system][:architecture]), :architecture) || Browserino::UNKNOWN
+      Browserino::extract_match(ua.match(PATTERNS[:operating_system][:architecture]), :architecture) || UNKNOWN
     end
   end
 end

data/lib/browserino/patterns.rb

@@ -61,7 +61,12 @@ module Browserino
       googlebot: { name: /(?<name>googlebot)/i },
       yahoo_slurp: { name: /(?<name>yahoo\!\sslurp)/i },
       msnbot: { name: /(?<name>msnbot)/i },
-      bingbot: { name: /(?<name>bingbot)/i }
+      bingbot: { name: /(?<name>bingbot)/i },
+      baiduspider: { name: /(?<name>baiduspider)/i },
+      yandexbot: { name: /(?<name>yandexbot)/i },
+      sosospider: { name: /(?<name>sosospider)/i },
+      exabot: { name: /(?<name>exabot)/i },
+      sogou_spider: { name: /(?<name>sogou\s?spider)/i }
     },
 
     engine: {

data/lib/browserino/version.rb

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

data/lib/browserino.rb

@@ -10,7 +10,6 @@ require "browserino/agent"
 
 require "browserino/alias"
 require "browserino/version"
-require "browserino/match_extractor"
 require "browserino/patterns"
 require "browserino/browser"
 require "browserino/engine"
@@ -58,4 +57,13 @@ module Browserino
     end
     name ||= Browserino::UNKNOWN
   end
+
+  def self.extract_match(match, sym, trim = true)
+    if match && match.names.map(&:to_sym).include?(sym)
+      match[sym].strip! if trim
+      match[sym].to_s.downcase
+    else
+      Browserino::UNKNOWN
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browserino
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Sidney Liebrand
@@ -140,7 +140,6 @@ files:
 - lib/browserino/maps/linux.rb
 - lib/browserino/maps/macintosh.rb
 - lib/browserino/maps/windows.rb
-- lib/browserino/match_extractor.rb
 - lib/browserino/operating_system.rb
 - lib/browserino/patterns.rb
 - lib/browserino/unknown.rb

data/lib/browserino/match_extractor.rb

@@ -1,12 +0,0 @@
-module Browserino
-  module MatchExtractor
-    def self.extract(match, sym, trim = true)
-      if match && match.names.map(&:to_sym).include?(sym)
-        match[sym].strip! if trim
-        match[sym].to_s.downcase
-      else
-        Browserino::UNKNOWN
-      end
-    end
-  end
-end