simple2ch 0.1.8 → 1.1.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple2ch
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 1.1.0
 platform: ruby
 authors:
 - dogwood008
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2016-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,76 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-stack_explorer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: charwidth
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +164,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.3
+- !ruby/object:Gem::Dependency
+  name: htmlentities
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.3.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.3.3
+- !ruby/object:Gem::Dependency
+  name: retryable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+- !ruby/object:Gem::Dependency
+  name: bbs_2ch_url_validator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 description: 2ch Japanese BBS simple reader.
 email:
 - dogwood008+rubygems@gmail.com
@@ -102,25 +214,59 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - UPDATES.md
 - lib/simple2ch.rb
+- lib/simple2ch/bbs.rb
 - lib/simple2ch/board.rb
 - lib/simple2ch/dat.rb
-- lib/simple2ch/res.rb
-- lib/simple2ch/simple2ch_exception.rb
-- lib/simple2ch/thre.rb
+- lib/simple2ch/regex.rb
+- lib/simple2ch/response.rb
+- lib/simple2ch/simple2ch_error.rb
+- lib/simple2ch/thread.rb
 - lib/simple2ch/version.rb
 - simple2ch.gemspec
+- spec/bbs_spec.rb
 - spec/board_spec.rb
 - spec/dat_spec.rb
-- spec/res_spec.rb
+- spec/response_spec.rb
 - spec/simple2ch_spec.rb
 - spec/spec_helper.rb
-- spec/thre_spec.rb
+- spec/thread_spec.rb
+- spec/vcr/Simple2ch_BBS/_boards/use_cache/behaves_like_boards/from_2ch_sc/1_1_1_1_1_2.yml
+- spec/vcr/Simple2ch_BBS/_boards/use_cache/behaves_like_boards/from_open2ch_net/1_1_1_1_2_2.yml
+- spec/vcr/Simple2ch_BBS/_boards/use_force_reload/behaves_like_boards/from_2ch_sc/1_1_2_1_1_2.yml
+- spec/vcr/Simple2ch_BBS/_boards/use_force_reload/behaves_like_boards/from_2ch_sc/1_1_2_1_1_3.yml
+- spec/vcr/Simple2ch_BBS/_boards/use_force_reload/behaves_like_boards/from_open2ch_net/1_1_2_1_2_2.yml
+- spec/vcr/Simple2ch_BBS/_boards/use_force_reload/behaves_like_boards/from_open2ch_net/1_1_2_1_2_3.yml
+- spec/vcr/Simple2ch_Board/_threads/1_4_1.yml
+- spec/vcr/Simple2ch_Board/_threads/1_4_2.yml
+- spec/vcr/Simple2ch_Board/_threads/1_4_3.yml
+- spec/vcr/Simple2ch_Board/_threads/1_4_7.yml
+- spec/vcr/Simple2ch_Board/_threads/1_4_8.yml
+- spec/vcr/Simple2ch_Board/_threads/1_4_9.yml
+- spec/vcr/Simple2ch_Dat/should_have_responses/1_2_1.yml
+- spec/vcr/Simple2ch_Dat/should_have_responses/1_2_3.yml
+- spec/vcr/Simple2ch_Dat/should_have_responses/1_2_4.yml
+- spec/vcr/Simple2ch_Dat/should_have_responses/size/1_2_2_1.yml
+- spec/vcr/Simple2ch_Response/_anchors/when_a_thre_have_both_id_and_non-id_responses/1_2_7_1.yml
+- spec/vcr/Simple2ch_Response/_parse/when_real_data/when_2ch_sc/1_1_2_1_1.yml
+- spec/vcr/Simple2ch_Response/_parse/when_real_data/when_open2ch_net/1_1_2_2_1.yml
+- spec/vcr/Simple2ch_Thread/_new/2ch_sc/1_1_1_1.yml
+- spec/vcr/Simple2ch_Thread/_new/2ch_sc/1_1_1_2.yml
+- spec/vcr/Simple2ch_Thread/_new/open2ch_net/1_1_2_1.yml
+- spec/vcr/Simple2ch_Thread/_new/open2ch_net/1_1_2_2.yml
+- spec/vcr/Simple2ch_Thread/_responses/1_2_1.yml
+- spec/vcr/Simple2ch_Thread/_responses/first/1_2_2_1.yml
+- spec/vcr/Simple2ch_Thread/_responses/first/1_2_3_1.yml
+- spec/vcr/Simple2ch_Thread/_title/1_3_1.yml
+- spec/vcr/Simple2ch_Thread/_title/size/1_3_2_1.yml
 homepage: https://github.com/dogwood008/simple2ch
 licenses:
 - MIT
