simple2ch 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a768ea004e48d4fd18ae5c19c52646469b7d97b2
-  data.tar.gz: 15615e279f263ce11fb4173be0d6cab0aa10d860
+  metadata.gz: a6ec2043f50a5e9ae0b2b036c2d63c8b494774a6
+  data.tar.gz: 55b076ab99e2448569d5a8b0d3fba090a1586305
 SHA512:
-  metadata.gz: 06123263022a7c964e11198bfc79a25d6c1ddbed030b7e8e1e74b3d89fe6dd491e2566abaa2c18ba122c5d8119b7a71da31ab7624e8f7301a0178a4b6effe543
-  data.tar.gz: 83a07323fbf88d98da9e004dbf10e3840bac8e77d598c0e908189d2dc5eb4b403a43d9a2fb3580cb313ca80f3fc02a187d0cc9ee7ce819daaf2c71fd1bf325ee
+  metadata.gz: a3812ee2760a1da7e40a353f49bbad985bcd01f42a0a7296f82eb8aa280ea5b663d07909feb7e97d017fbacd4b2883b33e2c7004b7855f041970714c55203cc4
+  data.tar.gz: d39aa7fd4452dd3f8196cdc9e2e0381d6a30761f9855565cee24e7549cd744693dfa8086d95dca7ed723571004b016b9f2c81cb0cf9c29c730a4909602292e37

data/README.md

@@ -1,5 +1,4 @@
 # Simple2ch
-
 2ch Japanese BBS simple reader for Ruby.
 
 Ruby用の2chの簡易リーダーです。
