simple2ch 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0170aa4c9b6c57954cdcafb4637de91787e4013e
-  data.tar.gz: 3f13604c021839d6844f5e54d64b9e7ce4c579e9
+  metadata.gz: 06540f8c53a91b5a17332526346eb10d30eef3a3
+  data.tar.gz: 558d933b554ff40333d429139832ff4ea012e07f
 SHA512:
-  metadata.gz: 1512403f89049adb48022be4bd9a83840f6d89e09642db9123762c350507cf03c469b376fcba72a2e86b53575a35bdb3b6cab91fee00becc46b8528c46f939a4
-  data.tar.gz: a941bbc19e40dbed17e5e5cffe5244358b762cbdef72a858cb76f433c1832a5987f962c29b72ae16494f3a1dcee179c52e4b862c0abc235b4ccf44d1861d1c8d
+  metadata.gz: a8ecd7d6c4f98653fb177b8591b466c4bd79a5360fa1ae81b849fa2deec149b243fd6eea88f80e2a58763069430705949b73f81aab9b5afa26a72859b9a64c5d
+  data.tar.gz: 97cafe8a2b0fe8f910cd791e5e3d3976195c438b9a5dba3140835b889e02edcf74292daadb7dfe5712cd717c98e1617572f7cc042d02a20c965542da2bf7fb5c

data/README.md

@@ -8,21 +8,16 @@ Ruby用の2chの簡易リーダーです。
 [リファレンス](http://dogwood008.github.io/simple2ch/)
 
 ## 更新内容
+[v0.1.4]
+* デバッグ
+  * Thre#resesを実行した際に、IDを持たないレスがあれば、DatParseExceptionが起きる問題を修正
+* エイリアス追加
+  * Thre#resをThre#resesのエイリアスに設定
+
 [v0.1.3]
 * デバッグ
   * Res#received_anchors呼び出し時にNoThreGivenExceptionが起きる場合がある問題を修正
 
-[v0.1.2]
-* リファクタリングとデバッグ
-* メソッド修正
-  * Thre#reses(Array<Fixnum>)で指定したレス番号のレスを取得
-  * Thre#resesは今まで通り使用可能
-* メソッド追加
-  * Thre#received_anchors
-    * 全レスについて被レスを返す
-  * Res#received_anchors(Thre)
-    * 自レスへの被レスを返す
-
 
 ## Installation
 

data/UPDATES.md

@@ -1,3 +1,9 @@
+[v0.1.4]
+* デバッグ
+  * Thre#resesを実行した際に、IDを持たないレスがあれば、DatParseExceptionが起きる問題を修正
+* エイリアス追加
+  * Thre#resをThre#resesのエイリアスに設定
+
 [v0.1.3]
 * デバッグ
   * Res#received_anchors呼び出し時にNoThreGivenExceptionが起きる場合がある問題を修正

data/lib/simple2ch/res.rb

@@ -74,7 +74,7 @@ module Simple2ch
     end
 
     # 自レスへのアンカーが書き込まれているレス番号を返す
-    # @return Array<Fixnum> レス番号
+    # @return [Array<Fixnum>] レス番号
     def received_anchors
       thre = get_thre
       received_anchors = thre.received_anchors
@@ -103,7 +103,7 @@ module Simple2ch
     # @param [String] dat datのデータ1行
     # @raise [DatParseException] Datのパースに失敗したときに発生
     def self.parse_dat(dat)
-      split_date_and_id_regex = /(^\d{4}\/\d{2}\/\d{2}\(.\) \d{2}:\d{2}:\d{2}\.\d{2}) ID:(\S+)$/
+      split_date_and_id_regex = /(^\d{4}\/\d{2}\/\d{2}\(.\) \d{2}:\d{2}:\d{2}\.\d{2})(?: ID:(\S+)$){0,1}/
       ret = {}
       split = dat.split('<>')
       ret[:author] = split[0]
@@ -112,7 +112,7 @@ module Simple2ch
       ret[:contents] = split[3].strip
 
       date_and_author_id =~ split_date_and_id_regex
-      if !$1 || !$2
+      if !$1
         raise DatParseException
       end
       ret[:date] = Time.parse $1

data/lib/simple2ch/thre.rb

@@ -37,18 +37,26 @@ module Simple2ch
     end
 
     # Datを解析して、レスを返す
-    # @param [Array<Fixnum>] num_of_reses 取得したいレス番号
+    # @param [Array<Fixnum>,Fixnum] num_of_reses 取得したいレス番号
     # @return [Array<Res>] レスの配列
     def reses(num_of_reses=nil)
       fetch_dat unless @reses
-      if num_of_reses && num_of_reses.size > 0
-        @reses.find_all{|r|
-          num_of_reses.index(r.res_num)
-        }
-      else
-        @reses
+      case num_of_reses
+        when Array
+          if num_of_reses.size > 0
+            @reses.find_all { |r|
+              num_of_reses.index(r.res_num)
+            }
+          else
+            raise 'Blank array was given.'
+          end
+        when Fixnum
+          @reses.find { |r| r.res_num == num_of_reses }
+        when NilClass
+          @reses
       end
     end
+    alias_method :res, :reses
 
     # 過去ログかどうかを返す
     # @return [Boolean] 過去ログか否か

data/lib/simple2ch/version.rb

@@ -1,3 +1,3 @@
 module Simple2ch
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/res_spec.rb

@@ -10,31 +10,31 @@ describe Simple2ch::Res do
 以下、＼(^o^)／でVIPがお送りします<><>2014/09/04(木) 18:47:41.41 ID:bHgEtoQU0.net<> 思い切り二次創作じゃねえか <br> PS4でやるんだっけ <>} }
   let(:res) { dat_data.split(/\n/).map.with_index(1) { |d, i| Simple2ch::Res.parse i, d } }
 
-  context 'should have res number' do
+  describe 'should have res number' do
     subject { res[0].res_num }
     it { is_expected.to be_a_kind_of(Numeric) }
     it { is_expected.to be > 0 }
   end
 
-  context 'should have author' do
+  describe 'should have author' do
     subject { res[0].author }
     it { is_expected.to be_a_kind_of(String) }
     it { is_expected.not_to be eq nil }
   end
 
-  context 'should have author_id' do
+  describe 'should have author_id' do
     subject { res[0].author_id }
     it { is_expected.to be_a_kind_of(String) }
     it { is_expected.not_to be eq nil }
   end
 
-  context 'should have contents' do
+  describe 'should have contents' do
     subject { res[0].contents }
     it { is_expected.to be_a_kind_of(String) }
     it { is_expected.not_to be eq nil }
   end
 
-  context 'should have date' do
+  describe 'should have date' do
     subject { res[0].date }
     it { is_expected.to be_a_kind_of(Time) }
     it { is_expected.not_to be eq nil }
@@ -94,6 +94,16 @@ describe Simple2ch::Res do
       let(:anchor) { [] }
       it_behaves_like 'have valid anchors'
     end
+    context 'when a thre have both id and non-id reses', force: true do
+      let(:board_name) { 'プログラム技術' }
+      let(:url) { 'http://toro.2ch.sc/tech/' }
+      let(:thread_key) { '1382307475' }
+      let(:board) { Board.new(board_name, url) }
+      let(:thre) { Thre.new(board, thread_key) }
+      subject { thre.reses }
+      it { is_expected.to be_a_kind_of Array }
+    end
+
   end
 
   describe '#recepted_anchors' do
@@ -103,8 +113,8 @@ describe Simple2ch::Res do
     let(:board) { Board.new board_name, url }
     let(:thre) { Thre.new board, thread_key }
     let(:res) { thre.reses([40])[0] }
-    let(:input_thre) { res.thre = thre}
-    subject{ input_thre; res.received_anchors }
+    let(:input_thre) { res.thre = thre }
+    subject { input_thre; res.received_anchors }
     it { is_expected.to be_a_kind_of Array }
     its(:size) { is_expected.to be == 4 }
     it { is_expected.to be == [43, 44, 45, 54] }

data/spec/thre_spec.rb

@@ -2,7 +2,7 @@ require 'rspec'
 require 'spec_helper'
 
 describe Simple2ch::Thre do
-  let(:board) { Simple2ch::Board.new 'ニュース速報(VIP)', 'http://viper.2ch.sc/news4vip/'}
+  let(:board) { Simple2ch::Board.new 'ニュース速報(VIP)', 'http://viper.2ch.sc/news4vip/' }
   let(:dat_data) { '1409796283.dat<>Ｃ言語の勉強始めたんだがな (144)' }
   let(:thre) { Simple2ch::Thre.parse(board, dat_data) }
 
@@ -26,7 +26,7 @@ describe Simple2ch::Thre do
   describe 'should have responses' do
     subject { thre.reses }
     it { is_expected.to be_a_kind_of(Array) }
-    it { subject.each{ |r| expect(r).to be_a_kind_of(Simple2ch::Res) } }
+    it { subject.each { |r| expect(r).to be_a_kind_of(Simple2ch::Res) } }
     its(:size) { is_expected.to be > 0 }
   end
 
@@ -37,23 +37,34 @@ describe Simple2ch::Thre do
 
   describe '#reses' do
     shared_examples 'have specified reses' do
-      subject{thre.reses(specified_reses)}
-      it{is_expected.to be_a_kind_of Array}
-      its(:size){is_expected.to be == size}
+      subject { thre.reses(specified_reses) }
+      it { is_expected.to be_a_kind_of Array }
+      its(:size) { is_expected.to be == size }
     end
     context 'when without res_num' do
-      let(:size){144}
-      let(:specified_reses){nil}
+      let(:size) { 144 }
+      let(:specified_reses) { nil }
       it_behaves_like 'have specified reses'
     end
 
-    context 'when with res_num' do
-      let(:size){3}
-      let(:specified_reses){[1,2,10]}
+    context 'when with res_nums' do
+      let(:size) { 3 }
+      let(:specified_reses) { [1, 2, 10] }
       it_behaves_like 'have specified reses'
-      it{
+      it {
         extracted_reses = thre.reses(specified_reses)
-        expect(extracted_reses[2]).to be == thre.reses.find{|r| r.res_num==10}
+        expect(extracted_reses[2]).to be == thre.reses.find { |r| r.res_num==10 }
+      }
+    end
+
+    context 'when with only a res_num' do
+      let(:size) { 3 }
+      let(:specified_res_num) { 10 }
+      subject { thre.reses(specified_res_num) }
+      it { is_expected.to be_a_kind_of Res }
+      it {
+        extracted_res = thre.reses(specified_res_num)
+        expect(extracted_res).to be == thre.reses.find { |r| r.res_num==specified_res_num }
       }
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple2ch
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - dogwood008
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-21 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler