browserino 2.5.2 → 2.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a9d892c5ad880cdc418ac696b69dd465ec03820
-  data.tar.gz: 9addf30f035f5c74ada82cf47151c6ec9816667e
+  metadata.gz: 3625bb25aba01e627a8bd14d19971350f039c2f2
+  data.tar.gz: 15d14f30031beec4d0ae944b38a37600c19d57e9
 SHA512:
-  metadata.gz: e9276a510795d45e68ae8e717c07d340258c2f956e2b778fb4d2c632ba45dccc53e256f020cc8eb2be888f515ae2fbc23d70d00ef7d74f91505c38fb2383ee69
-  data.tar.gz: ff0ca377b67f2a492d3abce13b2c864a85f02077af6c8e49b5d021652e7238a0b8c0e38f32adef4b01cc7b6f5f1249b6aff1fc0f3b52871cc48a11ad29383750
+  metadata.gz: 7bded8f6898e7a644bb021d78716cdf26becec40c6171887ef2ae55bd9da8898b65773636604f958cf3c559f57c9513b92ff19c59bbc2d302eba8b4cd6ea4df5
+  data.tar.gz: 844f0b75b0ebbdaaeee98e6bff3aa9e09bd2634789d3fc266b942c28bf0435fcd23f29c1d684420942e576a1e3f06c3783f3568bbd0bd50335ce09ab77071f68

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 ## CHANGELOG
 _dates are in dd-mm-yyyy format_  
 
+#### 12-01-2016 VERSION 2.5.0
+
+- Added support for the Vivaldi browser
+- New method `#vivaldi?`
+- Added support for the bsd family of operating systems
+- New method `#bsd?`
+- Fixed using symbols for system version identification (e.g. `:vista` or `:el_capitan`) without a version number
+
 #### 11-01-2016 VERSION 2.4.1(.1)
 
 - Caching the agent object in Rails
@@ -42,7 +50,7 @@ _dates are in dd-mm-yyyy format_
 - 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 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

data/README.md

@@ -10,9 +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)_
 
+#### 19-01-2016 VERSION 2.5.3
+
+- Minor refactoring of code
+
 #### 15-01-2016 VERSION 2.5.2
 
-- **DEPRECATE** Custom return values (passed through `Browserino::parse`) will no longer alter the output of the agent object
+- **DEPRECATE** Custom return values (passed through `Browserino.parse`) will no longer alter the output of the agent object
 - Added support for windows phone detection
 - Added `windows_phone?` method
 
