simple2ch 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6ec2043f50a5e9ae0b2b036c2d63c8b494774a6
-  data.tar.gz: 55b076ab99e2448569d5a8b0d3fba090a1586305
+  metadata.gz: acd8e7b89961a88b05475aed31e51d4406704f6d
+  data.tar.gz: a73c6c26db2fd2998b8d837e803d59a27c8122d1
 SHA512:
-  metadata.gz: a3812ee2760a1da7e40a353f49bbad985bcd01f42a0a7296f82eb8aa280ea5b663d07909feb7e97d017fbacd4b2883b33e2c7004b7855f041970714c55203cc4
-  data.tar.gz: d39aa7fd4452dd3f8196cdc9e2e0381d6a30761f9855565cee24e7549cd744693dfa8086d95dca7ed723571004b016b9f2c81cb0cf9c29c730a4909602292e37
+  metadata.gz: 215c6e5ab3951dc9f5094c45555639e7050b451408236ca72a1596809cf0aa69e5a090bfb8a191af470b434289e4cee8688e7464049443ca6b362740934f1604
+  data.tar.gz: 38ada2533a803b733f6538d6f62e6c7f4de8ceec6e654189c9c68b954249c0a7285989254189e470455eb5f8fb8d2e2565b00e922aa40809ca380e2315704dac

data/README.md

@@ -8,17 +8,15 @@ Ruby用の2chの簡易リーダーです。
 
 ## 更新内容
 
+* [v0.1.7]
+	* 機能追加
+		* Thre#url, Thre#dat_urlの追加
+	* バグ修正
+		* エンコーディング関連
 * [v0.1.6]
 	* 機能追加
 		* 板一覧の取得に対応
 		* URLからスレの取得に対応
-* [v0.1.5]
-	* デバッグ
-		* StandardErrorで例外を捕縛できない問題を修正
-		* DatParseException, NotA2chUrlException発生時に与えられたURLを表示するよう変更
-	* 機能追加
-		* おーぷん２ちゃんねる対応
-
 
 ## Installation
 

data/lib/simple2ch.rb

@@ -22,18 +22,14 @@ module Simple2ch
 
   # 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, 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
+  def self.fetch(url)
+    encode = if url.to_s.index('subject.txt') || url.to_s.index('.dat') || url.to_s.index('bbsmenu')
+                    'SHIFT_JIS'
+                  else
+                    'UTF-8'
+                  end
+    OpenURI.open_uri(url, 'r:binary').read.force_encoding(encode).encode('utf-8', undef: :replace, invalid: :replace, replace: '〓')
   end
 
   # bbsmenuのURLが渡されればセットして，板リストを返す
@@ -43,7 +39,7 @@ module Simple2ch
   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'
+        net: 'http://menu.2ch.net/bbsmenu.html', sc: 'http://2ch.sc/bbsmenu.html', open: 'http://open2ch.net/bbsmenu.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>/
@@ -55,22 +51,22 @@ module Simple2ch
         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 fetch #{url}" if (data = fetch(URI.parse(prepared_bbsmenu_url))).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
+    @@boards[type_of_2ch]
   end
 
   # 2chのタイプを返す
   # @param [String] url URL
   # @return [Symbol] :open or :net or :sc
+  # @raise [NotA2chUrlException] 2chのURLでないURLが与えられた際に発生
   def self.type_of_2ch(url)
     parsed_url = self.parse_url(url)
     openflag = parsed_url[:openflag]
@@ -82,7 +78,7 @@ module Simple2ch
     elsif !openflag && tld=='sc'
       :sc
     else
-      nil
+      raise NotA2chUrlException, "Given URL: #{url}"
     end
   end
 
@@ -92,19 +88,18 @@ module Simple2ch
   # @raise [NotA2chUrlException] 2chのURLでないURLが与えられた際に発生
   def self.parse_url(url)
     # http://www.rubular.com/r/h63xdfmQIH
-    case url
+    case url.to_s
       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)
-        }
+          /http:\/\/(?:(?<server_name>.*)\.)?(?:(?<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

data/lib/simple2ch/dat.rb

@@ -2,6 +2,8 @@ module Simple2ch
   class Dat
     # @return [String] スレッドキー
     attr_reader :thread_key
+    # @return [String] タイトル
+    attr_reader :title
 
     # @param [Thre] thre スレッド
     def initialize(thre)
@@ -47,6 +49,10 @@ module Simple2ch
       fetch_dat.each_line do |l|
         res_num += 1
         begin
+          if res_num==1
+            title = l.split('<>').pop
+            @title = title unless @title
+          end
           @reses << Res.parse(res_num, l, @thre)
         rescue KakoLogException
           @f_kako_log = true

data/lib/simple2ch/thre.rb

@@ -42,7 +42,12 @@ module Simple2ch
     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}
+      thre = board.thres.find{|t| t.thread_key == thread_key}
+      unless thre
+        thre = Thre.new board, thread_key
+        thre.reses
+      end
+      thre
     end
 
     # Datを解析して、レスを返す
@@ -86,6 +91,20 @@ module Simple2ch
       @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
+
     private
     # 全てのレスに対し、あるレスへのアンカーが書き込まれているレス番号のハッシュを返す
     # @return [Hash]{ res_num<Fixnum> => res_nums<Array<Fixnum>> } レス番号のハッシュ
@@ -99,12 +118,14 @@ module Simple2ch
       ret
     end
 
-
     # Datを取ってきてレスと過去ログかどうかを返す
     # @return [Boolean] f_kako_log 過去ログか否か
     def fetch_dat
       dat = Dat.new(self)
-      @reses, @f_kako_log = dat.reses, dat.kako_log?
+      @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

data/lib/simple2ch/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple2ch
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - dogwood008
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler