nicorepo 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 287151c7de9632af7c207fb45f87b9f2eba205f6
-  data.tar.gz: 6768a4c68e512fc8e9b6a984a47bd8eadf4d04ad
+  metadata.gz: 4d0c8ac38ef205c58bc61e5014580cf41126433f
+  data.tar.gz: 64fe13068e72c8edae3d9feb8ddab9e3f5fcf1d1
 SHA512:
-  metadata.gz: fcb8600bbc7a0237a19d9fd58a7133e50a235065a51dda0e7e4a7bcf1af98ba87d67237d5bfd4ba0b1221d16ebd91516dfa69c089b4eacc825cdb19508ed3ead
-  data.tar.gz: 1fa75e08fc371cdf417b58a6c068141bf87d8f9d7ccee547f040f294bbab87b7fe59966f0490e0c7d327227e0a14d62204e5043a9231c69500e8ba74dd4a4f4d
+  metadata.gz: 149c12f8221bee89fd75e8ae6ea344557df39c16a2e86c0aa4bf4c49872125a56b535907bf6e93e2dc8f58016c740b7b9e00ee65b5a30abec743aebc0ea3889e
+  data.tar.gz: 6e76250ea97bc1a16bba04c8323e911972d93edd814f4b35942fdea4de3c1a7f2d3f5cb8997709e2e006cee08aa8879435817c899476e0c25ff3378b13b1088d

data/.gitignore

@@ -20,5 +20,4 @@ tmp
 *.o
 *.a
 mkmf.log
-spec/resource/account.txt
 

data/.nicorepo.yaml.sample

@@ -1,7 +1,7 @@
-num:
+request_num:
   general: 20
   videos: 5
-nest:
+limit_page:
   general: 5
   videos: 10
 

data/README.md

@@ -1,109 +1,94 @@
 # Nicorepo
-ニコニコ動画のニコレポをスクレイピングするためのライブラリとスクリプトです。
 
-- 欲しいニコレポログを、欲しい数だけ取得できます（例：投稿動画を30個）
-- 複数ページにわたってログを取得できます
-- スクリプトを使ってターミナル上からニコレポ確認したり、ブラウザにURL送ったりできます
+Nicorepo is scraper and filter of nicorepo on nicovideo.
 
+- filter reports by kind of them
+- specify number and pages to fetch reports
+- open url in browser
 
-# 環境とか
+It requires ruby 2.0.0.
 
-- ruby 2.0.0p247
-- 依存Gem: `mechanize`, `launchy`
+## Installation
 
+Add this line to your application's Gemfile:
 
-# 使い方
+    gem 'nicorepo'
 
-## スクリプト
+And then execute:
 
-bin/nicorepoを呼び出します。本体はlib/nicorepo/cli.rbです。
+    $ bundle
 
-    $ nicorepo command params
+Or install it yourself as:
 
-なお、起動前にアカウントを設定する必要があります。
+    $ gem install nicorepo
 
-config.yamlをnicorepoフォルダに作成して、下記のように記述してください。
+## Usage
 
-    mail: your@mail
-    pass: your_password
+### Authentication
 
+Nicorepo supports reading netrc file.
 
-### command
+Add following lines to your netrc file (`~/.netrc`)
 
-    all, a    [disp_num]         : すべてのニコレポを表示
-    videos, v [disp_num] [nest]  : 投稿動画のみ
-    lives, l  [disp_num] [nest]  : 生放送のみ
-    interactive, i               : 対話モード（後述）
+```
+machine nicovideo.jp
+  login your@email.account
+  password your-password
+```
 
-- [disp\_num]の数だけニコレポを表示します。省略すると10個表示します
+### Start nicorepo cli as interactive mode
 
-- [nest]は探しに行くページの最大数です。[nest]以上探しても[disp\_num]の数だけ見つけられない場合は諦めます。省略すると3ページです
+    $ nicorepo i
 
-- それぞれエイリアスが設定されています。all なら a だけで認識します
+You can use following commands in interactive cli to fetch nicorepos.
+For example, if you want 20 video reports by searcing over 5 pages, the command will be,
 
+    > video 20 5
 
-### 対話モード
+Or you can also use aliases.
 
-`nicorepo i`で起動します。
-対話モードは上記コマンドに加えて、下記の対話用コマンドが使用できます。
+    > v 20 5
 
-    open, o [log_num]  : 指定のニコレポログの対象URLをブラウザで開く
-    login              : 再ログイン
-    exit               : 対話モード終了
+And each commad has default value so it is simply used like,
 
-`all`や`videos`でニコレポを表示すると、各ログの最初に連番が振られます。
-その連番を`open`に指定すると、対象のURLをブラウザで開きます。
+    # it means `video 10 3`
+    > v
 
+**Commands**
 
-### config.yaml
+command  | alias | params                 | description
+---------|-------|------------------------|-------------------------------------
+  all    | a     | request_num            | all reports
+  videos | v     | request_num limit_page | only videos
+  lives  | l     | request_num limit_page | only lives
+  open   | o     | report_num             | open the specified report url in the browser
+  login  |       |                        | re-login
+  exit   |       |                        | exit nicorepo
 
-config.yamlでは、アカウントの設定の他に、取得するログの数、探しに行くページの数をコマンドごとに設定することが出来ます。
-設定項目は以下のとおりです。
+### Configuration
 
-    general: コマンド全体に定義した数を設定します
-    all, videos, lives: それぞれのコマンドに定義した数を設定します。generalより優先します
+You can configure default `request_num` and `limit_page` by adding `~/.nicorepo.yaml` if you want.
+Please refer the sample `nicorepo/.nicorepo.yaml.sample` or copy it to your home directory.
 
-（例）
+**Sample**
 
-    general:
-      num: 20
-      nest: 5
-    videos:
-      num: 5
-      nest: 10
+```
+request_num:
+  general: 20
+  videos: 5
+limit_page:
+  general: 5
+  videos: 10
+```
 
+- `general`: used in all commands
+- `all`, `videos`, `lives`: used in each command, has priority than `general`
 
-## ライブラリ
+## Contributing
 
