nicovideo 0.1.3 → 0.1.4

data/README.txt

@@ -15,7 +15,7 @@ See sample/nv_download.rb
 
 == Author
 
-- emergent ( http://d.hatena.ne.jp/emergent )
+- Satoshi Yoshikawa / emergent ( http://d.hatena.ne.jp/emergent )
 - thanks for many bloggers who wrote scraping scripts 
 
 == License

data/Rakefile

@@ -1,4 +1,24 @@
-require 'config/requirements'
-require 'config/hoe' # setup Hoe + all gem configuration
-
-Dir['tasks/**/*.rake'].each { |rake| load rake }
+require 'config/requirements'
+require 'config/hoe' # setup Hoe + all gem configuration
+
+require 'rake/contrib/rubyforgepublisher'
+
+Dir['tasks/**/*.rake'].each { |rake| load rake }
+
+Rake::RDocTask.new do |rdoc|
+  rdoc.rdoc_dir = 'html'
+  rdoc.options += RDOC_OPTS
+  rdoc.template = "#{ENV['template']}.rb" if ENV['template']
+  if ENV['DOC_FILES']
+    rdoc.rdoc_files.include(ENV['DOC_FILES'].split(/,\s*/))
+  else
+    rdoc.rdoc_files.include('README.txt', 'ChangeLog')
+    rdoc.rdoc_files.include('lib/**/*.rb')
+  end
+end
+
+desc "Publish to RubyForge"
+task :rubyforge => [:rdoc, :package] do
+  Rake::RubyForgePublisher.new(RUBYFORGE_PROJECT, 'emergent').upload
+end
+

data/lib/nicovideo.rb

@@ -11,6 +11,8 @@ require 'nicovideo/openlist'
 require 'nicovideo/search'
 require 'nicovideo/tagsearch'
 require 'nicovideo/ranking'
+require 'nicovideo/random'
+require 'nicovideo/newarrival'
 #require 'nicovideo/tags'
 #require 'nicovideo/ichiba'
 #require 'nicovideo/feed'

data/lib/nicovideo/base.rb

@@ -104,6 +104,14 @@ module Nicovideo
     def openlist(video_id)
       OpenList.new(@agent, video_id)
     end
+
+    def random()
+      Random.new(@agent)
+    end
+
+    def newarrival(pagenum=1)
+      Newarrival.new(@agent,pagenum)
+    end
     
     # type : 'mylist', 'view' or 'res'
     # span : 'daily', 'newarrival', 'weekly', 'monthly', 'total'

data/lib/nicovideo/newarrival.rb

@@ -0,0 +1,34 @@
+module Nicovideo
+  class Newarrival < Page
+    include Enumerable
+
+    def initialize(agent, pagenum)
+      super(agent)
+
+      @pagenum = pagenum > 10 ? 10 : pagenum
+
+      params = ["videos"]
+      self.register_getter params
+
+      @url = url()
+    end
+
+    def parse(page)
+      result_xpath = page/'//div[@class="cmn_thumb_R"]//p[@class="TXT12"]/a[@class="video"]'
+      @videos = result_xpath.inject([]) do |arr, v|
+        vp = VideoPage.new(@agent, v.attributes['href'].sub(/watch\/(\w+)$/,'\1'))
+        vp.title = v.inner_html
+        arr << vp
+      end
+    end
+
+    def each
+      self.videos.each {|v| yield v }
+    end
+
+    def url
+      opt = '?page=' + @pagenum.to_s if @pagenum
+      "#{BASE_URL}/newarrival#{opt}"
+    end
+  end
+end

data/lib/nicovideo/random.rb

@@ -0,0 +1,38 @@
+module Nicovideo
+  class Random < Page
+    include Enumerable
+
+    def initialize agent
+      super(agent)
+      @url = url()
+      self.register_getter ["videos"]
+    end
+
+    def each
+      self.videos.each {|v| yield v }
+    end
+
+    def url
+      "#{BASE_URL}/random"
+    end
+
+    def to_a
+      videos()
+    end
+
+    def reload
+    end
+
+    protected
+    def parse(page)
+      result_xpath = page/'//td[@class="random_td"]//p[@class="TXT12"]/a[@class="video"]'
+      @videos = result_xpath.inject([]) {|arr,v| #
+        #puts v.attributes['href']
+        vp = VideoPage.new(@agent, v.attributes['href'].sub(/watch\/(\w+)$/,'\1'))
+        vp.title = v.inner_html
+        arr << vp
+      }
+    end
+
+  end
+end

data/lib/nicovideo/version.rb

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

data/lib/nicovideo/videopage.rb

@@ -15,6 +15,20 @@ module Nicovideo
 
     def id()   @video_id end
 
+    def type
+      @params ||= get_params
+      pattern = %r!^http://.*\.nicovideo\.jp/smile\?(.*?)=.*$!
+      CGI.unescape(@params['url']) =~ pattern
+      case $1
+      when 'm'
+        return 'mp4'
+      when 's'
+        return 'swf'
+      else
+        return 'flv'
+      end
+    end
+
     def comments(num=500)
       puts_info 'getting comment xml : id = ' + @video_id
       begin

data/test/test_mylist.rb

@@ -35,7 +35,7 @@ class TestNicovideoMyList < Test::Unit::TestCase
     ml.title = "test"
     assert_equal("test", ml.title)
 
-    sleep 1
+    sleep 5
   end
 
   def test_mylist_invalid
@@ -51,7 +51,7 @@ class TestNicovideoMyList < Test::Unit::TestCase
     assert_raise(Nicovideo::NotFound) { ml.description }
     assert_raise(Nicovideo::NotFound) { ml.videos }
 
-    sleep 1
+    sleep 5
   end
 
   def test_mylist_notopened
@@ -67,6 +67,6 @@ class TestNicovideoMyList < Test::Unit::TestCase
     assert_raise(Nicovideo::Forbidden) { ml.description }
     assert_raise(Nicovideo::Forbidden) { ml.videos }
 
-    sleep 1
+    sleep 5
   end
 end

data/test/test_newarrival.rb

@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestNicovideoNewarrival < 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.newarrival
+    }
+
+    rv.each {|v|
+#      puts v.id + ':' + v.published_at.to_s + ':' + v.title
+      puts v.id + ':' + v.title
+#      sleep 1
+    }
+
+    sleep 1
+  end
+
+  def test_ranking_invalid
+  end
+
+  def test_ranking_notopened
+  end
+end

data/test/test_random.rb

@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestNicovideoRandom < 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.random
+    }
+
+    rv.each {|v|
+#      puts v.id + ':' + v.published_at.to_s + ':' + v.title
+      puts v.id + ':' + v.title
+#      sleep 1
+    }
+
+    sleep 1
+  end
+
+  def test_ranking_invalid
+  end
+
+  def test_ranking_notopened
+  end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: nicovideo
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
-date: 2008-03-16 00:00:00 +09:00
+  version: 0.1.4
+date: 2008-03-20 00:00:00 +09:00
 summary: utils for nicovideo
 require_paths: 
 - lib
@@ -46,6 +46,8 @@ files:
 - lib/nicovideo/ranking.rb
 - lib/nicovideo/search.rb
 - lib/nicovideo/tagsearch.rb
+- lib/nicovideo/newarrival.rb
+- lib/nicovideo/random.rb
 - test/test_helper.rb
 - test/runner.rb
 - test/test_nicovideo.rb
@@ -56,6 +58,8 @@ files:
 - test/test_ranking.rb
 - test/test_search.rb
 - test/test_tagsearch.rb
+- test/test_newarrival.rb
+- test/test_random.rb
 - sample/nv_download.rb
 - sample/nv_download2.rb
 - sample/nv_mylist.rb
@@ -67,9 +71,11 @@ test_files:
 - test/test_mylist.rb
 - test/test_ranking.rb
 - test/test_tagsearch.rb
+- test/test_newarrival.rb
 - test/test_videopage.rb
 - test/test_helper.rb
 - test/test_login.rb
+- test/test_random.rb
 - test/test_search.rb
 rdoc_options: 
 - --main