woothee 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c014eaeb7dddd4ad586f76066fdadb6c0585cdef
-  data.tar.gz: 61bb29e14c857fe716a04144ce0bb53b061b48d7
+  metadata.gz: 44162a8c67cb953882dbe7e9d65148a68ef40742
+  data.tar.gz: 6d316209571959729e3cfaf4cc1ff96abf1860c9
 SHA512:
-  metadata.gz: ef8c6a020c0712bbb2b3560a01458cc40ddd0b2d2ea2aacc9f5073e4e95986f3a7efc9215d06df09cd78397004635802b7a7612c7457ff4b8baae5b0b1db0d12
-  data.tar.gz: 3cc4730be55cde4d26c537bf75c81d9751bfb6b82e8de1d5b3645212bacd4adac7feae84e5530d14db6e843107782fd3056426ddb89658661c817691b7526593
+  metadata.gz: 0ae44d2cace028c8bcd236d106b0a8c022c3848fe75d539832280081c88b4f334772e86618a3ef0ba985206998fa91fee10f3b06aa3e1f3c1f70f44bccce2fb4
+  data.tar.gz: 0a750dce5c17a0a4c9e9e06b793b33081571406d90f70ce8e33e4de9c19cc23df01993793017ed6c49cbb0da090440f0f4edb28e0d5ac23b64e0ae9635aec7c6

data/lib/woothee.rb

@@ -77,6 +77,8 @@ module Woothee
 
     return true if Woothee::Browser.challenge_opera(useragent, result)
 
+    return true if Woothee::Browser.challenge_webview(useragent, result)
+
     false
   end
 

data/lib/woothee/browser.rb

@@ -28,6 +28,14 @@ module Woothee::Browser
 
     version = Woothee::VALUE_UNKNOWN
 
+    # Edge
+    if ua =~ /Edge\/([.0-9]+)/o
+      version = $1
+      update_map(result, Woothee::DataSet.get('Edge'))
+      update_version(result, version)
+      return true
+    end
+
     if ua =~ /(?:Chrome|CrMo|CriOS)\/([.0-9]+)/o
       chrome_version = $1
 
@@ -82,6 +90,26 @@ module Woothee::Browser
     true
   end
 
+  def self.challenge_webview(ua, result)
+    version = Woothee::DataSet.get('VALUE_UNKNOWN')
+
+    # iOS
+    if ua =~ /iP(?:hone;|ad;|od) .*like Mac OS X/
+      return false if ua.index('Safari/')
+
+      version = if ua =~ /Version\/([.0-9]+)/
+                  $1
+                else
+                  Woothee::VALUE_UNKNOWN
+                end
+      update_map(result, Woothee::DataSet.get('Webview'))
+      update_version(result, version)
+      return true
+    end
+
+    false
+  end
+
   def self.challenge_sleipnir(ua, result)
     return false if ua.index('Sleipnir/').nil?
 

data/lib/woothee/crawler.rb

@@ -97,6 +97,10 @@ module Woothee::Crawler
       update_map(result, Woothee::DataSet.get('facebook'))
       return true
     end
+    if ua.index('Twitterbot/')
+      update_map(result, Woothee::DataSet.get('twitter'))
+      return true
+    end
     if ua.index('ichiro')
       if ua.index('http://help.goo.ne.jp/door/crawler.html') or ua.index('compatible; ichiro/mobile goo;')
         update_map(result, Woothee::DataSet.get('goo'))

data/lib/woothee/dataset.rb

@@ -35,10 +35,13 @@ end
 
 module Woothee::DataSet
   DATASET = {}
-  # GENERATED from dataset.yaml at Wed Oct 22 20:17:46 JST 2014 by tagomoris
+  # GENERATED from dataset.yaml at Tue Aug 11 16:54:38 JST 2015 by tagomoris
   obj = {:label => 'MSIE', :name => 'Internet Explorer', :type => :browser}
   obj[:vendor] = 'Microsoft'
   DATASET[obj[:label]] = obj
+  obj = {:label => 'Edge', :name => 'Edge', :type => :browser}
+  obj[:vendor] = 'Microsoft'
+  DATASET[obj[:label]] = obj
   obj = {:label => 'Chrome', :name => 'Chrome', :type => :browser}
   obj[:vendor] = 'Google'
   DATASET[obj[:label]] = obj
@@ -54,9 +57,15 @@ module Woothee::DataSet
   obj = {:label => 'Sleipnir', :name => 'Sleipnir', :type => :browser}
   obj[:vendor] = 'Fenrir Inc.'
   DATASET[obj[:label]] = obj
+  obj = {:label => 'Webview', :name => 'Webview', :type => :browser}
+  obj[:vendor] = 'OS vendor'
+  DATASET[obj[:label]] = obj
   obj = {:label => 'Win', :name => 'Windows UNKNOWN Ver', :type => :os}
   obj[:category] = :pc
   DATASET[obj[:label]] = obj
+  obj = {:label => 'Win10', :name => 'Windows 10', :type => :os}
+  obj[:category] = :pc
+  DATASET[obj[:label]] = obj
   obj = {:label => 'Win8.1', :name => 'Windows 8.1', :type => :os}
   obj[:category] = :pc
   DATASET[obj[:label]] = obj
@@ -129,6 +138,9 @@ module Woothee::DataSet
   obj = {:label => 'BlackBerry', :name => 'BlackBerry', :type => :os}
   obj[:category] = :smartphone
   DATASET[obj[:label]] = obj
+  obj = {:label => 'BlackBerry10', :name => 'BlackBerry 10', :type => :os}
+  obj[:category] = :smartphone
+  DATASET[obj[:label]] = obj
   obj = {:label => 'docomo', :name => 'docomo', :type => :full}
   obj[:vendor] = 'docomo'
   obj[:category] = :mobilephone
@@ -282,6 +294,9 @@ module Woothee::DataSet
   obj = {:label => 'facebook', :name => 'facebook', :type => :full}
   obj[:category] = :crawler
   DATASET[obj[:label]] = obj
+  obj = {:label => 'twitter', :name => 'twitter', :type => :full}
+  obj[:category] = :crawler
+  DATASET[obj[:label]] = obj
   obj = {:label => 'mixi', :name => 'mixi', :type => :full}
   obj[:category] = :crawler
   DATASET[obj[:label]] = obj

data/lib/woothee/os.rb

@@ -31,6 +31,7 @@ module Woothee::OS
 
     version = $1
     data = case
+           when version == 'NT 10.0' then Woothee::DataSet.get('Win10')
            when version == 'NT 6.3' then Woothee::DataSet.get('Win8.1')
            when version == 'NT 6.2' then Woothee::DataSet.get('Win8')
            when version == 'NT 6.1' then Woothee::DataSet.get('Win7')
@@ -116,6 +117,11 @@ module Woothee::OS
       data = Woothee::DataSet.get('Android')
     when ua.index('CFNetwork')
       data = Woothee::DataSet.get('iOS')
+    when ua.index('BB10')
+      data = Woothee::DataSet.get('BlackBerry10')
+      if ua =~ /BB10(?:.+)Version\/([.0-9]+)/
+        os_version = $1
+      end
     when ua.index('BlackBerry')
       data = Woothee::DataSet.get('BlackBerry')
       if ua =~ /BlackBerry(?:\d+)\/([.0-9]+) /

data/lib/woothee/version.rb

@@ -1,3 +1,3 @@
 module Woothee
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: woothee
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -94,3 +94,4 @@ test_files:
 - spec/00_valid_spec.rb
 - spec/01_dataset_spec.rb
 - spec/02_run_testsets_spec.rb
+has_rdoc: false