browserino 1.0.2 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09967128c9c89bc6bb97b7cd455ddf0a91f8947e
-  data.tar.gz: 57fff14bb77564131996b23d066764746692f8bf
+  metadata.gz: 829974a6744a8e99a66ca28dd8a73298e647bb09
+  data.tar.gz: f8930fa43ae37894a805e84747b8f3aaf4a89386
 SHA512:
-  metadata.gz: d55c9c93837fcfce61caf28ac2c845313b05c8aa6378b25ca0217fab37c919754a5d23972dfa947ade7b4a3b6fac71f5906b5bd77a805157883319b452c60ade
-  data.tar.gz: 0756df1c2c34208293f74aba43e670312e4a6ced67f03eb4bab2b78479e6096315736365a3f803617d7717c2856c1eefb240b2690dc3a861c29eb22a7174ffb7
+  metadata.gz: 58351ed9e54ffb8e1a5889780a6dfeca4ee8deea880253c26b9a39cc6c4f922d2e4b314f06a78d694b13db4c1efae4437ee8f851b1bb96afdfba5e381ec253fa
+  data.tar.gz: 897d7f2b7e3d3460b147883919e3f872ccb311256e8811c79e2ce02b11c7111c639e15d1b4ed9ed7213a41321b7a73444f2b541b36bc03fce0210605077b6545

data/lib/browserino/agent.rb

@@ -2,47 +2,60 @@ module Browserino
   class Agent
     attr_accessor :info
 
-    def initialize(hash)
+    def initialize(hash, unknown = Browserino::UNKNOWN)
       @info = hash
+      @unknown = unknown
     end
 
     def browser_name
-      @info[:browser_name].downcase || Browserino::UNKNOWN
+      with_valid(@info[:browser_name]) { |v| v.to_s.downcase }
     end
 
     def browser_version
-      @info[:browser_version].gsub('_', '.').downcase || Browserino::UNKNOWN
+      with_valid(@info[:browser_version]) { |v| v.to_s.downcase.gsub('_', '.') }
     end
 
     def engine_name
-      @info[:engine_name].downcase || Browserino::UNKNOWN
+      with_valid(@info[:engine_name]) { |v| v.to_s.downcase }
+
     end
 
     def engine_version
-      @info[:engine_version].gsub('_', '.').downcase || Browserino::UNKNOWN
+      with_valid(@info[:engine_version]) { |v| v.to_s.downcase.gsub('_', '.') }
     end
 
     def system_name(opts = {})
       opts = {full: true}.merge(opts)
-      name = @info[:system_name].downcase
+      name = with_valid(@info[:system_name]) { |v| v.to_s.downcase }
       if opts[:full]
-        [name, fetch_system_version_name(name).downcase]
+        [name, fetch_system_version_name(name)]
       else
-        name || Browserino::UNKNOWN
+        name
       end
     end
 
     def system_version
-      @info[:system_version].gsub('_', '.').downcase || Browserino::UNKNOWN
+      with_valid(@info[:system_version]) { |v| v.to_s.downcase.gsub('_', '.') }
     end
 
     def system_architecture
-      @info[:system_architecture].downcase || Browserino::UNKNOWN
+      with_valid(@info[:system_architecture]) { |v| v.to_s.downcase }
     end
 
     private
 
+    def with_valid(val)
+      if val && (val != '' || val != false) && block_given?
+        res = yield(val)
+        return @unknown if res == ''
+        res
+      else
+        @unknown
+      end
+    end
+
     def fetch_system_version_name(name)
+      return @unknown if name.nil? || name == '' || !name
       const = name.upcase
       name.downcase!
       if name.match(/mac|ios/i)
@@ -53,7 +66,7 @@ module Browserino
       if version && defined? const
         Browserino::Mapping.const_get(const).select { |name, versions| true if versions.include?(version) }.keys.first
       else
-         Browserino::UNKNOWN
+         @unknown
       end
     end
   end

data/lib/browserino/patterns.rb

@@ -3,43 +3,43 @@ module Browserino
     browser: {
       opera: {
         name: /(?<name>ope?ra?)/i,
-        version: /(ope?ra?|version)(\/|\s)(?<version>[\d\.]+)/i
+        version: /(?:ope?ra?|version)(\/|\s)(?<version>[\d\.]+)/i
       },
 
       maxthon: {
         name: /(?<name>maxthon)/i,
-        version: /maxthon(\s|\/)(?<version>[\d\.]+)/i
+        version: /maxthon(?:\s|\/)(?<version>[\d\.]+)/i
       },
 
       ie: {
         name: /(?<name>msie|trident)/i,
-        version: /((ms)?ie\s|rv\:)(?<version>[\d\.b]+)/i
+        version: /(?:(?:ms)?ie\s|rv\:)(?<version>[\d\.b]+)/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
+        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
+        version: /chrome?(?:ium|plus)?\/(?<version>[\d\.]+)/i
       },
 
       safari: {
         name: /(?<name>safari)/i,
-        version: /(version|safari)\/(?<version>[\d\.]+)/i
+        version: /(?:version|safari)\/(?<version>[\d\.]+)/i
       }
     },
 
     engine: {
       name: /(?<name>((apple)?webkit|gecko|trident|presto))/i,
-      version: /((apple)?webkit|rv:|trident|presto)[\/\s]?(?<version>[\d\.]+)/i
+      version: /(?:(?:apple)?webkit|rv:|trident|presto)[\/\s]?(?<version>[\d\.]+)/i
     },
 
     operating_system: {
-      name: /(?<name>windows|macintosh|android|ios)/i,
-      version: /(nt|mac\sos\sx|android|(cpu\s|i)os)\s(?<version>[\d\._]+)/i,
+      name: /(?<name>windows|macintosh|android|ios|linux)/i,
+      version: /(?:nt|mac\sos\sx|android|(cpu\s|i)os)\s(?<version>[\d\._]+)/i,
       architecture: /(?<architecture>(x?(86_)?64)|i(3|6)86)/i
     }
   }

data/lib/browserino/unknown.rb

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

data/lib/browserino/version.rb

@@ -1,3 +1,3 @@
 module Browserino
-  VERSION = "1.0.2"
+  VERSION = "1.1.2"
 end

data/lib/browserino.rb

@@ -16,7 +16,7 @@ require "browserino/engine"
 require "browserino/operating_system"
 
 module Browserino
-  def self.parse ua
+  def self.parse(ua, unknown_alt = Browserino::UNKNOWN)
     ua = AgentManipulator.new(ua).ua
     name = find_browser_name(ua)
     Agent.new(check_for_aliases({
@@ -27,7 +27,7 @@ module Browserino
       system_name: OperatingSystem::name(ua),
       system_version: OperatingSystem::version(ua),
       system_architecture: OperatingSystem::architecture(ua)
-    }))
+    }), unknown_alt)
   end
 
   private
@@ -47,6 +47,6 @@ module Browserino
       tmp = browsers.shift
       name = tmp if (ua.match(PATTERNS[:browser][tmp][:name]))
     end
-    name ||= :unknown
+    name ||= Browserino::UNKNOWN
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: browserino
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.2
 platform: ruby
 authors:
 - Sidney Liebrand
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler