browserino 2.5.3 → 2.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3625bb25aba01e627a8bd14d19971350f039c2f2
-  data.tar.gz: 15d14f30031beec4d0ae944b38a37600c19d57e9
+  metadata.gz: e08c3808d746044e878ba7737b86d38b65e1c76a
+  data.tar.gz: 3eff20f91f4768ecd53ff13dc1678b0ee2bb7573
 SHA512:
-  metadata.gz: 7bded8f6898e7a644bb021d78716cdf26becec40c6171887ef2ae55bd9da8898b65773636604f958cf3c559f57c9513b92ff19c59bbc2d302eba8b4cd6ea4df5
-  data.tar.gz: 844f0b75b0ebbdaaeee98e6bff3aa9e09bd2634789d3fc266b942c28bf0435fcd23f29c1d684420942e576a1e3f06c3783f3568bbd0bd50335ce09ab77071f68
+  metadata.gz: 806f7ea91c5ada6d329bc371d2f3fcddc1876ceb1210479b2b875f86ddaab5961f16e1006599eabdd503a1ff3aee9e190d9c376c5f765dbae994bea8b23a1b85
+  data.tar.gz: a07a4116f54d82fd693535f9b0a876fe10d8ad4bbd31c1a0a537f0b3a50a15353340da04a9d74f9af9c13ec8401745d7db2385305b3e5253c505b77b7ad0ba3f

data/.rubocop.yml

@@ -0,0 +1,9 @@
+AllCops:
+  Exclude:
+    - 'spec/*'
+    - 'Guardfile'
+    - '*.gemspec'
+    - 'Rakefile'
+
+Documentation:
+  Enabled: false

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 cache: bundler
 rvm:
+  - 2.3.0
   - 2.2.1
   - 2.1.0
   - 2.0.0

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 ## CHANGELOG
 _dates are in dd-mm-yyyy format_  
 
+#### 12-01-2016 VERSION 2.5.1
+
+- 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

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)_
 
+#### 20-01-2016 VERSION 2.5.4
+
+- formatted / refactored code with rubocop
+- iOS `system_name full: true` returns the version no. of iOS if found
+
 #### 19-01-2016 VERSION 2.5.3
 
 - Minor refactoring of code
@@ -20,10 +25,6 @@ _older changes can be found in the [CHANGELOG.md](https://github.com/SidOfc/brow
 - Added support for windows phone detection
 - Added `windows_phone?` method
 
-#### 12-01-2016 VERSION 2.5.1
-
-- Patched blackberry mapping, this used to be done by model number instead but is now corrected
-
 ## Installation
 
 *supports ruby 1.9.3+*  
@@ -180,7 +181,7 @@ agent.to_h
 ```
 
 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 and the `Browserino::PATTERNS` hashes `:browser` and `:bot` output to identify wether or not to throw this exception.
+The function uses the names of the `Browserino::Mapping` constants and the `Browserino::Core::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.

data/bin/console

@@ -1,9 +1,10 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "browserino"
-require "pry"
-ua = 'Mozilla/5.0 (compatible; MSIE 9.0; Windows Phone OS 7.5; Trident/5.0; IEMobile/9.0)'
+require 'bundler/setup'
+require 'browserino'
+require 'pry'
+ua = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_2) AppleWebKit/601.3.9 \
+      (KHTML, like Gecko) Version/9.0.2 Safari/601.3.9'
 @agent = Browserino.parse(ua)
 
 puts "> @agent variable available parsed with: '#{ua}'\n\n"

data/lib/browserino/agent.rb

@@ -1,33 +1,12 @@
 module Browserino
   class Agent
-    def initialize(ua)
+    include Core::Helpers
+    attr_reader :ua
+
+    def initialize(info, ua = nil)
       @ua = ua
       @not = false
-
-      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][pat_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),
-        locale: OperatingSystem::locale(cleansed_ua),
-        bot_name: nil
-      }
-
-      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 = info
     end
 
     def browser_name
@@ -51,7 +30,6 @@ module Browserino
     end
 
     def system_name(opts = {})
