browserino 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b85dfc764ad259ee956ed4fd456d2a3d157f0e17
-  data.tar.gz: b8f96ecc2cc453dada5c1ca5df9dbd3216c0d6a9
+  metadata.gz: b2d30f42c7e1a63c8e19cbad7586428a031131b3
+  data.tar.gz: b42852889bef245e914e0f7e595ba0901461bfeb
 SHA512:
-  metadata.gz: 66997f7437d4108c2779f2a1c2d07b0b41b6d95772435e4616ebde8567936bd87545d775db05fc6c81602bbf79a6693e22b938bae2724f130e0c660fddb54c18
-  data.tar.gz: a6f8eed6eedd79d2621a6982f1aa52d37302e7bc0577880f30cbcd8bea4f6864811703ac72e48fa6960f4a48f7bafb3ff5a78e5f9faf7b4765ac11b3183bc402
+  metadata.gz: 7e723963f0ec847654a3fa638cb11b8d660f62062a2be94eef57b05c30b9c8585456b3eef02002d46b536e8d743f2a9c4f4b34b39572692c9a29394c7d8ec9b2
+  data.tar.gz: 02be67d0b2ff279028a0596f077bf684c401bde84e1316422d535580b9e57818d6e01e2863a1466c85288347983af9082b1dc45990de33ea0fcc3cc083ab6833

data/.codeclimate.yml

@@ -0,0 +1,19 @@
+---
+engines:
+  rubocop:
+    enabled: true
+  duplication:
+    enabled: true
+    config:
+      languages:
+        - ruby:
+           mass_threshold: 30
+
+ratings:
+  paths:
+    - lib/**
+    - "**.rb"
+
+exclude_paths:
+  - spec/**/*
+  - "**/vendor/**/*"

data/.gitignore

@@ -8,3 +8,5 @@
 /spec/reports/
 /tmp/
 .DS_Store
+*.swp
+Session.vim

data/.rspec

@@ -1,2 +1,2 @@
---format documentation
+--format progress
 --color

data/.rubocop.yml

@@ -1,12 +1,18 @@
 AllCops:
   Exclude:
-    - 'spec/*'
+    - 'spec/**/*'
     - 'Guardfile'
     - '*.gemspec'
     - 'Rakefile'
     - 'tmp/**/*'
     - 'vendor/**/*'
 
+Style/ExtraSpacing:
+  Enabled: true
+
+SpaceAroundOperators:
+  Enabled: false
+
 Documentation:
   Enabled: false
 
@@ -26,12 +32,12 @@ Metrics/BlockLength:
   Enabled: false
 
 Metrics/AbcSize:
-  Max: 20
+  Max: 15
 
 Metrics/ClassLength:
   CountComments: false
-  Max: 175
+  Max: 150
 
 Metrics/MethodLength:
   CountComments: false
-  Max: 15
+  Max: 10

data/.travis.yml

@@ -1,13 +1,14 @@
 sudo: false
-cache: bundler
 language: ruby
+cache: bundler
 rvm:
   - 2.0.0
   - 2.1.0
   - 2.2.0
   - 2.3.0
   - 2.4.0
-before_install: gem install bundler
+before_install: gem update bundler
 script:
   - bundle exec rspec spec
+  - bundle exec codeclimate-test-reporter
   - bundle exec rubocop

data/browserino.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'browserino/version'
@@ -17,10 +18,11 @@ Gem::Specification.new do |spec|
   spec.executables   = ['browserino']
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.14"
-  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rubocop"
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "codeclimate-test-reporter"
 end

data/lib/browserino/client.rb

@@ -2,8 +2,6 @@
 
 module Browserino
   class Client
-    attr_reader :property_names
-
     def initialize(props = {}, like = nil)
       @property_names = props.keys
       @like           = like
@@ -12,28 +10,16 @@ module Browserino
       # order below. First, seperate static value methods from procs,
       # procs will be able to call methods in this instances' context
       # therefore we need to define static methods before procs
+      generate_preset_methods! props
 
-      # for each static property:
-      # -- define a method that returns it's property value
-      # -- define a question method that returns it's property value or
-      #    checks version against supplied value if truthy
-      define_simple_methods! props
-
-      # for each proc property:
-      # -- define a method that returns it's instance evalled block value
-      # -- define a question method that returns it's instance evalled block
-      #    value or checks version against supplied value if truthy
-      define_proc_methods! props
-
-      # for each of #name, #engine and #platform, use their results as
+      # for each of #name, #engine, #platform and #device use their results as
       # methods names, this will create a method #firefox? for the output
       # of a #name # => :firefox for example.
-      define_name_result_methods!
-
-      # finally, add labels and their aliasses into the mix
-      # none of these methods should override an existing method
-      # therefore we check it's existence using defined?
-      define_label_methods!
+      # NOTE: labels do not have to be added, they will be extracted
+      # and inserted by this method, this method will also add aliasses
+      # of all the names as methods.
+      generate_result_methods! props, :name, :engine, :platform, :device
+      generate_proc_methods! props
     end
 
     def properties
