browserino 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bdd2af440a3b1476900a3cdd36d2905660053c6
-  data.tar.gz: 0c7a2151e6ec79341ba5dda81eceddef2e8128ed
+  metadata.gz: b85dfc764ad259ee956ed4fd456d2a3d157f0e17
+  data.tar.gz: b8f96ecc2cc453dada5c1ca5df9dbd3216c0d6a9
 SHA512:
-  metadata.gz: fb4d367fb7cfd3bd9cf637998de4a41549e18f20aaa0f14e007cb28883aff70b66e4beb75f757d99fe299b61a77db0c4322b90da74691e30677c524428a1c3eb
-  data.tar.gz: c13adf9ce004e08c5504b07367c5f362446ca06dbc6abe372872f703cca9694e8b3dd6f8fd7900970dea265a917e5d37ca9e951aef94176f241afaa4eba3f82c
+  metadata.gz: 66997f7437d4108c2779f2a1c2d07b0b41b6d95772435e4616ebde8567936bd87545d775db05fc6c81602bbf79a6693e22b938bae2724f130e0c660fddb54c18
+  data.tar.gz: a6f8eed6eedd79d2621a6982f1aa52d37302e7bc0577880f30cbcd8bea4f6864811703ac72e48fa6960f4a48f7bafb3ff5a78e5f9faf7b4765ac11b3183bc402

data/.rubocop.yml

@@ -4,6 +4,8 @@ AllCops:
     - 'Guardfile'
     - '*.gemspec'
     - 'Rakefile'
+    - 'tmp/**/*'
+    - 'vendor/**/*'
 
 Documentation:
   Enabled: false
@@ -11,9 +13,25 @@ Documentation:
 Lint/AmbiguousRegexpLiteral:
   Enabled: false
 
+Style/CaseEquality:
+  Enabled: false
+
 Style/RegexpLiteral:
   Enabled: false
 
+Style/MethodMissing:
+  Enabled: false
+
+Metrics/BlockLength:
+  Enabled: false
+
+Metrics/AbcSize:
+  Max: 20
+
+Metrics/ClassLength:
+  CountComments: false
+  Max: 175
+
 Metrics/MethodLength:
   CountComments: false
   Max: 15

data/.travis.yml

@@ -1,3 +1,5 @@
+sudo: false
+cache: bundler
 language: ruby
 rvm:
   - 2.0.0
@@ -6,4 +8,6 @@ rvm:
   - 2.3.0
   - 2.4.0
 before_install: gem install bundler
-script: bundle exec rspec spec
+script:
+  - bundle exec rspec spec
+  - bundle exec rubocop

data/bin/browserino

@@ -25,4 +25,4 @@ row = '+' * (out.map(&:size).max - 1) + "\n"
 
 out[0]  = "#{row}#{out[0]}"
 out[-1] = "#{out[-1]}#{row}"
-puts out.join("#{row}")
+puts out.join row

data/bin/console

@@ -4,9 +4,8 @@ require 'bundler/setup'
 require 'pry'
 require 'browserino'
 
-@client = Browserino.parse ARGV[0].dup || 'Mozilla/5.0 (Macintosh; Intel Mac\
-                                           OS X 10_11_2) AppleWebKit/601.3.9\
-                                           (KHTML, l ike Gecko) Version/9.0.\
-                                           2 Safari/601.3.9'
+smpl = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_2) AppleWebKit/601.3.9' \
+       ' (KHTML, l ike Gecko) Version/9.0.2 Safari/601.3.9'
 
+@client = Browserino.parse(ARGV[0].dup || smpl)
 Pry.start

data/browserino.gemspec

@@ -5,7 +5,7 @@ require 'browserino/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "browserino"
-  spec.version       = Browserino::VERSION
+  spec.version       = Browserino.version.full
   spec.authors       = ["Sidney Liebrand"]
   spec.email         = ["sidneyliebrand@gmail.com"]
   spec.summary       = %q{A browser identification gem with command line and Rails (>= 3.2.0) integration}