-      opts = {full: false}.merge(opts)
       if opts[:full]
         [@info[:system_name], fetch_system_version_name(@info[:system_name])]
       else
@@ -75,55 +53,51 @@ module Browserino
       @info[:bot_name]
     end
 
-    def ua
-      @ua
-    end
-
     def compat?
-      allow_inverted_return (ie? && browser_version != browser_version(compat: true))
+      invert_if_not ie? && browser_version != browser_version(compat: true)
     end
 
     def known?
-      allow_inverted_return (!browser_name.nil? || !bot_name.nil?)
+      invert_if_not !browser_name.nil? || !bot_name.nil?
     end
 
     def mobile?
-      allow_inverted_return !!(ua =~ Browserino::PATTERNS[:operating_system][:mobile])
+      invert_if_not !ua.match(Core::PATTERNS[:operating_system][:mobile]).nil?
     end
 
     def x64?
-      allow_inverted_return system_architecture == 'x64'
+      invert_if_not system_architecture == 'x64'
     end
 
     def x32?
-      allow_inverted_return system_architecture == 'x32'
+      invert_if_not system_architecture == 'x32'
     end
 
     def osx?(*arg)
-      allow_inverted_return macintosh?(*arg)
+      invert_if_not macintosh?(*arg)
     end
 
     def win?(*arg)
-      allow_inverted_return windows?(*arg)
+      invert_if_not windows?(*arg)
     end
 
     def bb?(*arg)
-      allow_inverted_return blackberry?(*arg)
+      invert_if_not blackberry?(*arg)
     end
 
     def bot?(name = nil)
-      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)
+      is_bot = ua.strip.empty? || !bot_name.nil?
+      is_name = name.nil? || name.to_s.downcase.tr('_', ' ') == bot_name
+      invert_if_not is_bot && is_name
     end
 
     def method_missing(method_sym, *args, &block)
-      name = method_sym.to_s.gsub('?', '')
-      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
+      name = method_sym.to_s.tr('?', '')
+      invert_if_not 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)
@@ -137,105 +111,18 @@ module Browserino
 
     def to_s(sep = '')
       props = @info.map do |k, _|
-        case k
-        when :system_version
-          system_name + sep + send(k).to_s.split('.').first.to_s
-        when :engine_version
-          engine_name + sep + send(k).to_s.split('.').first.to_s
-        when :browser_version
-          browser_name + sep + send(k).to_s.split('.').first.to_s
-        else send(k)
-        end
+        y = [:system_version, :engine_version, :browser_version].include?(k)
+        y ? send(k) + sep + send(k).to_s.split('.').first : send(k)
       end
-      props.compact.map { |v| v.gsub(/\s/, '-') }.join(' ')
+      props.compact.map { |v| v.tr(' ', '-') }.join(' ')
     end
 
     def to_a
-      @info.inject([]) do |memo, arr|
-        memo.push [arr.first, send(arr.first)]
-        memo
-      end
+      @info.each_with_object([]) { |v, a| a.push(v) }
     end
 
     def to_h
