browserino 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 903638619bac70152006ad3f7f4f81f42ff912a2
-  data.tar.gz: e44bda5c85019d19eee5565c3fc3a984638b8a94
+  metadata.gz: 0f08ae3900de04e818da158b3f213e35d7ea8559
+  data.tar.gz: d9a2ae06194faf027c91de73569e2d9054e8e970
 SHA512:
-  metadata.gz: 3812f76cdca55381905d31f99b203cbf77f1e90e56ab1d88bbab87796afdc0d9e8c38a42cc810ba59d0e20589849e73ebbd332139a5d4f268da0e48c11da4188
-  data.tar.gz: 63eb1ce3ff47b142ad6bf04479445eb9c0b9f941b5fe2ae718d4cf613a2775b01c5df66eef394caeb6737de34e9e9decfcd23c48da46161579fc4197dbbe4258
+  metadata.gz: bac6047a73c354f69e1a3b6d95747381e61d8fa69e3773c231432d0b7f8b2adfa3db760bdbcb61d6bcc20f8a104235caf895c642fb9876be603a8f5776afbd6d
+  data.tar.gz: 654765d84f9e822dd886ceb393bd7e4ba12831aaece76851689a27ffd4e7d320516769dac020ff4756b9a3759ce620102e249617585e7a816e05611fea42b5ec

data/README.md

@@ -66,7 +66,7 @@ agent = Browserino::parse('Mozilla/5.0 (iPad; CPU OS 6_0 like Mac OS X) AppleWeb
 agent.browser_name # => safari
 agent.browser_version # => 6.0
 
-agent.engine_name # => applewebkit
+agent.engine_name # => webkit
 agent.engine_version # => 536.26
 
 agent.system_name # => ios
@@ -76,7 +76,7 @@ agent.system_architecture # => unknown (though it will make an attempt)
 
 ## Development
 
-*Should you want to contribute to the project the instructions for it will be here when version 1 releases*
+*Should you want to contribute to the project the instructions for it will be here when version 1 releases (PENDING)*
 
 ## Contributing
 

data/bin/console

@@ -21,6 +21,7 @@ puts '------------------'
 puts '|      system    |'
 puts '------------------'
 puts @agent.system_name
+puts @agent.system_name(full: true)[1]
 puts @agent.system_version
 puts @agent.system_architecture
 puts '================='

data/lib/browserino/agent.rb

@@ -7,51 +7,53 @@ module Browserino
     end
 
     def browser_name
-      @info[:browser_name]
+      @info[:browser_name].downcase
     end
 
     def browser_version
-      @info[:browser_version].gsub('_', '.')
+      @info[:browser_version].gsub('_', '.').downcase
     end
 
     def engine_name
-      @info[:engine_name]
+      @info[:engine_name].downcase
     end
 
     def engine_version
-      @info[:engine_version].gsub('_', '.')
+      @info[:engine_version].gsub('_', '.').downcase
     end
 
     def system_name(opts = {})
-      opts = {full: false}.merge(opts)
-      name = @info[:system_name]
+      opts = {full: true}.merge(opts)
+      name = @info[:system_name].downcase
       if opts[:full]
-        [name, fetch_system_version_name(name)]
+        [name, fetch_system_version_name(name).downcase]
       else
         name
       end
     end
 
     def system_version
-      @info[:system_version].gsub('_', '.')
+      @info[:system_version].gsub('_', '.').downcase
     end
 
     def system_architecture
-      @info[:system_architecture]
+      @info[:system_architecture].downcase
     end
 
     private
 
     def fetch_system_version_name(name)
-      codename = Browserino::Mapping.const_get(name.upcase)
+      const = 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')
+      elsif name.match(/win|android/i)
         version = system_version.gsub('.', '').to_i
       end
-      if version
-        codename.select { |k, v| v if k.include?(version) }.values.first
+      if version && defined? const
+        Browserino::Mapping.const_get(const).select { |name, versions| true if versions.include?(version) }.keys.first
+      else
+        'unknown'
       end
     end
   end

data/lib/browserino/alias.rb

@@ -1,7 +1,29 @@
 module Browserino
   ALIAS = {
-    'webkit' => ['applewebkit'],
-    'ie' => ['msie'],
-    'unknown' => ['unknown', :unknown, '']
+    browser_name: {
+      'ie' => ['msie'],
+      'unknown' => ['unknown', :unknown, '']
+    },
+    browser_version: {
+      'unknown' => ['unknown', :unknown, '']
+    },
+    engine_name: {
+      'webkit' => ['applewebkit'],
+      'unknown' => ['unknown', :unknown, '']
+    },
+    engine_version: {
+      'unknown' => ['unknown', :unknown, '']
+    },
+    system_name: {
+      'unknown' => ['unknown', :unknown, '']
+    },
+    system_version: {
+      'unknown' => ['unknown', :unknown, '']
+    },
+    system_architecture: {
+      'x64' => ['64', 'x86_64'],
+      'x32' => ['32', 'i686', 'i383'],
+      'unknown' => ['unknown', :unknown, '', nil]
+    }
   }
 end

data/lib/browserino/maps/android.rb

@@ -4,27 +4,27 @@
 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',
+      '1.0' => [10],
+      '1.1' => [11],
+      'Cupcake 3' => [15],
+      'Cupcake 4' => [16],
+      'Eclair 5' => [20],
+      'Eclair 6' => [201],
+      'Eclair 7' => [21],
+      'Froyo 8' => [22, 221, 222, 223],
+      'Gingerbread 9' => [23, 231, 232],
+      'Gingerbread 10' => [233, 234, 235, 236, 237],
+      'Honeycomb 11' => [30],
+      'honeycomb 12' => [31],
+      'Honeycomb 13' => [32, 321, 322, 323, 324, 325, 326],
+      'Ice Cream Sandwich 14' => [40, 401, 402],
+      'Ice Cream Sandwich 15' => [403, 404],
+      'Jelly Bean 16' => [41, 411, 412],
+      'Jelly Bean 17' => [42, 421, 422],
+      'Jelly Bean 18' => [43, 431],
+      'KitKat 19' => [44, 441, 442, 443, 444],
+      'Lollipop 21' => [50, 501, 502],
+      'Lollipop 22' => [51, 511]
     }
   end
 end

data/lib/browserino/maps/ios.rb

@@ -4,8 +4,8 @@
 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'
+      'iPhone OS' => [20, 21, 22, 30, 31],
+      'iOS' => [40, 41, 42, 43, 50, 51, 60, 61, 70, 71, 80, 81, 82, 83, 84, 90, 91]
     }
   end
 end

data/lib/browserino/maps/linux.rb

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

data/lib/browserino/maps/osx.rb

@@ -4,18 +4,18 @@
 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'
+      'Cheetah' => [100],
+      'Puma' => [101],
+      'Jaguar' => [102],
+      'Panther' => [103],
+      'Tiger' => [104],
+      'Leopard' => [105],
+      'Snow Leopard' => [106],
+      'Lion' => [107],
+      'Mountain Lion' => [108],
+      'Mavericks' => [109],
+      'Yosemite' => [1010],
+      'El Capitan' => [1011]
     }
   end
 end

data/lib/browserino/maps/windows.rb

@@ -4,16 +4,15 @@
 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'
+      '3.5' => [35],
+      '4' => [40],
+      '2000' => [50],
+      'XP' => [51, 52],
+      'Vista' => [60],
+      '7' => [61],
+      '8' => [62],
+      '8.1' => [63],
+      '10' => [100]
     }
   end
 end

data/lib/browserino/version.rb

@@ -1,3 +1,3 @@
 module Browserino
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/browserino.rb

@@ -33,7 +33,7 @@ module Browserino
   def self.check_for_aliases(hash)
     h = {}
     hash.each do |prop, val|
-      h[prop] = ALIAS.select { |key, matches| true if matches.include?(val) }.keys.first || val
+      h[prop] = ALIAS[prop].select { |k, m| true if m.include?(val) }.keys.first || val
     end
     h
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: browserino
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Sidney Liebrand
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,6 +136,7 @@ files:
 - lib/browserino/engine.rb
 - lib/browserino/maps/android.rb
 - lib/browserino/maps/ios.rb
+- lib/browserino/maps/linux.rb
 - lib/browserino/maps/osx.rb
 - lib/browserino/maps/windows.rb
 - lib/browserino/match_extractor.rb