browserino 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04172a00c8555e14df05ea14f1a49bade29c8ed5
-  data.tar.gz: 36265c36de92a49f1667413b8617f0dd06098889
+  metadata.gz: b0c1778165ad285635aa2a94d77f330e3fd8ab13
+  data.tar.gz: 47074688ffecb4510e46ac8267924611c5762f7a
 SHA512:
-  metadata.gz: c5fed0edd65dc6e5d7aaa01631ae04d9a55e3a424a6e9d0a1ea7f808f6f3142c3ebc664aee50866ebbbe74817ad6c0bd799c2381eea26f38724b56587ff3a503
-  data.tar.gz: 17c7df4a9eebd05668932c3702d66335ed5a13855941c403c6146b7a0d0fc90902c12714bd65a92e3e9c7008657a649a2ab081e7cb188340b52e16482e4b663e
+  metadata.gz: ce7e65ae46fb6e4234576537d1b9a3f3d9133fbd3e0b1cc8099f6e94eba304f9b72503f682361687321eb1ab8ac39e681698cd9ec6dc3a377931a63ca87646e8
+  data.tar.gz: f5d83f13710bbd03e0e1a02134bb288f36e47129ce6d35aa3f9d5f65b5988a9f71f3d806aea2e1fbd60c6d54ff39094d9bdbb65aa55ac185b948062239bb896d

data/README.md

@@ -9,16 +9,15 @@ This gem aims to provide information about the browser that your visitor is usin
 ## Changelog
 _dates are in dd-mm-yyyy format_
 
+#### 17-12-2015 VERSION 1.3.0
+
+- Added Edge detection
+- For supported browsers, it is now possible to check name and version through `method_missing?`
+
 #### 16-12-2015 VERSION 1.2.0
 
 - Opera tests didn't run before
-- For supported systems, it is possible to check OS and version. This is true for `android`, `macintosh`, `ios`, `windows` and `linux` *(any version number can optionally be included)*
-
-  - `agent.windows?`
-  - `agent.windows10?`
-  - `agent.macintosh?`
-  - `agent.macintosh10?`
-  - `agent.linux?`
+- For supported systems, it is possible to check OS and version through `method_missing?`
 
 #### 15-12-2015 VERSION 1.1.2
 
@@ -83,10 +82,40 @@ agent.system_version # => 6.0
 agent.system_architecture # => 'x32' or 'x64' or 'unknown'
 ```
 
-## Development
+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
+The function uses the names of the `Browserino::Mapping.constants(true)` or `Browserino::PATTERNS[:browser].keys` output to identify wether or not to throw this exception.
+
+Supported systems
+
+```ruby
+agent.android?
+agent.ios?
+agent.windows?
+agent.macintosh?
+agent.linux?
+```
+
+**note** Windows versions use their respective *NT* versioning so `agent.windows6?` equals `Vista` - I have yet to make changes to fix that. Browser versions use their actual version which always matches up with their real version, the same goes for the other systems.
 
-Currently things are actually going quite well besides the fact that I am trying to learn multiple techniques at the same time thus causing code to sometimes... well be messy at best.
-What I would not want you all to do is dive in there and try to understand it (tho if you do and want in, let me know!) but I would greatly appriciate help regarding the testing of this sniffer.
+Supported browsers
+
+```ruby
+agent.opera?
+agent.maxthon?
+agent.edge?
+agent.ie?
+agent.firefox?
+agent.chrome?
+agent.safari?
+```
+
+Since linux doesn't have any supported versions all you can pretty much do is check if `agent.linux?` is true if you want to check for linux systems. The others do have versions so if you wanted to check for windows 10 you could do:
+
+```ruby
+agent.windows10?
+```
+
+## Development
 
 The tests are dynamically produced and quite easy to write.
 
@@ -137,7 +166,7 @@ Valid browser names are defined by __/lib/browserino/patterns.rb__ (the keys are
 
 #### system_name examples
 
-_The main reason for not having Linux distro's / versions yet is because of the fact that there are MANY different distro's with no real structured release system (going to work on that whenever there's free time!)_
+_The main reason for not having Linux distro's / versions <strike>yet</strike> is because of the fact that there are MANY different distro's with no real structured release system. <strike>(going to work on that whenever there's free time!)</strike>_
 
 ```ruby
 ['windows', '7'] # where the 'windows' part is the name of the OS and the '7' is the actual version release (e.g. NT 6.1)