@@ -20,14 +24,6 @@ _older changes can be found in the [CHANGELOG.md](https://github.com/SidOfc/brow
 
 - Patched blackberry mapping, this used to be done by model number instead but is now corrected
 
-#### 12-01-2016 VERSION 2.5.0
-
-- Added support for the Vivaldi browser
-- New method `#vivaldi?`
-- Added support for the bsd family of operating systems
-- New method `#bsd?`
-- Fixed using symbols for system version identification (e.g. `:vista` or `:el_capitan`) without a version number
-
 ## Installation
 
 *supports ruby 1.9.3+*  
@@ -56,7 +52,7 @@ require 'browserino'
 Afterwards you can simply call
 
 ```ruby
-Browserino::parse('<user agent>')
+Browserino.parse('<user agent>')
 ```
 
 Or if you're using Rails *(>= 3.2.0)*, in your controllers you'll have access to an `agent` object
@@ -71,13 +67,13 @@ end
 
 The return value will always be `nil` if a value isn't found
 
-`Browserino::parse()` will return a `Browserino::Agent` object containing all the information parsed out of the supplied user agent.
+`Browserino.parse()` will return a `Browserino::Agent` object containing all the information parsed out of the supplied user agent.
 On this object there are a few method calls you can do to retrieve information.
 
 ```ruby
 require 'browserino'
 
-agent = Browserino::parse('user-agent')
+agent = Browserino.parse('user-agent')
 
 agent.browser_name
 # => 'safari'

data/bin/console

@@ -3,13 +3,12 @@
 require "bundler/setup"
 require "browserino"
 require "pry"
-ua = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.80 Safari/537.36 Vivaldi/1.0.344.37'
-@agent = Browserino::parse(ua)
+ua = 'Mozilla/5.0 (compatible; MSIE 9.0; Windows Phone OS 7.5; Trident/5.0; IEMobile/9.0)'
+@agent = Browserino.parse(ua)
 
 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"
-puts "> unknown_alt - A default value for unknown properties, default nil (recommended)\n\n"
+puts "> Browserino.parse([string] ua)\n\n"
+puts "> ua - The user agent you'd actually want to parse as a string"
 
 Pry.start

data/lib/browserino/agent.rb

@@ -1,14 +1,17 @@
 module Browserino
   class Agent
-    def initialize(ua, unknown = Browserino::UNKNOWN)
+    def initialize(ua)
       @ua = ua
       @not = false
 
-      cleansed_ua = Browserino::strip_lies @ua
-      name = Browserino::agent_id cleansed_ua
+      cleansed_ua = Browserino.strip_lies(@ua)
+      pat_name = Browser::name(cleansed_ua)
+      name = pat_name.to_s.downcase.gsub(/_/, ' ')
+      name = nil if name == ''
+
       info = {
         browser_name: name,
-        browser_version: Browser::version(cleansed_ua, PATTERNS[:browser][name]),
+        browser_version: Browser::version(cleansed_ua, PATTERNS[:browser][pat_name]),
         engine_name: Engine::name(cleansed_ua),
         engine_version: Engine::version(cleansed_ua),
         system_name: OperatingSystem::name(cleansed_ua),
@@ -18,73 +21,58 @@ module Browserino
         bot_name: nil
       }
 
-      if Browserino::PATTERNS[:bot].include? name
-        info.merge!({browser_name: nil, browser_version: nil, bot_name: name})
+      if Browserino::PATTERNS[:bot].include? pat_name
+        info.merge!(browser_name: nil,
+                    browser_version: nil,
+                    bot_name: name)
       end
 
-      @info = Browserino::check_for_aliases(info)
+      @info = Browserino.check_for_aliases(info)
     end
 
     def browser_name
-      with_valid(@info[:browser_name]) do |v|
-        v.to_s.downcase.gsub(/_/, ' ')
-      end
+      @info[:browser_name]
     end
 
     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
+        @info[:browser_version]
       end
     end
 
     def engine_name
-      with_valid(@info[:engine_name]) do |v|
-        v.to_s.downcase
-      end
+      @info[:engine_name]
     end
 
     def engine_version
-      with_valid(@info[:engine_version]) do |v|
-        v.to_s.downcase.gsub('_', '.')
-      end
+      @info[:engine_version]
     end
 
     def system_name(opts = {})
       opts = {full: false}.merge(opts)
-      name = with_valid(@info[:system_name]) do |v|
-        v.to_s.downcase
-      end
       if opts[:full]
-        [name, fetch_system_version_name(name)]
+        [@info[:system_name], fetch_system_version_name(@info[:system_name])]
       else
-        name
+        @info[:system_name]
       end
     end
 
     def system_version
-      with_valid(@info[:system_version]) do |v|
-        v.to_s.downcase.gsub('_', '.')
-      end
+      @info[:system_version]
     end
 
     def system_architecture
-      with_valid(@info[:system_architecture]) do |v|
-        v.to_s.downcase
-      end
+      @info[:system_architecture]
     end
 
     def locale
-      with_valid(@info[:locale]) { |v| v.to_s.downcase }
+      @info[:locale]
     end
 
     def bot_name
-      with_valid(@info[:bot_name]) do |v|
-        v.to_s.downcase.gsub(/_/, ' ')
-      end
+      @info[:bot_name]
     end
 
     def ua
@@ -96,7 +84,7 @@ module Browserino
     end
 
     def known?
-      allow_inverted_return (browser_name != Browserino::UNKNOWN || bot_name != Browserino::UNKNOWN)
+      allow_inverted_return (!browser_name.nil? || !bot_name.nil?)
     end
 
     def mobile?
@@ -131,12 +119,11 @@ module Browserino
 
     def method_missing(method_sym, *args, &block)
       name = method_sym.to_s.gsub('?', '')
-      res = case agent_or_system?(method_sym)
-      when :system then correct_system?(name, *args)
-      when :agent then correct_agent?(name, *args)
-      else super
-      end
-      allow_inverted_return res
+      allow_inverted_return case agent_or_system?(method_sym)
+                            when :system then correct_system?(name, *args)
+                            when :agent then correct_agent?(name, *args)
+                            else super
+                            end
     end
 
     def respond_to?(method_sym)
@@ -229,20 +216,9 @@ module Browserino
       end
     end
 
-    def with_valid(val)
-      if val && (val != '' || val != false) && block_given?
-        res = yield(val)
-        return Browserino::UNKNOWN if res == ''
-        res
-      else
-        Browserino::UNKNOWN
-      end
-    end
-
     def fetch_system_version_name(name)
       return Browserino::UNKNOWN if name.nil? || name == '' || !name
-      const = name.upcase.gsub(/\s/, '_')
-      name.downcase!
+      const = name.dup.upcase.gsub(/\s/, '_')
       version = if system_version == Browserino::UNKNOWN
                   nil
                 elsif name.match(/mac|ios|blackberry/i)

data/lib/browserino/alias.rb

@@ -1,23 +1,15 @@
 module Browserino
   ALIAS = {
-    browser_name: {
-      'ie' => ['msie']
-    },
-    browser_version: {},
-    engine_name: {
-      'webkit' => ['applewebkit']
-    },
-    engine_version: {},
+    browser_name: { 'ie' => /msie/ },
+    engine_name: { 'webkit' => /applewebkit/ },
     system_name: {
-      'linux' => ['ubuntu', 'x11'],
-      'windows_phone' => ['windows phone os', 'windows phone']
+      'linux' => /ubuntu|x11/,
+      'windows_phone' => /windows\sphone/,
+      'ios' => /ip(?:[ao]d|hone)/
     },
-    system_version: {},
     system_architecture: {
-      'x64' => ['64', 'x86_64', 'amd64', 'wow64'],
-      'x32' => ['32', 'i686', 'i383', 'i386', 'x86_32']
-    },
-    bot_name: {},
-    locale: {}
+      'x64' => /(?:x86_|amd|wow)?64/,
+      'x32' => /(?:(?:x86_)?32|i[36]8[36])/
+    }
   }
 end

data/lib/browserino/browser.rb

@@ -1,8 +1,23 @@
 module Browserino
   module Browser
+    def self.name(ua)
+      name = nil
+      patterns = PATTERNS[:browser].merge(PATTERNS[:bot])
+      agents = patterns.keys
+
+      until agents.empty? || !name.nil?
+        tmp = agents.shift
+        name = tmp if (ua.match(patterns[tmp][:name]))
+      end
+
+      name
+    end
+
     def self.version(ua, patterns)
       if patterns
-        Browserino::extract_match(ua.match(patterns[:version]), :version)
+        Browserino::extract_match(ua.match(patterns[:version]), :version) do |v|
+          v.gsub('_', '.')
+        end
       else
         UNKNOWN
       end

data/lib/browserino/engine.rb

@@ -1,11 +1,13 @@
 module Browserino
   module Engine
     def self.name(ua)
-      Browserino::extract_match(ua.match(PATTERNS[:engine][:name]), :name) || UNKNOWN
+      Browserino::extract_match(ua.match(PATTERNS[:engine][:name]), :name)
     end
 
     def self.version(ua)
-      Browserino::extract_match(ua.match(PATTERNS[:engine][:version]), :version) || UNKNOWN
+      Browserino::extract_match(ua.match(PATTERNS[:engine][:version]), :version) do |v|
+        v.gsub('_', '.')
+      end
     end
   end
 end

data/lib/browserino/integrate/action_controller.rb

@@ -4,7 +4,7 @@ module Browserino
   class ActionController
     module Base
       def agent
-        @agent ||= Browserino::parse(request.headers['User-Agent'])
+        @agent ||= Browserino.parse(request.headers['User-Agent'])
       end
     end
   end

data/lib/browserino/operating_system.rb

@@ -1,19 +1,21 @@
 module Browserino
   module OperatingSystem
     def self.name(ua)
-      Browserino::extract_match(ua.match(PATTERNS[:operating_system][:name]), :name) || UNKNOWN
+      Browserino::extract_match(ua.match(PATTERNS[:operating_system][:name]), :name)
     end
 
     def self.version(ua)
-      Browserino::extract_match(ua.match(PATTERNS[:operating_system][:version]), :version) || UNKNOWN
+      Browserino::extract_match(ua.match(PATTERNS[:operating_system][:version]), :version) do |v|
+        v.gsub('_', '.')
+      end
     end
 
     def self.architecture(ua)
-      Browserino::extract_match(ua.match(PATTERNS[:operating_system][:architecture]), :architecture) || UNKNOWN
+      Browserino::extract_match(ua.match(PATTERNS[:operating_system][:architecture]), :architecture)
     end
 
     def self.locale(ua)
-      Browserino::extract_match(ua.match(PATTERNS[:operating_system][:locale]), :locale) || UNKNOWN
+      Browserino::extract_match(ua.match(PATTERNS[:operating_system][:locale]), :locale)
     end
   end
 end

data/lib/browserino/patterns.rb

@@ -84,7 +84,7 @@ module Browserino
     },
 
     operating_system: {
-      name: /(?<name>windows(?:\sphone(?:\sos)?)?|macintosh|android|ios|blackberry|linux|ubuntu|x11|bsd)/i,
+      name: /(?<name>windows(?:\sphone(?:\sos)?)?|macintosh|android|ip(?:[ao]d|hone)|blackberry|linux|ubuntu|x11|bsd)/i,
       version: /(?:windows(?:\sphone(?:\sos)?)?|nt|mac\sos\sx|android|(cpu\s|i)os|blackberry.*?version\/|bb)\s?(?<version>[\d\._]+)/i,
       architecture: /(?<architecture>((?:x|x86_|amd|wow)64)|i(3|6)86)/i,
       mobile: /bolt|nokia|samsung|mobi(?:le)?|android|i?p(?:[ao]d|hone)|bb\d+|blackberry|iemobile|fennec|bada|meego|vodafone|t\-mobile|opera\sm(?:ob|in)i/i,

data/lib/browserino/version.rb

@@ -1,3 +1,3 @@
 module Browserino
-  VERSION = "2.5.2"
+  VERSION = "2.5.3"
 end

data/lib/browserino.rb

@@ -24,20 +24,15 @@ require "browserino/operating_system"
 # require_relative "../spec/user_agents_browsers"
 
 module Browserino
-  def self.parse(ua, unknown_alt = nil)
-    if unknown_alt
-      puts "The feature for using a custom return value is deprecated and will be removed in a future release. For now, your value will be ignored and nil will be the return value for unknown properties."
-    end
-    Agent.new(ua, UNKNOWN)
+  def self.parse(ua, _ = nil) # _ = nil maintains backwards compatibility
+    Agent.new ua
   end
 
   private
 
   def self.strip_lies(ua)
-    #make iphone / ipad / ipod consistent
-    ua = ua.gsub(/ip((a|o)d|hone)/i, 'ios')
     ua = ua.gsub(/(Mozilla\/[\d\.]+)/i, '')
-    ua = ua.gsub(/9\.80/i, '')
+    ua = ua.gsub(/9\.80/, '') if /opera/i =~ ua
     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
@@ -46,29 +41,22 @@ module Browserino
     ua
   end
 
-  def self.check_for_aliases(hash)
-    hash.inject({}) do |memo, kv|
-      ls = ALIAS[kv.first].select { |k, m| true if m.include?(kv.last) }.keys.first || kv.last
-      memo[kv.first] = ls
-      memo
-    end
-  end
-
-  def self.agent_id(ua)
-    name = nil
-    patterns = PATTERNS[:browser].merge(PATTERNS[:bot])
-    browsers = patterns.keys
-    until browsers.empty? || !name.nil?
-      tmp = browsers.shift
-      name = tmp if (ua.match(patterns[tmp][:name]))
+  def self.check_for_aliases(h)
+    ALIAS.each do |k, v|
+      h[k] = v.select { |n, re| n if h[k] =~ re }.keys.first || h[k]
     end
-    name ||= UNKNOWN
+    h
   end
 
-  def self.extract_match(match, sym, trim = true)
+  def self.extract_match(match, sym)
     if match && match.names.include?(sym.to_s)
-      match[sym].strip! if trim
-      match[sym].to_s.downcase
+      m = match[sym].to_s.downcase.strip
+      m = yield(m) if block_given?
+      if m && m.strip != ''
+        m
+      else
+        UNKNOWN
+      end
     else
       UNKNOWN
     end

metadata

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