useragent 0.4.16 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ecc00650c07d846ea38bcb5cd16475b84d51915e
+  data.tar.gz: befbabc6d8c1df3cf374401a79f146a6c99e4528
+SHA512:
+  metadata.gz: ff947472eb8e67b26049dc96b36ac5915131d8d69c4e8aea9f132133c1b1530363dd9835e0affec2e5e34c6c04e398b9655b4a92d8110a7b20fe0c1e37bb5e7a
+  data.tar.gz: e9b0f2fff90b7a38cbeaa05da2dc0e73d30113f8a1ce109457c1c22547325141c0186761eb6a335bfccb2fa43b818004ab0d265b3e99b5d70e51e8b9e0ff523a

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Joshua Peek
+Copyright (c) 2013 Joshua Peek
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -11,15 +11,13 @@ UserAgent is a Ruby library that parses and compares HTTP User Agents.
 ==== Reporting
 
   string = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/536.5 (KHTML, like Gecko) Chrome/19.0.1084.56 Safari/536.5'
-  user_agent = UserAgent.parse(string)	
+  user_agent = UserAgent.parse(string)
   user_agent.browser
   # => 'Chrome'
   user_agent.version
   # => '19.0.1084.56'
   user_agent.platform
   # => 'Macintosh'
-  user_agent.mobile?
-  # => false
 
 ==== Comparison
 
@@ -34,4 +32,4 @@ UserAgent is a Ruby library that parses and compares HTTP User Agents.
   SupportedBrowsers.detect { |browser| user_agent >= browser }
 
 
-Copyright (c) 2009 Joshua Peek, released under the MIT license
+Copyright (c) 2013 Joshua Peek, released under the MIT license

data/lib/user_agent/browsers/all.rb

@@ -61,7 +61,9 @@ class UserAgent
           true
         elsif platform == 'Symbian'
           true
-        elsif detect_product('Mobile')
+        elsif detect_product('Mobile') || detect_comment('Mobile')
+          true
+        elsif os =~ /Android/
           true
         elsif application && application.comment &&
             application.comment.detect { |k, v| k =~ /^IEMobile/ }
@@ -95,6 +97,10 @@ class UserAgent
         def detect_product(product)
           detect { |useragent| useragent.product.to_s.downcase == product.to_s.downcase }
         end
+
+        def detect_comment(comment)
+          detect { |useragent| useragent.comment && useragent.comment.include?(comment) }
+        end
     end
   end
 end

data/lib/user_agent/browsers/internet_explorer.rb

@@ -13,7 +13,7 @@ class UserAgent
       end
 
       def version
-        application.comment[1].sub("MSIE ", "")
+        Version.new(application.comment[1].sub("MSIE ", ""))
       end
 
       def compatibility

data/lib/user_agent/browsers/webkit.rb

@@ -10,10 +10,10 @@ class UserAgent
       end
 
       def browser
-        if os =~ /Android/
-          'Android'
-        elsif detect_product('Chrome')
+        if detect_product('Chrome')
           'Chrome'
+        elsif os =~ /Android/
+          'Android'
         elsif platform == 'webOS' || platform == 'BlackBerry'  || platform == 'Symbian'
           platform
         else
@@ -111,6 +111,8 @@ class UserAgent
             OperatingSystems.normalize_os(application.comment[0])
           elsif application.comment[2].nil?
             OperatingSystems.normalize_os(application.comment[1])
+          elsif application.comment[1] =~ /Android/
+            OperatingSystems.normalize_os(application.comment[1])
           else
             OperatingSystems.normalize_os(application.comment[2])
           end

data/lib/user_agent/operating_systems.rb

@@ -15,7 +15,19 @@ class UserAgent
     }.freeze
 
     def self.normalize_os(os)
-      Windows[os] || os
+      Windows[os] || normalize_mac_os_x(os) || os
     end
+
+    private
+      def self.normalize_mac_os_x(os)
+        if os =~ /(?:Intel|PPC) Mac OS X\s*([0-9_\.]+)?/
+          if $1.nil?
+            "OS X"
+          else
+            version = $1.gsub('_', '.')
+            "OS X #{version}"
+          end
+        end
+      end
   end
 end

metadata

@@ -1,51 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: useragent
 version: !ruby/object:Gem::Version
-  version: 0.4.16
-  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors:
 - Joshua Peek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-02 00:00:00.000000000 Z
+date: 2013-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! '    HTTP User Agent parser
-
-'
+description: |2
+      HTTP User Agent parser
 email: josh@joshpeek.com
 executables: []
 extensions: []
@@ -66,27 +60,25 @@ files:
 - README.rdoc
 homepage: http://github.com/josh/useragent
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: HTTP User Agent parser
 test_files: []
-has_rdoc: