niconico 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6c8ec6d8e97f5b09a642ef672cdeeb5abd92ab3
-  data.tar.gz: c90979d2f36e626d1560cba1e469f01222043931
+  metadata.gz: 36a98bd1ac8a923065e75fb31ce853304d878dd6
+  data.tar.gz: 6117581998277bd370b01516ab7f4f33c5f07c6c
 SHA512:
-  metadata.gz: 55c044ba6cd293d95491271834e994774697df728f897028bf1f924544f382ddc13cb5679833d80761453f6f93baf217a52bb2c5030e884be97da2dd24216993
-  data.tar.gz: 6f2bdf570c70d805a4b266de5bc2bbe62d84dcf50df3fbe969288657db088e2d4d677150ccd356e26ab90cfd23f8f4b3300379eb3d99f0fbe989c2f6ff78dc2d
+  metadata.gz: f597570ac2329a7cd8da0bb401e735aa1242e2da6e35eb4d80d369ada23e1ca1deebe9cc7541afb6b9be4088b62b6aebb006c90251ad4adb910b5d669482ee0d
+  data.tar.gz: e8b48d6985978f6f00d3fd3d7965c36661b289824d7346066a16beb34cf1787683e1baaf8f89a4a65a036037365cc424162520e9532b9dd93a4e9ff1067971e8

data/CONTRIBUTING.md

@@ -0,0 +1,7 @@
+- __You should use English__ for commits, pull request's title, description, and comments basically.
+
+  - I'll ask you to do translation if you've posted in Japanese.
+  - Don't worry for poor English :)
+  - 基本英語でコミットコメントを残し、pull request のタイトル、コメントを書いてください。
+  - 日本語で書いた場合英語にするようにお願いをしています。
+

data/lib/niconico.rb

@@ -46,3 +46,4 @@ end
 require_relative './niconico/video'
 require_relative './niconico/mylist'
 require_relative './niconico/ranking'
+require_relative './niconico/channel'

data/lib/niconico/channel.rb

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+require 'json'
+require 'open-uri'
+require 'nokogiri'
+require_relative './video'
+
+class Niconico
+  def channel_videos(ch)
+    login unless @logined
+
+    rss = Nokogiri::XML(open("http://ch.nicovideo.jp/#{ch}/video?rss=2.0", &:read))
+
+    rss.search('channel item').map do |item|
+      title = item.at('title').inner_text
+      link = item.at('link').inner_text
+      Video.new(self, link.sub(/^.+\/watch\//, ''), title: title)
+    end
+  end
+end

data/lib/niconico/version.rb

@@ -1,3 +1,3 @@
 class Niconico
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

data/lib/niconico/video.rb

@@ -20,6 +20,7 @@ class Niconico
     def initialize(parent, video_id, defer=nil)
       @parent = parent
       @agent = parent.agent
+      @fetched = false
       @thread_id = @id = video_id
       @url = "#{Niconico::URL[:watch]}#{@id}"
 
@@ -35,6 +36,7 @@ class Niconico
     end
 
     def economy?; @eco; end
+    def fetched?; @fetched; end
 
     def get(options = {})
       begin
@@ -67,31 +69,41 @@ class Niconico
       @description ||= d.inner_html unless d.nil?
 
       @video_url = getflv[:url]
-      @eco = !(/low$/ =~ @video_url).nil?
-      @type = case @video_url.match(/^http:\/\/(.+\.)?nicovideo\.jp\/smile\?(.+?)=.*$/).to_a[2]
-              when 'm'; :mp4
-              when 's'; :swf
-              else;     :flv
-              end
+      if @video_url
+        @eco = !(/low$/ =~ @video_url).nil?
+        @type = case @video_url.match(/^http:\/\/(.+\.)?nicovideo\.jp\/smile\?(.+?)=.*$/).to_a[2]
+                when 'm'; :mp4
+                when 's'; :swf
+                else;     :flv
+                end
+      end
       @tags ||= @page.search("#video_tags a[rel=tag]").map(&:inner_text)
       @mylist_comment ||= nil
 
+      @fetched = true
       @page
     end
 
+    def available?
+      !!video_url
+    end
+
     def get_video
-      @agent.get_file(@video_url)
+      raise VideoUnavailableError unless available?
+      @agent.get_file(video_url)
     end
 
     def get_video_by_other
+      raise VideoUnavailableError unless available?
       {cookie: @agent.cookie_jar.cookies(URI.parse(@video_url)),
-       url: @video_url}
+       url: video_url}
     end
 
     def inspect
-      "#<Niconico::Video: #{@id}.#{@type} \"#{@title}\"#{@eco ? " low":""}>"
+      "#<Niconico::Video: #{@id}.#{@type} \"#{@title}\"#{@eco ? " low":""}#{(fetched? && !@video_url) ? ' (unavailable)' : ''}#{fetched? ? '' : ' (defered)'}>"
     end
 
     class NotFound < StandardError; end
+    class VideoUnavailableError < StandardError; end
   end
 end

data/niconico.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |s|
   s.description = "wrapper of Mechanize, optimized for nicovideo. :)"
 
   s.add_dependency "mechanize", '>= 2.7.3'
+  s.add_dependency "nokogiri", '>= 1.6.1'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: niconico
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Shota Fukumori (sora_h)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.3
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.1
 description: wrapper of Mechanize, optimized for nicovideo. :)
 email:
 - her@sorah.jp
@@ -32,10 +46,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CONTRIBUTING.md
 - Gemfile
 - README.mkd
 - Rakefile
 - lib/niconico.rb
+- lib/niconico/channel.rb
 - lib/niconico/mylist.rb
 - lib/niconico/ranking.rb
 - lib/niconico/version.rb