niconico 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f18309964d6f29767de3ae7b97e2fb729cb128a8
-  data.tar.gz: a435cf5c3044951a6068df200298a062a2f88b1e
+  metadata.gz: f3206a2fa1c511105d47e732cdfc0a112c324e96
+  data.tar.gz: 393d00222c2354bcd57fca25e24b6f863bfbc100
 SHA512:
-  metadata.gz: 1e561eea62e13e2f9d91ebc2da2250d943fd4e9162d7c26a931c1518bc3e2f907f7528f4103fb5092568a5be5a37957c7c2a69979fb6e8712828d35454f7daa7
-  data.tar.gz: b0e9642cc454d46d145206c73b4da59980a76ca22afaf2de505847da4f2e8f4cfb0317b76434506c9f7d3ad4a9af1f4bb6ef577a417c4cf368355010734039cf
+  metadata.gz: df5ee49a049b077e2bc7fe61597d003cdd3dfa12663e4ea118acc1e9f32bc74b0eb4274f226071493d39ba6ae1d9a46abc7789e446ae16780c0b46ad94e1b7fd
+  data.tar.gz: f3ec9f17c59f053471c8cf34ae7874b3216f569824d09259e9ef8849a0af6dd56362aea5d46962eb811974109b1fd8981bddb9d4c3bff5ada07939891adee54d

data/lib/niconico.rb

@@ -14,19 +14,26 @@ class Niconico
 
   TEST_VIDEO_ID = "sm9"
 
-  attr_reader :agent, :logined
+  attr_reader :agent
+
+  def logged_in?; @logged_in; end
+  alias logined logged_in?
 
   def initialize(*args)
     case args.size
     when 2
       @mail, @pass = args
     when 1
-      @token = args.first
+      if args.first.kind_of?(Hash)
+        @mail, @pass, @token = args.first.values_at(:mail, :password, :token)
+      else
+        @token = args.first
+      end
     else
       raise ArgumentError, "wrong number of arguments (#{args.size} for 1..2)"
     end
 
-    @logined = false
+    @logged_in = false
 
     @agent = Mechanize.new.tap do |agent|
       agent.user_agent = "Niconico.gem (#{Niconico::VERSION}, https://github.com/sorah/niconico)"
@@ -42,19 +49,32 @@ class Niconico
   end
 
   def login(force=false)
-    return false if !force && @logined
-
-    if @token
+    return false if !force && @logged_in
+
+    if @token && @mail && @pass
+      begin
+        login_with_token
+      rescue LoginError
+        login_with_email
+      end
+    elsif @token
       login_with_token
     elsif @mail && @pass
       login_with_email
     else
-      raise 'huh? (may be bug)'
+      raise ArgumentError, 'Insufficient options for logging in (token or/and pair of mail and password required)'
     end
   end
 
   def inspect
-    "#<Niconico: #{@mail || '(token)'}, #{@logined ? "" : "not "}logined>"
+    "#<Niconico: #{@mail || '(token)'}, #{@logged_in ? "" : "not "}logged in>"
+  end
+
+  def token
+    return @token if @token
+    login unless logged_in?
+
+    @token = agent.cookie_jar.each('https://www.nicovideo.jp').find{|_| _.name == 'user_session' }.value
   end
 
   class LoginError < StandardError; end
@@ -65,7 +85,8 @@ class Niconico
     page = @agent.post(URL[:login], 'mail' => @mail, 'password' => @pass)
 
     raise LoginError, "Failed to login (x-niconico-authflag is 0)" if page.header["x-niconico-authflag"] == '0'
-    @logined = true
+    @token = nil
+    @logged_in = true
   end
 
   def login_with_token
@@ -79,7 +100,7 @@ class Niconico
     page = @agent.get(URL[:top])
     raise LoginError, "Failed to login (x-niconico-authflag is 0)" if page.header["x-niconico-authflag"] == '0'
 
-    @logined = true
+    @logged_in = true
   end
 
 end

data/lib/niconico/channel.rb

@@ -6,7 +6,7 @@ require 'niconico/video'
 
 class Niconico
   def channel_videos(ch)
-    login unless @logined
+    login unless logged_in?
 
     rss = Nokogiri::XML(open("http://ch.nicovideo.jp/#{ch}/video?rss=2.0", &:read))
 

data/lib/niconico/mylist.rb

@@ -3,7 +3,7 @@ require 'json'
 
 class Niconico
   def mylist(i)
-    login unless @logined
+    login unless logged_in?
 
     page = @agent.get(url = "http://www.nicovideo.jp/mylist/#{i.to_s.sub(/^mylist\//,"")}")
     #require 'ir_b'; ir b

data/lib/niconico/ranking.rb

@@ -8,7 +8,7 @@ class Niconico
   # options[:method] -> :fav,     :view, :comment, :mylist
   #                     (or :all)        (or :res)
   def ranking(category = 'all', options={})
-    login unless @logined
+    login unless logged_in?
 
     span = options[:span] || :daily
     span = :hourly  if span == :hour

data/lib/niconico/version.rb

@@ -1,3 +1,3 @@
 class Niconico
-  VERSION = "1.4.2"
+  VERSION = "1.5.0"
 end

data/lib/niconico/video.rb

@@ -4,7 +4,7 @@ require 'niconico/deferrable'
 
 class Niconico
   def video(video_id)
-    login unless @logined
+    login unless logged_in?
     Video.new(self, video_id)
   end
 
@@ -91,10 +91,33 @@ class Niconico
 
     def get_video_by_other
       raise VideoUnavailableError unless available?
+      warn "WARN: Niconico::Video#get_video_by_other is deprecated. use Video#video_cookie_jar or video_cookie_jar_file, and video_cookies with video_url instead. (Called by #{caller[0]})"
       {cookie: @agent.cookie_jar.cookies(URI.parse(@video_url)),
        url: video_url}
     end
 
+    def video_cookies
+      return nil unless available?
+      @agent.cookie_jar.cookies(URI.parse(video_url))
+    end
+
+    def video_cookie_jar
+      raise VideoUnavailableError unless available?
+      video_cookies.map { |cookie|
+        [cookie.domain, "TRUE", cookie.path,
+         cookie.secure.inspect.upcase, cookie.expires.to_i,
+         cookie.name, cookie.value].join("\t")
+      }.join("\n")
+    end
+
+    def video_cookie_jar_file
+      raise VideoUnavailableError unless available?
+      Tempfile.new("niconico_cookie_jar_#{self.id}").tap do |io|
+        io.puts(video_cookie_jar)
+        io.flush
+      end
+    end
+
     def inspect
       "#<Niconico::Video: #{@id}.#{@type} \"#{@title}\"#{@eco ? " low":""}#{(fetched? && !@video_url) ? ' (unavailable)' : ''}#{fetched? ? '' : ' (defered)'}>"
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: niconico
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
 - Shota Fukumori (sora_h)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-09 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize