simple2ch 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06540f8c53a91b5a17332526346eb10d30eef3a3
-  data.tar.gz: 558d933b554ff40333d429139832ff4ea012e07f
+  metadata.gz: a768ea004e48d4fd18ae5c19c52646469b7d97b2
+  data.tar.gz: 15615e279f263ce11fb4173be0d6cab0aa10d860
 SHA512:
-  metadata.gz: a8ecd7d6c4f98653fb177b8591b466c4bd79a5360fa1ae81b849fa2deec149b243fd6eea88f80e2a58763069430705949b73f81aab9b5afa26a72859b9a64c5d
-  data.tar.gz: 97cafe8a2b0fe8f910cd791e5e3d3976195c438b9a5dba3140835b889e02edcf74292daadb7dfe5712cd717c98e1617572f7cc042d02a20c965542da2bf7fb5c
+  metadata.gz: 06123263022a7c964e11198bfc79a25d6c1ddbed030b7e8e1e74b3d89fe6dd491e2566abaa2c18ba122c5d8119b7a71da31ab7624e8f7301a0178a4b6effe543
+  data.tar.gz: 83a07323fbf88d98da9e004dbf10e3840bac8e77d598c0e908189d2dc5eb4b403a43d9a2fb3580cb313ca80f3fc02a187d0cc9ee7ce819daaf2c71fd1bf325ee

data/README.md

@@ -8,16 +8,19 @@ 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.3]
-* デバッグ
-  * Res#received_anchors呼び出し時にNoThreGivenExceptionが起きる場合がある問題を修正
-
 
 ## Installation
 

data/UPDATES.md

@@ -1,3 +1,9 @@
+[v0.1.5]
+* デバッグ
+  * StandardErrorで例外を捕縛できない問題を修正
+* 機能追加
+  * おーぷん２ちゃんねる対応
+  
 [v0.1.4]
 * デバッグ
   * Thre#resesを実行した際に、IDを持たないレスがあれば、DatParseExceptionが起きる問題を修正

data/lib/simple2ch/board.rb

@@ -29,6 +29,12 @@ module Simple2ch
       end
     end
 
+    # おーぷん2chか否かを返す
+    # @return [Boolean] おーぷん2chか否か
+    def open2ch?
+      @f_open2ch && true
+    end
+
     private
     # URLが正しいかバリデーションする
     # @param [URI] url
@@ -40,18 +46,20 @@ module Simple2ch
 
       if sp_uri.host.index '2ch'
         case url
-          when /http:\/\/(.+)\.2ch.(net|sc)\/test\/read.cgi\/(.+)\/([0-9]+)/,
-              /http:\/\/(.+)\.2ch\.(net|sc)\/(.+)\/subject\.txt/,
-              /http:\/\/(.+)\.2ch\.(net|sc)\/(.+)\//,
-              /http:\/\/(.+)\.2ch\.(net|sc)\/(\w+)/,
-              /http:\/\/(.+)\.2ch.(net|sc)\/(.+)\/dat\/([0-9]+)\.dat/
-            @server_name = $1; @board_name = $3
-            board_url = URI.parse("http://#{$1}.2ch.sc/#{$3}/")
+          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
+            raise NotA2chUrlException, "Given URL :#{url}"
         end
       else
-        raise NotA2chUrlException
+        raise NotA2chUrlException, "Given URL :#{url}"
       end
     end
 

data/lib/simple2ch/res.rb

@@ -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+)$){0,1}/
+      split_date_and_id_regex = /(?<time>^\d{4}\/\d{2}\/\d{2}\(.\) ?\d{2}:\d{2}:\d{2}(\.\d{2})?)(?: ID:(?<author_id>\S+)$){0,1}/
       ret = {}
       split = dat.split('<>')
       ret[:author] = split[0]
@@ -111,12 +111,12 @@ module Simple2ch
       date_and_author_id = split[2]
       ret[:contents] = split[3].strip
 
-      date_and_author_id =~ split_date_and_id_regex
-      if !$1
-        raise DatParseException
+      if split_date_and_id_regex =~ date_and_author_id
+        ret[:date] = Time.parse $~[:time]
+        ret[:author_id] = $~[:author_id]
+      else
+        raise DatParseException, "Data didn't match regex. Data:#{date_and_author_id}"
       end
-      ret[:date] = Time.parse $1
-      ret[:author_id] = $2
 
       ret
     end

data/lib/simple2ch/simple2ch_exception.rb

@@ -1,5 +1,5 @@
 module Simple2ch
-  class Simple2chException < Exception; end
+  class Simple2chException < StandardError; end
   class NotA2chUrlException < Simple2chException; end
   class KakoLogException < Simple2chException; end
   class DatParseException < Simple2chException; end

data/lib/simple2ch/version.rb

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

data/spec/board_spec.rb

@@ -7,7 +7,7 @@ describe Simple2ch::Board do
     {
         sc: 'http://viper.2ch.sc/news4vip/',
         net: 'http://viper.2ch.net/news4vip/',
-        #open: 'http://viper.open2ch.net/news4vip/', #TODO
+        open: 'http://viper.open2ch.net/news4vip/',
         not_a_2ch_format: 'http://test.example.com/hoge/',
         invalid_url: 'http://abc_def.com/foobar/' # under score in host is invalid
     }
@@ -33,6 +33,13 @@ describe Simple2ch::Board do
     its(:size) { is_expected.to be > 0 }
   end
 
+  context 'should be a valid Simple2ch::Board object' do
+    subject { Simple2ch::Board.new(title, url[:open]) }
+    its(:title) { is_expected.to be_a_kind_of String }
+    its(:title) { is_expected.to be == title }
+    its('url.to_s') { is_expected.to be == url[:open] }
+  end
+
   context 'should raise NotA2chUrlException if URL is not a 2ch format' do
     subject { lambda{ Simple2ch::Board.new(title, url[:not_a_2ch_format]) } }
     it { is_expected.to raise_error Simple2ch::NotA2chUrlException }

metadata

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