bbiff 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c1a06f19c088ba3f97fb5f001619c04457be919
-  data.tar.gz: 1ddafb3e022314b5faf792730855f8c208987199
+  metadata.gz: a336858969f74c19921c4bcbbb9372c9b248b86a
+  data.tar.gz: 637d9a30868080c684f45e98be3e4b3cae0fa724
 SHA512:
-  metadata.gz: 212dd524640a9dfbf8882ff9f91866f8c2953de159047226dd163815acc8b0d821c76a3c57dbb46caa2da503d54b6ef508b605280b422794adefc32d79b75927
-  data.tar.gz: a08cbd2ebed22e3504a5a03f3a2c13f3d14485e86147aedc0bd2a24e9585076e45da12ef69810ac5cdfc10f39dc0e50a72705827be0e27f568f3276a792f110c
+  metadata.gz: fcc542d4956eca74ea3ce9ef64b65828dfacc71212ab3498e69c35e27dc47442fa8e720ce869cb5b5759def5e01e4cd5e26e00c5e614b5ca88d7f5540e8b5961
+  data.tar.gz: 56c12ff08643a69dafe39feab20e0a49fb518dd135529e61bae7a28a7cd437ddea0a7b09a25a76a40a5dded7c41fb1ba2bdb0b6214d078db64b45c0c9d10846b

data/.gitignore

@@ -1,3 +1,4 @@
+*~
 /.bundle/
 /.yardoc
 /Gemfile.lock

data/README.md

@@ -46,6 +46,9 @@ ver 0.2.0
   * 最後に監視したスレッドを覚えておいて、URLを省略した時のデフォルト
     にするようにした。
 
+ver 0.2.1
+  * スレタイに ( を含むスレのある掲示板のスレを指定すると落ちるバグを修正。
+
 ## 作者
 
 予定地 <plonk@piano.email.ne.jp>

data/bbiff.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
-  spec.add_dependency "activesupport", "~> 4.0"
-  spec.add_dependency "unicode-display_width"
-  spec.add_dependency "toml-rb"
+  spec.add_dependency "unicode-display_width", "~>1.0.2"
+  spec.add_dependency "toml-rb", "~>0.3.12"
 end

data/lib/bbiff/bbs_reader.rb

@@ -16,28 +16,18 @@ class C板
   end
 
   def 設定
-    応答 = Net::HTTP.start(@設定URL.host, @設定URL.port) { |http|
-      http.get(@設定URL.path)
-    }
-    r = 応答.body
+    r = ダウンロード(@設定URL)
     return 設定をパーズする(r.force_encoding("EUC-JP").encode("UTF-8"))
   end
 
   def スレ一覧
-    応答 = Net::HTTP.start(@スレ一覧URL.host, @スレ一覧URL.port) { |http|
-      http.get(@スレ一覧URL.path)
-    }
-    r = 応答.body
+    r = ダウンロード(@スレ一覧URL)
     return r.force_encoding("EUC-JP").encode("UTF-8")
   end
 
   def dat(スレッド番号)
     url = dat_url(スレッド番号)
-    応答 = Net::HTTP.start(url.host, url.port) { |http|
-      p url
-      http.get(url.path)
-    }
-    r = 応答.body
+    r = ダウンロード(url)
     return r.force_encoding("EUC-JP").encode("UTF-8")
   end
 
@@ -47,12 +37,19 @@ class C板
 
   def threads
     スレ一覧.each_line.map do |line|
-      fail FormatError unless line =~ /^(\d+)\.cgi,([^(]+)\((\d+)\)$/
+      fail 'スレ一覧のフォーマットが変です' unless line =~ /^(\d+)\.cgi,(.+?)\((\d+)\)$/
       id, title, last = $1.to_i, $2, $3.to_i
       Thread.new(self, id, title, last)
     end
   end
 
+  def ダウンロード(url)
+    応答 = Net::HTTP.start(url.host, url.port) { |http|
+      http.get(url.path)
+    }
+    return 応答.body
+  end
+
   private
 
   def 設定をパーズする(文字列)
@@ -66,7 +63,7 @@ class Post
   attr_reader :no, :name, :mail, :body
 
   def self.from_line(line)
-    no, name, mail, date, body, = line.split('<>')
+    no, name, mail, date, body, = line.split('<>', 6)
     Post.new(no, name, mail, date, body)
   end
 
@@ -83,7 +80,7 @@ class Post
   end
 
   def to_s
-    [no, name, mail, @date, body].join('<>')
+    [no, name, mail, @date, body, '', ''].join('<>')
   end
 
   private
@@ -113,6 +110,7 @@ class Thread
   end
 
   def posts(range)
+    fail ArgumentError unless range.is_a? Range
     dat_for_range(range).each_line.map do |line|
       Post.from_line(line.chomp).tap do |post|
         # ついでに last を更新
@@ -128,8 +126,7 @@ class Thread
       query = "#{range.first}-#{range.last}"
     end
     url = URI(dat_url + query)
-    res = Net::HTTP.start(url.host, url.port) { |http| http.get(url.path) }
-    res.body.force_encoding("EUC-JP").encode("UTF-8")
+    @board.ダウンロード(url).force_encoding("EUC-JP").encode("UTF-8")
   end
 end
 

data/lib/bbiff/res_format.rb

@@ -1,6 +1,4 @@
 require 'cgi'
-require 'active_support'
-require 'active_support/core_ext/numeric'
 require_relative 'bbs_reader'
 
 class Fixnum
@@ -25,22 +23,21 @@ def render_resno(no)
   no.to_s
 end
 
-def render_date t
+def render_date(t)
   weekday = [*'日月火水木金土'.each_char]
   delta = Time.now - t
 
   case delta
   when 0...1
     "たった今"
-  when 1...(1.minute)
+  when 1...60
     "#{delta.to_i}秒前"
-  when (1.minute)...(1.hour)
+  when 60...3600
     "#{(delta / 60).to_i}分前"
-  when (1.hour)...(24.hours)
+  when 3600...(24 * 3600)
     "#{(delta / 3600).to_i}時間前"
-  # when (1.day)...Float::INFINITY
   else
-    "#{t.year}/#{t.month}/#{t.day}(#{weekday[t.wday]}) #{t.hour}:#{t.min}:#{t.sec}"
+    "%d/%d/%d(%s) %02d:%02d:%02d" % [t.year, t.month, t.day, weekday[t.wday], t.hour, t.min, t.sec]
   end
 end
 
@@ -48,7 +45,7 @@ def indent(n, text)
   text.each_line.map { |line| n.en + line }.join
 end
 
-def render_body body
+def render_body(body)
   unescaped = CGI.unescapeHTML(body.gsub(/<br>/i, "\n"))
   indent(4, unescaped) + "\n"
 end

data/lib/bbiff/version.rb

@@ -1,3 +1,3 @@
 module Bbiff
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbiff
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Yoteichi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,47 +53,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: unicode-display_width
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: unicode-display_width
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: toml-rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.12
 description: 
 email:
 - plonk@piano.email.ne.jp
@@ -140,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: notifies new post arrival on the Shitaraba BBS.