@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rubocop"
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "pry"
 end

data/lib/browserino/client.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
+
 module Browserino
   class Client
     attr_reader :property_names
 
     def initialize(props = {}, like = nil)
-      @property_names = props.is_a?(Hash) && props.keys || []
-      @like           = like if like
+      @property_names = props.keys
+      @like           = like
+
       # properties are added as methods that will each be defined in a specific
       # order below. First, seperate static value methods from procs,
       # procs will be able to call methods in this instances' context
@@ -61,10 +63,8 @@ module Browserino
       @x32_cache ||= architecture == :x32
     end
 
-    # check the type of a Client
-    def type?(sym)
-      return type == sym if sym.is_a? Symbol
-      type == sym.to_sym
+    def arm?
+      @arm_cache ||= architecture == :arm
     end
 
     # the catch all method, anything it can ask as question will respond
@@ -105,12 +105,13 @@ module Browserino
     end
 
     def to_s
-      @str_cache ||= [:name, :engine, :platform].map do |prop|
-        name = send prop
-        ver  = version if prop == :name
-        ver  = send "#{prop}_version" if ver.nil?
+      @str_cache ||= %i[name engine platform].map do |prop|
+        n = properties[prop]
+        v = version_for prop
+        l = label_for prop
+        a = l ? l : [n, (v.major if v > '0.0.0')].join.to_sym
 
-        [[name], [name, (ver.major if ver > '0.0.0')].compact.join.to_sym]
+        [n, a].uniq
       end.flatten.uniq.join(' ').gsub(/\s{2,}/, ' ').strip
     end
 
@@ -139,19 +140,39 @@ module Browserino
 
     private
 
+    def name_for(sym)
+      mtd = %i[version label].include?(sym) ? :name : "#{sym}_name".to_sym
+      properties[mtd]
+    end
+
+    def label_for(sym)
+      mtd = %i[version name].include?(sym) ? :label : "#{sym}_label".to_sym
+      properties[mtd]
+    end
+
+    def version_for(sym)
+      mtd = %i[label name].include?(sym) ? :version : "#{sym}_version".to_sym
+      properties[mtd]
+    end
+
+    def get_answer(mtd, res, ver = nil, val = nil)
+      incl = [res, *Browserino.config.aliasses[res]].include? val
+      return res.is_a?(Version) ? res > 0 : res && true unless val
+      ver && incl ? version_for(mtd) == ver : incl
+    end
+
     def define_simple_methods!(props)
-      props.reject { |val| val.respond_to? :call }.each do |name, value|
+      props.each do |name, value|
         define_singleton_method(name) { value }
-        define_singleton_method("#{name}?") do |val = nil, **opts|
-          values = [value, *Browserino.config.aliasses[value]]
-          return values.include? val if val && !opts[:version]
-          if val && opts[:version]
-            ver_res = send(name == :name ? :version : "#{name}_version")
-            return (ver_res == opts[:version]) && values.include?(val)
-          end
-          return value > 0 if value.is_a? Version
-          value && true
-        end
+        define_question_method! name, value
+      end
+    end
+
+    def define_question_method!(name, value)
+      define_singleton_method("#{name}?") do |val = nil, opts = {}|
+        ver = opts.delete :version
+        val = val.to_sym if ver
+        get_answer name, value, ver, val
       end
     end
 
@@ -163,10 +184,9 @@ module Browserino
     end
 
     def define_name_result_methods!
-      [:name, :engine, :platform].each do |prop|
-        result  = send prop
-        ver_res = version if prop == :name
-        ver_res = send("#{prop}_version") if ver_res.nil?
+      %i[name engine platform].each do |prop|
+        result  = properties[prop]
+        ver_res = version_for(prop)
 
         # for each of the props:
         # -- define a question method using the value of prop
@@ -193,11 +213,8 @@ module Browserino
 
     def define_label_methods!
       property_names.select { |name| name =~ /label/i }.each do |prop|
-        next unless (result = send(prop))
-
-        ver_type = prop.to_s.gsub /_?label/, ''
-        ver_res  = version if ver_type.empty?
-        ver_res  = send("#{ver_type}_version") unless prop == :label
+        next unless (result = properties[prop])
+        ver_res = version_for(prop.to_s.split('_').first)
 
         define_singleton_method("#{result}?") do |value = nil|
           return ver_res == value if value

data/lib/browserino/config.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
+
 module Browserino
   class Config < Options
     def define(&block)
       instance_eval(&block)
-      return unless identities.any? && identities.all?
 
-      identities.each do |identity|
-        properties << identity.properties.keys
-        types      << identity.type
-        names      << identity.name
+      matchers.each do |matcher|
+        properties << matcher.properties.keys
+        types      << matcher.type
+        names      << matcher.name
       end
 
       properties.flatten!.uniq!
@@ -32,15 +32,19 @@ module Browserino
     end
 
     def match(rgxp = nil, **opts, &block)
-      rgxp, opts = [nil, rgxp] if rgxp.is_a? Hash
+      if rgxp.is_a? Hash
+        opts = rgxp.dup
+        rgxp = nil
+      end
+
       opts = @tmp_defaults.merge opts if @tmp_defaults.is_a? Hash
 
       if rgxp && opts[:like]
-        identities.unshift with_alias(rgxp, opts, &block)
+        matchers.unshift with_alias(rgxp, opts, &block)
       elsif rgxp
-        identities << Identity.new(rgxp, opts, &block)
+        matchers << Matcher.new(rgxp, opts, &block).freeze
       else
-        global_identities.unshift Identity.new(&block)
+        global_matchers.unshift Matcher.new(&block).freeze
       end
     end
 
@@ -54,37 +58,52 @@ module Browserino
     end
 
     def preset(props, &block)
-      @tmp_defaults = props
+      @preset_store ||= []
+      @preset_store << props if @preset_store.empty?
+      @preset_store << @tmp_defaults.merge(props) if @tmp_defaults
+      @tmp_defaults = @preset_store.last
+
       instance_eval(&block)
-      @tmp_defaults = nil
+
+      @preset_store.pop
+      @tmp_defaults = @preset_store.last
     end
 
-    def like(tmp, &block)
-      preset like: tmp.to_sym, &block
+    def like(tmp, opts = {}, &block)
+      preset opts.merge(like: tmp.to_sym), &block
     end
 
-    def validators(&block)
-      preset type: :validator, &block
+    def emails(opts = {}, &block)
+      preset opts.merge(type: :email), &block
     end
 
-    def browsers(&block)
-      preset type: :browser, &block
+    def validators(opts = {}, &block)
+      preset opts.merge(type: :validator), &block
     end
 
-    def bots(&block)
-      preset type: :bot, &block
+    def browsers(opts = {}, &block)
+      preset opts.merge(type: :browser), &block
     end
 
-    def libraries(&block)
-      preset type: :library, &block
+    def bots(opts = {}, &block)
+      preset opts.merge(type: :bot), &block
+    end
+
+    def libraries(opts = {}, &block)
+      preset opts.merge(type: :library), &block
     end
 
     def with_alias(pattern, **opts, &block)
-      id = identities.select { |id| id == opts[:like] }.first
+      alt = matchers.select { |id| id == opts[:like] }.first
 
-      raise "No alias found for: #{opts[:like] || 'nil'}" unless id
+      raise "No alias found for: #{opts[:like] || 'nil'}" unless alt
+
+      base = alt.properties
+      if (excl = opts.delete(:except))
+        base = base.reject { |k| excl.include? k }
+      end
 
-      Identity.new pattern, id.properties.merge(opts), &block
+      Matcher.new(pattern, base.merge(opts), &block).freeze
     end
   end
 end

data/lib/browserino/definitions/aliasses.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Browserino.config.define do
   # aliasses will be defined after a Client has been initialized
   # only the aliasses matching the Client will be defined
@@ -9,4 +10,5 @@ Browserino.config.define do
   alias_for :ie,         :internet_explorer
   alias_for :facebook,   :fb
   alias_for :duckduckgo, :ddg
+  alias_for :chromeos,   :cros
 end

data/lib/browserino/definitions/filters.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Browserino.config.define do
   # executes before parsing the user agent, 's' in this case is the actual
   # user agent string in full glory. Do manipulations as you wish, I'm
@@ -12,7 +13,7 @@ Browserino.config.define do
     ua = ua.gsub(%r{chrome|safari}i, '').gsub('OPR', 'opera') if ua =~ %r{OPR}
     ua = ua.gsub %r{9\.80}, '' if ua =~ %r{opera}i
     ua = ua.gsub %r{webkit/}i, '' if ua =~ %r{presto}i
-    ua = ua.gsub %r{(?:ms)?ie}i, '' if ua =~ %r{rv:}i
+    ua = ua.gsub %r{(?:ms)?ie\b}i, '' if ua =~ %r{rv:}i
     ua = ua.gsub %r{android|linux}i, '' if ua =~ %r{tizen}i
     ua = ua.gsub %r{linux}i, '' if ua =~ %r{android|s(unos|olaris)|w(eb)?os}i
     ua = ua.gsub %r{x11}i, '' if ua =~ %r{bsd|s(unos|olaris)}i
@@ -20,10 +21,18 @@ Browserino.config.define do
     ua = ua.gsub %r{rv:}i, '' if ua =~ %r{servo}i
     ua = ua.gsub %r{mac\sos\sx}i, '' if ua =~ %r{ip(?:[ao]d|hone)}i
     ua = ua.gsub %r{msie}i, '' if ua =~ %r{huaweisymantecspider}i
+    ua = ua.gsub %r{risc\sos}i, 'risc' if ua =~ %r{risc\sos}i
+    ua = ua.gsub %r{msie}i, '' if ua =~ %r{surf|\w*bot}i
+    ua = ua.gsub %r{safari}i, 'chrome' if ua =~ %r{bluechrome}i
+    ua = ua.gsub %r{msie|windows}i, '' if ua =~ %r{dts\sagent}i
+    ua = ua.gsub %r{blade\sos}i, 'blade-os' if ua =~ %r{future\sstar}i
+    ua = ua.gsub %r{safari}i, '' if ua =~ %r{obigo}i
+    ua = ua.gsub %r{awesomium}i, '' if ua =~ %r{flashfire}i
+    ua = ua.gsub %r{version}i, '' if ua =~ %r{kindle/\d}i
     ua
   end
 
-  # after an identity is found, it's values are filtered in two stages
+  # after a matcher is found, it's values are filtered in two stages
   # first, filters will parse all statically defined values (e.g.) no regexp
   # or block within matchers, after that, smart matcher patterns will be
   # conditionally added and parsed with the previously collected values and
@@ -31,34 +40,37 @@ Browserino.config.define do
 
   # this is a global filter, multiple can be defined and they will all run
   # before any named filters
-  filter do |value|
-    case value
-    when TrueClass, FalseClass, NilClass, Proc then value
-    when %r{\A[\d_\.]+\z}i then value.to_s.strip.tr('_', '.')
-    else value.to_s.downcase.strip.gsub(%r{[\s-]+}i, '_').to_sym
+  filter do |val|
+    case val
+    when TrueClass, FalseClass, NilClass, Proc then val
+    when %r{\A[\d_\.]+\z}i then val.to_s.strip.tr('_', '.')
+    else val.to_s.downcase.strip.gsub(%r{[\s-]+}i, '_').to_sym
     end
   end
 
   # this is a named filter, it defines the same filter for 3 properties
   # multiple name filters for the same property can be created, they will be
   # executed in order of addition
-  filter :version, :engine_version, :platform_version do |value|
-    Browserino::Version.new value
+  filter :version, :engine_version, :platform_version do |val|
+    Browserino::Version.new val
   end
 
-  filter :platform do |value|
-    value = :ios       if value =~ %r{ip(?:[ao]d|hone)}i
-    value = :webos     if value =~ %r{w(?:eb)?os}i
-    value = :linux     if value =~ %r{ubuntu|x11}i
-    value = :solaris   if value =~ %r{s(?:unos|olaris)}i
-    value = :macintosh if value =~ %r{mac_os_x}i
-    value
+  filter :platform do |val|
+    if %r{ip(?:[ao]d|hone)}i =~ val    then :ios
+    elsif %r{w(?:eb)?os}i =~ val       then :webos
+    elsif %r{ubuntu|x11}i =~ val       then :linux
+    elsif %r{mac_os_x}i =~ val         then :macintosh
+    elsif %r{s(?:unos|olaris)}i =~ val then :solaris
+    elsif %r{cros}i =~ val             then :chromeos
+    elsif %r{kindle|kf\w+}i =~ val     then :fire_os
+    else val
+    end
   end
 
-  filter :architecture do |value|
-    value = :x64 if value && value =~ %r{(?:x86_|amd|wow)?64|i686}i
-    value = :x32 if value && value != :x64
-    value
+  filter :architecture do |val|
+    val = :x64 if val && val != :arm && val =~ %r{(?:x86_|amd|wow)?64|i686}i
+    val = :x32 if val && !%i[arm x64].include?(val)
+    val
   end
 
   filter :mobile do |value|

data/lib/browserino/definitions/labels.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Browserino.config.define do
   # labels will be defined before a client has been initialized
   # they will not be filtered before being injected into the Client
@@ -7,7 +8,9 @@ Browserino.config.define do
   # will create #label, #engine_label and #platform_label properties
   # respectively. These enjoy all the features that regular defined properties
   # in for instance methods enjoy, such as automatic question methods like
-  # client.platform_label? :mavericks
+  # client.platform_label? :mavericks and they can also be used in
+  # the method this alias is for, e.g. client.platform? :mavericks or
+  # client.is? :mavericks
   label :android,            for: :android,   range: '1'..'1.4.9'
   label :cupcake,            for: :android,   range: '1.5'..'1.9.9'
   label :eclair,             for: :android,   range: '2'..'2.1'
@@ -35,11 +38,14 @@ Browserino.config.define do
   label :el_capitan,         for: :macintosh, range: '10.11'..'10.11.9'
   label :sierra,             for: :macintosh, range: '10.12'..'10.12.9'
 
-  label :windows_dos,        for: :windows,   range: '3.1'..'4.0'
-  label :windows_2000,       for: :windows,   range: '5.0'..'5.0.9'
-  label :windows_xp,         for: :windows,   range: '5.1'..'5.2.9'
-  label :windows_vista,      for: :windows,   range: '6.0'..'6.0.9'
-  label :windows_7,          for: :windows,   range: '6.1'..'6.1.9'
-  label :windows_8,          for: :windows,   range: '6.2'..'6.3'
-  label :windows_10,         for: :windows,   range: '10.0'..'10.0.9'
+  label :dos,               for: :windows,   range: '3.1'..'4.0'
+  label :windows98,         for: :windows,   range: '98'..'98.9.9'
+  label :windows2000,       for: :windows,   range: '5.0'..'5.0.9'
+  label :xp,                for: :windows,   range: '5.1'..'5.2.9'
+  label :vista,             for: :windows,   range: '6.0'..'6.0.9'
+  label :windows7,          for: :windows,   range: '6.1'..'6.1.9'
+  label :windows8,          for: :windows,   range: '6.2'..'6.3'
+  label :windows10,         for: :windows,   range: '10.0'..'10.9.9'
+
+  label :outlook2016,       for: :outlook,   range: '16.0'..'16.9.9'
 end