@@ -8,18 +7,17 @@ Ruby用の2chの簡易リーダーです。
 [リファレンス](http://dogwood008.github.io/simple2ch/)
 
 ## 更新内容
-[v0.1.5]
-* デバッグ
-  * StandardErrorで例外を捕縛できない問題を修正
-  * DatParseException, NotA2chUrlException発生時に与えられたURLを表示するよう変更
-* 機能追加
-  * おーぷん２ちゃんねる対応
 
-[v0.1.4]
-* デバッグ
-  * Thre#resesを実行した際に、IDを持たないレスがあれば、DatParseExceptionが起きる問題を修正
-* エイリアス追加
-  * Thre#resをThre#resesのエイリアスに設定
+* [v0.1.6]
+	* 機能追加
+		* 板一覧の取得に対応
+		* URLからスレの取得に対応
+* [v0.1.5]
+	* デバッグ
+		* StandardErrorで例外を捕縛できない問題を修正
+		* DatParseException, NotA2chUrlException発生時に与えられたURLを表示するよう変更
+	* 機能追加
+		* おーぷん２ちゃんねる対応
 
 
 ## Installation
@@ -37,31 +35,60 @@ Or install it yourself as:
     $ gem install simple2ch
 
 ## Usage
-* 初期化
+### 初期化
+
 ```ruby
 require 'simple2ch'
 ```
 
+### Simple2ch
 
-* スレ取得
 ```ruby
-board = Simple2ch::Board.new('ニュー速VIP', 'http://viper.2ch.sc/news4vip/')
-board.thres #=>[#<Simple2ch::Thre>, ..., #<Simple2ch::Thre>]
+boards = Simple2ch.boards 'http://open2ch.net' #=> [#<Simple2ch::Board>, ..., #<Simple2ch::Board>]
 ```
 
-* レス取得
+### Simple2ch::Board
 ```ruby
-hoge = SUM_OF_NUMBER1
-thre = board.thres[hoge] #=> #<Simple2ch::Thre>
-thre.reses #=> [#<Simple2ch::Res>, ..., #<Simple2ch::Res>]
+board = boards.find{|b| b.title == 'プログラム'} #=> #<Simple2ch::Board>
+board.title #=> "プログラム"
+board.thres #=> [#<Simple2ch::Thre>, ..., #<Simple2ch::Thre>]
 ```
 
-* 書き込み内容取得
+### Simple2ch::Thre
+
 ```ruby
-foo = SUM_OF_NUMBER2
-res = thre.reses[foo] #=> #<Simple2ch::Res>
-res.author #=> "以下、＼(^o^)／でVIPがお送りします"
-res.contents #=> "hoge foo bar"
+thre = board.thres.find{|t| t.title == 'さぁRubyはじめるよ'} #=> #<Simple2ch::Thre>
+reses = thre.reses #=> [#<Simple2ch::Res>, ..., #<Simple2ch::Res>]
+```
+
+#### URLを直接指定して取得
+
+```ruby
+thre = Simple2ch::Thre.create_from_url('http://toro.open2ch.net/test/read.cgi/tech/1371956681/l50') #=> #<Simple2ch::Thre>
+thre.title #=> "さぁRubyはじめるよ"
+reses = thre.reses
+```
+
+#### 板を指定して取得
+
+```ruby
+board = Simple2ch::Board.new('ニュー速VIP', 'http://viper.open2ch.net/news4vip/')
+thres = board.thres #=>[#<Simple2ch::Thre>, ..., #<Simple2ch::Thre>]
+thre = thres.find{|t| t.title == 'プログラム'}
+reses = thre.reses
+```
+
+
+### Simple2ch::Res
+
+```ruby
+res = reses[0] #=> #<Simple2ch::Res>
+res.res_num #=> 1
+res.contents #=> "Ruby覚えたいなぁ"
+res.author #=> "s"
+res.author_id #=> "R/Yck7smD"
+res.date #=> 2013-06-23 12:04:41 +0900
+res.mail #=> ""
 ```
 
 
@@ -72,3 +99,4 @@ res.contents #=> "hoge foo bar"
 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
+

data/lib/simple2ch/board.rb

@@ -12,10 +12,15 @@ module Simple2ch
 
     # @param [String] title 板の名前
     # @param [String] url 板のURL
-    def initialize(title, url)
+    # @option [Boolean] fetch_title 板の名前を自動取得するか
+    def initialize(title, url, fetch_title:nil)
       @server_name = @board_name = nil
       @url = validate_url url
-      @title = title
+      @title = if fetch_title
+                 (b=Simple2ch.boards(url).find{|bb| bb.url.to_s == @url.to_s}) &&  b.class!=Array ? b.title : nil
+               else
+                 title
+               end
       @thres = []
     end
 
@@ -35,6 +40,12 @@ module Simple2ch
       @f_open2ch && true
     end
 
+    # 2chタイプ名の取得
+    # @return [Symbol] 2chタイプ名(:net, :sc, :open)
+    def type_of_2ch
+      Simple2ch.type_of_2ch(@url.to_s)
+    end
+
     private
     # URLが正しいかバリデーションする
     # @param [URI] url
@@ -42,22 +53,13 @@ module Simple2ch
     # @raise [URI::InvalidURIError] そもそもURLのフォーマットで無いときに発生
     def validate_url(url)
       sp_uri = URI.parse url
-      board_url = ''
-
       if sp_uri.host.index '2ch'
-        case url
-          when /http:\/\/(?<server_name>.+)\.(?<openflag>open)?2ch.(?<tld>net|sc)\/test\/read.cgi\/(?<board_name>.+)\/(?<thread_key>[0-9]+)/,
-              /http:\/\/(?<server_name>.+)\.(?<openflag>open)?2ch.(?<tld>net|sc)\/(?<board_name>.+)\/subject\.txt/,
-              /http:\/\/(?<server_name>.+)\.(?<openflag>open)?2ch\.(?<tld>net|sc)\/(?<board_name>.+)\//,
-              /http:\/\/(?<server_name>.+)\.(?<openflag>open)?2ch\.(?<tld>net|sc)\/(?<board_name>\w+)/,
-              /http:\/\/(?<server_name>.+)\.(?<openflag>open)?2ch.(?<tld>net|sc)\/(.+)\/dat\/(?<thread_key>[0-9]+)\.dat/
-            @server_name = $~[:server_name]
-            @board_name = $~[:board_name]
-            @f_open2ch = ($~[:openflag] rescue false) && !$~[:openflag].empty? && true
-            board_url = URI.parse("http://#{server_name}.#{@f_open2ch ? 'open' : ''}2ch.#{@f_open2ch ? 'net' : 'sc'}/#{board_name}/")
-          else
-            raise NotA2chUrlException, "Given URL :#{url}"
-        end
+        parsed_url = Simple2ch.parse_url(url.to_s)
+        @server_name = parsed_url[:server_name]
+        @board_name = parsed_url[:board_name]
+        @f_open2ch = !(parsed_url[:openflag].to_s.empty?)
+        @tld = parsed_url[:tld]
+        URI.parse("http://#{server_name}.#{parsed_url[:openflag]}2ch.#{@tld}/#{board_name}/")
       else
         raise NotA2chUrlException, "Given URL :#{url}"
       end

data/lib/simple2ch/res.rb

@@ -115,7 +115,17 @@ module Simple2ch
         ret[:date] = Time.parse $~[:time]
         ret[:author_id] = $~[:author_id]
       else
-        raise DatParseException, "Data didn't match regex. Data:#{date_and_author_id}"
+        if dat.index 'あぼーん'
+          {
+              author: 'あぼーん',
+              mail: 'あぼーん',
+              contents: 'あぼーん',
+              date: 'あぼーん',
+              author_id: 'あぼーん',
+          }
+        else
+          raise DatParseException, "Data didn't match regex. Data:#{date_and_author_id}"
+        end
       end
 
       ret

data/lib/simple2ch/thre.rb

@@ -36,6 +36,15 @@ module Simple2ch
       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]
