nicovideo 0.0.6 → 0.1.0

data/ChangeLog

@@ -1,3 +1,8 @@
+2008-02-24  version 0.1.0
+
+	* added functions to search, tagsearch, ranking
+	* added low?() method(ref: http://d.hatena.ne.jp/hayori/20080218/1203312604)
+
 2008-02-16  version 0.0.6
 
 	* fixed bug of downloading video via mylist
@@ -10,6 +15,6 @@
 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 auto login (ref: http://d.hatena.ne.jp/zorio/20080122/1201018583)
 	* added published_at method to VideoPage
 	* did unit tests

data/lib/nicovideo.rb

@@ -8,8 +8,10 @@ require 'nicovideo/videopage'
 require 'nicovideo/comments'
 require 'nicovideo/mylist'
 require 'nicovideo/openlist'
+require 'nicovideo/search'
+require 'nicovideo/tagsearch'
+require 'nicovideo/ranking'
 #require 'nicovideo/tags'
 #require 'nicovideo/ichiba'
-#require 'nicovideo/rank'
 #require 'nicovideo/feed'
 

data/lib/nicovideo/base.rb

@@ -105,14 +105,25 @@ module Nicovideo
       OpenList.new(@agent, video_id)
     end
     
-    # not implemented
-    def ranking options=nil
-      Ranking.new(@agent, options)
+    # type : 'mylist', 'view' or 'res'
+    # span : 'daily', 'newarrival', 'weekly', 'monthly', 'total'
+    # category : 'all', 'music' ... and more
+    def ranking(type='mylist', span='daily', category='all', pagenum=nil)
+      Ranking.new(@agent, type, span, category, pagenum).to_a
     end
 
-    # not implemented
-    def search option=nil
-      Search.new(@agent, options)
+    # keyword : search keyword
+    # sort    : nil -> published date
+    #           'v' -> playback times
+    #           'n' -> commented date
+    #           'r' -> comment number
+    #           'm' -> mylist number
+    def search(keyword, sort=nil, order=nil, pagenum=1)
+      Search.new(@agent, keyword, sort, order, pagenum)
+    end
+
+    def tagsearch(keyword, sort=nil, order=nil, pagenum=1)
+      TagSearch.new(@agent, keyword, sort, order, pagenum)
     end
 
     private

data/lib/nicovideo/openlist.rb

@@ -29,12 +29,12 @@ module Nicovideo
     end
 
     def each
-      @mylists.each {|ml|
+      self.mylists.each {|ml|
         yield ml
       }
     end
 
-    def to_a() mylists end
+    def to_a() self.mylists end
 
     def pagenum=(pagenum)
       if @pagenum != pagenum
@@ -56,7 +56,7 @@ module Nicovideo
       self.pagenum = @pagenum - 1
     end
 
-    private
+    protected
     def parse(page)
       if page.body =~ /<strong>#{@video_id}<\/strong> を含む公開マイリストはありません。/
           @not_found = true

data/lib/nicovideo/page.rb

@@ -60,7 +60,7 @@ E
       return @page if (@page && !force) 
       raise NotFound if @not_found
 
-      puts_info 'getting html page : url = ' + url
+      puts_info 'getting html page : url = ' + url.to_s
       begin
         page = @agent.get(url)
         puts_debug page.header

data/lib/nicovideo/ranking.rb

@@ -0,0 +1,37 @@
+module Nicovideo
+  class Ranking < Page
+    def initialize agent, type='mylist', span='daily', category='all', pagenum=nil
+      super(agent)
+      @type     = type
+      @category = category
+      @pagenum  = pagenum
+      @url      = url()
+      self.register_getter ["videos"]
+    end
+
+    # call whenever pagenum changed
+    def url
+      url = "#{BASE_URL}/ranking/#{@type}/#{@span}/#{@category}"
+      if @pagenum
+        url += '?page=' + pagenum.to_s
+      end
+      url
+    end
+
+    def to_a
+      videos()
+    end
+
+    protected
+    def parse(page)
+      ranking = page/'h3/a[@class=video]'
+      @videos = ranking.inject([]) {|arr,v| #
+        #puts v.attributes['href']
+        vp = VideoPage.new(@agent, v.attributes['href'].sub(/#{BASE_URL}\/watch\/(\w+)$/,'\1'))
+        vp.title = v.inner_html
+        arr << vp
+      }
+    end
+
+  end
+end

data/lib/nicovideo/search.rb

@@ -0,0 +1,86 @@
+require 'cgi'
+
+module Nicovideo
+  class Search < Page
+    include Enumerable
+
+    def initialize agent, keyword, sort=nil, order=nil, pagenum=1
+      super(agent)
+      @search_type = 'search'
+      @keyword = CGI.escape(CGI.escape(keyword)) # なぜか2回エスケープが必要？
+      @order   = order
+
+      params = ["videos", "total_size", "has_next?", "has_prev?"]
+      self.register_getter params
+
+      @url = url()
+    end
+
+    def url
+      url = "#{BASE_URL}/#{@search_type}?ref=top&s=#{@keyword}"
+      url += '&sort='  + @sort  if @sort
+      url += '&order=' + @order if @order
+      url
+    end
+
+    def each
+      self.videos.each {|v|
+        yield v
+      }
+    end
+
+    def to_a() self.videos 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
+
+    protected
+    def parse(page)
+      if page.body =~ /<\/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
+      
+      result_xpath = page/'div[@class="thumb_R"]/p[@class="TXT12"]/a[@class="video"]'
+      puts result_xpath.size.to_s
+      @videos = result_xpath.inject([]) {|arr, v|
+        vp = VideoPage.new(@agent, v.attributes['href'].sub(/watch\/(\w+)$/,'\1'))
+        vp.title = v.inner_html
+        arr << vp
+      }
+
+    end
+    
+  end
+end

data/lib/nicovideo/tagsearch.rb

@@ -0,0 +1,13 @@
+require 'cgi'
+
+module Nicovideo
+  class TagSearch < Search
+
+    def initialize agent, keyword, sort=nil, order=nil, pagenum=1
+      super(agent, keyword, sort, order, pagenum)
+      @search_type = 'tag'
+      @url = url()
+    end
+
+  end
+end

data/lib/nicovideo/version.rb

@@ -1,8 +1,8 @@
 module Nicovideo #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 0
-    TINY  = 6
+    MINOR = 1
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/nicovideo/videopage.rb

@@ -50,6 +50,12 @@ module Nicovideo
       OpenList.new(@agent, @video_id)
     end
 
+    def low?
+      @params ||= get_params
+      return true if CGI.unescape(@params['url']) =~ /low$/
+      return false
+    end
+
     private
     def parse(page)
       # title

data/test/test_openlist.rb

@@ -13,6 +13,13 @@ class TestNicovideoOpenList < Test::Unit::TestCase
     @vid_notfound = 'sm500875' # 公開マイリストが存在しない
   end
 
+  def test_openlist_testing
+    result = @nv.openlist("sm500873")
+    result.each {|v|
+      puts v.title
+    }
+  end
+
   def test_openlist_valid
     ol = nil
     assert_nothing_raised {

data/test/test_ranking.rb

@@ -0,0 +1,30 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestNicovideoRanking < Test::Unit::TestCase
+  
+  def setup
+    account = YAML.load_file(ENV['HOME'] + '/.nicovideo/account.yml')
+    @nv = Nicovideo.new(account['mail'], account['password'])
+    @nv.login
+  end
+
+  def test_ranking_valid
+    rv = nil
+    assert_nothing_raised {
+      rv = @nv.ranking
+    }
+
+    rv.each {|v|
+      puts v.id + ':' + v.published_at.to_s + ':' + v.title
+      sleep 1
+    }
+
+    sleep 1
+  end
+
+  def test_ranking_invalid
+  end
+
+  def test_ranking_notopened
+  end
+end

data/test/test_search.rb

@@ -0,0 +1,66 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestNicovideoSearch < Test::Unit::TestCase
+  
+  def setup
+    account = YAML.load_file(ENV['HOME'] + '/.nicovideo/account.yml')
+    @nv = Nicovideo.new(account['mail'], account['password'])
+    @nv.login
+  end
+
+  def test_search_testing0
+    result = @nv.search("aaa")
+    puts result.total_size
+    result.each {|v|
+      puts v.title
+    }
+    sleep 1
+  end
+
+  def test_search_testing1
+    result = @nv.search("ミク")
+    result.each {|v|
+      puts v.title
+    }
+    sleep 1
+  end
+
+  def test_search_testing2
+    result = @nv.search("ミク", 'n')
+    result.each {|v|
+      puts v.title
+    }
+    sleep 1
+  end
+
+  def test_search_testing3
+    result = @nv.search("ミク", 'n', 'd')
+    result.each {|v|
+      puts v.title
+    }
+    sleep 1
+  end
+  
+  
+=begin  
+  def test_search_valid
+    rv = nil
+    assert_nothing_raised {
+      rv = @nv.ranking
+    }
+
+    rv.each {|v|
+      puts v.id + ':' + v.published_at.to_s + ':' + v.title
+      sleep 1
+    }
+
+    sleep 1
+  end
+
+  def test_search_invalid
+  end
+
+  def test_search_notopened
+  end
+=end
+end

data/test/test_tagsearch.rb

@@ -0,0 +1,65 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestNicovideoTagSearch < Test::Unit::TestCase
+  
+  def setup
+    account = YAML.load_file(ENV['HOME'] + '/.nicovideo/account.yml')
+    @nv = Nicovideo.new(account['mail'], account['password'])
+    @nv.login
+  end
+
+  def test_tagsearch_testing0
+    result = @nv.tagsearch("aaa")
+    puts result.total_size
+    result.each {|v|
+      puts v.title
+    }
+    sleep 1
+  end
+
+  def test_tagsearch_testing1
+    result = @nv.tagsearch("ミク")
+    result.each {|v|
+      puts v.title
+    }
+    sleep 1
+  end
+
+  def test_tagsearch_testing1
+    result = @nv.tagsearch("ミク", 'v', 'a')
+    result.each {|v|
+      puts v.title
+    }
+    sleep 1
+  end
+
+  def test_search_testing2
+    result = @nv.tagsearch("ミク", 'n')
+    result.each {|v|
+      puts v.title
+    }
+  end
+  
+  
+=begin  
+  def test_search_valid
+    rv = nil
+    assert_nothing_raised {
+      rv = @nv.ranking
+    }
+
+    rv.each {|v|
+      puts v.id + ':' + v.published_at.to_s + ':' + v.title
+      sleep 1
+    }
+
+    sleep 1
+  end
+
+  def test_search_invalid
+  end
+
+  def test_search_notopened
+  end
+=end
+end

data/test/test_videopage.rb

@@ -8,7 +8,7 @@ class TestNicovideoVideoPage < Test::Unit::TestCase
     @nv.login
 
 #    @vid_valid    = 'sm500873' # 閲覧可能(組曲)
-    @vid_valid    = 'sm1892625' # 閲覧可能(短い動画)
+    @vid_valid    = 'sm2407057' # 閲覧可能(短い動画)
     @vid_invalid  = 'smfdsafd' # IDが間違っている
     @vid_notfound = 'sm500875' # 削除済み
   end
@@ -20,6 +20,7 @@ class TestNicovideoVideoPage < Test::Unit::TestCase
       vp = @nv.watch(@vid_valid)
     }
     assert_nothing_raised { vp.flv }
+    sleep 5
   end
 =begin
   def test_watch_valid

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: nicovideo
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
-date: 2008-02-16 00:00:00 +09:00
+  version: 0.1.0
+date: 2008-02-24 00:00:00 +09:00
 summary: utils for nicovideo
 require_paths: 
 - lib
@@ -43,6 +43,9 @@ files:
 - lib/nicovideo/comments.rb
 - lib/nicovideo/mylist.rb
 - lib/nicovideo/openlist.rb
+- lib/nicovideo/ranking.rb
+- lib/nicovideo/search.rb
+- lib/nicovideo/tagsearch.rb
 - test/test_helper.rb
 - test/runner.rb
 - test/test_nicovideo.rb
@@ -50,6 +53,9 @@ files:
 - test/test_videopage.rb
 - test/test_mylist.rb
 - test/test_openlist.rb
+- test/test_ranking.rb
+- test/test_search.rb
+- test/test_tagsearch.rb
 - sample/nv_download.rb
 - sample/nv_download2.rb
 - sample/nv_mylist.rb
@@ -58,9 +64,12 @@ test_files:
 - test/test_openlist.rb
 - test/test_nicovideo.rb
 - test/test_mylist.rb
+- test/test_ranking.rb
+- test/test_tagsearch.rb
 - test/test_videopage.rb
 - test/test_helper.rb
 - test/test_login.rb
+- test/test_search.rb
 rdoc_options: 
 - --main
 - README.txt