woothee 0.3.0 → 0.3.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 13da5f2dcefa4793ff7a8868504db2965fe0dc86
+  data.tar.gz: a57fad8bf90c80c9a21d840a6304a1b75b762293
+SHA512:
+  metadata.gz: a678ca5fbe5b9731c34b895c1831a8fdbf99ba370c73bd6e791b66da12b8fe8fa95b585cddc434f9ff3ba8112847be51400bc0f9221c18e2e7e1a09ba828539b
+  data.tar.gz: 7ef9e2d99119fb99861cefe8e1c7306ddeb625845db13459ee3c61d52fce9543d17546c6fc2e7023041ee58a71d7cb2f166d7b4307a095a0f87d4c0b26b5e406

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec

data/lib/woothee/appliance.rb

@@ -10,7 +10,7 @@ module Woothee::Appliance
     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;') then Woothee::DataSet.get('PS3')
+           when ua.index('PLAYSTATION 3 ') || ua.index('PLAYSTATION 3;') then Woothee::DataSet.get('PS3')
            else nil
            end
     return false unless data

data/lib/woothee/browser.rb

@@ -57,7 +57,9 @@ module Woothee::Browser
   def self.challenge_opera(ua, result)
     return false if ua.index('Opera').nil?
 
-    version = if ua =~ /Opera[\/ ]([.0-9]+)/o
+    version = if ua =~ /Version\/([.0-9]+)/o
+                $1
+              elsif ua =~ /Opera[\/ ]([.0-9]+)/o
                 $1
               else
                 Woothee::VALUE_UNKNOWN

data/lib/woothee/crawler.rb

@@ -45,8 +45,8 @@ module Woothee::Crawler
   end
 
   def self.challenge_crawlers(ua, result)
-    if ua.index('Yahoo') or ua.index('listing.yahoo.co.jp/support/faq/')
-      if ua.index('compatible; Yahoo! Slurp;')
+    if ua.index('Yahoo') or ua.index('help.yahoo.co.jp/help/jp/') or ua.index('listing.yahoo.co.jp/support/faq/')
+      if ua.index('compatible; Yahoo! Slurp')
         update_map(result, Woothee::DataSet.get('YahooSlurp'))
         return true
       end
@@ -54,7 +54,7 @@ module Woothee::Crawler
         update_map(result, Woothee::DataSet.get('YahooJP'))
         return true
       end
-      if ua.index('crawler (http://listing.yahoo.co.jp/support/faq/')
+      if ua.index('crawler (http://listing.yahoo.co.jp/support/faq/') || ua.index('crawler (http://help.yahoo.co.jp/help/jp/')
         update_map(result, Woothee::DataSet.get('YahooJP'))
         return true
       end
@@ -95,14 +95,38 @@ module Woothee::Crawler
     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('gooIchiro'))
+        update_map(result, Woothee::DataSet.get('goo'))
         return true
       end
     end
+    if ua.index('gooblogsearch/')
+      update_map(result, Woothee::DataSet.get('goo'))
+      return true
+    end
     if ua.index('Apple-PubSub')
       update_map(result, Woothee::DataSet.get('ApplePubSub'))
       return true
     end
+    if ua.index("(www.radian6.com/crawler)")
+      update_map(result, Woothee::DataSet.get("radian6"))
+      return true
+    end
+    if ua.index('Genieo/')
+      update_map(result, Woothee::DataSet.get("Genieo"))
+      return true
+    end
+    if ua.index("labs.topsy.com/butterfly/")
+      update_map(result, Woothee::DataSet.get("topsyButterfly"))
+      return true
+    end
+    if ua.index("rogerbot/1.0 (http://www.seomoz.org/dp/rogerbot")
+      update_map(result, Woothee::DataSet.get("rogerbot"))
+      return true
+    end
+    if ua.index("compatible; AhrefsBot/")
+      update_map(result, Woothee::DataSet.get("AhrefsBot"))
+      return true
+    end
     if ua.index('livedoor FeedFetcher') or ua.index('Fastladder FeedFetcher')
       update_map(result, Woothee::DataSet.get('livedoorFeedFetcher'))
       return true
@@ -113,7 +137,7 @@ module Woothee::Crawler
         return true
       end
     end
-    if ua.index('mixi-check') or ua.index('mixi-news-crawler')
+    if ua.index('mixi-check') or ua.index('mixi-crawler') or ua.index('mixi-news-crawler')
       update_map(result, Woothee::DataSet.get('mixi'))
       return true
     end
@@ -128,7 +152,7 @@ module Woothee::Crawler
   end
 
   def self.challenge_maybe_crawler(ua, result)
-    if ua =~ /bot(?:[-_ .\/;@()]|$)/oi
+    if ua =~ /(bot|crawler|spider)(?:[-_ .\/;@()]|$)/oi
       update_map(result, Woothee::DataSet.get('VariousCrawler'))
       return true
     end

data/lib/woothee/dataset.rb

@@ -33,7 +33,7 @@ end
 
 module Woothee::DataSet
   DATASET = {}
-  # GENERATED from dataset.yaml at Mon Nov 26 15:53:14 JST 2012 by tagomoris
+  # GENERATED from dataset.yaml at Mon Jun 10 18:14:36 JST 2013 by tagomoris
   obj = {:label => 'MSIE', :name => 'Internet Explorer', :type => :browser}
   obj[:vendor] = 'Microsoft'
   DATASET[obj[:label]] = obj
@@ -265,10 +265,25 @@ module Woothee::DataSet
   obj = {:label => 'ApplePubSub', :name => 'Apple iCloud', :type => :full}
   obj[:category] = :crawler
   DATASET[obj[:label]] = obj
+  obj = {:label => 'Genieo', :name => 'Genieo Web Filter', :type => :full}
+  obj[:category] = :crawler
+  DATASET[obj[:label]] = obj
+  obj = {:label => 'topsyButterfly', :name => 'topsy Butterfly', :type => :full}
+  obj[:category] = :crawler
+  DATASET[obj[:label]] = obj
+  obj = {:label => 'rogerbot', :name => 'SeoMoz rogerbot', :type => :full}
+  obj[:category] = :crawler
+  DATASET[obj[:label]] = obj
+  obj = {:label => 'AhrefsBot', :name => 'ahref AhrefsBot', :type => :full}
+  obj[:category] = :crawler
+  DATASET[obj[:label]] = obj
+  obj = {:label => 'radian6', :name => 'salesforce radian6', :type => :full}
+  obj[:category] = :crawler
+  DATASET[obj[:label]] = obj
   obj = {:label => 'Hatena', :name => 'Hatena', :type => :full}
   obj[:category] = :crawler
   DATASET[obj[:label]] = obj
-  obj = {:label => 'gooIchiro', :name => 'goo', :type => :full}
+  obj = {:label => 'goo', :name => 'goo', :type => :full}
   obj[:category] = :crawler
   DATASET[obj[:label]] = obj
   obj = {:label => 'livedoorFeedFetcher', :name => 'livedoor FeedFetcher', :type => :full}

data/lib/woothee/misc.rb

@@ -32,17 +32,19 @@ module Woothee::Misc
 
   def self.challenge_http_library(ua, result)
     data,version = case
-                   when ua =~ /^(?:Apache-HttpClient\/|Jakarta Commons-HttpClient\/|Java\/)/o
+                   when ua =~ /^(?:Apache-HttpClient\/|Jakarta Commons-HttpClient\/|Java\/)/o || ua =~ /[- ]HttpClient(\/|$)/o
+                     [Woothee::DataSet.get('HTTPLibrary'), 'Java']
+                   when ua.index('Java(TM) 2 Runtime Environment,')
                      [Woothee::DataSet.get('HTTPLibrary'), 'Java']
                    when ua =~ /^Wget/o
                      [Woothee::DataSet.get('HTTPLibrary'), 'wget']
                    when ua =~ /^(?:libwww-perl|WWW-Mechanize|LWP::Simple|LWP |lwp-trivial)/o
                      [Woothee::DataSet.get('HTTPLibrary'), 'perl']
-                   when ua =~ /^Python-urllib\//o
+                   when ua =~ /^(?:Ruby|feedzirra|Typhoeus)/o
+                     [Woothee::DataSet.get('HTTPLibrary'), 'ruby']
+                   when ua =~ /^(Python-urllib\/|Twisted )/o
                      [Woothee::DataSet.get('HTTPLibrary'), 'python']
-                   when ua =~ /^(:?PHP\/|WordPress\/|CakePHP|PukiWiki\/)/o
-                     [Woothee::DataSet.get('HTTPLibrary'), 'php']
-                   when ua.index('PEAR HTTP_Request class;')
+                   when ua =~ /^(?:PHP|WordPress|CakePHP|PukiWiki|PECL::HTTP)(?:\/| |$)/o || ua =~ /(?:PEAR |)HTTP_Request(?: class|2)/o
                      [Woothee::DataSet.get('HTTPLibrary'), 'php']
                    else [nil,nil]
                    end
@@ -54,7 +56,9 @@ module Woothee::Misc
   end
 
   def self.challenge_maybe_rss_reader(ua, result)
-    data = if ua =~ /rss(?:reader|bar|[-_ \/;()])/oi
+    data = if ua =~ /rss(?:reader|bar|[-_ \/;()]|[ +]*\/)/oi || ua =~ /headline-reader/oi
+             Woothee::DataSet.get('VariousRSSReader')
+           elsif ua.index('cococ/')
              Woothee::DataSet.get('VariousRSSReader')
            else
              nil

data/woothee.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.description = "Cross-language UserAgent classifier library, ruby implementation"
   gem.homepage    = "https://github.com/tagomoris/woothee"
   gem.summary     = gem.description
-  gem.version     = "0.3.0"
+  gem.version     = "0.3.2"
   gem.authors     = ["TAGOMORI Satoshi"]
   gem.email       = "tagomoris@gmail.com"
   gem.has_rdoc    = false

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: woothee
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 0.3.2
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-26 00:00:00.000000000 Z
+date: 2013-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.8.0
 description: Cross-language UserAgent classifier library, ruby implementation
@@ -51,27 +48,26 @@ files:
 - woothee.gemspec
 homepage: https://github.com/tagomoris/woothee
 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.21
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Cross-language UserAgent classifier library, ruby implementation
 test_files:
 - spec/00_valid_spec.rb