nicoscraper 0.2.9 → 0.2.10

data/lib/config/wait.rb

@@ -3,30 +3,30 @@ module Nicos
     class Config
       @@waitConfigDefault =
       @@waitConfig = {
-        'seqAccLimit' => 10,  # 連続してリクエストする回数
-        'afterSeq'    => 10,  # 連続リクエスト後のウェイト（以下全て単位は秒）
-        'each'        => 1,   # 連続リクエスト時の、1リクエスト毎のウェイト
+        :seqAccLimit => 10,  # 連続してリクエストする回数
+        :afterSeq    => 10,  # 連続リクエスト後のウェイト（以下全て単位は秒）
+        :each        => 1,   # 連続リクエスト時の、1リクエスト毎のウェイト
 
-        'increment'   => 1,   # アクセス拒絶時の、次回以降の1リクエスト毎のウェイトの増加量
+        :increment   => 1,   # アクセス拒絶時の、次回以降の1リクエスト毎のウェイトの増加量
 
-        'deniedSeqReq'=> {    # 連続アクセス拒絶時
-          'retryLimit'  => 3,   # 再試行回数の上限
-          'wait'        => 120  # 再試行までのウェイト
+        :deniedSeqReq=> {    # 連続アクセス拒絶時
+          :retryLimit  => 3,   # 再試行回数の上限
+          :wait        => 120  # 再試行までのウェイト
         },
         
-        'serverIsBusy'=> {    # サーバ混雑時
-          'retryLimit'  => 3,
-          'wait'        => 120
+        :serverIsBusy=> {    # サーバ混雑時
+          :retryLimit  => 3,
+          :wait        => 120
         },
         
-        'serviceUnavailable' => { # 503時
-          'retryLimit'  => 3,
-          'wait'        => 120
+        :serviceUnavailable => { # 503時
+          :retryLimit  => 3,
+          :wait        => 120
         },
         
-        'timedOut' => {       # タイムアウト時
-          'retryLimit'  => 3,
-          'wait'        => 10
+        :timedOut => {       # タイムアウト時
+          :retryLimit  => 3,
+          :wait        => 10
         }
       }
 
@@ -39,7 +39,7 @@ module Nicos
 
       def Config.setWait(waitConfig)
         case waitConfig
-        when "default"
+        when :default
           @@waitConfig = @@waitConfigDefault
         when nil
         else

data/nicoscraper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{nicoscraper}
-  s.version = "0.2.9"
+  s.version = "0.2.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Masami Yonehara}]
-  s.date = %q{2011-09-29}
+  s.date = %q{2011-09-30}
   s.description = %q{It scrape movies and mylists of Niconico douga.
   }
   s.email = %q{zeitdiebe@gmail.com}

data/test/movie_spec.rb

@@ -1,16 +1,17 @@
 # -*- encoding: utf-8 -*-
-$:.unshift File.dirname(__FILE__) + "/../lib"
+#$:.unshift File.dirname(__FILE__) + "/../lib"
 
-require 'nicoscraper'
+require '../lib/nicoscraper.rb'
+
+describe Nicos::Movie, "After executiton of 'getInfo' method." +
+    "And for example, with passing argument (sm1097445)" do
 
-describe Nicos::Movie, "After executiton of 'getInfo' method" do  
   before(:all) do
     @movie = Nicos::Movie.new("sm1097445")
-    @movie.getInfo
-    p @movie
+    @result = @movie.getInfo
   end
 
-  it "should have following values" do
+  it "should have the following structure and values." do
     @movie.available    .should be_true
   
     @movie.video_id     .should == "sm1097445"
@@ -38,11 +39,21 @@ describe Nicos::Movie, "After executiton of 'getInfo' method" do
   end    
 
   it "should return true when execute 'isBelongsTo' method." +
-      "passing arguments (1450136)" do
+      "with passing arguments (1450136)" do
     result = @movie.isBelongsTo(1450136)
     result .should_not be_nil
     result .should be_true
   end
+
+  it "should return the following values." do
+    @result[:parsed]   .should be_instance_of(Hash)
+    @result[:status]   .should equal(:success)
+    @result[:retry]    .should have_key(:deniedSeqReq)
+    @result[:retry]    .should have_key(:serverIsBusy)
+    @result[:retry]    .should have_key(:serviceUnavailable)
+    @result[:retry]    .should have_key(:timedOut)
+
+  end
 end
 
 describe Nicos::Movie, "when access with non-existent video_id" do
@@ -55,36 +66,3 @@ describe Nicos::Movie, "when access with non-existent video_id" do
     @movie.available    .should be_false
   end    
 end
-
-describe Nicos::Mylist, "After executiton of 'getInfo' method" do  
-  before(:all) do
-    @mylist = Nicos::Mylist.new(15196568)
-    @mylist.getInfo
-    puts @mylist
-  end
-
-  it "should have following values" do
-    @mylist.available    .should be_true
-  
-    @mylist.mylist_id    .should == 15196568
-    @mylist.user_id      .should be_nil
-    @mylist.title        .should == "【Oblivion】おっさんの大冒険"
-    @mylist.description  .should_not be_nil
-    @mylist.public       .should be_nil
-    @mylist.default_sort .should be_nil
-    @mylist.create_time  .should be_nil
-    @mylist.update_time  .should_not be_nil
-
-    @mylist.icon_id      .should be_nil
-    @mylist.movies       .should_not be_nil
-    @mylist.movies       .should be_kind_of(Array)
-    @mylist.author       .should == "おぽこ"
-  end 
-
-  it "should return over 0.9 when execute 'getSimilarity' method." +
-      "passing arguments (1450136)" do
-    result = @mylist.getSimilarity
-    result .should_not be_nil
-    result .should >= 0.9
-  end
-end

data/test/mylist_spec.rb

@@ -3,33 +3,117 @@
 
 require '../lib/nicoscraper.rb'
 
-describe Nicos::Movie, "After executiton of 'getInfo' method" do  
+describe Nicos::Mylist, "After executiton of 'getInfo' method" +
+    "And for example, with passing argument (15196568)" do  
   before(:all) do
     @mylist = Nicos::Mylist.new(15196568)
     @mylist.getInfo
-    p @mylist
   end
 
-  it "should have following values" do
+
+  it "should have the following values" do
+    @mylist.available    .should be_true
+  
+    @mylist.mylist_id    .should == 15196568
+    @mylist.user_id      .should be_nil
+    @mylist.title        .should == "【Oblivion】おっさんの大冒険"
+    @mylist.description  .should_not be_nil
+    @mylist.public       .should be_nil
+    @mylist.default_sort .should be_nil
+    @mylist.create_time  .should be_nil
+    @mylist.update_time  .should_not be_nil
+
+    @mylist.icon_id      .should be_nil
+    @mylist.movies       .should_not be_nil
+    @mylist.movies       .should be_kind_of(Array)
+    @mylist.author       .should == "おぽこ"
+  end 
+
+
+  it "should have Movie class instances. and these have the following structure." do
     @mylist.available.should be_true
   
     @mylist.mylist_id.should === 15196568
-    @mylist.movies   .should be_instance_of(Array)
+    @mylist.movies          .should be_instance_of(Array)
 
     movieObj = @mylist.movies[0]
-    movieObj.available    .should be_true
+    movieObj.available      .should be_true
   
-    movieObj.video_id     .should_not be_nil
-    movieObj.title        .should_not be_nil
-    movieObj.first_retrieve  .should_not be_nil
+    movieObj.video_id       .should_not be_nil
+    movieObj.title          .should_not be_nil
+    movieObj.first_retrieve .should_not be_nil
     #movieObj.memo         .should_not be_nil
-    movieObj.description  .should_not be_nil
-    movieObj.thumbnail_url.should_not be_nil
-    movieObj.length       .should_not be_nil
+    movieObj.description    .should_not be_nil
+    movieObj.thumbnail_url  .should_not be_nil
+    movieObj.length         .should_not be_nil
 
-    movieObj.view_counter .should_not == 0
-    movieObj.comment_num  .should_not == 0
-    movieObj.mylist_counter.should_not == 0
+    movieObj.view_counter   .should_not == 0
+    movieObj.comment_num    .should_not == 0
+    movieObj.mylist_counter .should_not == 0
   end    
 
 end
+
+
+describe Nicos::Mylist, "After executiton of 'getInfo' method" +
+    "for non-existent mylist." do  
+  before(:all) do
+    @mylist = Nicos::Mylist.new(999999999)
+  end
+
+  it "should " do
+    r = @mylist.getInfo
+    r[:status]  .should === :notFound
+    r[:result]  .should be_nil
+
+    @mylist.available   .should_not be_true
+  end
+end
+
+
+describe Nicos::Mylist, "After executiton of 'getInfo' method" +
+    "for nonpublic mylist." do  
+  before(:all) do
+    @mylist = Nicos::Mylist.new(22947348)
+  end
+
+  it "should " do
+    r = @mylist.getInfo
+    r[:status]  .should === :notPublic
+    r[:result]  .should be_nil
+
+    @mylist.available   .should_not be_true
+  end
+end
+
+# マイリストは削除と404の区別がない？
+describe Nicos::Mylist, "After executiton of 'getInfo' method" +
+    "for deleted mylist." do  
+  before(:all) do
+    @mylist = Nicos::Mylist.new(23361251) # 自分のマイリストで、公開設定にしてから削除したもの。
+  end
+
+  it "should " do
+    r = @mylist.getInfo
+    # r["status]  .should === :deleted
+    r[:status]  .should === :notFound
+    r[:result]  .should be_nil
+
+    @mylist.available   .should_not be_true
+  end
+end
+
+
+describe Nicos::Mylist, "After executiton of 'getInfo' method" do  
+  before(:all) do
+    @mylist = Nicos::Mylist.new(15196568)
+    @mylist.getInfo
+  end
+
+  it "should return over 0.9 when execute 'getSimilarity' method." +
+      "passing arguments (1450136)" do
+    result = @mylist.getSimilarity
+    result .should_not be_nil
+    result .should >= 0.9
+  end
+end

data/test/searcher_spec.rb

@@ -7,15 +7,15 @@ require '../lib/nicoscraper.rb'
 describe "When execute 'Nicos::Connector::setWait" do
   before(:all) do
     wait = {
-      'seqAccLimit' => 100,
+      :seqAccLimit => 100,
      
-      'deniedSeqReq'=> {   
-        'retryLimit'  => 30,  
-        'wait'        => 1200  
+      :deniedSeqReq => {   
+        :retryLimit   => 30,  
+        :wait         => 1200  
       },
       
-      'serverIsBusy'=> {   
-        'retryLimit'  => 10
+      :serverIsBusy => {   
+        :retryLimit  => 10
       }
     }
 
@@ -25,49 +25,49 @@ describe "When execute 'Nicos::Connector::setWait" do
   it "should have following values." do
     c = Nicos::Searcher::ByTag.new()  
     c.waitConfig    .should_not be_nil
-    c.waitConfig["seqAccLimit"]
+    c.waitConfig[:seqAccLimit]
                     .should == 100
-    c.waitConfig["afterSeq"]
+    c.waitConfig[:afterSeq]
                     .should == 10
-    c.waitConfig["each"]
+    c.waitConfig[:each]
                     .should == 1
-    c.waitConfig["increment"]
+    c.waitConfig[:increment]
                     .should == 1
-    c.waitConfig["deniedSeqReq"]["retryLimit"]
+    c.waitConfig[:deniedSeqReq][:retryLimit]
                     .should == 30
-    c.waitConfig["deniedSeqReq"]["wait"]
+    c.waitConfig[:deniedSeqReq][:wait]
                     .should == 1200
-    c.waitConfig["serverIsBusy"]["retryLimit"]
+    c.waitConfig[:serverIsBusy][:retryLimit]
                     .should == 10
-    c.waitConfig["serverIsBusy"]["wait"]
+    c.waitConfig[:serverIsBusy][:wait]
                     .should == 120
-    c.waitConfig["serviceUnavailable"]["retryLimit"]
+    c.waitConfig[:serviceUnavailable][:retryLimit]
                     .should == 3
-    c.waitConfig["serviceUnavailable"]["wait"]
+    c.waitConfig[:serviceUnavailable][:wait]
                     .should == 120
-    c.waitConfig["timedOut"]["retryLimit"]
+    c.waitConfig[:timedOut][:retryLimit]
                     .should == 3
-    c.waitConfig["timedOut"]["wait"]
+    c.waitConfig[:timedOut][:wait]
                     .should == 10
   end
 
   after(:all) do
-    Nicos::Connector::Config::setWait("default")
+    Nicos::Connector::Config::setWait(:default)
   end  
 end
 
 describe "When execute 'Nicos::Connector::setWait" do
   before(:all) do
     wait = {
-      'seqAccLimit' => 100,
+      :seqAccLimit => 100,
      
-      'deniedSeqReq'=> {   
-        'retryLimit'  => 30,  
-        'wait'        => 1200  
+      :deniedSeqReq => {   
+        :retryLimit   => 30,  
+        :wait         => 1200  
       },
       
-      'serverIsBusy'=> {   
-        'retryLimit'  => 10
+      :serverIsBusy => {   
+        :retryLimit  => 10
       }
     }
 
@@ -79,55 +79,55 @@ describe "When execute 'Nicos::Connector::setWait" do
 
   it "should have following values." do
     @c1.waitConfig    .should_not be_nil
-    @c1.waitConfig["seqAccLimit"]
+    @c1.waitConfig[:seqAccLimit]
                     .should == 100
-    @c1.waitConfig["afterSeq"]
+    @c1.waitConfig[:afterSeq]
                     .should == 10
-    @c1.waitConfig["each"]
+    @c1.waitConfig[:each]
                     .should == 1
-    @c1.waitConfig["increment"]
+    @c1.waitConfig[:increment]
                     .should == 1
-    @c1.waitConfig["deniedSeqReq"]["retryLimit"]
+    @c1.waitConfig[:deniedSeqReq][:retryLimit]
                     .should == 30
-    @c1.waitConfig["deniedSeqReq"]["wait"]
+    @c1.waitConfig[:deniedSeqReq][:wait]
                     .should == 1200
-    @c1.waitConfig["serverIsBusy"]["retryLimit"]
+    @c1.waitConfig[:serverIsBusy][:retryLimit]
                     .should == 10
-    @c1.waitConfig["serverIsBusy"]["wait"]
+    @c1.waitConfig[:serverIsBusy][:wait]
                     .should == 120
-    @c1.waitConfig["serviceUnavailable"]["retryLimit"]
+    @c1.waitConfig[:serviceUnavailable][:retryLimit]
                     .should == 3
-    @c1.waitConfig["serviceUnavailable"]["wait"]
+    @c1.waitConfig[:serviceUnavailable][:wait]
                     .should == 120
-    @c1.waitConfig["timedOut"]["retryLimit"]
+    @c1.waitConfig[:timedOut][:retryLimit]
                     .should == 3
-    @c1.waitConfig["timedOut"]["wait"]
+    @c1.waitConfig[:timedOut][:wait]
                     .should == 10
 
     @c2.waitConfig    .should_not be_nil
-    @c2.waitConfig["seqAccLimit"]
+    @c2.waitConfig[:seqAccLimit]
                     .should == 10
-    @c2.waitConfig["afterSeq"]
+    @c2.waitConfig[:afterSeq]
                     .should == 10
-    @c2.waitConfig["each"]
+    @c2.waitConfig[:each]
                     .should == 1
-    @c2.waitConfig["increment"]
+    @c2.waitConfig[:increment]
                     .should == 1
-    @c2.waitConfig["deniedSeqReq"]["retryLimit"]
+    @c2.waitConfig[:deniedSeqReq][:retryLimit]
                     .should == 3
-    @c2.waitConfig["deniedSeqReq"]["wait"]
+    @c2.waitConfig[:deniedSeqReq][:wait]
                     .should == 120
-    @c2.waitConfig["serverIsBusy"]["retryLimit"]
+    @c2.waitConfig[:serverIsBusy][:retryLimit]
                     .should == 3
-    @c2.waitConfig["serverIsBusy"]["wait"]
+    @c2.waitConfig[:serverIsBusy][:wait]
                     .should == 120
-    @c2.waitConfig["serviceUnavailable"]["retryLimit"]
+    @c2.waitConfig[:serviceUnavailable][:retryLimit]
                     .should == 3
-    @c2.waitConfig["serviceUnavailable"]["wait"]
+    @c2.waitConfig[:serviceUnavailable][:wait]
                     .should == 120
-    @c2.waitConfig["timedOut"]["retryLimit"]
+    @c2.waitConfig[:timedOut][:retryLimit]
                     .should == 3
-    @c2.waitConfig["timedOut"]["wait"]
+    @c2.waitConfig[:timedOut][:wait]
                     .should == 10
   end
 end
@@ -136,38 +136,37 @@ describe "When execute 'Nicos::Searcher::ByTag.execute' method " +
           "and return a string except \"continue\" in this block" do  
   before(:all) do
     wait = {
-      'seqAccLimit' => 0,  # 連続してリクエストする回数
-      'afterSeq'    => 0,  # 連続リクエスト後のウェイト（以下全て単位は秒）
-      'each'        => 0,   # 連続リクエスト時の、1リクエスト毎のウェイト
+      :seqAccLimit => 100,  # 連続してリクエストする回数
+      :afterSeq    => 0,  # 連続リクエスト後のウェイト（以下全て単位は秒）
+      :each        => 0,   # 連続リクエスト時の、1リクエスト毎のウェイト
 
-      'increment'   => 0,   # アクセス拒絶時の、次回以降の1リクエスト毎のウェイトの増加量
+      :increment   => 0,   # アクセス拒絶時の、次回以降の1リクエスト毎のウェイトの増加量
 
-      'deniedSeqReq'=> {    # 連続アクセス拒絶時
-        'retryLimit'  => 3,   # 再試行回数の上限
-        'wait'        => 120  # 再試行までのウェイト
+      :deniedSeqReq=> {    # 連続アクセス拒絶時
+        :retryLimit  => 3,   # 再試行回数の上限
+        :wait        => 120  # 再試行までのウェイト
       },
       
-      'serverIsBusy'=> {    # サーバ混雑時
-        'retryLimit'  => 3,
-        'wait'        => 120
+      :serverIsBusy=> {    # サーバ混雑時
+        :retryLimit  => 3,
+        :wait        => 120
       },
       
-      'serviceUnavailable' => { # 503時
-        'retryLimit'  => 3,
-        'wait'        => 120
+      :serviceUnavailable => { # 503時
+        :retryLimit  => 3,
+        :wait        => 120
       },
       
-      'timedOut' => {       # タイムアウト時
-        'retryLimit'  => 3,
-        'wait'        => 10
+      :timedOut => {       # タイムアウト時
+        :retryLimit  => 3,
+        :wait        => 10
       }
     }
     Nicos::Connector::Config::setWait(wait)
-
     searcher = Nicos::Searcher::ByTag.new()
     @count = 0
 
-    searcher.execute("ゆっくり実況プレイpart1リンク", "post_old") { |result|
+    searcher.execute("ゆっくり実況プレイpart1リンク", :post_old) { |result|
       @count += 1
       "not continue"
     }
@@ -184,7 +183,7 @@ describe "When execute 'Nicos::Searcher::ByTag.execute' method " +
     searcher = Nicos::Searcher::ByTag.new()
     @count = 0
 
-    searcher.execute("ゆっくり実況プレイpart1リンク", "post_old") { |result|
+    searcher.execute("ゆっくり実況プレイpart1リンク", :post_old) { |result|
       @count += 1
       nil
     }
@@ -201,7 +200,7 @@ describe "When execute 'Nicos::Searcher::ByTag.execute' method " +
     searcher = Nicos::Searcher::ByTag.new()
     count = 0
 
-    searcher.execute("ゆっくり実況プレイpart1リンク", "post_old") { |result, status|
+    searcher.execute("ゆっくり実況プレイpart1リンク", :post_old:) { |result, status|
       @result = result
       @status = status
 p @status
@@ -236,11 +235,11 @@ p @status
   end   
 
   it "should contains movie objects that have following structure." do
-    @status["results"]["notPublic"]    .should be_instance_of(Array)
-    @status["results"]["limInCommunity"].should be_instance_of(Array)
-    @status["results"]["notFound"]     .should be_instance_of(Array)
-    @status["results"]["deleted"]      .should be_instance_of(Array)
-    @status["results"]["succeededNum"] .should >= 0
+    @status[:results][:notPublic]    .should be_instance_of(Array)
+    @status[:results][:limInCommunity].should be_instance_of(Array)
+    @status[:results][:notFound]     .should be_instance_of(Array)
+    @status[:results][:deleted]      .should be_instance_of(Array)
+    @status[:results][:succeededNum] .should >= 0
   end    
 end
 
@@ -250,7 +249,7 @@ describe "When execute 'Nicos::Searcher::ByTag.execute' method " +
     searcher = Nicos::Searcher::ByTag.new()
     count = 0
 
-    searcher.execute("アヤックス", "post_old") { |result, status|
+    searcher.execute("アヤックス", :post_old) { |result, status|
       @result = result
 
       count += 1
@@ -283,3 +282,25 @@ describe "When execute 'Nicos::Searcher::ByTag.execute' method " +
     @result[0].mylist_counter.should_not be_nil 
   end    
 end
+
+describe "When execute 'Nicos::Searcher::ByTag.execute' method " +
+          "and exception caused." do  
+  before(:all) do
+    searcher = Nicos::Searcher::ByTag.new()
+    count = 0
+
+    searcher.execute("アヤックス", :post_old) { |result, status|
+      @result = result
+
+      count += 1
+      puts count
+      "continue"
+    }
+  end
+
+  it "should have Array of movie objects." do
+    @result   .should be_kind_of(Array)
+    @result[0].should be_instance_of(Nicos::Movie)
+  end
+  
+end