+      board.thres.find{|t| t.thread_key == thread_key}
+    end
+
     # Datを解析して、レスを返す
     # @param [Array<Fixnum>,Fixnum] num_of_reses 取得したいレス番号
     # @return [Array<Res>] レスの配列
@@ -71,6 +80,12 @@ module Simple2ch
       @received_anchors ||= calc_received_anchors
     end
 
+    # 2chタイプ名の取得
+    # @return [Symbol] 2chタイプ名(:net, :sc, :open)
+    def type_of_2ch
+      @board ? @board.type_of_2ch : nil
+    end
+
     private
     # 全てのレスに対し、あるレスへのアンカーが書き込まれているレス番号のハッシュを返す
     # @return [Hash]{ res_num<Fixnum> => res_nums<Array<Fixnum>> } レス番号のハッシュ

data/lib/simple2ch/version.rb

@@ -1,3 +1,3 @@
 module Simple2ch
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/simple2ch.rb

@@ -8,7 +8,7 @@ module Simple2ch
   require 'simple2ch/dat'
   require 'simple2ch/res'
   require 'simple2ch/thre'
-  require 'net/http'
+  require 'open-uri'
   require 'time'
   require 'charwidth'
   require 'pp' if DEBUG
@@ -17,15 +17,97 @@ module Simple2ch
     File.dirname __dir__
   end
 
+  # Module variables
+  @@boards = {}
+
   # HTTPでGETする
   # @param [URI] url URL
+  # @param [Symbol] site :net, :sc, :openのいずれか．(2ch.net or 2ch.sc or open2ch.net)
   # @return [String] 取得本文
-  def self.fetch(url)
-    req = Net::HTTP::Get.new(url.path)
-    res = Net::HTTP.start(url.host, url.port) {|http|
-      http.request(req)
-    }
-    res.body.force_encoding("cp932").encode!('utf-8', :undef => :replace)
+  def self.fetch(url, site=:sc)
+    res = OpenURI.open_uri(url){|text| text.read }
+    case site
+      when :net, :sc
+        res.force_encoding("cp932").encode!('utf-8', :undef => :replace)
+      when :open
+        res.force_encoding("utf-8")
+      else
+        raise RuntimeError, "Invalid type of 2ch was given: #{site}"
+    end
+  end
+
+  # bbsmenuのURLが渡されればセットして，板リストを返す
+  # @param [String] bbsmenu_url bbs_menuのURL
+  # @option [Boolean] force_refresh キャッシュを利用せず板リストを再取得する
+  # @return [Array<Simple2ch::Board>] 板リスト
+  def self.boards(bbsmenu_url=nil, force_refresh:nil)
+    if bbsmenu_url
+      bbsmenu_urls = {
+        net: 'http://menu.2ch.net/bbsmenu.html', sc: 'http://2ch.sc/bbsmenu.html', open: 'http://open2ch.net/menu/pc_menu.html'
+      }
+      # http://www.rubular.com/r/u1TJbQAULD
+      board_extract_regex = /<A HREF=http:\/\/(?<subdomain>\w+).(?<openflag>open|)2ch.(?<tld>sc|net)\/(?<board_name>\w+)\/>(?<board_name_ja>.+)<\/A>/
+      type_of_2ch = self.type_of_2ch(bbsmenu_url)
+
+      if force_refresh || (boards=@@boards.fetch(type_of_2ch, [])).size == 0
+        prepared_bbsmenu_url = bbsmenu_urls[type_of_2ch]
+
+        data = nil
+        boards_array = []
+
+        raise RuntimeError, "Failed to fetch #{url}" if (data = fetch(URI.parse(prepared_bbsmenu_url), type_of_2ch)).empty?
+        raise RuntimeError, "Failed to parse #{url}" if (boards_array=data.scan(board_extract_regex).uniq).empty?
+
+        boards_array.each do |b|
+          boards << Simple2ch::Board.new(b[4],"http://#{b[0]}.#{b[1]}2ch.#{b[2]}/#{b[3]}/")
+        end
+        @@boards[type_of_2ch] = boards
+      else
+        @@boards[type_of_2ch]
+      end
+    end
+  end
+
+  # 2chのタイプを返す
+  # @param [String] url URL
+  # @return [Symbol] :open or :net or :sc
+  def self.type_of_2ch(url)
+    parsed_url = self.parse_url(url)
+    openflag = parsed_url[:openflag]
+    tld = parsed_url[:tld]
+    if openflag && tld=='net'
+      :open
+    elsif !openflag && tld=='net'
+      :net
+    elsif !openflag && tld=='sc'
+      :sc
+    else
+      nil
+    end
+  end
+
+  # URLを分解する
+  # @param [String] url URL
+  # @return [Array<String>] 結果(thread_key等が該当無しの場合，nilを返す)
+  # @raise [NotA2chUrlException] 2chのURLでないURLが与えられた際に発生
+  def self.parse_url(url)
+    # http://www.rubular.com/r/h63xdfmQIH
+    case url
+      when /http:\/\/(?<server_name>.+)\.(?<openflag>open)?2ch.(?<tld>net|sc)\/test\/read.cgi\/(?<board_name>.+)\/(?<thread_key>[0-9]+)/,
+          /http:\/\/(?<server_name>.+)\.(?<openflag>open)?2ch.(?<tld>net|sc)\/(?<board_name>.+)\/subject\.txt/,
+          /http:\/\/(?<server_name>.+)\.(?<openflag>open)?2ch\.(?<tld>net|sc)\/(?<board_name>.+)\//,
+          /http:\/\/(?<server_name>.+)\.(?<openflag>open)?2ch\.(?<tld>net|sc)\/(?<board_name>\w+)/,
+          /http:\/\/(?<server_name>.+)\.(?<openflag>open)?2ch.(?<tld>net|sc)\/(.+)\/dat\/(?<thread_key>[0-9]+)\.dat/,
+          /http:\/\/(?:(?<server_name>\w*)\.)?(?<openflag>open)?2ch\.(?<tld>sc|net)/
+        { server_name: ($~[:server_name] rescue nil),
+          board_name: ($~[:board_name] rescue nil),
+          openflag: ($~[:openflag] rescue nil),
+          tld: $~[:tld],
+          thread_key: ($~[:thread_key] rescue nil)
+        }
+      else
+        raise NotA2chUrlException, "Given URL: #{url}"
+    end
   end
 end
 

