browserino 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a557c586ae721cf86bd257419c005819b091627
-  data.tar.gz: 64a189ecc37fe48ae70c49771cdd6c802c1d7764
+  metadata.gz: 0985bfbbaf7922a31610653d71982e3c936ac386
+  data.tar.gz: 506e7d3941a34945d0039e8505fcd3708adf64f4
 SHA512:
-  metadata.gz: d7d73fb9dcb55af48db3a4da10d180978ea01deba02ba6f95954ad2eb521b1132c168aeef5da7d5801570a7ebb636486281b6ec5ef18164d11233e31d12da40e
-  data.tar.gz: 36dda426a5a4ac89bce0c423c5578c8c9262bc5102db24d93dc2a6122ecdf8e51111767b9734f5fabd0d95b652546008f4a3393733197f1c0625efe9b238538d
+  metadata.gz: 064c7865d9886f3357584b1d9fb71c49c2d0b06fdeb52ae852b82aed33cc22be7a637b2f114011d3f6ade358d571942397776c24377830b3a477e348cb3f77cf
+  data.tar.gz: f2c86ebf7dc2df2b7ab77f439f82fa68c9dec06ee15640afbba1b902c6a3cecde291d474a4b3778148017791521478bb39c4a5e39bdd24866355ebe6db30cce6

data/README.md

@@ -9,6 +9,13 @@ This gem aims to provide information about the browser that your visitor is usin
 ## Changelog
 _dates are in dd-mm-yyyy format_
 
+#### 19-12-2015 VERSION 1.5.0
+
+- Implemented to_s to return a concatenated string of property values
+- Implemented to_a to return an array with arrays containing property name-value pairs
+- Implemented to_h to return a hash containing property name-value pairs
+- Removed unused code
+
 #### 19-12-2015 VERSION 1.4.0
 
 - Added not method to invert questions about browser / system
@@ -85,6 +92,27 @@ agent.system_name # => 'macintosh'
 agent.system_name full: true # => ['macintosh', 'mavericks']
 agent.system_version # => 6.0
 agent.system_architecture # => 'x32' or 'x64' or 'unknown'
+
+# methods to convert object into a String, Array or hash
+agent.to_s # => 'safari safari7 webkit webkit537 macintosh macintosh10'
+agent.to_a # => [
+#                 [:browser_name, 'safari'],
+#                 [:browser_version, '7.0.3'],
+#                 [:engine_name, 'webkit'],
+#                 [:engine_version, '537.75.14'],
+#                 [:system_name, 'macintosh'],
+#                 [:system_version, '10'],
+#                 [:system_architecture, nil]
+#               ]
+agent.to_h # => {
+#                 browser_name: 'safari',
+#                 browser_version: '7.0.3',
+#                 engine_name: 'webkit',
+#                 engine_version: '537.75.14',
+#                 system_name: 'macintosh',
+#                 system_version: '10',
+#                 system_architecture: nil
+#               }
 ```
 
 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

data/lib/browserino/agent.rb

@@ -1,7 +1,5 @@
 module Browserino
   class Agent
-    attr_accessor :info
-
     def initialize(hash, unknown = Browserino::UNKNOWN)
       @info = hash
       @unknown = unknown
@@ -60,17 +58,12 @@ module Browserino
       end
     end
 
-    def not
-      @not = true
-      self
-    end
-
     def method_missing(method_sym, *args, &block)
       criteria = method_sym.to_s.gsub('?', '').split(/(?<=[a-zA-Z])(?=\d+)/)
       name = criteria[0]
       res = case browser_or_system?(method_sym)
-      when :system then correct_system?(*criteria)
-      when :browser then correct_browser?(*criteria)
+      when :system then correct_system?(criteria[0], criteria[1])
+      when :browser then correct_browser?(criteria[0], criteria[1])
       else super
       end
       if @not
@@ -85,6 +78,38 @@ module Browserino
       browser_or_system?(method_sym).nil?
     end
 
+    def not
+      @not = true
+      self
+    end
+
+    def to_s
+      props = @info.map do |k, _v|
+        res = send k
+        case k
+        when :system_version
+          system_name + res.to_s.split('.').first.to_s
+        when :engine_version
+          engine_name + res.to_s.split('.').first.to_s
+        when :browser_version
+          browser_name + res.to_s.split('.').first.to_s
+        else res
+        end
+      end
+      props.compact.join(' ')
+    end
+
+    def to_a
+      @info.inject([]) do |memo, arr|
+        memo.push [arr.first, send(arr.first)]
+        memo
+      end
+    end
+
+    def to_h
+      to_a.to_h
+    end
+
     private
 
     def browser_or_system?(method_sym)

data/lib/browserino/match_extractor.rb

@@ -1,9 +1,7 @@
 module Browserino
   module MatchExtractor
     def self.extract(match, sym, trim = true)
-      if match.nil?
-        Browserino::UNKNOWN
-      elsif match.names.map(&:to_sym).include?(sym)
+      if match && match.names.map(&:to_sym).include?(sym)
         match[sym].strip! if trim
         match[sym].to_s.downcase
       else

data/lib/browserino/version.rb

@@ -1,3 +1,3 @@
 module Browserino
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browserino
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Sidney Liebrand