@@ -141,15 +287,43 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: 2ch Japanese BBS simple reader.
 test_files:
+- spec/bbs_spec.rb
 - spec/board_spec.rb
 - spec/dat_spec.rb
-- spec/res_spec.rb
+- spec/response_spec.rb
 - spec/simple2ch_spec.rb
 - spec/spec_helper.rb
-- spec/thre_spec.rb
-has_rdoc: 
+- spec/thread_spec.rb
+- spec/vcr/Simple2ch_BBS/_boards/use_cache/behaves_like_boards/from_2ch_sc/1_1_1_1_1_2.yml
+- spec/vcr/Simple2ch_BBS/_boards/use_cache/behaves_like_boards/from_open2ch_net/1_1_1_1_2_2.yml
+- spec/vcr/Simple2ch_BBS/_boards/use_force_reload/behaves_like_boards/from_2ch_sc/1_1_2_1_1_2.yml
+- spec/vcr/Simple2ch_BBS/_boards/use_force_reload/behaves_like_boards/from_2ch_sc/1_1_2_1_1_3.yml
+- spec/vcr/Simple2ch_BBS/_boards/use_force_reload/behaves_like_boards/from_open2ch_net/1_1_2_1_2_2.yml
+- spec/vcr/Simple2ch_BBS/_boards/use_force_reload/behaves_like_boards/from_open2ch_net/1_1_2_1_2_3.yml
+- spec/vcr/Simple2ch_Board/_threads/1_4_1.yml
+- spec/vcr/Simple2ch_Board/_threads/1_4_2.yml
+- spec/vcr/Simple2ch_Board/_threads/1_4_3.yml
+- spec/vcr/Simple2ch_Board/_threads/1_4_7.yml
+- spec/vcr/Simple2ch_Board/_threads/1_4_8.yml
+- spec/vcr/Simple2ch_Board/_threads/1_4_9.yml
+- spec/vcr/Simple2ch_Dat/should_have_responses/1_2_1.yml
+- spec/vcr/Simple2ch_Dat/should_have_responses/1_2_3.yml
+- spec/vcr/Simple2ch_Dat/should_have_responses/1_2_4.yml
+- spec/vcr/Simple2ch_Dat/should_have_responses/size/1_2_2_1.yml
+- spec/vcr/Simple2ch_Response/_anchors/when_a_thre_have_both_id_and_non-id_responses/1_2_7_1.yml
+- spec/vcr/Simple2ch_Response/_parse/when_real_data/when_2ch_sc/1_1_2_1_1.yml
+- spec/vcr/Simple2ch_Response/_parse/when_real_data/when_open2ch_net/1_1_2_2_1.yml
+- spec/vcr/Simple2ch_Thread/_new/2ch_sc/1_1_1_1.yml
+- spec/vcr/Simple2ch_Thread/_new/2ch_sc/1_1_1_2.yml
+- spec/vcr/Simple2ch_Thread/_new/open2ch_net/1_1_2_1.yml
+- spec/vcr/Simple2ch_Thread/_new/open2ch_net/1_1_2_2.yml
+- spec/vcr/Simple2ch_Thread/_responses/1_2_1.yml
+- spec/vcr/Simple2ch_Thread/_responses/first/1_2_2_1.yml
+- spec/vcr/Simple2ch_Thread/_responses/first/1_2_3_1.yml
+- spec/vcr/Simple2ch_Thread/_title/1_3_1.yml
+- spec/vcr/Simple2ch_Thread/_title/size/1_3_2_1.yml

data/lib/simple2ch/simple2ch_exception.rb

@@ -1,7 +0,0 @@
-module Simple2ch
-  class Simple2chException < StandardError; end
-  class NotA2chUrlException < Simple2chException; end
-  class KakoLogException < Simple2chException; end
-  class DatParseException < Simple2chException; end
-  class NoThreGivenException < Simple2chException; end
-end

data/lib/simple2ch/thre.rb

@@ -1,140 +0,0 @@
-module Simple2ch
-  class Thre
-    # @return [String] スレッドキー(Unix time)
-    attr_reader :thread_key
-    # @return [Fixnum] 返信の数
-    attr_reader :num_of_response
-    # @return [Board] 属する板
-    attr_reader :board
-
-    # @param [Board] board スレッドが属する板情報
-    # @param [String] thread_key スレッドキー
-    # @param [String] title スレッド名
-    # @param [Fixnum] num_of_response 総書き込み数
-    def initialize(board, thread_key, title: '', num_of_response: '')
-      @board = board
-      @thread_key = thread_key
-      @title = title
-      @num_of_response = num_of_response
-      @reses = nil
-      @f_kako_log = nil
-      @received_anchors = nil
-    end
-
-    # 板オブジェクトとsubject.txtの1行データを渡すとスレオブジェクトを返す
-    # @param [Board] board スレッドが属する板情報
-    # @param [String] thread_data 0000000000.dat<>スレッドタイトル (レス数)
-    # @return [Thre] スレ
-    def self.parse(board, thread_data)
-      thread_data =~ /(\d{10})\.dat<>(.+) \((\d+)\)/
-      hash = {}
-      thread_key = $1
-      hash[:title] = $2
-      hash[:num_of_response] = $3.to_i
-      self.new board, thread_key, hash
-    end
-
-    # スレのURLからスレオブジェクトを生成して返す
-    # @param [String] url URL
-    # @return [Thre] スレ
-    def self.create_from_url(url)
-      board = Simple2ch::Board.new('', url, fetch_title: true)
-      thread_key = Simple2ch.parse_url(url)[:thread_key]
-      thre = board.thres.find{|t| t.thread_key == thread_key}
-      unless thre
-        thre = Thre.new board, thread_key
-        thre.reses
-      end
-      thre
-    end
-
-    # Datを解析して、レスを返す
-    # @param [Array<Fixnum>,Fixnum] num_of_reses 取得したいレス番号
-    # @return [Array<Res>] レスの配列
-    def reses(num_of_reses=nil)
-      fetch_dat unless @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] 過去ログか否か
-    def kako_log?
-      fetch_dat if @f_kako_log.nil?
-      @f_kako_log
-    end
-
-    # 全てのレスに対し、あるレスへのアンカーが書き込まれているレス番号のハッシュを返す
-    # @return [Hash]{ res_num<Fixnum> => res_nums<Array<Fixnum>> } レス番号のハッシュ
-    def received_anchors
-      @received_anchors ||= calc_received_anchors
-    end
-
-    # 2chタイプ名の取得
-    # @return [Symbol] 2chタイプ名(:net, :sc, :open)
-    def type_of_2ch
-      @board ? @board.type_of_2ch : nil
-    end
-
-    # スレのURLを返す
-    # @return [String] スレのURL
-    def url
-      tld = type_of_2ch == :sc ? :sc : :net
-      "http://#{@board.server_name}.#{type_of_2ch==:open ? 'open' : ''}2ch.#{tld}/test/read.cgi/#{@board.board_name}/#{@thread_key}/"
-    end
-
-    # スレのdatURLを返す
-    # @return [String] スレのdatURL
-    def dat_url
-      tld = type_of_2ch == :sc ? :sc : :net
-      "http://#{@board.server_name}.#{type_of_2ch==:open ? 'open' : ''}2ch.#{tld}/#{@board.board_name}/dat/#{@thread_key}.dat"
-    end
-
-    # タイトルを返す
-    # @return [String] スレッドの名前
-    def title
-      unless @title
-        fetch_dat
-      end
-      @title
-    end
-
-    private
-    # 全てのレスに対し、あるレスへのアンカーが書き込まれているレス番号のハッシュを返す
-    # @return [Hash]{ res_num<Fixnum> => res_nums<Array<Fixnum>> } レス番号のハッシュ
-    def calc_received_anchors
-      ret = {}
-      reses.each do |res|
-        res.anchors.each do |anchor|
-          ret.store(anchor, ret.fetch(anchor, []).push(res.res_num))
-        end
-      end
-      ret
-    end
-
-    # Datを取ってきてレスと過去ログかどうかを返す
-    # @return [Boolean] f_kako_log 過去ログか否か
-    def fetch_dat
-      dat = Dat.new(self)
-      @reses = dat.reses
-      @num_of_response = @reses.size
-      @f_kako_log = dat.kako_log?
-      @title =  dat.title if !@title || @title.empty?
-      dat = nil
-      @f_kako_log
-    end
-  end
-end

data/spec/res_spec.rb

@@ -1,123 +0,0 @@
-require 'rspec'
-require 'spec_helper'
-
-describe Simple2ch::Res do
-  let(:dat_data) { %q{以下、＼(^o^)／でVIPがお送りします<><>2014/09/04(木) 18:46:36.03 ID:wBAvTswZ0.net<> http://livedoor.blogimg.jp/hatima/imgs/b/c/bccae87d.jpg <br>  <br>  <br> ※二次創作ではなく、公式です <>古参よ、これが今の東方projectだ
-以下、＼(^o^)／でVIPがお送りします<><>2014/09/04(木) 18:47:10.12 ID:X4fy/81O0.net<> うそつけ <>
-以下、＼(^o^)／でVIPがお送りします<><>2014/09/04(木) 18:47:14.08 ID:WDyAzc5v0.net<> 嘘乙 <>
-以下、＼(^o^)／でVIPがお送りします<><>2014/09/04(木) 18:47:19.71 ID:9QYJSuKn0.net<> 正直楽しみ <>
-以下、＼(^o^)／でVIPがお送りします<><>2014/09/04(木) 18:47:35.65 ID:rbjZvMWo0.net<> はてぃま <>
-以下、＼(^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 } }
-
-  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
-
-  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
-
-  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
-
-  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
-
-  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 }
-  end
-
-  describe '#anchors' do
-    shared_examples('have valid anchors') do
-      let(:res_num) { 100 }
-      subject { Res.new(res_num, contents: contents) }
-
-      describe 'that\'s anchored res is valid' do
-        its(:anchors) { is_expected.to be_a_kind_of Array }
-        its(:anchors) { is_expected.to be == anchor }
-        its('anchors.size') { is_expected.to be == anchor.size }
-      end
-    end
-    context 'when it have anchors separated commas' do
-      let(:contents) { %Q{&gt;&gt;1, 2,　3,12,　３４\n9} }
-      let(:anchor) { [1, 2, 3, 12, 34] }
-      it_behaves_like 'have valid anchors'
-    end
-    context 'when it have anchors separated commas & spaces' do
-      let(:contents) { %Q{&gt;&gt;1, 2,　3 4　5　６, １２、　３４\n9} }
-      let(:anchor) { [1, 2, 3, 4, 5, 6, 12, 34] }
-      it_behaves_like 'have valid anchors'
-    end
-    context 'when it have anchors range' do
-      let(:contents) { %Q{&gt;1-5\n9} }
-      let(:anchor) { (1..5).to_a }
-      it_behaves_like 'have valid anchors'
-    end
-    context 'when it have range and separated anchors pattern#1' do
-      let(:contents) { %Q{&gt;1-5,6,8} }
-      let(:anchor) { [1, 2, 3, 4, 5, 6, 8] }
-      it_behaves_like 'have valid anchors'
-    end
-    context 'when it have range and separated anchors pattern#2' do
-      let(:contents) { %Q{&gt;1,3, ９−１３\n25} }
-      let(:anchor) { [1, 3, 9, 10, 11, 12, 13] }
-      it_behaves_like 'have valid anchors'
-    end
-    context 'when it have ARASHI anchors' do
-      let(:contents) { %Q{>1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,
->52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,
-
->>1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
-　　∧＿∧
-　 (´･ω･｀)　　 　　n
-￣　..　 　 ＼　 　 （ E）
-ﾌ ア.フ.ィ /ヽ ヽ_／／
->>21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40
-　　∧＿∧
-　 (´･ω･｀)　　 　　n
-￣　　 ..　 ＼　 　 （ E）
-ﾌ ア.フ.ィ /ヽ ヽ_／／
->>41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60 } }
-      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
-    let(:board_name) { 'ニュー速VIP' }
-    let(:url) { 'http://viper.2ch.sc/news4vip/' }
-    let(:thread_key) { '1409796283' }
-    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 }
-    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] }
-  end
-
-end