data/bin/console

@@ -7,7 +7,10 @@ require "pry"
 ua = 'Mozilla/5.0 (Windows NT 10.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.135 Safari/537.36 Edge/12.10136'
 @agent = Browserino::parse(ua)
 
-puts @agent.windows10?
+puts ua
+puts "@agent.windows10? #=> #{@agent.windows10?}"
+puts "@agent.edge? #=> #{@agent.edge?}"
+puts "@agent.edge12? #=> #{@agent.edge12?}"
 
 # puts "parsed #{ua} with results:"
 # puts '------------------'

data/lib/browserino/agent.rb

@@ -42,30 +42,53 @@ module Browserino
       with_valid(@info[:system_architecture]) { |v| v.to_s.downcase }
     end
 
+    def correct_system?(name, version = nil)
+      os_equal = (name == system_name)
+      if version
+        os_equal && version == system_version.to_s[0..(version.size - 1)]
+      else
+        os_equal
+      end
+    end
+
+    def correct_browser?(name, version = nil)
+      browser_equal = (name == browser_name)
+      if version
+        browser_equal && version == browser_version.to_s[0..(version.size - 1)]
+      else
+        browser_equal
+      end
+    end
+
     def method_missing(method_sym, *args, &block)
       criteria = method_sym.to_s.gsub('?', '').split(/(?<=[a-zA-Z])(?=\d+)/)
       name = criteria[0]
-      if respond_to? name
-        os_equal = (name == system_name)
-        return os_equal unless criteria.size > 1
-        if criteria.size > 1
-          version = criteria[1]
-          os_equal && version == system_version.to_s[0..(version.size - 1)]
-        else
-          os_equal
-        end
-      else
-        super
+      case browser_or_system?(method_sym)
+      when :system then correct_system?(*criteria)
+      when :browser then correct_browser?(*criteria)
+      else super
       end
     end
 
     def respond_to?(method_sym)
-      name = method_sym.to_s.gsub('?', '').split(/(?<=[a-zA-Z])(?=\d+)/).first
-      Browserino::Mapping.constants(true).include?(name.upcase.to_sym)
+      browser_or_system?(method_sym).nil?
     end
 
     private
 
+    def browser_or_system?(method_sym)
+      name = method_sym.to_s.gsub('?', '').split(/(?<=[a-zA-Z])(?=\d+)/).first
+      sys = Browserino::Mapping.constants(true).include?(name.upcase.to_sym)
+      browser = Browserino::PATTERNS[:browser].keys.include?(name.to_sym)
+      if sys
+        :system
+      elsif browser
+        :browser
+      else
+        nil
+      end
+    end
+
     def with_valid(val)
       if val && (val != '' || val != false) && block_given?
         res = yield(val)

data/lib/browserino/patterns.rb

@@ -11,6 +11,11 @@ module Browserino
         version: /maxthon(?:\s|\/)(?<version>[\d\.]+)/i
       },
 
+      edge: {
+        name: /(?<name>edge)/i,
+        version: /(?:edge\/)(?<version>[\d\.b]+)/i
+      },
+
       ie: {
         name: /(?<name>msie|trident)/i,
         version: /(?:(?:ms)?ie\s|rv\:)(?<version>[\d\.b]+)/i

data/lib/browserino/version.rb

@@ -1,3 +1,3 @@
 module Browserino
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

metadata

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