woothee 0.4.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cd84ea6750dd3090ec24f2675afce80bf01c79d
-  data.tar.gz: 160d90a091231343e606087baba391704997fce2
+  metadata.gz: 8d02d577c470c8ee9b7204b5f7bdc48dd3af1dae
+  data.tar.gz: 7fd13c2c702219ee6f8ce5b059b64da041fcb55c
 SHA512:
-  metadata.gz: 0de822e9c1f39fd382b9cace5747eec947d165fdc1009e82dcfbc477b211e5ca1b304a32a8fc46bd2266a5535835e6619d986607964faef201a2cde46aef97d5
-  data.tar.gz: 47e5968cc10abca1a296c1be9c2d038e516ee872a7d5fe74d44eb251c7abdcee773b90616ea2ef9967e0b6cbc9824fdeda754aefcb314973907f36f89f040283
+  metadata.gz: 4622d9e21b6105f977d4bba8f508b851fa8a52963ec4bb0c9186cd72b43c6fcf1582a3a1fc9bca03f75c6f5777c6059ef6b1ba670e892b8b7878d4f9a443e691
+  data.tar.gz: 8c4d48ea2764cacfcdb311e623e574e6d7bc77f5a11527ddfaf7333bd537d961508bc559bd38eae66b1010d6825d174c713f9faefc1aa8d3414e11b46839e638

data/README.md

@@ -27,7 +27,7 @@ Class 'Woothee' have no instance methods.
 ```ruby
 require 'woothee'
 Woothee.parse("Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1; Trident/4.0)")
- # => {:name=>"Internet Explorer", :category=>:pc, :os=>"Windows 7", :version=>"8.0", :vendor=>"Microsoft"}
+ # => {:name=>"Internet Explorer", :category=>:pc, :os=>"Windows 7", :version=>"8.0", :vendor=>"Microsoft", :os_version=>"NT 6.1"}
 ```
 
 Parse user-agent string and returns Hash instance with keys `:name`, `:category`, `:os`, `:version` and `:vendor`.
@@ -45,6 +45,8 @@ For unknown user-agent (or partially failed to parse), result Hash instance may
  * This field used to indicate cellar phone carrier for category 'mobilephone'
 * `:vendor`
  * optional field, shows browser vendor
+* `:os_version`
+ * optional field, shows version of operating systems
 
 ### Finding crawlers (almost all, not all) in fast
 

data/lib/woothee.rb

@@ -152,6 +152,7 @@ module Woothee
     Woothee::ATTRIBUTE_NAME => Woothee::VALUE_UNKNOWN,
     Woothee::ATTRIBUTE_CATEGORY => Woothee::VALUE_UNKNOWN,
     Woothee::ATTRIBUTE_OS => Woothee::VALUE_UNKNOWN,
+    Woothee::ATTRIBUTE_OS_VERSION => Woothee::VALUE_UNKNOWN,
     Woothee::ATTRIBUTE_VERSION => Woothee::VALUE_UNKNOWN,
     Woothee::ATTRIBUTE_VENDOR => Woothee::VALUE_UNKNOWN,
   }.freeze

data/lib/woothee/appliance.rb

@@ -7,16 +7,36 @@ module Woothee::Appliance
   extend Woothee::Util
 
   def self.challenge_playstation(ua, result)
-    data = case
-           when ua.index('PSP (PlayStation Portable);') then Woothee::DataSet.get('PSP')
-           when ua.index('PlayStation Vita') then Woothee::DataSet.get('PSVita')
-           when ua.index('PLAYSTATION 3 ') || ua.index('PLAYSTATION 3;') then Woothee::DataSet.get('PS3')
-           when ua.index('PlayStation 4 ') then Woothee::DataSet.get('PS4')
-           else nil
-           end
+    data = nil
+    os_version = nil
+    case
+    when ua.index('PSP (PlayStation Portable);')
+      data = Woothee::DataSet.get('PSP')
+      if ua =~ /PSP \(PlayStation Portable\); ([.0-9]+)\)/
+        os_version = $1
+      end
+    when ua.index('PlayStation Vita')
+      data = Woothee::DataSet.get('PSVita')
+      if ua =~ /PlayStation Vita ([.0-9]+)\)/
+        os_version = $1
+      end
+    when ua.index('PLAYSTATION 3 ') || ua.index('PLAYSTATION 3;')
+      data = Woothee::DataSet.get('PS3')
+      if ua =~ /PLAYSTATION 3;? ([.0-9]+)\)/
+        os_version = $1
+      end
+    when ua.index('PlayStation 4 ')
+      data = Woothee::DataSet.get('PS4')
+      if ua =~ /PlayStation 4 ([.0-9]+)\)/
+        os_version = $1
+      end
+    end
     return false unless data
 
     update_map(result, data)