@@ -46,43 +32,40 @@ module Browserino
       @like ||= self
     end
 
-    def like?(sym = nil, opts = {})
-      opts  = sym if sym.is_a? Hash
-      must  = []
-      must << like.is?(sym) if sym
-      must << like.version?(opts[:version]) if opts[:version]
-
-      must.any? && must.all?
+    def like?(sym, opts = {})
+      invertable like.is?(sym, opts)
     end
 
     def x64?
-      @x64_cache ||= architecture == :x64
+      invertable(@x64 ||= architecture == :x64)
     end
 
     def x32?
-      @x32_cache ||= architecture == :x32
+      invertable(@x32 ||= architecture == :x32)
     end
 
     def arm?
-      @arm_cache ||= architecture == :arm
+      invertable(@arm ||= architecture == :arm)
+    end
+
+    def is?(sm, opts = {})
+      return invertable send("#{sm}?", opts[:version]) if opts && opts[:version]
+      invertable send("#{sm}?")
     end
 
-    # the catch all method, anything it can ask as question will respond
-    # otherwise nil is returned, this is also true when supplying a version
-    def is?(sym, opts = {})
-      return send "#{sym}?", opts[:version] if opts[:version]
-      send "#{sym}?"
+    def not?(sym, opts = {})
+      !is? sym, opts
     end
 
     def ===(other)
-      return false unless name
+      return invertable false unless name
 
-      case other
-      when Regexp then other =~ name
-      when String then other.to_sym == name
-      when Symbol, Browserino::Client then other == name
-      else false
-      end
+      invertable case other
+                 when Regexp         then other        =~ name
+                 when String         then other.to_sym == name
+                 when Symbol, Client then other        == name
+                 else false
+                 end
     end
 
     def ==(other)
@@ -98,21 +81,22 @@ module Browserino
     end
 
     def to_json(*args)
-      @json_cache ||= properties.map do |prop, val|
-        final = val.is_a?(Version) && val.full || val
-        [prop, final]
-      end.to_h.to_json(*args)
+      @json ||= properties.each_with_object({}) do |(prop, val), hsh|
+        hsh[prop] = val.is_a?(Version) && val.full || val
+      end.to_json(*args)
     end
 
-    def to_s
-      @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
+    def label_or_version_name(prop)
+      ver = version_for prop
+      label_for(prop) || ver && [properties[prop].to_s.strip,
+                                 (ver.major if ver > '0.0.0')].join.strip
+    end
 
-        [n, a].uniq
-      end.flatten.uniq.join(' ').gsub(/\s{2,}/, ' ').strip
+    def to_s
+      @str ||= %i[name engine platform device].each_with_object([]) do |prop, a|
+        a << properties[prop].to_s.strip
+        a << label_or_version_name(prop)
+      end.compact.reject(&:empty?).uniq.join ' '
     end
 
     def to_hash
@@ -130,7 +114,7 @@ module Browserino
     # scary, I know, but a falsy value is all we need to return if some
     # property isn't known or true as any property can be defined on the Client
     def method_missing(_, *__, &___)
-      nil
+      invertable nil
     end
 
     # always respond to missing, read method_missing comment
@@ -138,96 +122,81 @@ module Browserino
       true
     end
 
+    # if you wish for a method to respond to the #not method,
+    # you'll have to return the result of a function using the `invertable`
+    # method as seen in `method_missing` - this will apply the state of the
+    # instance variable and invert the state aswell as the result if set,
+    # otherwise it will just return the value without touching it
+    def not
+      @not = true && self
+    end
+
     private
 
-    def name_for(sym)
-      mtd = %i[version label].include?(sym) ? :name : "#{sym}_name".to_sym
-      properties[mtd]
+    def invertable(result)
+      @not ? @not = false || !result : result
     end
 
-    def label_for(sym)
-      mtd = %i[version name].include?(sym) ? :label : "#{sym}_label".to_sym
-      properties[mtd]
+    def label_for(sym, from = properties)
+      return from[:label] if %i[version label name].include? sym
+      from["#{sym}_label".to_sym]
     end
 
-    def version_for(sym)
-      mtd = %i[label name].include?(sym) ? :version : "#{sym}_version".to_sym
-      properties[mtd]
+    def name_for(sym, from = properties)
+      return from[:name] if %i[version label name].include? sym
+      from["#{sym}_name".to_sym]
     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
+    def version_for(sym, from = properties)
+      return from[:version] if %i[version label name].include? sym
+      from["#{sym}_version".to_sym]
     end
 
-    def define_simple_methods!(props)
+    def generate_preset_methods!(props)
       props.each do |name, value|
