niconize 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7392a9cd6de6a5f11e16a73245a9b9f4c1c7e21b
-  data.tar.gz: c07d744c03e588ddc74155294aa0d1686dd7f95f
+  metadata.gz: 1cc43b954631ab50f77d00fa0e87d53051881547
+  data.tar.gz: 28638569cb79839859d18e235b8f85ef762f0b96
 SHA512:
-  metadata.gz: 7128f180be1294e3746a370fa4231cf08361d475cd268f55d9aee4b8a57ba5174420c81c20534e380c76d9bbf4b0b30f255148aef1b972f6458fd042f428f701
-  data.tar.gz: 8d86c97d9231c3a87b7bf3a8f8fe3f5df31f753e0491a7dfedf550f45f3e5786a71904a46ce1dd150907a92e4d50b30d250f484282c66c0e3b506d6b0e0c7229
+  metadata.gz: 208ece270a06a0a1f0b135baf88bda235125ca7f05bef0040321b1a97a000a58625c21416665651f733024a664985915def3d147d19a49acd9a2fd3a81e142c8
+  data.tar.gz: 2c7eb2ebc8c0a833ab374e82b9c346d0a85308bff73df2d8729d835e44603f572434c76ca2df234d89f4ca372114a1878d714c6ceb8eefb39613c497e20c633e

data/README.md

@@ -19,5 +19,5 @@ require 'niconize'
 niconize = Niconize.new('YOUR_MAIL_ADDRESS', 'PASSWORD')
 
 # timeshift reservation
-niconize.reserve('lvxxxxxx')
+niconize.live('lvxxxxxx').reserve
 ```

data/lib/niconize/live.rb

@@ -13,12 +13,32 @@ class Niconize
       @lv = lv
     end
 
-    def live_page
-      @live_page ||= @agent.get("http://live.nicovideo.jp/watch/#{lv}")
+    def reserve
+      raise TimeshiftError, 'This nicolive is already reserved' if reserved?
+      lv_num = lv.sub(/^lv/, '')
+
+      data = {
+        'mode' => 'regist',
+        'vid' => lv_num,
+        'token' => ulck,
+        '_' => ''
+      }
+
+      @agent.post(URL[:reserve], data)
     end
 
+    private
+
     def reserved?
-      !!live_page.search('a.watching_reservation_reserved')[0]
+      lv_num = lv.sub(/^lv/, '')
+      query = { 'mode' => 'list' }
+      response = @agent.get(URL[:reserve], query)
+      vid_list = response.search('timeshift_reserved_list').children.map { |vid| vid.inner_text }
+      !!vid_list.include?(lv_num)
+    end
+
+    def live_page
+      @live_page ||= @agent.get("http://live.nicovideo.jp/watch/#{lv}")
     end
 
     def token
@@ -38,20 +58,6 @@ class Niconize
       response.at('div.reserve').inner_html.scan(/ulck_[0-9]+/)[0]
     end
 
-    def reserve
-      raise TimeshiftError, 'This nicolive is already reserved'  unless reserved?
-      lv_num = lv.sub(/^lv/, '')
-
-      data = {
-        'mode' => 'regist',
-        'vid' => lv_num,
-        'token' => ulck,
-        '_' => ''
-      }
-
-      @agent.post(URL[:reserve], data)
-    end
-
     class TimeshiftError < StandardError; end
   end
 end

data/lib/niconize/version.rb

@@ -1,3 +1,3 @@
 class Niconize
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: niconize
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Tomohiro Suwa（tsuwatch）
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize