nicovideo 0.1.7 → 0.1.8

data/Rakefile

@@ -1,3 +1,9 @@
+class NilClass
+  def empty?
+    true
+  end
+end
+
 require 'config/requirements'
 require 'config/hoe' # setup Hoe + all gem configuration
 

data/config/hoe.rb

@@ -62,7 +62,8 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   p.changes = p.paragraphs_of("ChangeLog", 0..1).join("\\n\\n")
   #p.extra_deps = []     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
   p.extra_deps = [
-                  ['mechanize', '>=0.6.0']
+                  ['mechanize', '>=0.9.2'],
+		  ['json', '>=1.1.4']
                  ]
   #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
 end

data/lib/nicovideo/mylist.rb

@@ -3,6 +3,7 @@ require 'kconv'
 
 require 'rss/2.0'
 require 'rss/1.0'
+require 'json'
 
 module Nicovideo
   class MyList < Page
@@ -23,10 +24,45 @@ module Nicovideo
     def id()  @mylist_id end
     def url() @raw_url   end
 
+    def add(video_id)
+      video_page = VideoPage.new @agent, video_id
+
+      begin
+        add_result = @agent.post(video_page.url, {
+            :mylist => "add",
+            :mylistgroup_name => "",
+            :csrf_token => video_page.csrf_token,
+            :group_id => @mylist_id,
+            :ajax => "1"})
+
+        result_code = JSON.parse(add_result.body.sub(/^\(?(.*?)\)?$/, '\1'))
+
+        if result_code["result"] == "success" then
+          # added video isn't applied to rss immediately, so add video into list by hand.
+          page = @page || get_page(@url)
+          @videos << video_page
+          return self
+        end
+        raise ArgError if result_code["result"] == "duperror"
+        raise StandardError
+      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
+    end
+
     private
     def parse(page)
       @rss = RSS::Parser.parse(page.body)
-      @title = rss.channel.title.sub(/#{BASE_TITLE2+NICO_MYLIST} /, '')
+      @title = rss.channel.title.sub(/#{BASE_TITLE1}/,'').sub(/#{NICO_MYLIST} /, '')
       @user  = rss.channel.managingEditor
       @description = rss.channel.description
 

data/lib/nicovideo/openlist.rb

@@ -61,24 +61,24 @@ module Nicovideo
 
     protected
     def parse(page)
-      if page.body =~ /<strong>#{@video_id}<\/strong>を含む公開マイリストはありません。/
+      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.sub(/,/,'').to_i
+      @total_size = page.search('//div[@class="mb8p4"]//p[@class="TXT12"]//strong').first.inner_html.sub(/,/,'').to_i
 
       @has_next = false
       @has_prev = false
-      respages = page/'//div[@class="mb16p4"]//p[@class="TXT12"]//a'
+      respages = page/'//div[@class="pagelink"]'
       puts_info respages.size
       respages.each {|r| puts_info r.inner_html }
       if respages.size > 0
         respages.each {|text|
-          if text.inner_html =~ /前のページ/
+          if text.inner_html =~ /<a class="prevpage".*?>.*?戻る.*?<\/a>/
             @has_prev = true
           end
-          if text.inner_html =~ /次のページ/
+          if text.inner_html =~ /<a class="nextpage".*?>.*?進む.*?<\/a>/
             @has_next = true
           end
         }

data/lib/nicovideo/page.rb

@@ -6,8 +6,8 @@ module Nicovideo
     NV_DEBUG_LEVEL = 0
 
     BASE_URL = 'http://www.nicovideo.jp'
-    BASE_TITLE1  = '‐ニコニコ動画\(秋\)'.toutf8
-    BASE_TITLE2  = 'ニコニコ動画\(秋\)‐'.toutf8
+    BASE_TITLE1  = '‐ニコニコ動画\(.*?\)'.toutf8
+    BASE_TITLE2  = 'ニコニコ動画\(.*?\)‐'.toutf8
 
     def initialize agent
       @agent = agent

data/lib/nicovideo/search.rb

@@ -68,19 +68,19 @@ module Nicovideo
           raise NotFound
       end
 
-      @total_size = page.search('form[@name="sort"]//td[@class="TXT12"]//strong').first.inner_html.sub(/,/,'').to_i
+      @total_size = page.search('strong[@class="search_total"]').first.inner_html.sub(/,/,'').to_i
 
       @has_next = false
       @has_prev = false
-      respages = page/'//div[@class="mb16p4"]//p[@class="TXT12"]//a'
+      respages = page/'//div[@class="pagelink"]'
       puts_info respages.size
       respages.each {|r| puts_info r.inner_html }
       if respages.size > 0
         respages.each {|text|
-          if text.inner_html =~ /前のページ/
+          if text.inner_html =~ /<a class="prevpage".*?>.*?戻る.*?<\/a>/
             @has_prev = true
           end
-          if text.inner_html =~ /次のページ/
+          if text.inner_html =~ /<a class="nextpage".*?>.*?進む.*?<\/a>/
             @has_next = true
           end
         }

data/lib/nicovideo/thumbnail.rb

@@ -18,7 +18,7 @@ module Nicovideo
 			retry_count = 0
       begin
         body = timeout(wait_sec) do
-          open("http://www.nicovideo.jp/api/getthumbinfo/#{video_id}", :proxy => @proxy_url) do |f|
+          open("http://ext.nicovideo.jp/api/getthumbinfo/#{video_id}", :proxy => @proxy_url) do |f|
             f.read
           end
         end
@@ -34,11 +34,14 @@ module Nicovideo
 		end
 		
 		def get_elements(parent)
-			thumbnail_info = {}
+			thumbnail_info = ThumbInfo.new
 
 			parent.each_element do |element|
-				if element.has_elements? then
-					thumbnail_info[element.name] = element.texts # doesn't support recursive xml.
+				if element.name == 'tags' then
+          thumbnail_info.tags[element.attributes['domain']] = []
+          element.each_element do |child|
+            thumbnail_info.tags[element.attributes['domain']] << child.text
+          end
 					next
 			  end
 				thumbnail_info[element.name] = element.text
@@ -46,4 +49,20 @@ module Nicovideo
   		thumbnail_info
 		end
 	end
+
+  class ThumbInfo < Hash
+    attr_accessor :tags
+    def initialize
+      @tags = {}
+    end
+
+    def has_tag?(tag)
+      @tag_hash ||= tag_flatten.inject({}) {|tag_hash, temp_tag| tag_hash[temp_tag] = temp_tag}
+      @tag_hash.has_key? tag
+    end
+
+    def tag_flatten
+      @tag_flatten ||= @tags.values.flatten
+    end
+  end
 end

data/lib/nicovideo/version.rb

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

data/lib/nicovideo/videopage.rb

@@ -8,7 +8,7 @@ module Nicovideo
       @video_id = video_id
       @params   = nil
       @url      = BASE_URL + '/watch/' + @video_id
-      register_getter ["title", "tags", "published_at"]
+      register_getter ["title", "tags", "published_at", "csrf_token"]
     end
 
     attr_reader :video_id, :url
@@ -86,6 +86,9 @@ module Nicovideo
       str = page.search("div[@id='WATCHHEADER']//p[@class='TXT12']/strong")[0].inner_text
       tm = str.scan(/\d+/)
       @published_at = Time.mktime(*tm)
+      
+      # csrf_token
+      @csrf_token = page.search("form[@name='mylist_form']//input[@name='csrf_token']")[0]['value']
     end
     
     def get_params

data/test/test_mylist.rb

@@ -10,6 +10,9 @@ class TestNicovideoMyList < Test::Unit::TestCase
     @mid_valid    = '3982404' # 公開マイリスト
     @mid_invalid  = 'smfdsaf' # IDが間違っている
     @mid_notopened = '3825220' # 非公開
+    #@mid_testers_own = '12149071'     # テスト用アカウントに登録されているマイリストのID
+
+    @vid_valid    = 'sm2407057' # 閲覧可能(短い動画)
   end
 
   def test_mylist_valid
@@ -69,4 +72,21 @@ class TestNicovideoMyList < Test::Unit::TestCase
 
     sleep 5
   end
+
+  def test_add
+    ml = nil
+    assert_nothing_raised {
+      ml = @nv.mylist(@mid_testers_own)
+    }
+
+    # FIXME removing video function is NOT implemented,
+    # so you MUST remove video from mylist before test.
+    assert_nothing_raised {
+      ml.add @vid_valid
+    }
+
+    assert_equal(@vid_valid, ml.videos.last.video_id)
+
+    sleep 5
+  end
 end

data/test/test_videopage.rb

@@ -8,7 +8,8 @@ class TestNicovideoVideoPage < Test::Unit::TestCase
     @nv.login
 
 #    @vid_valid    = 'sm500873' # 閲覧可能(組曲)
-    @vid_valid    = 'sm2407057' # 閲覧可能(短い動画)
+    #@vid_valid    = 'sm2407057' # 閲覧可能(短い動画)
+    @vid_valid    = 'sm9' # 閲覧可能(短い動画)
     @vid_invalid  = 'smfdsafd' # IDが間違っている
     @vid_notfound = 'sm500875' # 削除済み
   end
@@ -40,10 +41,12 @@ class TestNicovideoVideoPage < Test::Unit::TestCase
     assert_instance_of(String,               vp.title)
     assert_instance_of(Time,                 vp.published_at)
     assert_instance_of(Nicovideo::Comments,  vp.comments)
+    assert_instance_of(String,               vp.csrf_token)
 
     puts vp.tags
     puts vp.title
     puts vp.published_at
+    puts vp.csrf_token
  #   assert_nothing_raised { vp.flv }
     #assert_instance_of(String, vp.flv)
     #assert_instance_of(String, vp.video)
@@ -60,6 +63,7 @@ class TestNicovideoVideoPage < Test::Unit::TestCase
         assert_instance_of(Array,                v.tags)
         assert_instance_of(String,               v.title)
         assert_instance_of(Nicovideo::Comments,  v.comments)
+        assert_instance_of(String,               v.csrf_token)
         # assert_instance_of(String, v.flv)
         # assert_instance_of(String, v.video)
       }
@@ -81,6 +85,7 @@ class TestNicovideoVideoPage < Test::Unit::TestCase
     assert_raise(Nicovideo::NotFound) { vp.comments }
     assert_raise(Nicovideo::NotFound) { vp.flv }
     assert_raise(Nicovideo::NotFound) { vp.video }
+    assert_raise(Nicovideo::NotFound) { vp.csrf_token }
 
     sleep 1
   end
@@ -97,6 +102,7 @@ class TestNicovideoVideoPage < Test::Unit::TestCase
     assert_raise(Nicovideo::NotFound) { vp.comments }
     assert_raise(Nicovideo::NotFound) { vp.flv }
     assert_raise(Nicovideo::NotFound) { vp.video }
+    assert_raise(Nicovideo::NotFound) { vp.csrf_token }
 
     sleep 1
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nicovideo
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - emergent
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-09 00:00:00 +09:00
+date: 2009-05-01 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,17 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.0
+        version: 0.9.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: json
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.1.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe