browserino 1.5.3 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d42fcb6e27f419709670519bb4fec4730be0498
-  data.tar.gz: eb6c9b68a6778652e9e541121d938deea327df8a
+  metadata.gz: f2ae02d6780d0cef93f9a41bb022a147dba31557
+  data.tar.gz: 3225266d8e2fbf37d3ea436bac8d3928779bba45
 SHA512:
-  metadata.gz: d339b3f44a2e19604a4b0b3ebf29b71495e9a1bafde4b9921832013fdd0b586fb2ffbb1ae2ce2d7492efe06f43ff62e1d9922b5dece1240bc74da369a40ed910
-  data.tar.gz: 9bd3aa28a228157f41afd6d9d2a7c8f76c237ddf8c1f0cbf154b45736ce2bf9f269cdf76f9d3a48d0b970f2fb7f96daeece2d14a5ac49a6a0ee4b2c735e05ff9
+  metadata.gz: af7551c42f54dc920a7bd309baab7106f69375e1914d1669a49f2bca63cfaf308d944b771e7f11dd4fe1bf73eae2ebec0f4b8978855871d3a446d7b4630dcb94
+  data.tar.gz: 78d2fca76155ac213f4c04dd81b9fe5fbd2ebba65ae73bc107cc2f767782c2509b888f6612dfd85f72376eaabe07bafa18d4370ff9072b0290723f8568129326

data/CHANGELOG.md

@@ -0,0 +1,37 @@
+## CHANGELOG
+_dates are in dd-mm-yyyy format_  
+
+#### 23-12-2015 VERSION 1.5.1.1
+
+- Removed print statements from method
+- Builds are now executed for Ruby 1.9.3 as well as 2.2.1
+
+#### 20-12-2015 VERSION 1.5.1
+
+- Fixed `respond_to?` method which would first return inverted results (e.g. false when it should be true)
+
+#### 19-12-2015 VERSION 1.5.0
+
+- Implemented to_s to return a concatenated string of property values
+- Implemented to_a to return an array with arrays containing property name-value pairs
+- Implemented to_h to return a hash containing property name-value pairs
+- Removed unused code
+
+#### 19-12-2015 VERSION 1.4.0
+
+- Added not method to invert questions about browser / system
+- Added random test cases to verify that all inverted answers are correct
+
+#### 17-12-2015 VERSION 1.3.0
+
+- Added Edge detection
+- For supported browsers, it is now possible to check name and version through `method_missing?`
+
+#### 16-12-2015 VERSION 1.2.0
+
+- Opera tests didn't run before
+- For supported systems, it is possible to check OS and version through `method_missing?`
+
+#### 15-12-2015 VERSION 1.1.2
+
+- User definable 'unknown' return value

data/README.md

@@ -7,7 +7,20 @@
 This gem aims to provide information about the browser that your visitor is using, it's main goal is not to let you exclude any browser from partying on your website (e.g. sniffing) but to provide you with more flexibility towards designing maybe a browser-themed website or knowledge of what your visitors are using to check out your website!
 
 ## Changelog
-_dates are in dd-mm-yyyy format_
+_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)_
+
+#### 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
 
@@ -20,41 +33,6 @@ _dates are in dd-mm-yyyy format_
 - Patterns could falsely identify a 64bit system, made the pattern more strict
 - using `X11` in a user agent as a synonym to a `#linux?` system
 
