browserino 2.5.1 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8174f4d5d67aa2a3e8d67fa4bc68f0a6507ff6ce
-  data.tar.gz: 796ee7682e4d20750377ca2259845ccb0898e46f
+  metadata.gz: 9a9d892c5ad880cdc418ac696b69dd465ec03820
+  data.tar.gz: 9addf30f035f5c74ada82cf47151c6ec9816667e
 SHA512:
-  metadata.gz: 9f2fecfa569f5a93d3284409326ebc5f3e3dd55aa1e76253c8802b1ef85c5b8896204272a81d84a7247e0f48adbdf5cdd3af24e2e1944c1156da987328a7feac
-  data.tar.gz: 1c131875416bbe641f9a71a552ec790ba864a9c32aafd1a51959a72dcf68aa81acd57da679ee9aabb6f1daafbed87a875f2b5b354c90b5812b0db6dd0f7455e9
+  metadata.gz: e9276a510795d45e68ae8e717c07d340258c2f956e2b778fb4d2c632ba45dccc53e256f020cc8eb2be888f515ae2fbc23d70d00ef7d74f91505c38fb2383ee69
+  data.tar.gz: ff0ca377b67f2a492d3abce13b2c864a85f02077af6c8e49b5d021652e7238a0b8c0e38f32adef4b01cc7b6f5f1249b6aff1fc0f3b52871cc48a11ad29383750

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 ## CHANGELOG
 _dates are in dd-mm-yyyy format_  
 
+#### 11-01-2016 VERSION 2.4.1(.1)
+
+- Caching the agent object in Rails
+- **DEPRECATE** Using a custom return value for when a property isn't found
+
 #### 10-01-2016 VERSION 2.4.0
 
 - Added rails integration

data/README.md