-        define_singleton_method(name) { value }
-        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
+        methods = [name, *Browserino.config.aliasses[name]]
+        methods.each do |mtd|
+          define_singleton_method(mtd) { value }
+          define_singleton_method("#{mtd}?") do |val = nil|
+            return value == val if val
+            value && true
+          end
+        end
       end
     end
 
-    def define_proc_methods!(props)
+    def generate_proc_methods!(props)
       props.select { |_, val| val.respond_to? :call }.each do |name, value|
         result = instance_eval(&value)
-        define_singleton_method(name) { result }
+        define_singleton_method(name)       { invertable result }
+        define_singleton_method("#{name}?") { invertable result && true }
       end
     end
 
-    def define_name_result_methods!
-      %i[name engine platform].each do |prop|
-        result  = properties[prop]
-        ver_res = version_for(prop)
+    def generate_result_methods!(info, *property_names)
+      property_names.each do |prop|
+        ver_res = version_for prop, info
 
-        # for each of the props:
-        # -- define a question method using the value of prop
-        #    (ex: name # => firefox # => "firefox?")
-        #    -- when supplied with a value, check it against {prop_res}_version
-        #    -- when called without argument, return result
-        define_singleton_method("#{result}?") do |value = nil|
-          return ver_res == value if value
-          result && true
-        end
-
-        # for each of the aliasses found:
-        # -- define a question method using the current alias
-        #    -- when supplied with a value, check it against {prop_res}_version
-        #    -- when called without argument, return result
-        Browserino.config.aliasses[result].each do |alt|
-          define_singleton_method("#{alt}?") do |value = nil|
-            return ver_res == value if value
-            result && true
-          end
-        end
+        create_question! info[prop],            version: ver_res, aliasses: true
+        create_question! label_for(prop, info), version: ver_res, aliasses: true
       end
     end
 
-    def define_label_methods!
-      property_names.select { |name| name =~ /label/i }.each do |prop|
-        next unless (result = properties[prop])
-        ver_res = version_for(prop.to_s.split('_').first)
+    def create_question!(result, opts = {})
+      methods = [result]
+      methods += Browserino.config.aliasses[result] if opts[:aliasses]
 
-        define_singleton_method("#{result}?") do |value = nil|
-          return ver_res == value if value
-          result && true
-        end
-
-        Browserino.config.aliasses[result].each do |alt|
-          define_singleton_method("#{alt}?") do |value = nil|
-            return ver_res == value if value
-            result && true
-          end
+      methods.each do |mtd|
+        define_singleton_method("#{mtd}?") do |val = nil|
+          invertable(val ? opts[:version] == val : true)
         end
       end
     end
+
+    def get_answer(mtd, res, ver = nil, val = nil)
+      return res.is_a?(Version) ? res > '0.0.0' : res && true unless val
+      incl = res == val
+      ver && incl ? version_for(mtd) == ver : incl
+    end
   end
 end

data/lib/browserino/config.rb

@@ -4,16 +4,9 @@ module Browserino
   class Config < Options
     def define(&block)
       instance_eval(&block)
-
-      matchers.each do |matcher|
-        properties << matcher.properties.keys
-        types      << matcher.type
-        names      << matcher.name
+      matchers.each_with_object types do |mtch, types_arr|
+        types_arr << mtch.type unless types_arr.include?(mtch.type)
       end
-
-      properties.flatten!.uniq!
-      types.uniq!
-      names.uniq!
     end
 
     def label(name, **opts)
@@ -32,11 +25,6 @@ module Browserino
     end
 
     def match(rgxp = nil, **opts, &block)
-      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]
@@ -69,28 +57,36 @@ module Browserino
       @tmp_defaults = @preset_store.last
     end
 
-    def like(tmp, opts = {}, &block)
-      preset opts.merge(like: tmp.to_sym), &block
-    end
-
+    # the order of these methods is the same as seen at the top of the
+    # definitions/matchers.rb file. It is the current "order" required
+    # for Browserino to work properly, maybe tweaking some regexes can lighten
+    # this up but it's OK for now.
     def emails(opts = {}, &block)
       preset opts.merge(type: :email), &block
     end
 
-    def validators(opts = {}, &block)
-      preset opts.merge(type: :validator), &block
-    end
-
     def browsers(opts = {}, &block)
       preset opts.merge(type: :browser), &block
     end
 
+    def like(tmp, opts = {}, &block)
+      preset opts.merge(like: tmp.to_sym), &block
+    end
+
+    def rss(opts = {}, &block)
+      preset opts.merge(type: :rss), &block
+    end
+
     def bots(opts = {}, &block)
-      preset opts.merge(type: :bot), &block
+      preset opts.merge(type: :bot, text: true), &block
+    end
+
+    def validators(opts = {}, &block)
+      preset opts.merge(type: :validator, text: true), &block
     end
 
     def libraries(opts = {}, &block)
-      preset opts.merge(type: :library), &block
+      preset opts.merge(type: :library, text: true), &block
     end
 
     def with_alias(pattern, **opts, &block)