data/spec/board_spec.rb

@@ -14,6 +14,22 @@ describe Simple2ch::Board do
   end
   let(:board) { Simple2ch::Board.new(title, url[:sc]) }
 
+  describe 'have a type of 2ch' do
+    subject{ Simple2ch::Board.new(title, given_url) }
+    context 'when 2ch.net' do
+      let(:given_url){ url[:net] }
+      its(:type_of_2ch){ is_expected.to eq :net }
+    end
+    context 'when 2ch.sc' do
+      let(:given_url){ url[:sc] }
+      its(:type_of_2ch){ is_expected.to eq :sc }
+    end
+    context 'when open2ch.net' do
+      let(:given_url){ url[:open] }
+      its(:type_of_2ch){ is_expected.to eq :open }
+    end
+  end
+
   context 'should get board title' do
     subject { board.title }
     it { is_expected.to be_a_kind_of(String) }

data/spec/simple2ch_spec.rb

@@ -1,7 +1,35 @@
 require 'rspec'
 require 'spec_helper'
 
+RSpec::Matchers.define :have_news4vip do
+  match do |boards|
+    (news4vip = boards.find{|b| b.title == 'ニュー速VIP'}) && news4vip.url.to_s.index('news4vip')
+  end
+end
+
 describe Simple2ch do
+  describe 'should get board from board list' do
+    let(:board_list_url) { {net: 'http://menu.2ch.net/bbsmenu.html', sc: 'http://2ch.sc/bbsmenu.html', open: 'http://open2ch.net/menu/pc_menu.html' } }
+    shared_examples 'get board list from bbsmenu' do
+      subject{ Simple2ch.boards(bbsmenu_url) }
+      it{ is_expected.not_to be_empty }
+      it{ is_expected.to have_news4vip}
+    end
+
+    context 'from 2ch.net' do
+      let(:bbsmenu_url) { board_list_url[:net] }
+      include_examples 'get board list from bbsmenu'
+    end
+    context 'from 2ch.sc' do
+      let(:bbsmenu_url) { board_list_url[:sc] }
+      include_examples 'get board list from bbsmenu'
+    end
+    context 'from open2ch.net' do
+      let(:bbsmenu_url) { board_list_url[:open] }
+      include_examples 'get board list from bbsmenu'
+    end
+  end
+
   context 'should get reses from board url' do
     before(:all) do
       board_name = 'ニュー速VIP'