@@ -10,6 +10,12 @@ This gem aims to provide information about the browser that your visitor is usin
 _dates are in dd-mm-yyyy format_  
 _older changes can be found in the [CHANGELOG.md](https://github.com/SidOfc/browserino/blob/master/CHANGELOG.md)_
 
+#### 15-01-2016 VERSION 2.5.2
+
+- **DEPRECATE** Custom return values (passed through `Browserino::parse`) will no longer alter the output of the agent object
+- Added support for windows phone detection
+- Added `windows_phone?` method
+
 #### 12-01-2016 VERSION 2.5.1
 
 - Patched blackberry mapping, this used to be done by model number instead but is now corrected
@@ -22,11 +28,6 @@ _older changes can be found in the [CHANGELOG.md](https://github.com/SidOfc/brow
 - New method `#bsd?`
 - Fixed using symbols for system version identification (e.g. `:vista` or `:el_capitan`) without a version number
 
-#### 11-01-2016 VERSION 2.4.1(.1)
-
-- Caching the agent object in Rails
-- **DEPRECATE** Using a custom return value for when a property isn't found
-
 ## Installation
 
 *supports ruby 1.9.3+*  
@@ -97,6 +98,7 @@ agent.engine_version
 
 agent.system_name
 # => 'macintosh'
+# possibilities are macintosh, windows, blackberry, android, linux, bsd and ios
 
 # or optionally, the full name (guessed from OS version)
 agent.system_name full: true
@@ -221,6 +223,8 @@ agent.macintosh?
 
 agent.blackberry?
 
+agent.windows_phone?
+
 agent.linux? # linux doesn't have versions
 
 agent.bsd? # bsd also doesn't have versions
@@ -256,6 +260,8 @@ agent.not.macintosh?
 
 agent.not.blackberry?
 
+agent.not.windows_phone?
+
 agent.not.linux?
 
 agent.not.bsd?
@@ -436,6 +442,8 @@ Valid browser names are defined by __/lib/browserino/patterns.rb__ (the keys are
 
 'bb'
 
+'windows_phone'
+
 'android'
 
 'ios'

data/lib/browserino/agent.rb

@@ -2,7 +2,6 @@ module Browserino
   class Agent
     def initialize(ua, unknown = Browserino::UNKNOWN)
       @ua = ua
-      @unknown = unknown
       @not = false
 
       cleansed_ua = Browserino::strip_lies @ua
@@ -97,7 +96,7 @@ module Browserino
     end
 
     def known?
-      allow_inverted_return (browser_name != @unknown || bot_name != @unknown)
+      allow_inverted_return (browser_name != Browserino::UNKNOWN || bot_name != Browserino::UNKNOWN)
     end
 
     def mobile?
@@ -233,18 +232,18 @@ module Browserino
     def with_valid(val)
       if val && (val != '' || val != false) && block_given?
         res = yield(val)
-        return @unknown if res == ''
+        return Browserino::UNKNOWN if res == ''
         res
       else
-        @unknown
+        Browserino::UNKNOWN
       end
     end
 
     def fetch_system_version_name(name)
-      return @unknown if name.nil? || name == '' || !name
-      const = name.upcase
+      return Browserino::UNKNOWN if name.nil? || name == '' || !name
+      const = name.upcase.gsub(/\s/, '_')
       name.downcase!
-      version = if system_version == @unknown
+      version = if system_version == Browserino::UNKNOWN
                   nil
                 elsif name.match(/mac|ios|blackberry/i)
                   system_version.split('.').first(2).join.to_i
@@ -259,7 +258,7 @@ module Browserino
         end
         version_names.keys.first || system_version.split('.').first(2).join('.')
       else
-         @unknown
+         Browserino::UNKNOWN
       end
     end
   end

data/lib/browserino/alias.rb

@@ -9,7 +9,8 @@ module Browserino
     },
     engine_version: {},
     system_name: {
-      'linux' => ['ubuntu', 'x11']
+      'linux' => ['ubuntu', 'x11'],
+      'windows_phone' => ['windows phone os', 'windows phone']
     },
     system_version: {},
     system_architecture: {

data/lib/browserino/maps/windows_phone.rb

@@ -0,0 +1,5 @@
+module Browserino
+  module Mapping
+    WINDOWS_PHONE = {}
+  end
+end

data/lib/browserino/patterns.rb

@@ -84,10 +84,10 @@ module Browserino
     },
 
     operating_system: {
-      name: /(?<name>windows|macintosh|android|ios|blackberry|linux|ubuntu|x11|bsd)/i,
-      version: /(?:nt|mac\sos\sx|android|(cpu\s|i)os|blackberry.*?version\/|bb)\s?(?<version>[\d\._]+)/i,
+      name: /(?<name>windows(?:\sphone(?:\sos)?)?|macintosh|android|ios|blackberry|linux|ubuntu|x11|bsd)/i,
+      version: /(?:windows(?:\sphone(?:\sos)?)?|nt|mac\sos\sx|android|(cpu\s|i)os|blackberry.*?version\/|bb)\s?(?<version>[\d\._]+)/i,
       architecture: /(?<architecture>((?:x|x86_|amd|wow)64)|i(3|6)86)/i,
-      mobile: /bolt|nokia|samsung|mobi(?:le)?|android|ip(?:[ao]d|hone)|bb\d+|blackberry|iemobile|fennec|bada|meego|vodafone|t\-mobile|opera\sm(?:ob|in)i/i,
+      mobile: /bolt|nokia|samsung|mobi(?:le)?|android|i?p(?:[ao]d|hone)|bb\d+|blackberry|iemobile|fennec|bada|meego|vodafone|t\-mobile|opera\sm(?:ob|in)i/i,
       locale: /\s(?<locale>\w{2}(?:\-\w{2})?)[;\)]/
     }
   }

data/lib/browserino/version.rb

@@ -1,3 +1,3 @@
 module Browserino
-  VERSION = "2.5.1"
+  VERSION = "2.5.2"
 end

data/lib/browserino.rb

@@ -5,6 +5,7 @@ require "browserino/maps/bsd"
 require "browserino/maps/linux"
 require "browserino/maps/android"
 require "browserino/maps/windows"
+require "browserino/maps/windows_phone"
 
 require "browserino/integrate/rails" if defined?(::Rails)
 
@@ -41,6 +42,7 @@ module Browserino
     ua = ua.gsub(/(?:ms)?ie/i, '') if /rv\:/i =~ ua
     ua = ua.gsub(/linux/i, '') if /android/i =~ ua
     ua = ua.gsub(/x11/i, '') if /bsd/i =~ ua
+    ua = ua.gsub(/windows\snt/i, '') if /windows\sphone/i =~ ua
     ua
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: browserino
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.2
 platform: ruby
 authors:
 - Sidney Liebrand
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,6 +143,7 @@ files:
 - lib/browserino/maps/linux.rb
 - lib/browserino/maps/macintosh.rb
 - lib/browserino/maps/windows.rb
+- lib/browserino/maps/windows_phone.rb
 - lib/browserino/operating_system.rb
 - lib/browserino/patterns.rb
 - lib/browserino/unknown.rb