useragent 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b5bc3c7403f99b975416f8a4c339e9054169051
-  data.tar.gz: 2c62dedcd7aa755e42670197a480a27e3ec757f2
+  metadata.gz: 70923abee7e8ba999ee2cd327e6eda2af9f0d721
+  data.tar.gz: caeb5dea87e448b5d41d0d3946d1e6bb95e42cf7
 SHA512:
-  metadata.gz: 3caceb0aefd8f62a314acf6a80f703c19e72fc81b7157ef06a95f0b86196fecf22cb7df27f3a7e721443f5a17e916878bd6747dabdab213ce50ceaade97d9851
-  data.tar.gz: 5431d35a284d115f7d85abaf4ac361577eab2badaf450ee808e948f5d3e5aef4419247c14b4cfa115f81d99eb23221cc6ece450cff0acff754bc8fcbae05aa46
+  metadata.gz: 5acfcce5871ad92a637be4d463ca721c4688db4c873eaa8afb5f2bb8526fb22ceed31274a332fd6908310d537d2a2cfda30c3b23662b5562dd086b2ec8934481
+  data.tar.gz: c6e856cff6f0b873bcc95bf78925a950500f3509e1c2c3303b1a88f894f1f0cdf7a831e48f622b5334e2a0f236851fd60af53768fa9b67481ec9391c30aeec91

data/LICENSE

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

data/README.md

@@ -0,0 +1,41 @@
+# UserAgent
+
+[![Build Status](https://travis-ci.org/gshutler/useragent.svg?branch=master)](https://travis-ci.org/gshutler/useragent)
+
+UserAgent is a Ruby library that parses and compares HTTP User Agents.
+
+## Installation
+
+    gem install useragent
+
+### Examples
+
+#### Reporting
+
+```ruby
+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.browser
+# => 'Chrome'
+user_agent.version
+# => '19.0.1084.56'
+user_agent.platform
+# => 'Macintosh'
+```
+
+#### Comparison
+
+```ruby
+Browser = Struct.new(:browser, :version)
+
+SupportedBrowsers = [
+  Browser.new("Safari", "3.1.1"),
+  Browser.new("Firefox", "2.0.0.14"),
+  Browser.new("Internet Explorer", "7.0")
+]
+
+user_agent = UserAgent.parse(request.user_agent)
+SupportedBrowsers.detect { |browser| user_agent >= browser }
+```
+
+Copyright (c) 2015 Garry Shutler, released under the MIT license

data/lib/user_agent.rb

@@ -6,15 +6,15 @@ require 'user_agent/version'
 class UserAgent
   # http://www.texsoft.it/index.php?m=sw.php.useragent
   MATCHER = %r{
-    ^([^/\s]+)        # Product
-    /?([^\s]*)        # Version
-    (\s\(([^\)]*)\))? # Comment
+    ^([^/\s]+)                     # Product
+    /?([^\s,]*)                    # Version
+    (\s\(([^\)]*)\)|,gzip\(gfe\))? # Comment
   }x.freeze
 
   DEFAULT_USER_AGENT = "Mozilla/4.0 (compatible)"
 
   def self.parse(string)
-    if string.nil? || string == ""
+    if string.nil? || string.strip == ""
       string = DEFAULT_USER_AGENT
     end
 

data/lib/user_agent/browsers.rb

@@ -14,7 +14,7 @@ class UserAgent
     }.freeze
 
     def self.all
-      [InternetExplorer, Chrome, Webkit, Opera, Gecko]
+      [InternetExplorer, Opera, Chrome, Webkit, Gecko]
     end
 
     def self.extend(array)

data/lib/user_agent/browsers/gecko.rb

@@ -6,6 +6,7 @@ class UserAgent
       end
 
       GeckoBrowsers = %w(
+        PaleMoon
         Firefox
         Camino
         Iceweasel

data/lib/user_agent/browsers/internet_explorer.rb

@@ -36,7 +36,7 @@ class UserAgent
       end
 
       def os
-        OperatingSystems.normalize_os(application.comment.join('; ').match(/Windows NT [\d\.]+|Windows Phone OS [\d\.]+/).to_s)
+        OperatingSystems.normalize_os(application.comment.join('; ').match(/Windows NT [\d\.]+|Windows Phone (OS )?[\d\.]+/).to_s)
       end
     end
   end

data/lib/user_agent/browsers/opera.rb

@@ -3,7 +3,12 @@ class UserAgent
     class Opera < Base
       def self.extend?(agent)
         (agent.first && agent.first.product == 'Opera') ||
-          (agent.application && agent.application.product == 'Opera')
+          (agent.application && agent.application.product == 'Opera') ||
+            (agent.last && agent.last.product == 'OPR')
+      end
+
+      def browser
+        'Opera'
       end
 
       def version

metadata

@@ -1,52 +1,53 @@
 --- !ruby/object:Gem::Specification
 name: useragent
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Joshua Peek
+- Garry Shutler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 description: |2
       HTTP User Agent parser
-email: josh@joshpeek.com
+email: garry@robustsoftware.co.uk
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
-- README.rdoc
+- README.md
 - lib/user_agent.rb
 - lib/user_agent/browsers.rb
 - lib/user_agent/browsers/base.rb
@@ -59,7 +60,7 @@ files:
 - lib/user_agent/operating_systems.rb
 - lib/user_agent/version.rb
 - lib/useragent.rb
-homepage: http://github.com/josh/useragent
+homepage: http://github.com/gshutler/useragent
 licenses:
 - MIT
 metadata: {}
@@ -69,12 +70,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []

data/README.rdoc

@@ -1,35 +0,0 @@
-= UserAgent
-
-UserAgent is a Ruby library that parses and compares HTTP User Agents.
-
-=== Installation
-
-  gem install useragent
-
-=== Examples
-
-==== 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.browser
-  # => 'Chrome'
-  user_agent.version
-  # => '19.0.1084.56'
-  user_agent.platform
-  # => 'Macintosh'
-
-==== Comparison
-
-  Browser = Struct.new(:browser, :version)
-  SupportedBrowsers = [
-    Browser.new("Safari", "3.1.1"),
-    Browser.new("Firefox", "2.0.0.14"),
-    Browser.new("Internet Explorer", "7.0")
-  ]
-
-  user_agent = UserAgent.parse(request.user_agent)
-  SupportedBrowsers.detect { |browser| user_agent >= browser }
-
-
-Copyright (c) 2013 Joshua Peek, released under the MIT license