data/spec/thre_spec.rb

@@ -2,45 +2,96 @@ require 'rspec'
 require 'spec_helper'
 
 describe Simple2ch::Thre do
-  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) }
-
-  describe 'should have title' do
-    subject { thre.title }
-    it { is_expected.to be_a_kind_of(String) }
+  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 }
   end
+  shared_examples 'should be valid' do
+    describe 'should have title' do
+      subject { thre.title }
+      it { is_expected.to be_a_kind_of(String) }
+    end
 
-  describe 'should have thread key' do
-    subject { thre.thread_key }
-    it { is_expected.to be_a_kind_of(String) }
-    it { is_expected.to match /\d{10}/ }
-  end
+    describe 'should have thread key' do
+      subject { thre.thread_key }
+      it { is_expected.to be_a_kind_of(String) }
+      it { is_expected.to match /\d{10}/ }
+    end
 
-  describe 'should have numbers of responses' do
-    subject { thre.num_of_response }
-    it { is_expected.to be_a_kind_of(Fixnum) }
-    it { is_expected.to be > 0 }
-  end
+    describe 'should have numbers of responses' do
+      subject { thre.num_of_response }
+      it { is_expected.to be_a_kind_of(Fixnum) }
+      it { is_expected.to be > 0 }
+    end
+
+    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) } }
+      its(:size) { is_expected.to be > 0 }
+    end
+
+    describe 'should have if Kako log' do
+      subject { thre.kako_log? }
+      it { is_expected.to kako_log }
+    end
 
-  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) } }
-    its(:size) { is_expected.to be > 0 }
   end
 
-  describe 'should have if Kako log' do
-    subject { thre.kako_log? }
-    it { is_expected.to be_truthy }
+  describe 'should be created from URL' do
+    shared_examples 'create from URL' do
+      let(:thre) { Simple2ch::Thre.create_from_url(url) }
+      subject{ thre }
+      it{ is_expected.to be_a_kind_of Simple2ch::Thre }
+      its(:board) { is_expected.to be_a_kind_of Simple2ch::Board }
+      its('board.title') { is_expected.not_to be_empty }
+      its(:title){ is_expected.not_to be_empty }
+      include_examples 'should be valid'
+    end
+    context 'from 2ch.net URL' do
+      let(:url) {'http://peace.2ch.net/test/read.cgi/tech/1158807229/l50'}
+      let(:kako_log){ be_falsey }
+      include_examples 'create from URL'
+    end
+    context 'from 2ch.sc URL' do
+      let(:url) {'http://peace.2ch.sc/test/read.cgi/tech/1158807229/l50'}
+      let(:kako_log){ be_falsey }
+      include_examples 'create from URL'
+    end
+    context 'from open2ch.net URL' do
+      let(:url) {'http://toro.open2ch.net/test/read.cgi/tech/1371956681/l50'}
+      let(:kako_log){ be_falsey }
+      include_examples 'create from URL'
+    end
   end
 
-  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 }
+  describe 'should have a type of 2ch' do
+    subject{ Simple2ch::Thre.new(board, thread_key) }
+    context '2ch.net' do
+      let!(:board){ Simple2ch::Board.new 'ニュース速報(VIP)', 'http://viper.2ch.net/news4vip/' }
+      let(:thread_key){ board.thres[0].thread_key }
+      its(:type_of_2ch) { is_expected.to eq :net }
+    end
+    context '2ch.sc' do
+      let!(:board){ Simple2ch::Board.new 'ニュース速報(VIP)', 'http://viper.2ch.sc/news4vip/' }
+      let(:thread_key){ board.thres[0].thread_key }
+      its(:type_of_2ch) { is_expected.to eq :sc }
     end
+    context '2ch.net' do
+      let!(:board){ Simple2ch::Board.new 'ニュース速報(VIP)', 'http://viper.open2ch.net/news4vip/' }
+      let(:thread_key){ board.thres[0].thread_key }
+      its(:type_of_2ch) { is_expected.to eq :open }
+    end
+  end
+
+  describe 'is valid' do
+    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) }
+    let(:kako_log) { be_truthy }
+    include_examples 'should be valid'
+
     context 'when without res_num' do
       let(:size) { 144 }
       let(:specified_reses) { nil }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple2ch
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - dogwood008
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-25 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -152,3 +152,4 @@ test_files:
 - spec/simple2ch_spec.rb
 - spec/spec_helper.rb
 - spec/thre_spec.rb
+has_rdoc: