niconico 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51a70da9e364d8d29e8fd3f9834056d211957cc8
-  data.tar.gz: 952d992157597985457145d55bb2df3702f45d2d
+  metadata.gz: 4e974da09ccd8ca51489f33e40cb8cee03492e8c
+  data.tar.gz: cd9f2c241c322cac652d47c82ba2461e9aae46ce
 SHA512:
-  metadata.gz: a633dad1e1abc5935908492f742b93af3e2a863506a046d6ba9984e9bbd1e06037a62185831549253c106265db81eb751a401fe61cca6b4cec47d039a55d3772
-  data.tar.gz: 4091116e411bd79762ed660fb42f5ac994606f6092143ef08c46210037b1998cb3da0071e245db1561330bc1abcde344b7d160069d3e02715149fba60b3fd2e4
+  metadata.gz: 83d692cf58272878c31836fcb8fd22cf76e11e063117a337d42aa7b62e9145bdf986d783b8fe611d4bcbd3e62c7c1cc088c17023ce5f2c0d93e325a59bdf37e8
+  data.tar.gz: e7527167a1871dbde1c74fe965b90a35456282be8171da7ce5faf1a52ed042d31b4ae028fbc744f84551f850ba32a923941a52fcd006f36e1edfed2bd4bb9837

data/lib/niconico.rb

@@ -9,7 +9,8 @@ class Niconico
     top: 'http://www.nicovideo.jp/',
     login: 'https://secure.nicovideo.jp/secure/login?site=niconico',
     watch: 'http://www.nicovideo.jp/watch/',
-    getflv: 'http://flapi.nicovideo.jp/api/getflv'
+    getflv: 'http://flapi.nicovideo.jp/api/getflv',
+    my_mylist: 'http://www.nicovideo.jp/my/mylist'
   }
 
   attr_reader :agent
@@ -74,12 +75,18 @@ class Niconico
     @token = agent.cookie_jar.each('https://www.nicovideo.jp').find{|_| _.name == 'user_session' }.value
   end
 
+  def nico_api
+    return @nico_api if @nico_api
+    login unless logged_in?
+    @nico_api = NicoAPI.new(self)
+  end
+
   class LoginError < StandardError; end
 
   private
 
   def login_with_email
-    page = @agent.post(URL[:login], 'mail' => @mail, 'password' => @pass)
+    page = @agent.post(URL[:login], 'mail_tel' => @mail, 'password' => @pass)
 
     raise LoginError, "Failed to log in (x-niconico-authflag is 0)" if page.header["x-niconico-authflag"] == '0'
     @token = nil
@@ -107,3 +114,4 @@ require 'niconico/mylist'
 require 'niconico/ranking'
 require 'niconico/channel'
 require 'niconico/live'
+require 'niconico/nico_api'

data/lib/niconico/nico_api.rb

@@ -0,0 +1,52 @@
+require 'json'
+
+class Niconico
+  class NicoAPI
+    class ApiError < Exception; end
+    class AcquiringTokenError < Exception; end
+
+    MYLIST_ITEM_TYPES = {video: 0, seiga: 5}
+
+    def initialize(parent)
+      @parent = parent
+    end
+
+    def agent; @parent.agent; end
+
+    def token; @token ||= get_token; end
+
+    def get_token
+      page = agent.get(Niconico::URL[:my_mylist])
+      match = page.search("script").map(&:inner_text).grep(/\tNicoAPI\.token/) {|v| v.match(/\tNicoAPI\.token = "(.+)";\n/)}.first
+      if match
+        match[1]
+      else
+        raise AcquiringTokenError, "Couldn't find a token"
+      end
+    end
+
+    def mylist_add(group_id, item_type, item_id, description='')
+      !!post(
+        '/api/mylist/add',
+        {
+          group_id: group_id,
+          item_type: MYLIST_ITEM_TYPES[item_type],
+          item_id: item_id,
+          description: description,
+          token: token
+        }
+      )
+    end
+
+    private
+
+    def post(path, params)
+      uri = URI.join(Niconico::URL[:top], path)
+      page = agent.post(uri, params)
+      json = JSON.parse(page.body)
+      raise ApiError, json unless json['status'] == 'ok'
+      json
+    end
+
+  end
+end

data/lib/niconico/version.rb

@@ -1,3 +1,3 @@
 class Niconico
-  VERSION = "1.6.0"
+  VERSION = "1.7.0"
 end

data/lib/niconico/video.rb

@@ -86,7 +86,18 @@ class Niconico
 
     def get_video
       raise VideoUnavailableError unless available?
-      @agent.get_file(video_url)
+      unless block_given?
+          @agent.get_file(video_url)
+      else
+        cookies = video_cookies.map(&:to_s).join(';')
+        uri = URI(video_url)
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.request_get(uri.request_uri, 'Cookie' => cookies) do |res|
+          res.read_body do |body|
+            yield body
+          end
+        end
+      end
     end
 
     def get_video_by_other
@@ -118,6 +129,10 @@ class Niconico
       end
     end
 
+    def add_to_mylist(mylist_id, description='')
+      @parent.nico_api.mylist_add(mylist_id, :video, @id, description)
+    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.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Shota Fukumori (sora_h)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-06 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -56,6 +56,7 @@ files:
 - lib/niconico/live.rb
 - lib/niconico/live/api.rb
 - lib/niconico/mylist.rb
+- lib/niconico/nico_api.rb
 - lib/niconico/ranking.rb
 - lib/niconico/version.rb
 - lib/niconico/video.rb
@@ -79,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: wrapper of Mechanize, optimized for nicovideo.