woothee 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13da5f2dcefa4793ff7a8868504db2965fe0dc86
-  data.tar.gz: a57fad8bf90c80c9a21d840a6304a1b75b762293
+  metadata.gz: c9a5c3078285a34a3f7d67fe200d7277c3c5284a
+  data.tar.gz: 93a32166115fcc0e3d1654e3e3e16f8132a826f4
 SHA512:
-  metadata.gz: a678ca5fbe5b9731c34b895c1831a8fdbf99ba370c73bd6e791b66da12b8fe8fa95b585cddc434f9ff3ba8112847be51400bc0f9221c18e2e7e1a09ba828539b
-  data.tar.gz: 7ef9e2d99119fb99861cefe8e1c7306ddeb625845db13459ee3c61d52fce9543d17546c6fc2e7023041ee58a71d7cb2f166d7b4307a095a0f87d4c0b26b5e406
+  metadata.gz: cdae3c0a784faeeb9d389c43f9426681c4b97eb1bf5e430be936629b07be05452ea21132af9688cb170281549d767cb94001e7bee49a14c76e454bca1ce252ac
+  data.tar.gz: d7dc70ec8d0a9a5e1737a592622a0224e827a6313719f1537ca6f9c6158725256707f692d4a8cd20e0a4df93e6542c0ed953d8379906c9a1b0521fd788137a41

data/lib/woothee/browser.rb

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

data/lib/woothee/dataset.rb

@@ -33,7 +33,7 @@ end
 
 module Woothee::DataSet
   DATASET = {}
-  # GENERATED from dataset.yaml at Mon Jun 10 18:14:36 JST 2013 by tagomoris
+  # GENERATED from dataset.yaml at Mon Sep  2 19:55:04 JST 2013 by tagomoris
   obj = {:label => 'MSIE', :name => 'Internet Explorer', :type => :browser}
   obj[:vendor] = 'Microsoft'
   DATASET[obj[:label]] = obj
@@ -55,6 +55,9 @@ module Woothee::DataSet
   obj = {:label => 'Win', :name => 'Windows UNKNOWN Ver', :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
   obj = {:label => 'Win8', :name => 'Windows 8', :type => :os}
   obj[:category] = :pc
   DATASET[obj[:label]] = obj

data/lib/woothee/os.rb

@@ -18,7 +18,8 @@ module Woothee::OS
     end
 
     version = $1
-    data = case 
+    data = case
+           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')
            when version == 'NT 6.0' then Woothee::DataSet.get('WinVista')

data/spec/00_valid_spec.rb

@@ -7,7 +7,7 @@ end
 
 describe Woothee do
   it "should be read from each modules correctly" do
-    lambda { require 'woothee/dataset' }.should_not raise_error(LoadError)
-    lambda { require 'woothee' }.should_not raise_error(LoadError)
+    expect { require 'woothee/dataset' }.not_to raise_error()
+    expect { require 'woothee' }.not_to raise_error()
   end
 end

data/spec/01_dataset_spec.rb

@@ -6,13 +6,13 @@ require 'woothee/dataset'
 
 describe Woothee::DataSet do
   it "contains constants" do
-    lambda { Woothee::ATTRIBUTE_NAME }.should_not raise_error(NameError)
+    lambda { Woothee::ATTRIBUTE_NAME }.should_not raise_error()
     Woothee::ATTRIBUTE_NAME.should eql(:name)
   end
 
   it "contains list of categories/attributes" do
-    lambda { Woothee::ATTRIBUTE_LIST }.should_not raise_error(NameError)
-    lambda { Woothee::CATEGORY_LIST }.should_not raise_error(NameError)
+    lambda { Woothee::ATTRIBUTE_LIST }.should_not raise_error()
+    lambda { Woothee::CATEGORY_LIST }.should_not raise_error()
     Woothee::ATTRIBUTE_LIST.should eql([
         Woothee::ATTRIBUTE_NAME, Woothee::ATTRIBUTE_CATEGORY, Woothee::ATTRIBUTE_OS,
         Woothee::ATTRIBUTE_VENDOR, Woothee::ATTRIBUTE_VERSION,

data/spec/02_run_testsets_spec.rb

@@ -22,7 +22,6 @@ TARGETS = [
           ]
 
 describe Woothee do
-  
   TARGETS.each do |filename,groupname|
     YAML.load_file(TESTSET_DIR + filename).each do |e|
       r = Woothee.parse(e['target'])
@@ -35,5 +34,4 @@ describe Woothee do
       end
     end
   end
-
 end

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.2"
+  gem.version     = "0.3.3"
   gem.authors     = ["TAGOMORI Satoshi"]
   gem.email       = "tagomoris@gmail.com"
   gem.has_rdoc    = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: woothee
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-10 00:00:00.000000000 Z
+date: 2013-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -65,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Cross-language UserAgent classifier library, ruby implementation
@@ -73,3 +73,4 @@ test_files:
 - spec/00_valid_spec.rb
 - spec/01_dataset_spec.rb
 - spec/02_run_testsets_spec.rb
+has_rdoc: false