browserino 4.1.0 → 4.2.0

data/lib/browserino/matcher.rb

@@ -23,13 +23,13 @@ module Browserino
     end
 
     def ===(other)
-      return false if properties[:name].nil?
+      return false unless (name = properties[:name])
 
       case other
-      when Regexp   then other =~ properties[:name]
-      when String   then other.to_sym == properties[:name]
-      when Symbol   then other == properties[:name]
-      when Matcher then other.properties[:name] == properties[:name]
+      when Regexp   then other =~ name
+      when String   then other.to_sym == name
+      when Symbol   then other == name
+      when Matcher then other.name == name
       else false
       end
     end

data/lib/browserino/methods.rb

@@ -4,20 +4,19 @@ module Browserino
   def self.analyze(ua, matcher = nil)
     @defaults ||= config.global_matchers.map(&:properties).reduce(&:merge)
 
-    props    = @defaults.merge(matcher && matcher.properties || {})
-    like     = props.delete :like
-    props    = collect props, ua
-    props    = collect_with_smart_watchers props, ua
-    props    = with_labels props
-    like     = Client.new props.merge(like_attrs(props, like, ua)) if like
+    props = @defaults.merge(matcher && matcher.properties || {})
+    like  = props.delete :like
+    props = mass_collect props, ua
+    like  = Client.new props.merge(like_attrs(props, like, ua)) if like
 
     Client.new props, like
   end
 
   def self.like_attrs(props, like, user_agent)
-    lattrs = config.matchers.select { |m| m == like }.first.properties
+    version = config.matchers.select { |m| m == like }
+                    .first.properties[:version]
     fattrs = { name: like }
-    fattrs[:version] = lattrs[:version] if lattrs[:version].is_a? Regexp
+    fattrs[:version] = version if version.is_a? Regexp
     fattrs[:version] ||= smart_matchers(fattrs)[:version]
 
     props.dup.merge collect(fattrs, user_agent)
@@ -69,13 +68,19 @@ module Browserino
 
   def self.parse_detector(detect, properties)
     pat = properties.each_with_object(detect[:with].dup) do |(key, val), str|
-      replacement = val.to_s.strip
+      replacement = val.to_s.strip.gsub '_', '[_\s-]'
       str.gsub! ":#{key}", replacement unless replacement.empty?
     end
 
     Regexp.new pat, get_flags(*detect[:flags].to_a)
   end
 
+  def self.mass_collect(props, ua)
+    props = collect props, ua
+    props = collect_with_smart_watchers props, ua
+    with_labels props
+  end
+
   def self.collect(properties, ua)
     properties.each_with_object({}) do |(n, v), r|
       r[n] = convert (v.is_a?(Regexp) ? v.match(ua).to_a[1] : v), format: n
@@ -92,16 +97,12 @@ module Browserino
   end
 
   def self.get_flags(*flags)
-    val = 0
-
-    flags.each do |flag|
+    flags.reduce(0) do |val, flag|
       case flag.to_sym
-      when :m then val |= Regexp::MULTILINE
-      when :i then val |= Regexp::IGNORECASE
-      when :x then val |= Regexp::EXTENDED
+      when :m then val | Regexp::MULTILINE
+      when :i then val | Regexp::IGNORECASE
+      when :x then val | Regexp::EXTENDED
       end
     end
-
-    val
   end
 end

data/lib/browserino/options.rb

@@ -24,6 +24,10 @@ module Browserino
       @options
     end
 
+    def to_h
+      @options
+    end
+
     def to_a
       @options.to_a
     end
@@ -32,6 +36,10 @@ module Browserino
       @options.to_s
     end
 
+    def to_str
+      to_s
+    end
+
     private
 
     def opt(sym)

data/lib/browserino/version.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
 module Browserino
-  VERSION = '4.1.0'.freeze
-
-  def self.version
-    @version ||= Version.new VERSION.dup
+  def self.version(current = '4.2.0')
+    @version ||= Version.new current
   end
 
   # This class makes versions easily comparable using logical operators
@@ -77,6 +75,8 @@ module Browserino
       other   = Version.new other unless other.is_a? Version
       subsize = [size, other.size].min
 
+      return if subsize.zero? && size > 0
+
       (self[0...subsize] <=> other[0...subsize]).send op, 0
     end
   end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: browserino
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Sidney Liebrand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-30 00:00:00.000000000 Z
+date: 2017-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - sidneyliebrand@gmail.com
@@ -102,6 +116,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".coveralls.yml"
 - ".gitignore"
 - ".rspec"
@@ -123,6 +138,14 @@ files:
 - lib/browserino/definitions/filters.rb
 - lib/browserino/definitions/labels.rb
 - lib/browserino/definitions/matchers.rb
+- lib/browserino/definitions/matchers/bots.rb
+- lib/browserino/definitions/matchers/browsers.rb
+- lib/browserino/definitions/matchers/emails.rb
+- lib/browserino/definitions/matchers/global.rb
+- lib/browserino/definitions/matchers/libraries.rb
+- lib/browserino/definitions/matchers/mediaplayers.rb
+- lib/browserino/definitions/matchers/rss.rb
+- lib/browserino/definitions/matchers/validators.rb
 - lib/browserino/integrate/action_controller.rb
 - lib/browserino/integrate/rails.rb
 - lib/browserino/matcher.rb
@@ -149,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: A browser identification gem with command line and Rails (>= 3.2.0) integration