-#### 23-12-2015 VERSION 1.5.1.1
-
-- Removed print statements from method
-- Builds are now executed for Ruby 1.9.3 as well as 2.2.1
-
-#### 20-12-2015 VERSION 1.5.1
-
-- Fixed `respond_to?` method which would first return inverted results (e.g. false when it should be true)
-
-#### 19-12-2015 VERSION 1.5.0
-
-- Implemented to_s to return a concatenated string of property values
-- Implemented to_a to return an array with arrays containing property name-value pairs
-- Implemented to_h to return a hash containing property name-value pairs
-- Removed unused code
-
-#### 19-12-2015 VERSION 1.4.0
-
-- Added not method to invert questions about browser / system
-- Added random test cases to verify that all inverted answers are correct
-
-#### 17-12-2015 VERSION 1.3.0
-
-- Added Edge detection
-- For supported browsers, it is now possible to check name and version through `method_missing?`
-
-#### 16-12-2015 VERSION 1.2.0
-
-- Opera tests didn't run before
-- For supported systems, it is possible to check OS and version through `method_missing?`
-
-#### 15-12-2015 VERSION 1.1.2
-
-- User definable 'unknown' return value
-
 ## Installation
 
 *supports ruby 1.9.3+*
@@ -111,11 +89,20 @@ agent.engine_version # => 537.75.14
 agent.system_name # => 'macintosh'
 # or optionally, the full name (guessed from OS version)
 agent.system_name full: true # => ['macintosh', 'mavericks']
-agent.system_version # => 6.0
-agent.system_architecture # => 'x32' or 'x64' or 'unknown'
+agent.system_version # => 10.9.3
+agent.system_architecture # => 'x32' or 'x64' if known
+# or through convenience methods:
+agent.x32? # => true for 32bit UA's
+agent.x64? # => true for 64bit UA's
+
+agent.known? # => true if browser_name present
+agent.mobile? # => true if agent is a mobile device
 
 # methods to convert object into a String, Array or hash
 agent.to_s # => 'safari safari7 webkit webkit537 macintosh macintosh10'
+# 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'],
@@ -146,6 +133,7 @@ agent.android?
 agent.ios?
 agent.windows?
 agent.macintosh?
+agent.blackberry?
 agent.linux?
 ```
 
@@ -157,6 +145,7 @@ agent.not.android?
 agent.not.ios?
 agent.not.windows?
 agent.not.macintosh?
+agent.not.blackberry?
 agent.not.linux?
 ```
 