+    if os_version
+      update_os_version(result, os_version)
+    end
     true
   end
 

data/lib/woothee/browser.rb

@@ -7,12 +7,14 @@ module Woothee::Browser
   extend Woothee::Util
 
   def self.challenge_msie(ua, result)
-    return false if ua.index("compatible; MSIE").nil? && ua.index("Trident/").nil?
+    return false if ua.index("compatible; MSIE").nil? && ua.index("Trident/").nil? && ua.index("IEMobile").nil?
 
     version = if ua =~ /MSIE ([.0-9]+);/o
                 $1
               elsif ua =~ /Trident\/([.0-9]+);(?: BOIE[0-9]+;[A-Z]+;)? rv:([.0-9]+)/o
                 $2
+              elsif ua =~ /IEMobile\/([.0-9]+);/o
+                $1
               else
                 Woothee::VALUE_UNKNOWN
               end

data/lib/woothee/dataset.rb

@@ -5,6 +5,7 @@ module Woothee
   KEY_TYPE = :type
   KEY_CATEGORY = :category
   KEY_OS = :os
+  KEY_OS_VERSION = :os_version
   KEY_VENDOR = :vendor
   KEY_VERSION = :version
 
@@ -22,18 +23,19 @@ module Woothee
   ATTRIBUTE_NAME = :name
   ATTRIBUTE_CATEGORY = :category
   ATTRIBUTE_OS = :os
+  ATTRIBUTE_OS_VERSION = :os_version
   ATTRIBUTE_VENDOR = :vendor
   ATTRIBUTE_VERSION = :version
 
   VALUE_UNKNOWN = "UNKNOWN"
 
   CATEGORY_LIST = [CATEGORY_PC,CATEGORY_SMARTPHONE,CATEGORY_MOBILEPHONE,CATEGORY_CRAWLER,CATEGORY_APPLIANCE,CATEGORY_MISC,VALUE_UNKNOWN]
-  ATTRIBUTE_LIST = [ATTRIBUTE_NAME,ATTRIBUTE_CATEGORY,ATTRIBUTE_OS,ATTRIBUTE_VENDOR,ATTRIBUTE_VERSION]
+  ATTRIBUTE_LIST = [ATTRIBUTE_NAME,ATTRIBUTE_CATEGORY,ATTRIBUTE_OS,ATTRIBUTE_VENDOR,ATTRIBUTE_VERSION,ATTRIBUTE_OS_VERSION]
 end
 
 module Woothee::DataSet
   DATASET = {}
-  # GENERATED from dataset.yaml at Sat Jul  5 01:54:48 JST 2014 by h_nakamura
+  # GENERATED from dataset.yaml at Wed Oct 22 20:17:46 JST 2014 by tagomoris
   obj = {:label => 'MSIE', :name => 'Internet Explorer', :type => :browser}
   obj[:vendor] = 'Microsoft'
   DATASET[obj[:label]] = obj

data/lib/woothee/os.rb

@@ -36,7 +36,9 @@ module Woothee::OS
            when version == 'NT 6.1' then Woothee::DataSet.get('Win7')
            when version == 'NT 6.0' then Woothee::DataSet.get('WinVista')
            when version == 'NT 5.1' then Woothee::DataSet.get('WinXP')
-           when version =~ /^Phone OS/o then Woothee::DataSet.get('WinPhone')
+           when version =~ /^Phone(?: OS)? ([.0-9]+)/o
+             version = $1
+             Woothee::DataSet.get('WinPhone')
            when version == 'NT 5.0' then Woothee::DataSet.get('Win2000')
            when version == 'NT 4.0' then Woothee::DataSet.get('WinNT4')
            when version == '98' then Woothee::DataSet.get('Win98') # wow, WinMe is shown as 'Windows 98; Win9x 4.90', fxxxk
@@ -47,6 +49,7 @@ module Woothee::OS
            end
     update_category(result, data[Woothee::KEY_CATEGORY])
     update_os(result, data[Woothee::KEY_NAME])
+    update_os_version(result, version)
     true
   end
 
@@ -54,6 +57,7 @@ module Woothee::OS
     return false if ua.index('Mac OS X').nil?
 
     data = Woothee::DataSet.get('OSX')
+    version = nil
     if ua.index('like Mac OS X')
       data = case
              when ua.index('iPhone;') then Woothee::DataSet.get('iPhone')
@@ -61,42 +65,71 @@ module Woothee::OS
              when ua.index('iPod') then Woothee::DataSet.get('iPod')
              else data
              end
+      if ua =~ /; CPU(?: iPhone)? OS (\d+_\d+(?:_\d+)?) like Mac OS X/
+        version = $1.gsub(/_/, '.')
+      end
+    else
+      if ua =~ /Mac OS X (10[._]\d+(?:[._]\d+)?)(?:\)|;)/
+        version = $1.gsub(/_/, '.')
+      end
     end
     update_category(result, data[Woothee::KEY_CATEGORY])
     update_os(result, data[Woothee::KEY_NAME])
+    if version
+      update_os_version(result, version)
+    end
     true
   end
 
   def self.challenge_linux(ua, result)
     return false if ua.index('Linux').nil?
 
-    data = if ua.index('Android')
-             Woothee::DataSet.get('Android')
-           else
-             Woothee::DataSet.get('Linux')
-           end
+    data = nil
+    os_version = nil
+    if ua.index('Android')
+      data = Woothee::DataSet.get('Android')
+      if ua =~ /Android[- ](\d+\.\d+(?:\.\d+)?)/
+        os_version = $1
+      end
+    else
+      data = Woothee::DataSet.get('Linux')
+    end
     update_category(result, data[Woothee::KEY_CATEGORY])
     update_os(result, data[Woothee::KEY_NAME])
+    if os_version
+      update_os_version(result, os_version)
+    end
     true
   end
 
   def self.challenge_smartphone(ua, result)
-    data = case
-           when ua.index('iPhone') then Woothee::DataSet.get('iPhone')
-           when ua.index('iPad') then Woothee::DataSet.get('iPad')
-           when ua.index('iPod') then Woothee::DataSet.get('iPod')
-           when ua.index('Android') then Woothee::DataSet.get('Android')
-           when ua.index('CFNetwork') then Woothee::DataSet.get('iOS')
-           when ua.index('BlackBerry') then Woothee::DataSet.get('BlackBerry')
-           else nil
-           end
+    data = nil
+    os_version = nil
+    case
+    when ua.index('iPhone')
+      data = Woothee::DataSet.get('iPhone')
+    when ua.index('iPad')
+      data = Woothee::DataSet.get('iPad')
+    when ua.index('iPod')
+      data = Woothee::DataSet.get('iPod')
+    when ua.index('Android')
+      data = Woothee::DataSet.get('Android')
+    when ua.index('CFNetwork')
+      data = Woothee::DataSet.get('iOS')
+    when ua.index('BlackBerry')
+      data = Woothee::DataSet.get('BlackBerry')
+      if ua =~ /BlackBerry(?:\d+)\/([.0-9]+) /
+        os_version = $1
+      end
+    end
 
     if result[Woothee::KEY_NAME] && result[Woothee::KEY_NAME] == Woothee::DataSet.get('Firefox')[Woothee::KEY_NAME]
       # Firefox OS specific pattern
       # http://lawrencemandel.com/2012/07/27/decision-made-firefox-os-user-agent-string/
       # https://github.com/woothee/woothee/issues/2
-      if ua =~ /^Mozilla\/[.0-9]+ \((?:Mobile|Tablet);(.*;)? rv:[.0-9]+\) Gecko\/[.0-9]+ Firefox\/[.0-9]+$/
+      if ua =~ /^Mozilla\/[.0-9]+ \((?:Mobile|Tablet);(?:.*;)? rv:([.0-9]+)\) Gecko\/[.0-9]+ Firefox\/[.0-9]+$/
         data = Woothee::DataSet.get('FirefoxOS')
+        os_version = $1
       end
     end
 
@@ -104,6 +137,9 @@ module Woothee::OS
 
     update_category(result, data[Woothee::KEY_CATEGORY])
     update_os(result, data[Woothee::KEY_NAME])
+    if os_version
+      update_os_version(result, os_version)
+    end
     true
   end
 
@@ -166,23 +202,39 @@ module Woothee::OS
   end
 
   def self.challenge_misc(ua, result)
-    data = case
-           when ua.index('(Win98;')
-             Woothee::DataSet.get('Win98')
-           when ua.index('Macintosh; U; PPC;')
-             Woothee::DataSet.get('MacOS')
-           when ua.index('Mac_PowerPC')
-             Woothee::DataSet.get('MacOS')
-           when ua.index('X11; FreeBSD ')
-             Woothee::DataSet.get('BSD')
-           when ua.index('X11; CrOS ')
-             Woothee::DataSet.get('ChromeOS')
-           else
-             nil
-           end
+    data = nil
+    os_version = nil
+    case
+    when ua.index('(Win98;')
+      data = Woothee::DataSet.get('Win98')
+      os_version = "98"
+    when ua.index('Macintosh; U; PPC;')
+      data = Woothee::DataSet.get('MacOS')
+      if ua =~ /rv:(\d+\.\d+\.\d+)/
+        os_version = $1
+      end
+    when ua.index('Mac_PowerPC')
+      data = Woothee::DataSet.get('MacOS')
+    when ua.index('X11; FreeBSD ')
+      data = Woothee::DataSet.get('BSD')
+      if ua =~ /FreeBSD ([^;\)]+);/
+        os_version = $1
+      end
+    when ua.index('X11; CrOS ')
+      data = Woothee::DataSet.get('ChromeOS')
+      if ua =~ /CrOS ([^\)]+)\)/
+        os_version = $1
+      end
+    else
+      nil
+    end
+
     if data
       update_category(result, data[Woothee::KEY_CATEGORY])
       update_os(result, data[Woothee::KEY_NAME])