-ニコニコ動画へのログインは次のような感じです。
+1. Fork it ( https://github.com/upinetree/nicorepo/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create a new Pull Request
 
-    repo = Nicorepo.new
-    repo.login(mail, pass)
-
-以降のニコレポ取得ですが、現在は3種類だけメソッドにしています。
-
-    all(req_num = LOGS_PER_PAGE)
-    videos(req_num = 3, page_nest_max = 5)
-    lives(req_num = 3, page_nest_max = 5)
-
-取得したニコレポは`Nicorepo::Log`のArrayで返ってきます。
-中身は、
-
-    @body   # 本文。「〜さんが…しました」
-    @title  # ログ対象の名前。動画名や生放送名など
-    @url    # ログ対象のURL。動画URLや生放送URLなど
-    @author # ログ発生元ユーザ
-    @kind   # ログの種類。CSSクラス名から抜粋したもの
-    @date   # ログ発生日時
-
-filtered_byを使うと、@kindを指定の条件でフィルタしてログを取得します。
-
-    filtered_by(filter, req_num = LOGS_PER_PAGE, page_nest_max = 1)
-
-例えば：
-
-    logs = filtered_by('clip')
-    logs = filtered_by('seiga')
-    logs = filtered_by('mylist')
-
-のような感じです。

data/lib/nicorepo/cli/cli.rb

@@ -5,24 +5,24 @@ require 'netrc'
 class Nicorepo
   class Cli
 
-    class LogExistenceError < StandardError; end
+    class ReportExistenceError < StandardError; end
     class LoginAccountError < StandardError; end
 
     def initialize
       @repo = Nicorepo.new
-      @logs = nil
+      @reports = nil
       @conf = Nicorepo::Cli::Config.new
     end
 
     def run(argv)
-      cmd, num, nest = parse(argv)
+      cmd, request_num, limit_page = parse(argv)
       help if cmd == 'help'
 
       login
 
-      logs = exec_command(cmd, num, nest)
-      if logs
-        disp logs
+      reports = exec_command(cmd, request_num, limit_page)
+      if reports
+        disp reports
       else
         case cmd
         when 'interactive'  then interactive_run
@@ -35,15 +35,15 @@ class Nicorepo
     def interactive_run
       loop do
         argv = Readline::readline("nicorepo > ", true).split
-        cmd, num, nest = parse(argv)
+        cmd, request_num, limit_page = parse(argv)
 
-        logs = exec_command(cmd, num, nest)
-        if logs
-          @logs = logs
-          disp @logs
+        reports = exec_command(cmd, request_num, limit_page)
+        if reports
+          @reports = reports
+          disp @reports
         else
           case cmd
-          when 'open'   then open_url(@logs, num)
+          when 'open'   then open_url(@reports, request_num)
           when 'login'  then login
           when 'exit'   then return true
           else help_interactive; next
@@ -53,11 +53,11 @@ class Nicorepo
     end
 
     # options is now just for testing
-    def open_url(logs, num, options = {})
-      url = logs[num - 1].url
+    def open_url(reports, request_num, options = {})
+      url = reports[request_num - 1].url
       if url.nil?
-        puts "log existence error: please fetch logs"
-        raise LogExistenceError
+        puts "report existence error: please fetch reports"
+        raise ReportExistenceError
       end
 
       Launchy.open(url, options) do |exception|
@@ -72,15 +72,14 @@ class Nicorepo
 
     def parse(argv)
       cmd  = translate(argv.shift  || 'help')
-      num  = (argv.shift || @conf.num(cmd)).to_i
-      nest = (argv.shift || @conf.nest(cmd)).to_i
+      request_num  = (argv.shift || @conf.request_num(cmd)).to_i
+      limit_page = (argv.shift || @conf.limit_page(cmd)).to_i
 
-      return cmd, num, nest
+      return cmd, request_num, limit_page
     end
 
     def login
-      n = Netrc.read
-      mail, pass = n["nicovideo.jp"]
+      mail, pass = Netrc.read["nicovideo.jp"]
       raise LoginAccountError, "machine nicovideo.jp is not defined in .netrc" if mail.nil? || pass.nil?
 
       begin
@@ -91,19 +90,19 @@ class Nicorepo
     end
 
     # it returns
-    #   - logs  if succeed to exec exepcted command
-    #   - nil   if unexpected command given
-    def exec_command(cmd, num, nest)
-      logs = nil
+    #   - reports if succeed to exec exepcted command
+    #   - nil     if unexpected command given
+    def exec_command(cmd, request_num, limit_page)
+      reports = nil
 
       case cmd
-      when 'all'    then logs = @repo.all    num
-      when 'videos' then logs = @repo.videos num, nest
-      when 'lives'  then logs = @repo.lives  num, nest
+      when 'all'    then reports = @repo.all    request_num
+      when 'videos' then reports = @repo.videos request_num, limit_page
+      when 'lives'  then reports = @repo.lives  request_num, limit_page
       else return nil
       end
 
-      return logs
+      return reports
     end
 
     ALIAS = {"a" => "all", "v" => "videos", "l" => "lives",
@@ -128,25 +127,25 @@ class Nicorepo
       puts '    usage: command [params]'
       puts '    command:'
       help_commands
-      puts '        open, o [log_num] - open url of given log number'
+      puts '        open, o [report_num] - open url of given report number'
       puts '        login'
       puts '        exit'
     end
 
     def help_commands
       puts <<-"EOS"
-        all, a    [disp_num]
-        videos, v [disp_num] [nest]
-        lives, l  [disp_num] [nest]
-          *disp_num - number of logs to display at once (default = 10)
-          *nest     - max nesting level of pages to search (default = 3)
+        all, a    [request_num]
+        videos, v [request_num] [limit_page]
+        lives, l  [request_num] [limit_page]
+          *request_num - number of reports to fetch from nicovideo (default = 10)
+          *limit_page  - limit page to fetch reports(default = 3)
       EOS
     end
 
-    def disp(logs)
-      logs.each.with_index(1) do |log, i|
-        puts "[#{i}] #{log.body} on #{log.date.to_s}"
-        puts "    '#{log.title}' (#{log.url})"
+    def disp(reports)
+      reports.each.with_index(1) do |report, i|
+        puts "[#{i}] #{report.body} on #{report.date.to_s}"
+        puts "    '#{report.title}' (#{report.url})"
       end
     end
   end

data/lib/nicorepo/cli/config.rb

@@ -8,16 +8,16 @@ class Nicorepo
 
       def initialize
         params = defaults.merge(load_config)
-        @nums  = params["num"]
-        @nests = params["nest"]
+        @request_nums  = params["request_num"]
+        @limit_pages = params["limit_page"]
       end
 
-      def num(cmd)
-        @nums[cmd] || @nums["general"]
+      def request_num(cmd)
+        @request_nums[cmd] || @request_nums["general"]
       end
 
-      def nest(cmd)
-        @nests[cmd] || @nests["general"]
+      def limit_page(cmd)
+        @limit_pages[cmd] || @limit_pages["general"]
       end
 
       private
@@ -31,10 +31,10 @@ class Nicorepo
 
       def defaults
         {
-          "num" => {
+          "request_num" => {
             "general" => 10
           },
-          "nest" => {
+          "limit_page" => {
             "general" => 3
           }
         }

data/lib/nicorepo/{log.rb → parser.rb}

@@ -1,20 +1,43 @@
 class Nicorepo
+  class Parser
+    def initialize(agent)
+      @agent = agent
+    end
 
-  class Log
-    attr_accessor :body, :title, :url, :author, :kind, :date
-
-    def initialize(node = nil)
-      if node.nil? then return end
-      @body   = parse_body   node
-      @title  = parse_title  node
-      @url    = parse_url    node
-      @author = parse_author node
-      @kind   = parse_kind   node
-      @date   = parse_date   node
+    def parse_page(url)
+      page = @agent.get(url)
+      {
+        reports_attrs: parse_reports(page),
+        next_url: next_url(page)
+      }
     end
 
     private
 
+    def parse_reports(page)
+      nodes = report_nodes(page)
+      nodes.map { |node| report_attrs(node) }
+    end
+
+    def report_attrs(node)
+      {
+        body:   parse_body(node),
+        title:  parse_title(node),
+        url:    parse_url(node),
+        author: parse_author(node),
+        kind:   parse_kind(node),
+        date:   parse_date(node)
+      }
+    end
+
+    def report_nodes(page)
+      page.search('div.timeline/div.log')
+    end
+
+    def next_url(page)
+      page.search('a.next-page-link').first['href']
+    end
+
     def parse_body(node)
       node.search('div.log-body').first.inner_text.gsub(/(\t|\r|\n)/, "")
     end
@@ -47,7 +70,5 @@ class Nicorepo
       d = node.search('div.log-footer/div.log-footer-inner/a.log-footer-date/time').first['datetime']
       Time.xmlschema(d).localtime
     end
- 
   end
-
 end

data/lib/nicorepo/report.rb

@@ -0,0 +1,15 @@
+class Nicorepo
+  class Report
+    attr_accessor :body, :title, :url, :author, :kind, :date
+
+    def initialize(attrs)
+      @body   = attrs[:body]
+      @title  = attrs[:title]
+      @url    = attrs[:url]
+      @author = attrs[:author]
+      @kind   = attrs[:kind]
+      @date   = attrs[:date]
+    end
+  end
+end
+

data/lib/nicorepo/reports.rb

@@ -0,0 +1,74 @@
+require 'nicorepo/report'
+require 'nicorepo/parser'
+require 'forwardable'
+
+class Nicorepo
+  class Reports
+    extend Forwardable
+
+    class ReportsAccessError < StandardError; end
+
+    TOP_URL = 'http://www.nicovideo.jp/my/top'
+
+    attr_reader :reports
+    def_delegators :@reports, :size
+
+    def initialize(parser)
+      @parser = parser
+      @reports = []
+    end
+
+    def fetch(request_num, limit_page)
+      @reports = fetch_recursively(request_num, limit_page)
+    end
+
+    def fetch_with_filtere(filter, request_num, limit_page)
+      @reports = fetch_recursively(request_num, limit_page, filter)
+    end
+
+    private
+
+    def fetch_recursively(request_num, limit_page, filter = nil, url = TOP_URL)
+      return [] unless limit_page > 0
+
+      # fetch current reports
+      page = @parser.parse_page(url)
+      begin
+        reports = page[:reports_attrs].map { |attrs| Report.new(attrs) }
+      rescue
+        raise ReportsAccessError
+      end
+      reports.select!{ |report| report.kind =~ /#{filter}/ } if filter
+
+      if reports.size > request_num then
+        return reports[0, request_num]
+      end
+
+      # recursively fetch next reports
+      if reports.size < request_num then
+        begin
+          next_reports = fetch_recursively(request_num - reports.size, limit_page - 1, filter, page[:next_url])
+        rescue
+          return reports
+        else
+          reports += next_reports unless next_reports.nil?
+        end
+      end
+
+      return reports
+    end
+  end
+
+  class VideoReports < Reports
+    def fetch(request_num, limit_page)
+      fetch_with_filtere('video-upload', request_num, limit_page)
+    end
+  end
+
+  class LiveReports < Reports
+    def fetch(request_num, limit_page)
+      fetch_with_filtere('live', request_num, limit_page)
+    end
+  end
+end
+

data/lib/nicorepo/version.rb

@@ -1,3 +1,3 @@
 class Nicorepo
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/nicorepo.rb

@@ -1,17 +1,11 @@
 require 'mechanize'
-require 'nicorepo/log'
+require 'nicorepo/reports'
 
 class Nicorepo
-
-  module URL
-    LOGIN = 'https://secure.nicovideo.jp/secure/login?site=niconico'
-    REPO_ALL = 'http://www.nicovideo.jp/my/top'
-  end
-
   class LoginError < StandardError; end
-  class LogsAccessError < StandardError; end
 
-  LOGS_PER_PAGE = 20
+  PER_PAGE = 20
+  LOGIN_URL = 'https://secure.nicovideo.jp/secure/login?site=niconico'
 
   attr_reader :agent
 
@@ -19,70 +13,29 @@ class Nicorepo
     @agent = Mechanize.new
     @agent.ssl_version = 'SSLv3'
     @agent.request_headers = { 'accept-language' => 'ja-JP', 'content-language' => 'ja-JP' }
+    @parser = Parser.new(@agent)
   end
 
   def login(mail, pass)
-    page = @agent.post(URL::LOGIN, mail: mail, password: pass)
+    page = @agent.post(LOGIN_URL, mail: mail, password: pass)
     raise LoginError, "Failed to login" if page.header["x-niconico-authflag"] == '0'
   end
 
-  def all(req_num = LOGS_PER_PAGE)
-    page_nest_max = req_num / LOGS_PER_PAGE + 1
-    fetch_logs(req_num, page_nest_max)
-  end
-
-  def videos(req_num = 3, page_nest_max = 5)
-    filtered_by('video-upload', req_num, page_nest_max)
-  end
-
-  def lives(req_num = 3, page_nest_max = 5)
-    filtered_by('live', req_num, page_nest_max)
-  end
-
-  def filtered_by(filter, req_num = LOGS_PER_PAGE, page_nest_max = 1)
-    fetch_logs(req_num, page_nest_max, filter)
+  def all(request_num = PER_PAGE)
+    limit_page = request_num / PER_PAGE + 1
+    Reports.new(@parser).fetch(request_num, limit_page)
   end
 
-  private
-
-  def fetch_logs(req_num, page_nest_max, filter = nil, url = URL::REPO_ALL)
-    return [] unless page_nest_max > 0
-
-    # fetch current logs
-    page = @agent.get(url)
-    begin
-      logs = log_nodes(page).map { |node| Log.new(node) }
-    rescue
-      raise LogsAccessError
-    end
-    logs.select!{ |log| log.kind =~ /#{filter}/ } if filter
-
-    if logs.size > req_num then
-      return logs[0, req_num]
-    end
-
-    # fetch next logs
-    if logs.size < req_num then
-      next_url = page.search('div.next-page/a').first['href']
-      begin
-        next_logs = fetch_logs(req_num - logs.size, page_nest_max - 1, filter, next_url)
-      rescue
-        warn '*** logs access error occurs ***'
-        return logs
-      else
-        logs += next_logs unless next_logs.nil?
-      end
-    end
-
-    return logs
+  def videos(request_num = 3, limit_page = 5)
+    VideoReports.new(@parser).fetch(request_num, limit_page)
   end
 
-  def log_nodes(page)
-    page.search('div.timeline/div.log')
+  def lives(request_num = 3, limit_page = 5)
+    LiveReports.new(@parser).fetch(request_num, limit_page)
   end
-
 end
 
 require "nicorepo/version"
 require 'nicorepo/cli/cli'
 require 'nicorepo/cli/config'
+

data/spec/cli/cli_config_spec.rb

@@ -7,61 +7,61 @@ describe Nicorepo::Cli::Config do
     Nicorepo::Cli::Config.any_instance.stub(:load_config).and_return(config_values)
   end
 
-  describe "#num" do
+  describe "#request_num" do
     context "with 'all' command" do
-      context "'all' num is NOT defined" do
-        context "'general' num is NOT defined" do
+      context "'all' request_num is NOT defined" do
+        context "'general' request_num is NOT defined" do
           let(:config_values) { {} }
 
-          it "should return default num" do
-            default_num = conf.send(:defaults)["num"]["general"]
-            conf.num("all").should eq(default_num)
+          it "should return default request_num" do
+            default_request_num = conf.send(:defaults)["request_num"]["general"]
+            conf.request_num("all").should eq(default_request_num)
           end
         end
 
-        context "'general' num is defined" do
-          let(:general_num) { 20 }
-          let(:config_values) { { "num" => { "general" => general_num } } }
+        context "'general' request_num is defined" do
+          let(:general_request_num) { 20 }
+          let(:config_values) { { "request_num" => { "general" => general_request_num } } }
 
-          it "should return defined 'general' num" do
-            conf.num("all").should eq(general_num)
+          it "should return defined 'general' request_num" do
+            conf.request_num("all").should eq(general_request_num)
           end
         end
       end
 
-      context "'all' num is defined" do
-        context "'general' num is NOT defined" do
-          let(:all_num) { 20 }
-          let(:config_values) { { "num" => { "all" => all_num } } }
+      context "'all' request_num is defined" do
+        context "'general' request_num is NOT defined" do
+          let(:all_request_num) { 20 }
+          let(:config_values) { { "request_num" => { "all" => all_request_num } } }
 
-          it "should return defined 'all' num" do
-            conf.num("all").should eq(all_num)
+          it "should return defined 'all' request_num" do
+            conf.request_num("all").should eq(all_request_num)
           end
         end
 
-        context "'general' num is defined" do
-          let(:all_num) { 20 }
-          let(:general_num) { 15 }
-          let(:config_values) { { "num" => { "all" => all_num, "general" => general_num } } }
+        context "'general' request_num is defined" do
+          let(:all_request_num) { 20 }
+          let(:general_request_num) { 15 }
+          let(:config_values) { { "request_num" => { "all" => all_request_num, "general" => general_request_num } } }
 
-          it "should return defined 'all' num" do
-            conf.num("all").should eq(all_num)
+          it "should return defined 'all' request_num" do
+            conf.request_num("all").should eq(all_request_num)
           end
         end
       end
     end
   end
 
-  describe "#nest" do
+  describe "#limit_page" do
     context "with 'all' command" do
-      context "'all' nest is defined" do
-        context "'general' nest is defined" do
-          let(:all_nest) { 10 }
-          let(:general_nest) { 5 }
-          let(:config_values) { { "nest" => { "all" => all_nest, "general" => general_nest } } }
+      context "'all' limit_page is defined" do
+        context "'general' limit_page is defined" do
+          let(:all_limit_page) { 10 }
+          let(:general_limit_page) { 5 }
+          let(:config_values) { { "limit_page" => { "all" => all_limit_page, "general" => general_limit_page } } }
 
-          it "should return defined 'all' nest" do
-            conf.nest("all").should eq(all_nest)
+          it "should return defined 'all' limit_page" do
+            conf.limit_page("all").should eq(all_limit_page)
           end
         end
       end

data/spec/nicorepo_spec.rb

@@ -1,14 +1,10 @@
 require 'spec_helper'
 
 describe Nicorepo do
-
-  include Helper
-
   before(:all) do
+    mail, pass = Netrc.read["nicovideo.jp"]
     @nicorepo = Nicorepo.new
-    @account = right_account
-
-    @nicorepo.login(@account[:mail], @account[:pass])
+    @nicorepo.login(mail, pass)
   end
 
   describe "#login" do
@@ -17,103 +13,49 @@ describe Nicorepo do
         @nicorepo.agent.should be_true
       end
     end
- 
+
     context "with wrong account" do
       it "should raise error" do
         repo = Nicorepo.new
-        lambda{ repo.login('test', 'testpass') }.should raise_error(Nicorepo::LoginError)
+        expect{ repo.login('test', 'testpass') }.to raise_error(Nicorepo::LoginError)
       end
     end
- end
+  end
 
   describe "#all" do
-    context "without arguments" do
-      it "should return 20 logs" do
-        @nicorepo.all.should have(20).logs
-      end
-    end
-
     context "with 5" do
-      it "should return 5 logs" do
-        @nicorepo.all(5).should have(5).logs
-      end
-    end
-
-    context "with 30" do
-      it "should return 30 logs" do
-        @nicorepo.all(30).should have(30).logs
+      it "should return 5 reports" do
+        @nicorepo.all(5).should have(5).reports
       end
     end
 
     context "with 50" do
-      it "should return 50 logs" do
-        @nicorepo.all(50).should have(50).logs
+      it "should return 50 reports" do
+        @nicorepo.all(50).should have(50).reports
       end
     end
   end
 
   describe "#videos" do
-    context "without arguments" do
-      it "should return 3 logs at the most" do
-        @nicorepo.videos.should have_at_most(3).logs
-      end
-
-      it "should return only video logs" do
+    context "with request_num = 5, limit_page = 3" do
+      it "should return only video reports" do
         videos = @nicorepo.videos
-        except_video = videos.reject{ |v| v.kind =~ /video/ }
-        except_video.size.should eq 0
+        not_videos = videos.reject{ |v| v.kind =~ /video/ }
+        not_videos.size.should eq 0
       end
-    end
 
-    context "with req_num = 5, page_nest_max = 3" do
-      it "should return 5 logs at the most" do
-        @nicorepo.videos(5, 3).should have_at_most(5).logs
+      it "should return 5 reports at the most" do
+        @nicorepo.videos(5, 3).should have_at_most(5).reports
       end
     end
   end
 
   describe "#lives" do
-    it "should return only live logs" do
+    it "should return only live reports" do
       lives = @nicorepo.lives
-      except_live = lives.reject{ |l| l.kind =~ /live/ }
-      except_live.size.should eq 0
+      not_lives = lives.reject{ |l| l.kind =~ /live/ }
+      not_lives.size.should eq 0
     end
   end
-
-  describe Nicorepo::Log do
-    before(:all) do
-      @log = @nicorepo.all.first
-      p @log
-    end
-    
-    it "should have the body" do
-      @log.body.should be_true
-    end
-
-    it "should have the title" do
-      @log.title.should be_true
-    end
-
-    it "should have the url" do
-      @log.url.should be_true
-    end
-
-    it "should have the author" do
-      @log.author.should be_true
-    end
-
-    it "should have the log-kind" do
-      @log.kind.should be_true
-    end
-
-    it "should have the date" do
-      @log.date.should be_true
-    end
-
-    after(:all) do
-    end
-  end
-
-  after(:all) do
-  end
 end
+

data/spec/spec_helper.rb

@@ -1,17 +1,4 @@
 require 'nicorepo'
 require 'pry'
-
-module Helper
-  def right_account
-    begin
-      f = open('spec/resource/account.txt')
-      mail = f.gets.chomp!
-      pass = f.gets.chomp!
-    ensure
-      f.close
-    end
-
-    {mail: mail, pass: pass}
-  end
-end
+require 'netrc'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nicorepo
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - upinetree
@@ -127,11 +127,12 @@ files:
 - lib/nicorepo.rb
 - lib/nicorepo/cli/cli.rb
 - lib/nicorepo/cli/config.rb
-- lib/nicorepo/log.rb
+- lib/nicorepo/parser.rb
+- lib/nicorepo/report.rb
+- lib/nicorepo/reports.rb
 - lib/nicorepo/version.rb
 - nicorepo.gemspec
 - spec/cli/cli_config_spec.rb
-- spec/cli/cli_spec.rb
 - spec/nicorepo_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/upinetree/nicorepo
@@ -160,6 +161,5 @@ specification_version: 4
 summary: Simple nicorepo scraper
 test_files:
 - spec/cli/cli_config_spec.rb
-- spec/cli/cli_spec.rb
 - spec/nicorepo_spec.rb
 - spec/spec_helper.rb

data/spec/cli/cli_spec.rb

@@ -1,85 +0,0 @@
-require 'spec_helper'
-
-describe Nicorepo::Cli do
-  before(:all) do
-    @old_stderr = $stderr
-    $stderr = StringIO.new
-  end
-
-  describe "#run" do
-
-    let(:cli) { Nicorepo::Cli.new }
-    before(:each) { cli.stub(:configure) }
-
-    context "when login failed" do
-      it "should exit with error massage" do
-        begin
-          Nicorepo::Cli::Config.any_instance.stub(:account).and_return({mail: "invalid@mail.com", pass: "invalid_pass"})
-          cli.run([ 'i' ])
-        rescue SystemExit => se
-          se.status.should eq 1 
-          $stderr.string.should match /invalid mail or pass/
-        end
-      end
-    end
-
-    context "when login succeed" do
-
-      before(:each) do
-        cli.stub(:login)
-      end
-
-      context "with command 'i'" do
-        it "should exec interactive mode" do
-          cli.should_receive(:interactive_run)
-          cli.run([ 'i' ])
-        end
-      end
-
-      context "with command 'lives'" do
-        it "should recieve logs of live" do
-          Nicorepo.any_instance.should_receive(:lives).and_return([Nicorepo::Log.new])
-          cli.run([ 'lives' ])
-        end
-      end
-    end
-  end
-
-  describe "#interactive_run" do
-    context "when entered 'exit'" do
-      it "should return true" do
-        cli = Nicorepo::Cli.new
-        Readline.stub!(:readline) { 'exit' }
-        cli.interactive_run.should be_true
-      end
-    end
-  end
-
-  describe "#open_url" do
-    context "with 1" do
-      before do
-        @cli = Nicorepo::Cli.new
-        @logs = [ Nicorepo::Log.new ]
-      end
-
-      it "should succeed to open url in browser with first log's url" do
-        @logs.first.url = 'http://www.nicovideo.jp'
-        expect{ @cli.open_url(@logs, 1, {dry_run: true}) }.to be_true
-      end
-
-      it "should raise error when url is nil" do
-        @logs.first.url = nil
-        expect{ @cli.open_url(@logs, 1, {dry_run: true}) }.to raise_error
-      end
-
-      it "should raise error when url is wrongs" do
-        @logs.first.url = 'hoge://piyo'
-        expect{ @cli.open_url(@logs, 1, {dry_run: true}) }.to raise_error
-      end
-    end
-  end
-
-  after(:all) do
-    $stderr = @old_stderr
-  end
-end