woothee 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a8f09fb64413bb4f5a1a6aaee714da4c3bd1083
-  data.tar.gz: 2012053f1446ddd7877a2bfafcdbffc9dc47aa3d
+  metadata.gz: 9cd84ea6750dd3090ec24f2675afce80bf01c79d
+  data.tar.gz: 160d90a091231343e606087baba391704997fce2
 SHA512:
-  metadata.gz: 33f486a66c52ab80b38cc8c1481c934d8f3869c5a3f04d2974f7f00ffb8e4d596c62ea448fb0d3e94ae5a9c92ae45f106e8a4cc9ed07bfb93f40bc3cb1080a51
-  data.tar.gz: a25d7a7df05ce0e3f5622838c526d29bb0a2f340cdf5067234f627db227110b4118c492eccb03c80726864e1d4f79507ea9e2473ab9e76a6f5dc77ec0fecfb10
+  metadata.gz: 0de822e9c1f39fd382b9cace5747eec947d165fdc1009e82dcfbc477b211e5ca1b304a32a8fc46bd2266a5535835e6619d986607964faef201a2cde46aef97d5
+  data.tar.gz: 47e5968cc10abca1a296c1be9c2d038e516ee872a7d5fe74d44eb251c7abdcee773b90616ea2ef9967e0b6cbc9824fdeda754aefcb314973907f36f89f040283

data/lib/woothee/browser.rb

@@ -11,7 +11,7 @@ module Woothee::Browser
 
     version = if ua =~ /MSIE ([.0-9]+);/o
                 $1
-              elsif ua =~ /Trident\/([.0-9]+); rv:([.0-9]+)/o
+              elsif ua =~ /Trident\/([.0-9]+);(?: BOIE[0-9]+;[A-Z]+;)? rv:([.0-9]+)/o
                 $2
               else
                 Woothee::VALUE_UNKNOWN

data/lib/woothee/crawler.rb

@@ -58,6 +58,10 @@ module Woothee::Crawler
         update_map(result, Woothee::DataSet.get('YahooJP'))
         return true
       end
+      if ua.index('Y!J-BRZ/YATSHA crawler') || ua.index('Y!J-BRY/YATSH crawler')
+        update_map(result, Woothee::DataSet.get('YahooJP'))
+        return true
+      end
       if ua.index('Yahoo Pipes')
         update_map(result, Woothee::DataSet.get('YahooPipes'))
         return true

data/lib/woothee/dataset.rb

@@ -33,7 +33,7 @@ end
 
 module Woothee::DataSet
   DATASET = {}
-  # GENERATED from dataset.yaml at Fri Apr 25 12:56:38 JST 2014 by tagomoris
+  # GENERATED from dataset.yaml at Sat Jul  5 01:54:48 JST 2014 by h_nakamura
   obj = {:label => 'MSIE', :name => 'Internet Explorer', :type => :browser}
   obj[:vendor] = 'Microsoft'
   DATASET[obj[:label]] = obj

data/lib/woothee/version.rb

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

data/spec/01_dataset_spec.rb

@@ -6,18 +6,18 @@ require 'woothee/dataset'
 
 describe Woothee::DataSet do
   it "contains constants" do
-    lambda { Woothee::ATTRIBUTE_NAME }.should_not raise_error()
-    Woothee::ATTRIBUTE_NAME.should eql(:name)
+    expect { Woothee::ATTRIBUTE_NAME }.not_to raise_error()
+    expect(Woothee::ATTRIBUTE_NAME).to eql(:name)
   end
 
   it "contains list of categories/attributes" do
-    lambda { Woothee::ATTRIBUTE_LIST }.should_not raise_error()
-    lambda { Woothee::CATEGORY_LIST }.should_not raise_error()
-    Woothee::ATTRIBUTE_LIST.should eql([
+    expect { Woothee::ATTRIBUTE_LIST }.not_to raise_error()
+    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::CATEGORY_LIST.should eql([
+    expect(Woothee::CATEGORY_LIST).to eql([
         Woothee::CATEGORY_PC, Woothee::CATEGORY_SMARTPHONE, Woothee::CATEGORY_MOBILEPHONE,
         Woothee::CATEGORY_CRAWLER, Woothee::CATEGORY_APPLIANCE, Woothee::CATEGORY_MISC,
         Woothee::VALUE_UNKNOWN,
@@ -25,6 +25,6 @@ describe Woothee::DataSet do
   end
 
   it "contains dataset" do
-    Woothee::DataSet.get('GoogleBot')[:name].should eql('Googlebot')
+    expect(Woothee::DataSet.get('GoogleBot')[:name]).to eql('Googlebot')
   end
 end

data/spec/02_run_testsets_spec.rb

@@ -28,7 +28,7 @@ describe Woothee do
       [:name, :category, :os, :version, :vendor].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))
-            r[attribute].to_s.should eql(e[attribute.to_s])
+            expect(r[attribute].to_s).to eql(e[attribute.to_s])
           end
         end
       end

data/woothee.gemspec

@@ -19,5 +19,6 @@ Gem::Specification.new do |gem|
   gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths = ['lib']
 
+  gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec", ">= 2.8.0"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: woothee
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2014-07-11 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