browserino 0.2.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62aa83f64ee7982eaf6453f3c254167a65bebd70
-  data.tar.gz: 01f75dffa40b326bf0d66c0fef20868e297c7d4e
+  metadata.gz: ad35d09a1a6278e60f23ce734ea23ecc5625656b
+  data.tar.gz: 3a422fd663f391581b0189d2ca792c72611deb74
 SHA512:
-  metadata.gz: a46012b967787e15d71ce2aa61482ed50f756de8e02dfd83aa0b7776c8b0c8846cdce704d1792f6fd7f662ad3ca3572d6744115ee8529304209a3b3d2e51cd64
-  data.tar.gz: 29e4edf778b263f13d06e3bfd4facf599746e9f3d457573d3124ef14f6de6e922c5a26846d2e080c2d140235c5b93893fc0adfaac51f594bf7f12aa774c3ff89
+  metadata.gz: 0a39500512bebd5272265e678252498ad8a514ec7883dbedf8a7cd200774a354cee423970b6715418847a8c2753f272f4fb39034ce7963c0ab03988b43c9ce75
+  data.tar.gz: b7c75865e23b990c115fc93376bd5089599e00185701b84b2794ca6244a7d72362e509fc7eba646cfa2c8a22294255141657271b62657b55342432663b288b6a

data/.travis.yml

@@ -3,5 +3,9 @@ rvm:
   - 2.2.1
 before_install: gem install bundler -v 1.10.5
 
+branches:
+  only:
+    - development
+
 cache: bundler
 script: 'bundle exec rspec spec'

data/README.md

@@ -10,7 +10,7 @@ This gem aims to provide information about the browser that your visitor is usin
 Hey there everone, my name is Sidney Liebrand and I aim to become a contributor to various open source projects as I gain experience in working with the community.
 For now All I'm going to say is that I'm not that experienced with git yet or how things go so bear with me should I make any mistake.
 
-If anyone ofcourse desires to manage me with this project feel free to add me on skype: *sidney.liebrand*
+If anyone ofcourse desires to manage this project with me feel free to add me on skype: *sidney.liebrand*
 
 ## Installation
 
@@ -43,6 +43,10 @@ Or install it yourself as:
   * version
   * architecture
 
+## Development
+
+*Should you want to contribute to the project the instructions for it will be here when version 1 releases*
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/SidOfc/browserino. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.

data/bin/console

@@ -2,13 +2,10 @@
 
 require "bundler/setup"
 require "browserino"
+require "pry"
 
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
+@agent = Browserino::parse('Mozilla/5.0 (iPad; CPU OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5355d Safari/8536.25')
 
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
+puts @agent
 
-require "irb"
-IRB.start
+Pry.start

data/browserino.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-rspec"
   spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "pry"
 end

data/lib/browserino/agent.rb

@@ -0,0 +1,58 @@
+module Browserino
+  class Agent
+    attr_accessor :info
+
+    def initialize(hash)
+      @info = hash
+    end
+
+    def browser_name
+      @info[:browser_name]
+    end
+
+    def browser_version
+      @info[:browser_version].gsub('_', '.')
+    end
+
+    def engine_name
+      @info[:engine_name]
+    end
+
+    def engine_version
+      @info[:engine_version].gsub('_', '.')
+    end
+
+    def system_name(opts = {})
+      opts = {full: false}.merge(opts)
+      name = @info[:system_name]
+      if opts[:full]
+        [name, fetch_system_version_name(name)]
+      else
+        name
+      end
+    end
+
+    def system_version
+      @info[:system_version].gsub('_', '.')
+    end
+
+    def system_architecture
+      @info[:system_architecture]
+    end
+
+    private
+
+    def fetch_system_version_name(name)
+      codename = Browserino::Mapping.const_get(name.upcase)
+      name.downcase!
+      if name.match(/mac|ios/i)
+        version = system_version.split('.').first(2).join.to_i
+      elsif name.start_with?('win') || name.start_with?('android')
+        version = system_version.gsub('.', '').to_i
+      end
+      if version
+        codename.select { |k, v| v if k.include?(version) }.values.first
+      end
+    end
+  end
+end

data/lib/browserino/agent_manipulator.rb

@@ -0,0 +1,28 @@
+module Browserino
+  @ua = nil
+
+  class AgentManipulator
+    def initialize(ua)
+      @ua = ua
+      standardize_ios!
+      strip_legacy_mozilla!
+      strip_fake_opera_version!
+    end
+
+    def standardize_ios!
+      @ua = @ua.gsub(/ip((a|o)d|hone)/i, 'ios')
+    end
+
+    def strip_legacy_mozilla!
+      @ua = @ua.gsub(/(Mozilla\/[\d\.]+)/i, '')
+    end
+
+    def strip_fake_opera_version!
+      @ua = @ua.gsub(/ope?ra?(\/|\s)?[\d\.]+/i, '')
+    end
+
+    def ua
+      @ua
+    end
+  end
+end

data/lib/browserino/browser.rb