+      if os_version
+        update_os_version(result, os_version)
+      end
       return true
     end
 

data/lib/woothee/util.rb

@@ -21,4 +21,8 @@ module Woothee::Util
   def update_os(target, os)
     target[Woothee::ATTRIBUTE_OS] = os
   end
+
+  def update_os_version(target, version)
+    target[Woothee::ATTRIBUTE_OS_VERSION] = version
+  end
 end

data/lib/woothee/version.rb

@@ -1,3 +1,3 @@
 module Woothee
-  VERSION = "0.4.2"
+  VERSION = "1.0.0"
 end

data/scripts/dataset_yaml2rb.rb

@@ -53,6 +53,7 @@ module Woothee
   KEY_TYPE = :type
   KEY_CATEGORY = :category
   KEY_OS = :os
+  KEY_OS_VERSION = :os_version
   KEY_VENDOR = :vendor
   KEY_VERSION = :version
 
@@ -70,13 +71,14 @@ module Woothee
   ATTRIBUTE_NAME = :name
   ATTRIBUTE_CATEGORY = :category
   ATTRIBUTE_OS = :os
+  ATTRIBUTE_OS_VERSION = :os_version
   ATTRIBUTE_VENDOR = :vendor
   ATTRIBUTE_VERSION = :version
 
   VALUE_UNKNOWN = "UNKNOWN"
 
   CATEGORY_LIST = [CATEGORY_PC,CATEGORY_SMARTPHONE,CATEGORY_MOBILEPHONE,CATEGORY_CRAWLER,CATEGORY_APPLIANCE,CATEGORY_MISC,VALUE_UNKNOWN]
-  ATTRIBUTE_LIST = [ATTRIBUTE_NAME,ATTRIBUTE_CATEGORY,ATTRIBUTE_OS,ATTRIBUTE_VENDOR,ATTRIBUTE_VERSION]
+  ATTRIBUTE_LIST = [ATTRIBUTE_NAME,ATTRIBUTE_CATEGORY,ATTRIBUTE_OS,ATTRIBUTE_VENDOR,ATTRIBUTE_VERSION,ATTRIBUTE_OS_VERSION]
 end
 
 module Woothee::DataSet

data/spec/01_dataset_spec.rb

@@ -15,7 +15,7 @@ describe Woothee::DataSet do
     expect { Woothee::CATEGORY_LIST }.not_to raise_error()
     expect(Woothee::ATTRIBUTE_LIST).to eql([
         Woothee::ATTRIBUTE_NAME, Woothee::ATTRIBUTE_CATEGORY, Woothee::ATTRIBUTE_OS,
-        Woothee::ATTRIBUTE_VENDOR, Woothee::ATTRIBUTE_VERSION,
+        Woothee::ATTRIBUTE_VENDOR, Woothee::ATTRIBUTE_VERSION, Woothee::ATTRIBUTE_OS_VERSION,
       ])
     expect(Woothee::CATEGORY_LIST).to eql([
         Woothee::CATEGORY_PC, Woothee::CATEGORY_SMARTPHONE, Woothee::CATEGORY_MOBILEPHONE,

data/spec/02_run_testsets_spec.rb

@@ -25,9 +25,9 @@ describe Woothee do
   TARGETS.each do |filename,groupname|
     YAML.load_file(TESTSET_DIR + filename).each do |e|
       r = Woothee.parse(e['target'])
-      [:name, :category, :os, :version, :vendor].each do |attribute|
+      [:name, :category, :os, :version, :vendor, :os_version].each do |attribute|
         it groupname + ("test(%s): %s" % [attribute, e['target']]) do
-          if [:name, :category].include?(attribute) or ([:os, :version, :vendor].include?(attribute) and e.has_key?(attribute.to_s))
+          if [:name, :category].include?(attribute) or ([:os, :version, :vendor, :os_version].include?(attribute) and e.has_key?(attribute.to_s))
             expect(r[attribute].to_s).to eql(e[attribute.to_s])
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: woothee
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 1.0.0
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-11 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake