nicovideo 0.0.3 → 0.0.4

data/ChangeLog

@@ -0,0 +1,7 @@
+2008-02-02  version 0.0.4
+
+	* added functions to get mylist and openlist
+	* auto login (ref: http://d.hatena.ne.jp/zorio/20080122/1201018583)
+	* added published_at method to VideoPage
+	* did unit tests
+

data/lib/nicovideo.rb

@@ -1,10 +1,13 @@
 $:.unshift File.dirname(__FILE__)
 
+require 'rubygems'
 require 'nicovideo/mechanize-ext'
 require 'nicovideo/base'
-require 'nicovideo/video'
+require 'nicovideo/page'
 require 'nicovideo/videopage'
 require 'nicovideo/comments'
+require 'nicovideo/mylist'
+require 'nicovideo/openlist'
 #require 'nicovideo/tags'
 #require 'nicovideo/ichiba'
 #require 'nicovideo/rank'

data/lib/nicovideo/base.rb

@@ -1,49 +1,83 @@
 module Nicovideo
 
-  class NicovideoArgError      < StandardError ; end
-  class NicovideoLoginError    < StandardError ; end
-  class NicovideoNotFoundError < StandardError ; end
+  class ArgError         < StandardError ; end
+  class LoginError       < StandardError ; end
+  class NotFound         < StandardError ; end
+  class Forbidden        < StandardError ; end
+#  class NotOpened        < StandardError ; end
+#  class OpenListNotFound < StandardError ; end
+#  class MyListNotFound   < StandardError ; end
 
   class Base
 
-    def initialize mail=nil, password=nil
+    def initialize mail=nil, password=nil, auto_login=true
       @mail = mail
       @password = password
-      @logged_in = false
       @agent = WWW::Mechanize.new()
-      
+      agent_init(auto_login)
+      @agent.set_account(@mail, @password)
+
       # for parameters current video
       @vp = nil
       self
     end
-    
-    def login mail=nil, password=nil
-      if !@logged_in
-        @mail = mail unless @mail
-        @password = password unless @password
-        account = {'mail' => @mail, 'password' => @password }
-        
-        begin
-          @agent.post('https://secure.nicovideo.jp/secure/login?site=niconico', account)
-          # TODO: check login success or failure
-          @logged_in = true
-        rescue
-          @logged_in = false
-          raise NicovideoLoginError
+
+    def agent_init auto_login=true
+      @agent.instance_eval do
+        alias raw_get get
+        alias raw_post post
+ 
+        def set_account(mail, password) @mail=mail; @password=password end
+        def authenticated?(page)
+          page.header['x-niconico-authflag'] != '0'
+        end
+
+        def login
+          raise ArgError unless (@mail && @password)
+          account = {'mail' => @mail, 'password' => @password }
+          res = raw_post('https://secure.nicovideo.jp/secure/login?site=niconico', account)
+          raise LoginError unless authenticated?(res)
+        end
+      end
+
+      if auto_login
+        @agent.instance_eval do
+          @wait_time = 3
+          def get(*args) try(:raw_post, *args) end
+          def post(*args) try(:raw_post, *args) end
+          
+          def try(name, *args)
+            page = method(name).call(*args)
+            unless authenticated?(page)
+              self.login
+              sleep @wait_time
+              page = method(name).call(*args)
+              raise LoginError unless authenticated?(page)
+            end
+            page
+          end
         end
       end
+      
+    end
+    
+    def login mail=nil, password=nil
+      @mail     ||= mail
+      @password ||= password
+      @agent.set_account(@mail, @password)
+      @agent.login
       self
     end
 
     def watch(video_id)
-      @vp = get_videopage(video_id)
+      videopage = get_videopage(video_id)
+      @vp = videopage
       if block_given?
-        yield @vp
+        yield videopage
       end
+      videopage
     end
 
-    def logged_in?() @logged_in end
-
     def get_tags(video_id)
       get_videopage(video_id).tags
     end
@@ -64,10 +98,16 @@ module Nicovideo
       get_videopage(video_id).comments(num)
     end
 
+    def mylist(mylist_id)
+      MyList.new(@agent, mylist_id)
+    end
+
+    def openlist(video_id)
+      OpenList.new(@agent, video_id)
+    end
+
     private
     def get_videopage(video_id)
-      self.login unless @logged_in
-
       if @vp.nil? || video_id != @vp.video_id
         @vp = VideoPage.new(@agent, video_id)
       end

data/lib/nicovideo/mylist.rb

@@ -0,0 +1,41 @@
+require 'kconv'
+
+
+require 'rss/2.0'
+require 'rss/1.0'
+
+module Nicovideo
+  class MyList < Page
+    NICO_MYLIST = 'マイリスト'
+
+    def initialize agent, mylist_id
+      super(agent)
+      @mylist_id = mylist_id
+      @raw_url = BASE_URL + '/mylist/' + @mylist_id
+      @url     = BASE_URL + '/mylist/' + @mylist_id + '?rss=2.0'
+
+      params = ["title", "user", "description", "videos", "rss"]
+      self.register_getter params
+    end
+    
+    attr_reader :myliset_id
+
+    def id()  @mylist_id end
+    def url() @raw_url   end
+
+    private
+    def parse(page)
+      @rss = RSS::Parser.parse(page.body)
+      @title = rss.channel.title.sub(/#{BASE_TITLE+NICO_MYLIST} /, '')
+      @user  = rss.channel.managingEditor
+      @description = rss.channel.description
+
+      @videos = rss.items.collect {|i|
+        vp = VideoPage.new(@agent, i.link.sub(/^.*watch\/(\w+)$/, '\1'))
+        vp.title = i.title
+        vp
+      }
+
+    end
+  end
+end

data/lib/nicovideo/openlist.rb

@@ -0,0 +1,88 @@
+require 'kconv'
+
+module Nicovideo
+
+  # This class doesn't access NICONICO DOUGA when an instance created.
+  # At the first time you call this instance method, this accesses NICONICO
+  class OpenList < Page
+    include Enumerable
+    
+    def initialize agent, video_id, pagenum=1, sort='c', order='d'
+      super(agent)
+      @video_id = video_id
+      @pagenum  = pagenum
+      @sort     = sort
+      @order    = order
+      @url      = url()
+
+      params = ["mylists", "total_size", "has_next?", "has_prev?"]
+      self.register_getter params
+    end
+
+    attr_reader :pagenum
+
+    def id() @video_id end
+
+    # call whenever pagenum changed
+    def url
+      @url = BASE_URL + '/openlist/' + @video_id + "?page=#{@pagenum}&sort=#{@sort}&order=#{@order}"
+    end
+
+    def each
+      @mylists.each {|ml|
+        yield ml
+      }
+    end
+
+    def to_a() mylists end
+
+    def pagenum=(pagenum)
+      if @pagenum != pagenum
+        @pagenum = pagenum
+        get_page(self.url, true)
+      end
+      @pagenum
+    end
+
+    def page=(pagenum)
+      self.pagenum = pagenum
+    end
+
+    def next
+      self.pagenum = @pagenum + 1
+    end
+
+    def prev
+      self.pagenum = @pagenum - 1
+    end
+
+    private
+    def parse(page)
+      if page.body =~ /<strong>#{@video_id}<\/strong> を含む公開マイリストはありません。/
+          @not_found = true
+          raise NotFound
+      end
+
+      @total_size = page.search('form[@name="sort"]//td[@class="TXT12"]//strong').first.inner_html.to_i
+      if (page/'a//img[@src="http://res.nicovideo.jp/img/common/pager_next_on.gif"]').size > 0
+        @has_next = true
+      else
+        @has_next = false
+      end
+
+      if (page/'a//img[@src="http://res.nicovideo.jp/img/common/pager_back_on.gif"]').size > 0
+        @has_prev = true
+      else 
+        @has_prev = false
+      end
+
+      scanpattern = /<a href=\"#{BASE_URL}\/mylist\/(\d+)\">(.+?)<\/a>/ou
+      listrefs = page.parser.to_html.scan(scanpattern)
+      @mylists = listrefs.inject([]) {|arr, v| # v[0]: mylist id, v[1]: mylist title
+        ml = MyList.new(@agent, v[0])
+        ml.title = v[1]
+        arr << ml
+      }
+    end
+  end
+end

data/lib/nicovideo/page.rb

@@ -0,0 +1,91 @@
+require 'kconv'
+
+module Nicovideo
+
+  class Page
+    NV_DEBUG_LEVEL = 0
+
+    BASE_URL = 'http://www.nicovideo.jp'
+    BASE_TITLE  = 'ニコニコ動画\(RC\)‐'.toutf8
+
+    def initialize agent
+      @agent = agent
+      @page  = nil
+      @title = nil
+
+      @not_found = false
+    end
+    
+    public
+    def exists?()
+      begin
+        @page = @page || get_page
+        return true
+      rescue
+        return false
+      end
+    end
+
+    def html()
+      page = @page || get_page
+      return nil unless page
+      page.parser.to_html
+    end
+
+    def title=(title)
+      @title = title
+    end
+
+    protected
+    def register_getter(params)
+      params.each {|p|
+        p_noq = p.sub(/\?$/,'')
+        eval <<E
+          @#{p_noq} = nil
+          def #{p}
+            if @#{p_noq}.nil?
+              @page ||= get_page(@url)
+            end
+            @#{p_noq}
+          end
+E
+      }
+    end
+    
+    def parse page
+      # to be extended
+    end
+
+    def get_page url, force=false
+      return @page if (@page && !force) 
+      raise NotFound if @not_found
+
+      puts_info 'getting html page : url = ' + url
+      begin
+        page = @agent.get(url)
+        puts_debug page.header
+        puts_debug page.body
+
+        parse(page)
+        @page = page
+      rescue WWW::Mechanize::ResponseCodeError => e
+        rc = e.response_code
+        puts_info rc
+        if rc == "404" || rc == "410"
+          @not_found = true
+          raise NotFound
+        elsif rc == "403"
+          raise Forbidden
+        else
+          raise e
+        end
+      end
+      @page
+    end
+
+    def puts_error str ; puts str if (NV_DEBUG_LEVEL >= 1) ; end
+    def puts_info  str ; puts str if (NV_DEBUG_LEVEL >= 2) ; end
+    def puts_debug str ; puts str if (NV_DEBUG_LEVEL >= 3) ; end
+  end
+
+end

data/lib/nicovideo/version.rb

@@ -2,7 +2,7 @@ module Nicovideo #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/nicovideo/videopage.rb

@@ -2,36 +2,25 @@ require 'kconv'
 require 'cgi'
 
 module Nicovideo
-  class VideoPage
-    NV_DEBUG_LEVEL = 0
-    TITLE_NICONICO = 'ニコニコ動画\(RC\)‐'.toutf8
-
-    def initialize agent, video_id=nil
-      @agent    = agent
+  class VideoPage < Page
+    def initialize agent, video_id
+      super(agent)
       @video_id = video_id
       @params   = nil
-      @page     = nil
+      @url      = BASE_URL + '/watch/' + @video_id
+      register_getter ["title", "tags", "published_at"]
     end
 
-    attr_reader :video_id
-
-    def exists?()
-      begin
-        @page = @page || get_page
-        return true
-      rescue
-        return false
-      end
-    end
+    attr_reader :video_id, :url
 
-    def id() @video_id end
+    def id()   @video_id end
 
     def comments(num=500)
       puts_info 'getting comment xml : id = ' + @video_id
       begin
-        @params = @params || get_params
+        @params = get_params unless @params
         ms = @params['ms']
-        raise unless ms
+        raise ArgError unless ms
         
         thread_id = @params['thread_id']
         body = %!<thread res_from="-#{num}" version="20061206" thread="#{thread_id}" />!
@@ -46,36 +35,46 @@ module Nicovideo
 
     def video()
       begin
-        @params = @params || get_params
+        @params ||= get_params
         video_url = CGI.unescape(@params['url'])
         video_flv = @agent.get_file(video_url)
         video_flv
       end
     end
 
-    def tags()
-      @page = @page || get_page
-      div = @page.parser.search("div#video_tags")
-      tags = div.to_html.scan(/<a href=\"tag\/[\w\%]+?\">(.+?)<\/a>/ou).inject([]) {|arr, v|
-        puts_debug v[0]
-        arr << v[0]
-      }
-      tags
+    def title=(title)
+      @title = title
     end
 
-    def title()
-      @page = @page || get_page
-      title = @page.title
-      title.toutf8.sub(/^#{TITLE_NICONICO}/ou, '')
+    def openlist(page=1)
+      OpenList.new(@agent, @video_id)
     end
 
     private
+    def parse(page)
+      # title
+      @title = page.title.toutf8.sub(/^#{BASE_TITLE}/ou, '')
+
+      # tags
+      div = page.parser.search("div#video_tags")
+      @tags = div.to_html.scan(/<a href=\"tag\/[\w\%]+?\">(.+?)<\/a>/ou).inject([]) {|arr, v|
+        puts_debug v[0]
+        arr << v[0]
+      }
+
+      # published_at
+      str = page.search("div[@id='WATCHHEADER']//p[@class='TXT12']/strong")[0].inner_text
+      tm = str.scan(/\d+/)
+      @published_at = Time.mktime(*tm)
+    end
+    
     def get_params
+      raise NotFound if @not_found
       begin
         unless @params
           puts_info 'getting params : id = ' + @video_id
-          @page = @page || get_page
-          content = @agent.get_file('http://www.nicovideo.jp/api/getflv?v=' + @video_id)
+          @page = get_videopage unless @page
+          content = @agent.get_file(BASE_URL + '/api/getflv?v=' + @video_id)
           puts_debug content
           @params = content.scan(/([^&]+)=([^&]*)/).inject({}){|h, v| h[v[0]] = v[1]; h}
         else
@@ -83,23 +82,9 @@ module Nicovideo
         end
         @params
       rescue
-        raise NicovideoNotFoundError
+        @not_found = true
+        raise NotFound
       end
     end
-
-    def get_page
-      if @video_id
-        puts_info 'getting HTML page : id = ' + @video_id
-        begin
-          @agent.get('http://www.nicovideo.jp/watch/' + @video_id)
-        rescue
-          raise NicovideoNotFoundError
-        end
-      end
-    end
-
-    def puts_error str ; puts str if (NV_DEBUG_LEVEL >= 1) ; end
-    def puts_info  str ; puts str if (NV_DEBUG_LEVEL >= 2) ; end
-    def puts_debug str ; puts str if (NV_DEBUG_LEVEL >= 3) ; end
   end
 end

data/sample/nv_download.rb

@@ -9,8 +9,11 @@ account = YAML.load_file(ENV['HOME'] + '/.nicovideo/account.yml')
 mail = account['mail']
 password = account['password']
 
-# you must login to Nicovideo
-nv = Nicovideo.new(mail, password).login
+# create instance
+nv = Nicovideo.new(mail, password)
+
+# login to Nicovideo (you don't need to login explicitly at v 0.0.4 or later)
+nv.login
 
 # get videos and comments
 video_ids.each {|video_id|

data/sample/nv_download2.rb

@@ -9,8 +9,11 @@ account = YAML.load_file(ENV['HOME'] + '/.nicovideo/account.yml')
 mail = account['mail']
 password = account['password']
 
-# you must login to Nicovideo
-nv = Nicovideo.new(mail, password).login
+# create instance
+nv = Nicovideo.new(mail, password)
+
+# login to Nicovideo (you don't need to login explicitly at v 0.0.4 or later)
+nv.login
 
 # get videos and comments
 video_ids.each {|video_id|

data/sample/nv_mylist.rb

@@ -0,0 +1,37 @@
+require 'rubygems'
+require 'nicovideo'
+require 'yaml'
+
+mylist_ids = ARGV
+
+# set account
+account = YAML.load_file(ENV['HOME'] + '/.nicovideo/account.yml')
+mail = account['mail']
+password = account['password']
+
+# create instance
+nv = Nicovideo.new(mail, password)
+
+# login to Nicovideo (you don't need to login explicitly at v 0.0.4 or later)
+nv.login
+
+# get mylist
+mylist_ids.each {|mylist_id|
+
+  ml = nv.mylist(mylist_id)
+  # method 'id' and 'mylist_id' return mylist ID(string).
+  puts 'mylist id = ' + ml.id
+
+  # method 'title', 'user' and 'description' return string.
+  puts 'title = ' + ml.title
+  puts 'user = ' + ml.user
+  puts 'description = ' + ml.description
+  
+  # method 'videos' returns array of VideoPage.
+  videos = ml.videos
+  videos.each {|v|
+    puts v.id
+  }
+
+  sleep 3
+}

data/sample/nv_openlist.rb

@@ -0,0 +1,35 @@
+require 'rubygems'
+require 'nicovideo'
+require 'yaml'
+
+video_ids = ARGV
+
+# set account
+account = YAML.load_file(ENV['HOME'] + '/.nicovideo/account.yml')
+mail = account['mail']
+password = account['password']
+
+# create instance
+nv = Nicovideo.new(mail, password)
+
+# login to Nicovideo (you don't need to login explicitly at v 0.0.4 or later)
+nv.login
+
+# get openlist
+video_ids.each {|video_id|
+
+  ol = nv.openlist(video_id)
+  # method 'id' and 'video_id' return video ID(string).
+  puts 'video id = ' + ol.id
+
+  # method 'total_size' returns Fixnum.
+  puts 'total_size = ' + ol.total_size.to_s
+  
+  # method 'mylists' returns array of MyList.
+  begin
+    mls = ol.mylists
+    mls.each {|ml| puts ml.id + ':' + ml.title }
+    sleep 1
+  end while (ol.has_next? && ol.next)
+  
+}

data/test/test_login.rb

@@ -0,0 +1,38 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestNicovideoLogin < Test::Unit::TestCase
+
+  def setup
+  end
+
+  def test_login_OK
+    valid_account = YAML.load_file(ENV['HOME'] + '/.nicovideo/account.yml')
+    nv = Nicovideo.new(valid_account['mail'], valid_account['password'])
+
+    assert_nothing_raised { nv.login }
+
+    sleep 1
+  end
+
+  def test_login_NG
+    invalid_account = {'mail' => 'invalid@account.com', 'password' => 'invalid' }
+    nv = Nicovideo.new(invalid_account['mail'], invalid_account['password'])
+
+    assert_raise(Nicovideo::LoginError) {
+      nv.login
+    }
+
+    sleep 1
+  end
+
+  def test_auto_login
+    valid_account = YAML.load_file(ENV['HOME'] + '/.nicovideo/account.yml')
+    nv = Nicovideo.new(valid_account['mail'], valid_account['password'])
+
+    assert_nothing_raised {
+      nv.watch('sm500873') {|v|
+        puts v.title
+      }
+    }
+  end
+end

data/test/test_mylist.rb

@@ -0,0 +1,72 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestNicovideoMyList < Test::Unit::TestCase
+  
+  def setup
+    account = YAML.load_file(ENV['HOME'] + '/.nicovideo/account.yml')
+    @nv = Nicovideo.new(account['mail'], account['password'])
+    @nv.login
+
+    @mid_valid    = '3982404' # 公開マイリスト
+    @mid_invalid  = 'smfdsaf' # IDが間違っている
+    @mid_notopened = '3825220' # 非公開
+  end
+
+  def test_mylist_valid
+    ml = nil
+    assert_nothing_raised {
+      ml = @nv.mylist(@mid_valid)
+    }
+    assert_instance_of(Nicovideo::MyList, ml)
+    puts ml.id
+    puts ml.url
+    puts ml.title
+    puts ml.description
+    puts ml.videos.size
+    ml.videos.each {|v| 
+      puts v.id + ' ' + v.title
+    }
+    assert_equal(@mid_valid, ml.id)
+    assert_equal("http://www.nicovideo.jp/mylist/"+@mid_valid, ml.url)
+    assert_instance_of(String, ml.title)
+    assert_instance_of(String, ml.description)
+    assert_instance_of(Array,  ml.videos)
+
+    ml.title = "test"
+    assert_equal("test", ml.title)
+
+    sleep 1
+  end
+
+  def test_mylist_invalid
+    ml = nil
+    assert_nothing_raised {
+      ml = @nv.mylist(@mid_invalid)
+    }
+
+    assert_equal(@mid_invalid,  ml.id)
+    assert_equal("http://www.nicovideo.jp/mylist/"+@mid_invalid, ml.url)
+
+    assert_raise(Nicovideo::NotFound) { ml.title }
+    assert_raise(Nicovideo::NotFound) { ml.description }
+    assert_raise(Nicovideo::NotFound) { ml.videos }
+
+    sleep 1
+  end
+
+  def test_mylist_notopened
+    ml = nil
+    assert_nothing_raised {
+      ml = @nv.mylist(@mid_notopened)
+    }
+
+    assert_equal(@mid_notopened,  ml.id)
+    assert_equal("http://www.nicovideo.jp/mylist/"+@mid_notopened, ml.url)
+
+    assert_raise(Nicovideo::Forbidden) { ml.title }
+    assert_raise(Nicovideo::Forbidden) { ml.description }
+    assert_raise(Nicovideo::Forbidden) { ml.videos }
+
+    sleep 1
+  end
+end

data/test/test_nicovideo.rb

@@ -1,11 +1,11 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class TestNicovideo < Test::Unit::TestCase
-
-  def setup
-  end
-  
-  def test_truth
-    assert true
-  end
-end
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestNicovideo < Test::Unit::TestCase
+
+  def setup
+  end
+  
+  def test_truth
+    assert true
+  end
+end

data/test/test_openlist.rb

@@ -0,0 +1,101 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestNicovideoOpenList < Test::Unit::TestCase
+
+  def setup
+    account = YAML.load_file(ENV['HOME'] + '/.nicovideo/account.yml')
+    @nv = Nicovideo.new(account['mail'], account['password'])
+    @nv.login
+
+    @vid_valid    = 'sm500873' # 公開マイリストが存在（単一ページ）
+    @vid_valid2   = 'sm500873' # 公開マイリストが存在（複数ページ）
+    @vid_invalid  = 'smfdsafd' # IDがおかしい（動画が存在しない）
+    @vid_notfound = 'sm500875' # 公開マイリストが存在しない
+  end
+
+  def test_openlist_valid
+    ol = nil
+    assert_nothing_raised {
+      ol = @nv.openlist(@vid_valid)
+    }
+    assert_instance_of(Nicovideo::OpenList, ol)
+    assert_instance_of(Array,               ol.mylists)
+    assert_instance_of(Array,               ol.to_a)
+    assert_instance_of(Fixnum,              ol.total_size)
+    assert_instance_of(Fixnum,              ol.pagenum)
+    assert(ol.has_next?)
+    assert(!ol.has_prev?)
+
+    assert_nothing_raised {
+      ol.pagenum = 2
+    }
+
+    assert_equal(ol.pagenum, 2)
+    assert(ol.has_next?)
+    assert(ol.has_prev?)
+
+    assert_nothing_raised {
+      ol.next
+    }
+
+    assert_equal(ol.pagenum, 3)
+
+    sleep 1
+  end
+
+  def test_openlist_valid2
+    ol = nil
+
+    assert_nothing_raised {
+      @nv.watch(@vid_valid) {|v|
+        ol = v.openlist
+      }
+    }
+      
+    assert_instance_of(Nicovideo::OpenList, ol)
+    assert_instance_of(Array,               ol.mylists)
+    assert_instance_of(Array,               ol.to_a)
+    assert_instance_of(Fixnum,              ol.total_size)
+    assert_instance_of(Fixnum,              ol.pagenum)
+    assert(ol.has_next?)
+    assert(!ol.has_prev?)
+
+    sleep 1
+  end
+
+  def test_openlist_invalid
+    ol = nil
+    assert_nothing_raised {
+      ol = @nv.openlist(@vid_invalid)
+    }
+
+    assert_instance_of(Nicovideo::OpenList, ol)
+    assert_raise(Nicovideo::NotFound) { ol.mylists }
+    assert_raise(Nicovideo::NotFound) { ol.to_a }
+    assert_raise(Nicovideo::NotFound) { ol.total_size }
+    assert_raise(Nicovideo::NotFound) { ol.has_next? }
+    assert_raise(Nicovideo::NotFound) { ol.has_prev? }
+    assert_raise(Nicovideo::NotFound) { ol.next }
+    assert_raise(Nicovideo::NotFound) { ol.prev }
+
+    sleep 1
+  end
+
+  def test_openlist_notfound
+    ol = nil
+    assert_nothing_raised {
+      ol = @nv.openlist(@vid_notfound)
+    }
+
+    assert_instance_of(Nicovideo::OpenList, ol)
+    assert_raise(Nicovideo::NotFound) { ol.mylists }
+    assert_raise(Nicovideo::NotFound) { ol.to_a }
+    assert_raise(Nicovideo::NotFound) { ol.total_size }
+    assert_raise(Nicovideo::NotFound) { ol.has_next? }
+    assert_raise(Nicovideo::NotFound) { ol.has_prev? }
+    assert_raise(Nicovideo::NotFound) { ol.next }
+    assert_raise(Nicovideo::NotFound) { ol.prev }
+
+    sleep 1
+  end
+end

data/test/test_videopage.rb

@@ -0,0 +1,79 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestNicovideoVideoPage < Test::Unit::TestCase
+
+  def setup
+    account = YAML.load_file(ENV['HOME'] + '/.nicovideo/account.yml')
+    @nv = Nicovideo.new(account['mail'], account['password'])
+    @nv.login
+
+    @vid_valid    = 'sm500873' # 閲覧可能(組曲)
+    @vid_invalid  = 'smfdsafd' # IDが間違っている
+    @vid_notfound = 'sm500875' # 削除済み
+  end
+
+  # TODO: add test cases of openlist and mylist 
+  def test_watch_valid
+    vp = nil
+    assert_nothing_raised {
+      vp = @nv.watch(@vid_valid)
+    }
+    assert_instance_of(Nicovideo::VideoPage, vp)
+    assert_instance_of(Array,                vp.tags)
+    assert_instance_of(String,               vp.title)
+    assert_instance_of(Nicovideo::Comments,  vp.comments)
+    # assert_instance_of(String, vp.flv)
+    # assert_instance_of(String, vp.video)
+
+    sleep 1
+  end
+
+  def test_watch_valid2
+    vp = nil
+    assert_nothing_raised {
+      @nv.watch(@vid_valid) {|v|
+        assert_instance_of(Nicovideo::VideoPage, v)
+        assert_instance_of(Array,                v.tags)
+        assert_instance_of(String,               v.title)
+        assert_instance_of(Nicovideo::Comments,  v.comments)
+        # assert_instance_of(String, v.flv)
+        # assert_instance_of(String, v.video)
+      }
+    }
+
+    sleep 1
+  end
+
+  # watchは、VideoPageインスタンスを返すのみなので例外発生なし
+  # VideoPageインスタンスのメソッドを実行したときに例外発生
+  def test_watch_invalid
+    vp = nil
+    assert_nothing_raised {
+      vp = @nv.watch(@vid_invalid)
+    }
+    assert_instance_of(Nicovideo::VideoPage, vp)
+    assert_raise(Nicovideo::NotFound) { vp.tags }
+    assert_raise(Nicovideo::NotFound) { vp.title }
+    assert_raise(Nicovideo::NotFound) { vp.comments }
+    assert_raise(Nicovideo::NotFound) { vp.flv }
+    assert_raise(Nicovideo::NotFound) { vp.video }
+
+    sleep 1
+  end
+
+  # watchは、VideoPageインスタンスを返すのみなので例外発生なし
+  def test_watch_notfound
+    vp = nil
+    assert_nothing_raised {
+      vp = @nv.watch(@vid_notfound)
+    }
+    assert_instance_of(Nicovideo::VideoPage, vp)
+    assert_raise(Nicovideo::NotFound) { vp.tags }
+    assert_raise(Nicovideo::NotFound) { vp.title }
+    assert_raise(Nicovideo::NotFound) { vp.comments }
+    assert_raise(Nicovideo::NotFound) { vp.flv }
+    assert_raise(Nicovideo::NotFound) { vp.video }
+
+    sleep 1
+  end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: nicovideo
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
-date: 2008-01-09 00:00:00 +09:00
+  version: 0.0.4
+date: 2008-02-02 00:00:00 +09:00
 summary: utils for nicovideo
 require_paths: 
 - lib
@@ -30,6 +30,7 @@ authors:
 - emergent
 files: 
 - README.txt
+- ChangeLog
 - Rakefile
 - config/hoe.rb
 - config/requirements.rb
@@ -37,16 +38,29 @@ files:
 - lib/nicovideo/version.rb
 - lib/nicovideo/mechanize-ext.rb
 - lib/nicovideo/base.rb
+- lib/nicovideo/page.rb
 - lib/nicovideo/videopage.rb
-- lib/nicovideo/video.rb
 - lib/nicovideo/comments.rb
+- lib/nicovideo/mylist.rb
+- lib/nicovideo/openlist.rb
 - test/test_helper.rb
 - test/test_nicovideo.rb
+- test/test_login.rb
+- test/test_videopage.rb
+- test/test_mylist.rb
+- test/test_openlist.rb
 - sample/nv_download.rb
 - sample/nv_download2.rb
+- sample/nv_mylist.rb
+- sample/nv_openlist.rb
 test_files: 
+- test/test_openlist.rb
+- test/test_runner.rb
 - test/test_nicovideo.rb
+- test/test_mylist.rb
+- test/test_videopage.rb
 - test/test_helper.rb
+- test/test_login.rb
 rdoc_options: 
 - --main
 - README.txt

data/lib/nicovideo/video.rb

@@ -1,13 +0,0 @@
-# not used
-module Nicovideo
-  class Video
-    def initialize video_id, data
-      @video_id = video_id
-      @data     = data
-    end
-    
-    def id()    @video_id end
-    def flv()   @data end
-    def video() @data end
-  end
-end