@@ -1,16 +1,8 @@
 module Browserino
   module Browser
-    def self.name(ua = nil)
-      name = nil
-      browsers = Browserino::PATTERNS[:browser].keys
-      until browsers.empty? || !name.nil?
-        subject = browsers.shift
-        name = subject if (ua.match(Browserino::PATTERNS[:browser][subject][:name]))
-      end
-      name ||= :unknown
-    end
-
-    def self.version
+    def self.version(ua, patterns)
+      out = MatchExtractor::extract(ua.match(patterns[:version]), :version).to_s.downcase unless patterns.nil?
+      out ||= ''
     end
   end
 end

data/lib/browserino/engine.rb

@@ -1,9 +1,11 @@
 module Browserino
   module Engine
-    def self.name
+    def self.name(ua)
+      MatchExtractor::extract(ua.match(Browserino::PATTERNS[:engine][:name]), :name).to_s.downcase
     end
 
-    def self.version
+    def self.version(ua)
+      MatchExtractor::extract(ua.match(Browserino::PATTERNS[:engine][:version]), :version).to_s.downcase
     end
   end
 end

data/lib/browserino/maps/android.rb

@@ -0,0 +1,30 @@
+# Taken from https://en.wikipedia.org/wiki/Android_version_history
+# 15 - 09 - 2015
+
+module Browserino
+  module Mapping
+    ANDROID = {
+      [10] => '1.0',
+      [11] => '1.1',
+      [15] => 'Cupcake 3',
+      [16] => 'Cupcake 4',
+      [20] => 'Eclair 5',
+      [201] => 'Eclair 6',
+      [21] => 'Eclair 7',
+      [22, 221, 222, 223] => 'Froyo 8',
+      [23, 231, 232] => 'Gingerbread 9',
+      [233, 234, 235, 236, 237] => 'Gingerbread 10',
+      [30] => 'Honeycomb 11',
+      [31] => 'honeycomb 12',
+      [32, 321, 322, 323, 324, 325, 326] => 'Honeycomb 13',
+      [40, 401, 402] => 'Ice Cream Sandwich 14',
+      [403, 404] => 'Ice Cream Sandwich 15',
+      [41, 411, 412] => 'Jelly Bean 16',
+      [42, 421, 422] => 'Jelly Bean 17',
+      [43, 431] => 'Jelly Bean 18',
+      [44, 441, 442, 443, 444] => 'KitKat 19',
+      [50, 501, 502] => 'Lollipop 21',
+      [51, 511] => 'Lollipop 22',
+    }
+  end
+end

data/lib/browserino/maps/ios.rb

@@ -0,0 +1,11 @@
+# Taken from http://www.thinkybits.com/blog/iOS-versions/
+# 15 - 09 - 2015
+
+module Browserino
+  module Mapping
+    IOS = {
+      [20, 21, 22, 30, 31] => 'iPhone OS',
+      [40, 41, 42, 43, 50, 51, 60, 61, 70, 71, 80, 81, 82, 83, 84, 90, 91] => 'iOS'
+    }
+  end
+end

data/lib/browserino/maps/osx.rb

@@ -0,0 +1,21 @@
+# Taken from https://nl.wikipedia.org/wiki/OS_X
+# 15 - 09 - 2015
+
+module Browserino
+  module Mapping
+    MACINTOSH = {
+      [100] => 'Cheetah',
+      [101] => 'Puma',
+      [102] => 'Jaguar',
+      [103] => 'Panther',
+      [104] => 'Tiger',
+      [105] => 'Leopard',
+      [106] => 'Snow Leopard',
+      [107] => 'Lion',
+      [108] => 'Mountain Lion',
+      [109] => 'Mavericks',
+      [1010] => 'Yosemite',
+      [1011] => 'El Capitan'
+    }
+  end
+end

data/lib/browserino/maps/windows.rb

@@ -0,0 +1,19 @@
+# Taken from https://nl.wikipedia.org/wiki/Windows_NT
+# 15 - 09 - 2015
+
+module Browserino
+  module Mapping
+    WINDOWS = {
+      [35] => '3.5',
+      [40] => '4',
+      [50] => '2000',
+      [51] => 'XP',
+      [52] => 'XP',
+      [60] => 'Vista',
+      [61] => '7',
+      [62] => '8',
+      [63] => '8.1',
+      [100] => '10'
+    }
+  end
+end

data/lib/browserino/match_extractor.rb

@@ -0,0 +1,14 @@
+module Browserino
+  module MatchExtractor
+    def self.extract(match, sym, trim = true)
+      if match.nil?
+        :unknown
+      elsif match.names.map(&:to_sym).include?(sym)
+        match[sym].strip! if trim
+        match[sym]
+      else
+        :unknown
+      end
+    end
+  end
+end

data/lib/browserino/operating_system.rb

@@ -1,12 +1,15 @@
 module Browserino
   module OperatingSystem
-    def self.name
+    def self.name(ua)
+      MatchExtractor::extract(ua.match(Browserino::PATTERNS[:operating_system][:name]), :name).to_s.downcase
     end
 
