niconize 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e2fd449ecb1caea083c160e8d493ea5244f7837
-  data.tar.gz: 72919a75160e374013f655af96058bbe1f33a650
+  metadata.gz: 2dd2227fcb3c2d07a558b2da07dc471c1793477e
+  data.tar.gz: 44f51cee9c2debfb64f305196943290aaed88cfe
 SHA512:
-  metadata.gz: 43ba97c373cbf3f91be3d8c1bd6b612bad27e974028a04119d03f90c3cba207310c5f56952c436572fb6e7127bb6b7f7562c88c9eae3b24c438dde7f083cf53e
-  data.tar.gz: c6bfa1f777404b2dce86e0de2a54c5796783ee05d21be04447269a4200948689118b3be20bb3d430bf01fdaec87659f47d1a7f2cf4c3623220b1e76a7dc3f510
+  metadata.gz: 2c00fbfce37a52e7c2f5dc0384e34c4fa8a7ad46de3de5a90a304bc32527ecf82789f500abfa0c15a10bbe656b2e20fe11ce229a2d7d3ce2924a918783c9ff72
+  data.tar.gz: dfe0b71dcb6b3a605f529e1c101f87278dd937ff70bfb7b7861062e1a157c37ec6731bd0b5cdd1f16cee3e382e37f498573c7d9c5584cb9c1e289a472d7336ba

data/README.md

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

data/lib/niconize/client.rb

@@ -0,0 +1,44 @@
+module Niconize
+  class Client
+    class LoginError < StandardError; end
+
+    URL = {
+      login: 'https://secure.nicovideo.jp/secure/login?site=niconico',
+      live_watch: 'http://live.nicovideo.jp/watch/',
+      reserve: 'http://live.nicovideo.jp/api/watchingreservation'
+    }
+
+    attr_reader :agent, :logined
+
+    def initialize(mail, password)
+      @mail = mail
+      @password = password
+
+      @logined = false
+
+      @agent = Mechanize.new
+      @agent.ssl_version = 'SSLv3'
+      @agent.request_headers = {
+        'accept-language' => 'ja, ja-JP'
+      }
+    end
+
+    def login
+      page = @agent.post(URL[:login], 'mail' => @mail, 'password' => @password)
+
+      raise LoginError, 'Failed to login (x-niconico-authflag is 0)' if page.header['x-niconico-authflag'] == '0'
+      @logined = true
+    end
+
+    def program(lv)
+      login unless logined
+      Niconize::Program.new(self, lv)
+    end
+
+    def reserved_programs
+      query = { 'mode' => 'list' }
+      response = agent.get(URL[:reserve], query)
+      response.search('timeshift_reserved_list').children.map { |vid_element| Niconize::Program.new(self, 'lv' + vid_element.inner_text) }
+    end
+  end
+end

data/lib/niconize/program.rb

@@ -1,17 +1,12 @@
-require_relative './live'
-
-class Niconize
-  def program(lv)
-    login unless @logined
-    Program.new(self, lv)
-  end
-
+module Niconize
   class Program
+    class TimeshiftError < StandardError; end
+
     attr_reader :lv, :vid
 
-    def initialize(parent, lv)
-      @parent = parent
-      @agent = parent.agent
+    def initialize(client, lv)
+      @client = client
+      @agent = client.agent
       @lv = lv
       @vid = lv.sub(/^lv/, '')
     end
@@ -26,13 +21,13 @@ class Niconize
         '_' => ''
       }
 
-      @agent.post(URL[:reserve], data)
+      @agent.post(Niconize::Client::URL[:reserve], data)
     end
 
     private
 
     def reserved?
-      !!@parent.live.reserved_programs.map { |program| program.vid }.include?(vid)
+      !!@client.reserved_programs.map { |program| program.vid }.include?(vid)
     end
 
     def live_page
@@ -49,11 +44,9 @@ class Niconize
         'vid' => vid,
         'token' => token
       }
-      response = @agent.get(URL[:reserve], query)
+      response = @agent.get(Niconize::Client::URL[:reserve], query)
       raise TimeshiftError, 'It is the limit of the number of your reservation' unless response.at('div.reserve')
       response.at('div.reserve').inner_html.scan(/ulck_[0-9]+/)[0]
     end
-
-    class TimeshiftError < StandardError; end
   end
 end

data/lib/niconize/version.rb

@@ -1,3 +1,3 @@
-class Niconize
-  VERSION = "0.0.6"
+module Niconize
+  VERSION = "0.0.7"
 end

data/lib/niconize.rb

@@ -1,36 +1,5 @@
-require "niconize/version"
 require "mechanize"
 
-class Niconize
-  URL = {
-    login: 'https://secure.nicovideo.jp/secure/login?site=niconico',
-    live_watch: 'http://live.nicovideo.jp/watch/',
-    reserve: 'http://live.nicovideo.jp/api/watchingreservation'
-  }
-
-  attr_reader :agent, :logined
-
-  def initialize(mail, password)
-    @mail = mail
-    @password = password
-
-    @logined = false
-
-    @agent = Mechanize.new
-    @agent.ssl_version = 'SSLv3'
-    @agent.request_headers = {
-      'accept-language' => 'ja, ja-JP'
-    }
-  end
-
-  def login
-    page = @agent.post(URL[:login], 'mail' => @mail, 'password' => @password)
-
-    raise LoginError, 'Failed to login (x-niconico-authflag is 0)' if page.header['x-niconico-authflag'] == '0'
-    @logined = true
-  end
-  class LoginError < StandardError; end
-end
-
-require_relative 'niconize/program'
-require_relative 'niconize/live'
+require "niconize/client"
+require "niconize/program"
+require "niconize/version"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: niconize
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Tomohiro Suwa（tsuwatch）
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -65,7 +65,7 @@ files:
 - README.md
 - Rakefile
 - lib/niconize.rb
-- lib/niconize/live.rb
+- lib/niconize/client.rb
 - lib/niconize/program.rb
 - lib/niconize/version.rb
 - niconize.gemspec

data/lib/niconize/live.rb

@@ -1,21 +0,0 @@
-require_relative './program'
-
-class Niconize
-  def live
-    login unless @logined
-    @live ||= Live.new(self)
-  end
-
-  class Live
-    def initialize(parent)
-      @parent = parent
-      @agent = parent.agent
-    end
-
-    def reserved_programs
-      query = { 'mode' => 'list' }
-      response = @agent.get(URL[:reserve], query)
-      response.search('timeshift_reserved_list').children.map { |vid_element| Program.new(@parent, 'lv' + vid_element.inner_text) }
-    end
-  end
-end