-      to_a.inject({}) do |memo, arr|
-        memo[arr[0].to_sym] = arr[1]
-        memo
-      end
-    end
-
-    private
-
-    def allow_inverted_return(res)
-      if @not
-        @not = false
-        !res
-      else
-        res
-      end
-    end
-
-    def compare_versions(a, b)
-      b = b.to_s.split('.')
-      !a.to_s.split('.').map { |v| v == b.shift }.include?(false)
-    end
-
-    def correct_system?(name, version = nil)
-      sys_name = name.to_s.downcase.gsub(/\s/, '_')
-      sys_name_compare = system_name(full: true).join.downcase.gsub(/\s/, '_')
-      name_variations = [sys_name_compare, sys_name_compare.gsub(/^[\s_]+|[\d\.\s_]+$/, '')]
-      if (name_variations.include?((sys_name + version.to_s).gsub(/\s/, '_').downcase) ||
-          (sys_name == system_name.gsub(/\s/, '_') && compare_versions(version, system_version)) ||
-          (!version && sys_name == system_name.gsub(/\s/, '_')))
-        true
-      else
-        false
-      end
-    end
-
-    def correct_agent?(name, version = nil)
-      name = name.gsub(/_/, ' ')
-      browser_equal = (name == browser_name || name == bot_name)
-      if version
-        browser_equal && compare_versions(version, browser_version)
-      else
-        browser_equal
-      end
-    end
-
-    def agent_or_system?(method_sym)
-      name = method_sym.to_s.gsub('?', '')
-      sys = Browserino::Mapping.constants(true).include?(name.upcase.to_sym)
-      agent = Browserino::PATTERNS[:browser].merge(Browserino::PATTERNS[:bot]).keys.include?(name.to_sym)
-      if sys
-        :system
-      elsif agent
-        :agent
-      else
-        nil
-      end
-    end
-
-    def fetch_system_version_name(name)
-      return Browserino::UNKNOWN if name.nil? || name == '' || !name
-      const = name.dup.upcase.gsub(/\s/, '_')
-      version = if system_version == Browserino::UNKNOWN
-                  nil
-                elsif name.match(/mac|ios|blackberry/i)
-                  system_version.split('.').first(2).join.to_i
-                elsif name.match(/win|android/i)
-                  system_version.gsub('.', '').to_i
-                else
-                  system_version.to_i
-                end
-      if version && defined? const
-        version_names = Browserino::Mapping.const_get(const).select do |_, versions|
-          true if versions.include?(version)
-        end
-        version_names.keys.first || system_version.split('.').first(2).join('.')
-      else
-         Browserino::UNKNOWN
-      end
+      to_a.each_with_object({}) { |v, h| h[v[0].to_sym] = v[1] }
     end
   end
 end

data/lib/browserino/browser.rb

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

data/lib/browserino/core/alias.rb

@@ -0,0 +1,17 @@
+module Browserino
+  module Core
+    Core::ALIAS = {
+      browser_name: { 'ie' => /msie/ },
+      engine_name: { 'webkit' => /applewebkit/ },
+      system_name: {
+        'linux' => /ubuntu|x11/,
+        'windows_phone' => /windows\sphone/,
+        'ios' => /ip(?:[ao]d|hone)/
+      },
+      system_architecture: {
+        'x64' => /(?:x86_|amd|wow)?64/,
+        'x32' => /(?:(?:x86_)?32|i[36]8[36])/
+      }
+    }.freeze
+  end
+end

data/lib/browserino/core/helpers.rb

@@ -0,0 +1,83 @@
+module Browserino
+  module Core
+    module Helpers
+      def invert_if_not(res)
+        if @not
+          @not = false
+          !res
+        else
+          res
+        end
+      end
+
+      def compare_versions(a, b)
+        b = b.to_s.split('.')
+        !a.to_s.split('.').map { |v| v == b.shift }.include?(false)
+      end
+
+      def compare_sys_name_variations_with(name, version = nil)
+        v = version.to_s.tr(' ', '_').downcase
+        n = system_name(full: true).join.downcase.tr(' ', '_')
+        [n, n.gsub(/[\d\.\s_]+$/, '')].include?((name + v))
+      end
+
+      def correct_system?(name, version = nil)
+        sys_name = name.to_s.tr(' ', '_').downcase
+        if compare_sys_name_variations_with(sys_name, version) ||
+           (sys_name == system_name.tr(' ', '_') &&
+           compare_versions(version, system_version)) ||
+           (!version && sys_name == system_name.tr(' ', '_'))
+          true
+        else
+          false
+        end
+      end
+
+      def correct_agent?(name, version = nil)
+        name = name.tr('_', ' ')
+        browser_equal = (name == browser_name || name == bot_name)
+        if version
+          browser_equal && compare_versions(version, browser_version)
+        else
+          browser_equal
+        end
+      end
+
+      def agent_or_system?(method_sym)
+        name = method_sym.to_s.tr('?', '')
+        supported = Core::PATTERNS[:browser].merge(Core::PATTERNS[:bot]).keys
+        if supported.include?(name.to_sym)
+          :agent
+        elsif Mapping.const?(name.upcase.to_sym)
+          :system
+        end
+      end
+
+      def fetch_system_version_name(name)
+        const = to_const_sym(name)
+        version = parse_system_version(const)
+        if version && Mapping.const?(const)
+          res = Mapping.const_get(const)
+                       .select { |_, v| true if v.include?(version) }.keys.first
+          res || system_version.split('.').first(2).join('.').downcase
+        end
+      end
+
+      def parse_system_version(name)
+        if system_version
+          if name =~ /mac|blackberry/i
+            system_version.split('.').first(2).join.to_i
+          elsif name =~ /win|android/i
+            system_version.tr('.', '').to_i
+          else
+            system_version.to_i
+          end
+        end
+      end
+
+      def to_const_sym(s)
+        s.to_s.tr(' ', '_').upcase.to_sym
+      end
+    end
+  end
+end