@@ -164,6 +153,9 @@ Supported browsers
 
 ```ruby
 agent.opera?
+agent.opera_mini?
+agent.bolt?
+agent.ucbrowser?
 agent.maxthon?
 agent.edge?
 agent.ie?

data/bin/console

@@ -3,11 +3,10 @@
 require "bundler/setup"
 require "browserino"
 require "pry"
-# ua = 'Mozilla/5.0 (iPad; CPU OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5355d Safari/8536.25'
-ua = 'Mozilla/5.0 (Windows NT 10.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.135 Safari/537.36 Edge/12.10136'
+ua = 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; BOLT/2.800) AppleWebKit/534.6 (KHTML, like Gecko) Version/5.0 Safari/534.6.3'
 @agent = Browserino::parse(ua)
 
-puts "> @agent variable available parsed with: 'Mozilla/5.0 (Windows NT 10.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.135 Safari/537.36 Edge/12.10136'\n\n"
+puts "> @agent variable available parsed with: '#{ua}'\n\n"
 puts "> You can create a fresh object by using\n"
 puts "> Browserino::parse((string) ua, (any) unknown_alt = nil)\n\n"
 puts "> ua          - The user agent you'd actually want to parse as a string"

data/lib/browserino/agent.rb

@@ -1,30 +1,52 @@
 module Browserino
   class Agent
-    def initialize(hash, unknown = Browserino::UNKNOWN)
-      @info = hash
+    def initialize(ua, unknown = Browserino::UNKNOWN)
+      @ua = ua
       @unknown = unknown
       @not = false
+
+      cleansed_ua = Browserino::cleanse @ua
+      name = Browserino::find_browser_name cleansed_ua
+      @info = Browserino::check_for_aliases({
+        browser_name: name,
+        browser_version: Browser::version(cleansed_ua, PATTERNS[:browser][name]),
+        engine_name: Engine::name(cleansed_ua),
+        engine_version: Engine::version(cleansed_ua),
+        system_name: OperatingSystem::name(cleansed_ua),
+        system_version: OperatingSystem::version(cleansed_ua),
+        system_architecture: OperatingSystem::architecture(cleansed_ua)
+      })
     end
 
     def browser_name
-      with_valid(@info[:browser_name]) { |v| v.to_s.downcase }
+      with_valid(@info[:browser_name]) do |v|
+        v.to_s.downcase.gsub(/_/, ' ')
+      end
     end
 
     def browser_version
-      with_valid(@info[:browser_version]) { |v| v.to_s.downcase.gsub('_', '.') }
+      with_valid(@info[:browser_version]) do |v|
+        v.to_s.downcase.gsub('_', '.')
+      end
     end
 
     def engine_name
-      with_valid(@info[:engine_name]) { |v| v.to_s.downcase }
+      with_valid(@info[:engine_name]) do |v|
+        v.to_s.downcase
+      end
     end
 
     def engine_version
-      with_valid(@info[:engine_version]) { |v| v.to_s.downcase.gsub('_', '.') }
+      with_valid(@info[:engine_version]) do |v|
+        v.to_s.downcase.gsub('_', '.')
+      end
     end
 
     def system_name(opts = {})
       opts = {full: false}.merge(opts)
-      name = with_valid(@info[:system_name]) { |v| v.to_s.downcase }
+      name = with_valid(@info[:system_name]) do |v|
+        v.to_s.downcase
+      end
       if opts[:full]
         [name, fetch_system_version_name(name)]
       else
@@ -33,11 +55,35 @@ module Browserino
     end
 
     def system_version
-      with_valid(@info[:system_version]) { |v| v.to_s.downcase.gsub('_', '.') }
+      with_valid(@info[:system_version]) do |v|
+        v.to_s.downcase.gsub('_', '.')
+      end
     end
 
     def system_architecture
-      with_valid(@info[:system_architecture]) { |v| v.to_s.downcase }
+      with_valid(@info[:system_architecture]) do |v|
+        v.to_s.downcase
+      end
+    end
+
+    def ua
+      @ua
+    end
+
+    def known?
+      browser_name != @unknown
+    end
+
+    def mobile?
+      !!(ua =~ /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)
+    end
+
+    def x64?
+      system_architecture == 'x64'
+    end
+
+    def x32?
+      system_architecture == 'x32'
     end
 
     def correct_system?(name, version = nil)
@@ -50,7 +96,7 @@ module Browserino
     end
 
     def correct_browser?(name, version = nil)
-      browser_equal = (name == browser_name)
+      browser_equal = (name.gsub(/_/, ' ') == browser_name)
       if version
         browser_equal && version == browser_version.to_s[0..(version.size - 1)]
       else
@@ -59,7 +105,7 @@ module Browserino
     end
 
     def method_missing(method_sym, *args, &block)
-      criteria = method_sym.to_s.gsub('?', '').split(/(?<=[a-zA-Z])(?=\d+)/)
+      criteria = method_sym.to_s.gsub('?', '').split(/(?<=[a-zA-Z_])(?=\d+)/)
       name = criteria[0]
       res = case browser_or_system?(method_sym)
       when :system then correct_system?(criteria[0], criteria[1])
@@ -83,20 +129,19 @@ module Browserino
       self
     end
 
-    def to_s
-      props = @info.map do |k, _v|
-        res = send k
+    def to_s(sep = '')
+      props = @info.map do |k, _|
         case k
         when :system_version
-          system_name + res.to_s.split('.').first.to_s
+          system_name + sep + send(k).to_s.split('.').first.to_s
         when :engine_version
-          engine_name + res.to_s.split('.').first.to_s
+          engine_name + sep + send(k).to_s.split('.').first.to_s
         when :browser_version
-          browser_name + res.to_s.split('.').first.to_s
-        else res
+          browser_name + sep + send(k).to_s.split('.').first.to_s
+        else send(k)
         end
       end
-      props.compact.join(' ')
+      props.compact.map { |v| v.gsub(/\s/, '-') }.join(' ')
     end
 
     def to_a

data/lib/browserino/patterns.rb

@@ -1,6 +1,21 @@
 module Browserino
   PATTERNS = {
     browser: {
+      ucbrowser: {
+        name: /(?<name>ucbrowser)/i,
+        version: /ucbrowser\/?(?<version>[\d\.]+)/i
+      },
+
+      bolt: {
+        name: /(?<name>bolt)/i,
+        version: /bolt\/(?<version>[\d\.]+)/i
+      },
+
+      opera_mini: {
+        name: /(?<name>ope?ra?\smini)/i,
+        version: /(?:ope?ra?\smini)\/(?<version>[\d\.]+)/i
+      },
+
       opera: {
         name: /(?<name>ope?ra?)/i,
         version: /(?:ope?ra?|version)(\/|\s)(?<version>[\d\.]+)/i
@@ -38,13 +53,13 @@ module Browserino
     },
 
     engine: {
-      name: /(?<name>((apple)?webkit|gecko|trident|presto))/i,
-      version: /(?:(?:apple)?webkit|rv:|trident|presto)[\/\s]?(?<version>[\d\.]+)/i
+      name: /(?<name>((apple)?webkit|presto|gecko|trident))/i,
+      version: /(?:(?:apple)?webkit|presto|rv:|trident)[\/\s]?(?<version>[\d\.]+)/i
     },
 
     operating_system: {
       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,
+      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
     }
   }

data/lib/browserino/version.rb

@@ -1,3 +1,3 @@
 module Browserino
-  VERSION = "1.5.3"
+  VERSION = "1.6.0"
 end

data/lib/browserino.rb

@@ -9,7 +9,6 @@ require "browserino/unknown"
 require "browserino/agent"
 
 require "browserino/alias"
-require "browserino/agent_manipulator"
 require "browserino/version"
 require "browserino/match_extractor"
 require "browserino/patterns"
@@ -19,21 +18,24 @@ require "browserino/operating_system"
 
 module Browserino
   def self.parse(ua, unknown_alt = Browserino::UNKNOWN)
-    ua = AgentManipulator.new(ua).ua
-    name = find_browser_name(ua)
-    Agent.new(check_for_aliases({
-      browser_name: name,
-      browser_version: Browser::version(ua, PATTERNS[:browser][name]),
-      engine_name: Engine::name(ua),
-      engine_version: Engine::version(ua),
-      system_name: OperatingSystem::name(ua),
-      system_version: OperatingSystem::version(ua),
-      system_architecture: OperatingSystem::architecture(ua)
-    }), unknown_alt)
+    Agent.new(ua, unknown_alt)
   end
 
   private
 
+  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(/linux/i, '') if /android/i =~ ua
+    ua
+  end
+
   def self.check_for_aliases(hash)
     h = {}
     hash.each do |prop, val|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: browserino
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.6.0
 platform: ruby
 authors:
 - Sidney Liebrand
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-31 00:00:00.000000000 Z
+date: 2016-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -119,6 +119,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Guardfile
@@ -130,7 +131,6 @@ files:
 - browserino.gemspec
 - lib/browserino.rb
 - lib/browserino/agent.rb
-- lib/browserino/agent_manipulator.rb
 - lib/browserino/alias.rb
 - lib/browserino/browser.rb
 - lib/browserino/engine.rb

data/lib/browserino/agent_manipulator.rb

@@ -1,28 +0,0 @@
-module Browserino
-  @ua = nil
-
-  class AgentManipulator
-    def initialize(ua)
-      @ua = ua
-      standardize_ios!
-      strip_legacy_mozilla!
-      strip_fake_opera_version!
-    end
-
-    def standardize_ios!
-      @ua = @ua.gsub(/ip((a|o)d|hone)/i, 'ios')
-    end
-
-    def strip_legacy_mozilla!
-      @ua = @ua.gsub(/(Mozilla\/[\d\.]+)/i, '')
-    end
-
-    def strip_fake_opera_version!
-      @ua = @ua.gsub(/9\.80/i, '')
-    end
-
-    def ua
-      @ua
-    end
-  end
-end