-    def self.version
+    def self.version(ua)
+      MatchExtractor::extract(ua.match(Browserino::PATTERNS[:operating_system][:version]), :version).to_s.downcase
     end
 
-    def self.architecture
+    def self.architecture(ua)
+      MatchExtractor::extract(ua.match(Browserino::PATTERNS[:operating_system][:architecture]), :architecture).to_s.downcase
     end
   end
 end

data/lib/browserino/patterns.rb

@@ -1,10 +1,3 @@
-# See this as a giant CSS selector.
-# It will iterate through hashes recursively.
-# If the :name is set in e.g. :browser then it will be global for all browsers.
-# However if in :browser there is a hash called :opera with a :name
-# then that will override the global setting.
-# This basically follows the 'Cascading Style Sheet' flow
-
 module Browserino
   PATTERNS = {
     browser: {
@@ -14,40 +7,40 @@ module Browserino
       },
 
       maxthon: {
-        name: /(?<name> maxthon)/i,
-        version: /maxthon(\s|\/)(?<version> [\d\.]+)/i
+        name: /(?<name>maxthon)/i,
+        version: /maxthon(\s|\/)(?<version>[\d\.]+)/i
       },
 
       ie: {
-        name: /(?<name> msie|trident)/i,
-        version: /(msie\s|rv\:)(?<version> [\d\.b]+)/i
+        name: /(?<name>msie|trident)/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
+        name: /(?<name>chrome?(ium|plus)?)/i,
+        version: /chrome?(ium|plus)?\/(?<version>[\d\.]+)/i
       },
 
       safari: {
-        name: /(?<name> safari)/i,
-        version: /(version|safari)\/(?<version> [\d\.]+)/i
+        name: /(?<name>safari)/i,
+        version: /(version|safari)\/(?<version>[\d\.]+)/i
       }
     },
 
     engine: {
-      name: /(?<name> ((apple)?webkit|gecko|trident|presto))/i,
-      version: /((apple)?webkit|gecko|trident|presto)(?<version> [\d\.]+)/i
+      name: /(?<name>((apple)?webkit|gecko|trident|presto))/i,
+      version: /((apple)?webkit|rv:|trident|presto)[\/\s]?(?<version>[\d\.]+)/i
     },
 
     operating_system: {
-      name: /(?<name> windows|macintosh|linux)/i,
-      version: /(nt|mac\sos\sx)\s(?<version> [\d\._]+)/i,
-      architecture: /(?<architecture> (x?(86_)?64)|i(3|6)86)/i
+      name: /(?<name>windows|macintosh|android|ios)/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
     }
   }
 end

data/lib/browserino/version.rb

@@ -1,3 +1,3 @@
 module Browserino
-  VERSION = "0.2.0"
+  VERSION = "0.3.2"
 end

data/lib/browserino.rb

@@ -1,4 +1,12 @@
+require "browserino/maps/osx"
+require "browserino/maps/ios"
+require "browserino/maps/android"
+require "browserino/maps/windows"
+
+require "browserino/agent_manipulator"
+require "browserino/agent"
 require "browserino/version"
+require "browserino/match_extractor"
 require "browserino/patterns"
 require "browserino/browser"
 require "browserino/engine"
@@ -6,13 +14,28 @@ require "browserino/operating_system"
 
 module Browserino
   def self.parse ua
-    ua = self::clean(ua)
-    Browser::name(ua)
+    ua = AgentManipulator.new(ua).ua
+    name = find_browser_name(ua)
+    Agent.new({
+      browser_name: name,
+      browser_version: Browser::version(ua, PATTERNS[:browser][name]),
+      engine_name: Engine::name(ua),
+      engine_version: Engine::version(ua),
+      system_name: OperatingSystem::name(ua),
+      system_version: OperatingSystem::version(ua),
+      system_architecture: OperatingSystem::architecture(ua)
+    })
   end
 
   private
 
-  def self.clean ua
-    ua.gsub(/(Mozilla\/[\d\.]+)/, '').strip
+  def self.find_browser_name ua
+    name = nil
+    browsers = PATTERNS[:browser].keys
+    until browsers.empty? || !name.nil?
+      tmp = browsers.shift
+      name = tmp if (ua.match(PATTERNS[:browser][tmp][:name]))
+    end
+    name ||= :unknown
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: browserino
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Sidney Liebrand
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-13 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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
@@ -115,8 +129,15 @@ files:
 - bin/setup
 - browserino.gemspec
 - lib/browserino.rb
+- lib/browserino/agent.rb
+- lib/browserino/agent_manipulator.rb
 - lib/browserino/browser.rb
 - lib/browserino/engine.rb
+- lib/browserino/maps/android.rb
+- lib/browserino/maps/ios.rb
+- lib/browserino/maps/osx.rb
+- lib/browserino/maps/windows.rb
+- lib/browserino/match_extractor.rb
 - lib/browserino/operating_system.rb
 - lib/browserino/patterns.rb
 - lib/browserino/version.rb
@@ -140,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A browser identification gem