data/lib/browserino/core/lies.rb

@@ -0,0 +1,13 @@
+module Browserino
+  module Core
+    Core::LIES = [
+      [%r{(Mozilla/[\d\.]+)}i, true],
+      [/9\.80/, /opera/i],
+      [%r{(?:apple)?webkit/[\d\.]+}i, /presto/i],
+      [/(?:ms)?ie/i, /rv:/i],
+      [/linux/i, /android/i],
+      [/x11/i, /bsd/i],
+      [/windows\snt/i, /windows\sphone/i]
+    ].freeze
+  end
+end

data/lib/browserino/core/patterns.rb

@@ -0,0 +1,104 @@
+module Browserino
+  module Core
+    Core::PATTERNS = {
+      browser: {
+        vivaldi: {
+          name: /(?<name>vivaldi)/i,
+          version: %r{vivaldi/(?<version>[\d\.]+)}i
+        },
+
+        ucbrowser: {
+          name: /(?<name>ucbrowser)/i,
+          version: %r{ucbrowser/?(?<version>[\d\.]+)}i
+        },
+
+        bolt: {
+          name: /(?<name>bolt)/i,
+          version: %r{bolt/(?<version>[\d\.]+)}i
+        },
+
+        opera_mini: {
+          name: /(?<name>ope?ra?\smini)/i,
+          version: %r{(?:ope?ra?\smini)/(?<version>[\d\.]+)}i
+        },
+
+        opera: {
+          name: /(?<name>ope?ra?)/i,
+          version: %r{(?:ope?ra?|version)[/\s](?<version>[\d\.]+)}i
+        },
+
+        maxthon: {
+          name: /(?<name>maxthon)/i,
+          version: %r{maxthon[\s/](?<version>[\d\.]+)}i
+        },
+
+        edge: {
+          name: /(?<name>edge)/i,
+          version: %r{edge/(?<version>[\d\.]+)}i
+        },
+
+        ie: {
+          name: /(?<name>msie|trident)/i,
+          version: /(?:(?:ms)?ie\s|rv:)(?<version>[\d\.]+)/i
+        },
+
+        seamonkey: {
+          name: /(?<name>seamonkey)/i,
+          version: %r{seamonkey/(?<version>[\d\.]+)}i
+        },
+
+        firefox: {
+          name: /(?<name>(?:fire|water)(?:fox|bird)
+                 |ice(?:weasel|cat)|netscape)/xi,
+          version: %r{(?:(?:fire|water)(?:fox|bird)|ice(?:weasel|cat)
+                      |netscape)/?(?<version>[\d\.]+)}xi
+        },
+
+        chrome: {
+          name: /(?<name>chrome?(ium|plus)?)/i,
+          version: %r{chrome?(?:ium|plus)?/(?<version>[\d\.]+)}i
+        },
+
+        safari: {
+          name: /(?<name>safari)/i,
+          version: %r{(?:version|safari)/(?<version>[\d\.]+)}i
+        }
+      },
+
+      bot: {
+        googlebot: { name: /(?<name>googlebot)/i },
+        yahoo_slurp: { name: /(?<name>yahoo\!\sslurp)/i },
+        msnbot: { name: /(?<name>msnbot)/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 },
+        nutch: { name: /(?<name>nutch)/i },
+        scrapy: { name: /(?<name>scrapy)/i },
+        dataparksearch: { name: /(?<name>dataparksearch)/i },
+        beslistbot: { name: /(?<name>beslistbot)/i }
+      },
+
+      engine: {
+        name: /(?<name>((apple)?webkit|presto|gecko|trident))/i,
+        version: %r{(?:(?:apple)?webkit|presto|rv:|trident)
+                    [/\s]?(?<version>[\d\.]+)}xi
+      },
+
+      operating_system: {
+        name: /(?<name>windows(?:\sphone(?:\sos)?)?|macintosh|android
+                |ip(?:[ao]d|hone)|blackberry|linux|ubuntu|x11|bsd)/xi,
+        version: %r{(?:windows(?:\sphone(?:\sos)?)?|nt|mac\sos\sx|android
+                    |(cpu\s|ip([ao]d|hone)\s)os|blackberry.*?version/|bb)
+                    \s?(?<version>[\d\._]+)}xi,
+        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/xi,
+        locale: /\s(?<locale>\w{2}(?:\-\w{2})?)[;\)]/
+      }
+    }.freeze
+  end
+end

