useragent 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 756a613a6bf15fa02a568deedcf0793efe787d94
-  data.tar.gz: e26e84bdf913d9f61cb6a9b3cee31534f4661e9b
+  metadata.gz: 2b5bc3c7403f99b975416f8a4c339e9054169051
+  data.tar.gz: 2c62dedcd7aa755e42670197a480a27e3ec757f2
 SHA512:
-  metadata.gz: 74bf4b404e15e94574f04636cf6ce784b9df02486c0d69c1652655db492996e1b7426ed6a546deeee27c3222334278845ca7365d8eca8356c24c3ae3b4874d62
-  data.tar.gz: d7382d205d07fa86149072d364427bd72cdc847904a06d725eac0c2687abee098ce4d210be0b8c69075ed7278faa9816317211ed8f68ad3ff72871137ace0e4b
+  metadata.gz: 3caceb0aefd8f62a314acf6a80f703c19e72fc81b7157ef06a95f0b86196fecf22cb7df27f3a7e721443f5a17e916878bd6747dabdab213ce50ceaade97d9851
+  data.tar.gz: 5431d35a284d115f7d85abaf4ac361577eab2badaf450ee808e948f5d3e5aef4419247c14b4cfa115f81d99eb23221cc6ece450cff0acff754bc8fcbae05aa46

data/lib/user_agent.rb

@@ -38,7 +38,7 @@ class UserAgent
     if version && !version.empty?
       @version = Version.new(version)
     else
-      @version = nil
+      @version = Version.new
     end
 
     if comment.respond_to?(:split)
@@ -54,11 +54,7 @@ class UserAgent
   # always return false.
   def <=>(other)
     if @product == other.product
-      if @version && other.version
-        @version <=> other.version
-      else
-        0
-      end
+      @version <=> other.version
     else
       false
     end
@@ -75,9 +71,9 @@ class UserAgent
   end
 
   def to_str
-    if @product && @version && @comment
+    if @product && !@version.nil? && @comment
       "#{@product}/#{@version} (#{@comment.join("; ")})"
-    elsif @product && @version
+    elsif @product && !@version.nil?
       "#{@product}/#{@version}"
     elsif @product && @comment
       "#{@product} (#{@comment.join("; ")})"

data/lib/user_agent/browsers/chrome.rb

@@ -24,7 +24,7 @@ class UserAgent
           chrome.version
         end
 
-        Version.new(str) if str
+        Version.new(str)
       end
 
       def application

data/lib/user_agent/browsers/gecko.rb

@@ -17,7 +17,8 @@ class UserAgent
       end
 
       def version
-        send(browser).version || super
+        v = send(browser).version
+        v.nil? ? super : v
       end
 
       def platform

data/lib/user_agent/browsers/internet_explorer.rb

@@ -13,9 +13,8 @@ class UserAgent
       end
 
       def version
-        if version = application.comment.join('; ')[/(MSIE\s|rv:)([\d\.]+)/, 2]
-          Version.new(version)
-        end
+        str = application.comment.join('; ')[/(MSIE\s|rv:)([\d\.]+)/, 2]
+        Version.new(str)
       end
 
       def compatibility_view?

data/lib/user_agent/browsers/opera.rb

@@ -8,7 +8,7 @@ class UserAgent
 
       def version
         if mini?
-          application.comment[1][/Opera Mini\/([\d\.]+)/, 1]
+          application.comment.detect{|c| c =~ /Opera Mini/}[/Opera Mini\/([\d\.]+)/, 1] rescue Version.new
         elsif product = detect_product('Version')
           product.version
         else

data/lib/user_agent/browsers/webkit.rb

@@ -62,7 +62,7 @@ class UserAgent
           BuildVersions[build.to_s]
         end
 
-        Version.new(str) if str
+        Version.new(str)
       end
 
       def application

data/lib/user_agent/version.rb

@@ -2,12 +2,14 @@ class UserAgent
   class Version
     include ::Comparable
 
-    def self.new(obj)
+    def self.new(obj = nil)
       case obj
       when Version
         obj
       when String
         super
+      when NilClass
+        super("")
       else
         raise ArgumentError, "invalid value for Version: #{obj.inspect}"
       end
@@ -16,15 +18,25 @@ class UserAgent
     def initialize(str)
       @str = str
 
-      if str =~ /^\d+$/ || str =~ /^\d+\./
+      if @str =~ /^\s*$/
+        @nil        = true
+        @sequences  = []
+        @comparable = false
+      elsif str =~ /^\d+$/ || str =~ /^\d+\./
+        @nil        = false
         @sequences  = str.scan(/\d+|[A-Za-z][0-9A-Za-z-]*$/).map { |s| s =~ /^\d+$/ ? s.to_i : s }
         @comparable = true
       else
+        @nil        = false
         @sequences  = [str]
         @comparable = false
       end
     end
 
+    def nil?
+      @nil
+    end
+
     def to_a
       @sequences.dup
     end
@@ -43,6 +55,8 @@ class UserAgent
         eql?(other)
       when String
         eql?(self.class.new(other))
+      when NilClass
+        nil?
       else
         false
       end
@@ -72,7 +86,7 @@ class UserAgent
         else
           return -1
         end
-      when String
+      when String, NilClass
         self <=> self.class.new(other)
       else
         nil

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: useragent
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Joshua Peek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-18 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   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: |2
@@ -45,6 +45,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.rdoc
 - lib/user_agent.rb
 - lib/user_agent/browsers.rb
 - lib/user_agent/browsers/base.rb
@@ -57,8 +59,6 @@ files:
 - lib/user_agent/operating_systems.rb
 - lib/user_agent/version.rb
 - lib/useragent.rb
-- LICENSE
-- README.rdoc
 homepage: http://github.com/josh/useragent
 licenses:
 - MIT
@@ -69,17 +69,17 @@ 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: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: HTTP User Agent parser