data/lib/browserino/engine.rb

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

data/lib/browserino/maps/android.rb

@@ -24,7 +24,8 @@ module Browserino
       'Jelly Bean 18' => [43, 431],
       'KitKat 19' => [44, 441, 442, 443, 444],
       'Lollipop 21' => [50, 501, 502],
-      'Lollipop 22' => [51, 511]
-    }
+      'Lollipop 22' => [51, 511],
+      'Marshmallow 23' => [60, 601]
+    }.freeze
   end
 end

data/lib/browserino/maps/blackberry.rb

@@ -1,5 +1,5 @@
 module Browserino
   module Mapping
-    BLACKBERRY = {}
+    BLACKBERRY = {}.freeze
   end
 end

data/lib/browserino/maps/bsd.rb

@@ -1,5 +1,5 @@
 module Browserino
   module Mapping
-    BSD = {}
+    BSD = {}.freeze
   end
 end

data/lib/browserino/maps/ios.rb

@@ -1,11 +1,5 @@
-# Taken from http://www.thinkybits.com/blog/iOS-versions/
-# 15 - 09 - 2015
-
 module Browserino
   module Mapping
-    IOS = {
-      'iPhone OS' => [20, 21, 22, 30, 31],
-      'iOS' => [40, 41, 42, 43, 50, 51, 60, 61, 70, 71, 80, 81, 82, 83, 84, 90, 91]
-    }
+    IOS = {}.freeze
   end
 end

data/lib/browserino/maps/linux.rb

@@ -1,5 +1,5 @@
 module Browserino
   module Mapping
-    LINUX = {}
+    LINUX = {}.freeze
   end
 end

data/lib/browserino/maps/macintosh.rb

@@ -16,6 +16,6 @@ module Browserino
       'Mavericks' => [109],
       'Yosemite' => [1010],
       'El Capitan' => [1011]
-    }
+    }.freeze
   end
 end

data/lib/browserino/maps/mapping.rb

@@ -0,0 +1,9 @@
+module Browserino
+  module Mapping
+    module_function
+
+    def const?(const)
+      constants(true).include?(const)
+    end
+  end
+end

data/lib/browserino/maps/windows.rb

@@ -13,6 +13,6 @@ module Browserino
       '8' => [62],
       '8.1' => [63],
       '10' => [100]
-    }
+    }.freeze
   end
 end

data/lib/browserino/maps/windows_phone.rb

@@ -1,5 +1,5 @@
 module Browserino
   module Mapping
-    WINDOWS_PHONE = {}
+    WINDOWS_PHONE = {}.freeze
   end
 end

data/lib/browserino/operating_system.rb

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

data/lib/browserino/unknown.rb

@@ -1,3 +1,3 @@
 module Browserino
-    UNKNOWN = nil
+  UNKNOWN = nil
 end

data/lib/browserino/version.rb

@@ -1,3 +1,3 @@
 module Browserino
-  VERSION = "2.5.3"
+  VERSION = '2.5.4'.freeze
 end

data/lib/browserino.rb

@@ -1,62 +1,85 @@
-require "browserino/maps/macintosh"
-require "browserino/maps/blackberry"
-require "browserino/maps/ios"
-require "browserino/maps/bsd"
-require "browserino/maps/linux"
-require "browserino/maps/android"
-require "browserino/maps/windows"
-require "browserino/maps/windows_phone"
+require 'browserino/core/helpers'
+require 'browserino/core/lies'
+require 'browserino/core/alias'
+require 'browserino/core/patterns'
 
-require "browserino/integrate/rails" if defined?(::Rails)
+require 'browserino/maps/mapping'
+require 'browserino/maps/macintosh'
+require 'browserino/maps/blackberry'
+require 'browserino/maps/ios'
+require 'browserino/maps/bsd'
+require 'browserino/maps/linux'
+require 'browserino/maps/android'
+require 'browserino/maps/windows'
+require 'browserino/maps/windows_phone'
 
-require "browserino/unknown"
-require "browserino/agent"
+require 'browserino/integrate/rails' if defined?(::Rails)
 
-require "browserino/alias"
-require "browserino/version"
-require "browserino/patterns"
-require "browserino/browser"
-require "browserino/engine"
-require "browserino/operating_system"
+require 'browserino/unknown'
+require 'browserino/agent'
+
+require 'browserino/version'
+require 'browserino/browser'
+require 'browserino/engine'
+require 'browserino/operating_system'
 
 # require_relative "../spec/user_agents"
 # require_relative "../spec/user_agents_bots"
 # require_relative "../spec/user_agents_browsers"
 
 module Browserino
-  def self.parse(ua, _ = nil) # _ = nil maintains backwards compatibility
-    Agent.new ua
+  module_function
+
+  def parse(ua, _ = nil) # _ = nil maintains backwards compatibility
+    name = Browser.name(ua)
+    info = fetch_info(strip_lies(ua), name)
+    tmp = info[:browser_name].to_s.tr('_', ' ')
+    info[:browser_name] = tmp.strip == '' ? nil : tmp
+    info = check_if_bot(name, info)
+
+    Agent.new check_for_aliases(info), ua
+  end
+
+  def fetch_info(ua, name)
+    { browser_name: name,
+      browser_version: Browser.version(ua, Core::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),
+      locale: OperatingSystem.locale(ua),
+      bot_name: nil }
   end
 
-  private
+  def check_if_bot(name, info)
+    if Core::PATTERNS[:bot].include?(name)
+      info[:bot_name] = info[:browser_name]
+      info[:browser_name] = nil
+      info[:browser_version] = nil
+    end
+    info
+  end
 
-  def self.strip_lies(ua)
-    ua = ua.gsub(/(Mozilla\/[\d\.]+)/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
-    ua = ua.gsub(/x11/i, '') if /bsd/i =~ ua
-    ua = ua.gsub(/windows\snt/i, '') if /windows\sphone/i =~ ua
-    ua
+  def strip_lies(ua)
+    Core::LIES.inject(ua) do |s, arr|
+      s = s.gsub(arr[0], '') if arr[1] == true || s =~ arr[1]
+      s
+    end
   end
 
-  def self.check_for_aliases(h)
-    ALIAS.each do |k, v|
+  def check_for_aliases(h)
+    Core::ALIAS.each do |k, v|
       h[k] = v.select { |n, re| n if h[k] =~ re }.keys.first || h[k]
     end
     h
   end
 
-  def self.extract_match(match, sym)
+  def extract_match(match, sym)
     if match && match.names.include?(sym.to_s)
       m = match[sym].to_s.downcase.strip
       m = yield(m) if block_given?
-      if m && m.strip != ''
-        m
-      else
-        UNKNOWN
-      end
+      m
     else
       UNKNOWN
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: browserino
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.5.4
 platform: ruby
 authors:
 - Sidney Liebrand
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -118,6 +118,7 @@ files:
 - ".coveralls.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -131,8 +132,11 @@ files:
 - browserino.gemspec
 - lib/browserino.rb
 - lib/browserino/agent.rb
-- lib/browserino/alias.rb
 - lib/browserino/browser.rb
+- lib/browserino/core/alias.rb
+- lib/browserino/core/helpers.rb
+- lib/browserino/core/lies.rb
+- lib/browserino/core/patterns.rb
 - lib/browserino/engine.rb
 - lib/browserino/integrate/action_controller.rb
 - lib/browserino/integrate/rails.rb
@@ -142,10 +146,10 @@ files:
 - lib/browserino/maps/ios.rb
 - lib/browserino/maps/linux.rb
 - lib/browserino/maps/macintosh.rb
+- lib/browserino/maps/mapping.rb
 - lib/browserino/maps/windows.rb
 - lib/browserino/maps/windows_phone.rb
 - lib/browserino/operating_system.rb
-- lib/browserino/patterns.rb
 - lib/browserino/unknown.rb
 - lib/browserino/version.rb
 homepage: https://github.com/SidOfc/browserino

data/lib/browserino/alias.rb

@@ -1,15 +0,0 @@
-module Browserino
-  ALIAS = {
-    browser_name: { 'ie' => /msie/ },
-    engine_name: { 'webkit' => /applewebkit/ },
-    system_name: {
-      'linux' => /ubuntu|x11/,
-      'windows_phone' => /windows\sphone/,
-      'ios' => /ip(?:[ao]d|hone)/
-    },
-    system_architecture: {
-      'x64' => /(?:x86_|amd|wow)?64/,
-      'x32' => /(?:(?:x86_)?32|i[36]8[36])/
-    }
-  }
-end

data/lib/browserino/patterns.rb

@@ -1,94 +0,0 @@
-module Browserino
-  PATTERNS = {
-    browser: {
-      vivaldi: {
-        name: /(?<name>vivaldi)/i,
-        version: /vivaldi\/(?<version>[\d\.]+)/i
-      },
-
-      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
-      },
-
-      maxthon: {
-        name: /(?<name>maxthon)/i,
-        version: /maxthon(?:\s|\/)(?<version>[\d\.]+)/i
-      },
-
-      edge: {
-        name: /(?<name>edge)/i,
-        version: /(?:edge\/)(?<version>[\d\.]+)/i
-      },
-
-      ie: {
-        name: /(?<name>msie|trident)/i,
-        version: /(?:(?:ms)?ie\s|rv\:)(?<version>[\d\.]+)/i
-      },
-
-      seamonkey: {
-        name: /(?<name>seamonkey)/i,
-        version: /seamonkey\/(?<version>[\d\.]+)/i
-      },
-
-      firefox: {
-        name: /(?<name>(?:fire|water)(?:fox|bird)|ice(?:weasel|cat)|netscape)/i,
-        version: /(?:(?:fire|water)(?:fox|bird)|ice(?:weasel|cat)|netscape)[\/]?(?<version>[\d\.]+)/i
-      },
-
-      chrome: {
-        name: /(?<name>chrome?(ium|plus)?)/i,
-        version: /chrome?(?:ium|plus)?\/(?<version>[\d\.]+)/i
-      },
-
-      safari: {
-        name: /(?<name>safari)/i,
-        version: /(?:version|safari)\/(?<version>[\d\.]+)/i
-      }
-    },
-
-    bot: {
-      googlebot: { name: /(?<name>googlebot)/i },
-      yahoo_slurp: { name: /(?<name>yahoo\!\sslurp)/i },
-      msnbot: { name: /(?<name>msnbot)/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 },
-      nutch: { name: /(?<name>nutch)/i },
-      scrapy: { name: /(?<name>scrapy)/i },
-      dataparksearch: { name: /(?<name>dataparksearch)/i },
-      beslistbot: { name: /(?<name>beslistbot)/i }
-    },
-
-    engine: {
-      name: /(?<name>((apple)?webkit|presto|gecko|trident))/i,
-      version: /(?:(?:apple)?webkit|presto|rv:|trident)[\/\s]?(?<version>[\d\.]+)/i
-    },
-
-    operating_system: {
-      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,
-      locale: /\s(?<locale>\w{2}(?:\-\w{2})?)[;\)]/
-    }
-  }
-end