x2ch 0.9.1 → 0.9.2

data/lib/x2ch.rb

@@ -86,7 +86,12 @@ module X2CH
 		end
 
 		def posts(if_modified_since = nil, range = nil)
-			res = Dat.download(@url + "dat/" + @dat, if_modified_since, range)
+			if @url.match(/machi.to/)
+				part = @url.match(/^(http:\/\/.+?)\/(.+?)\//).to_a
+				res = Dat.download(part[1] + "/bbs/offlaw.cgi/" + part[2] + '/' + @dat.sub('.cgi', ''), if_modified_since, range)
+			else
+				res = Dat.download(@url + "dat/" + @dat, if_modified_since, range)
+			end
 			ArrayResponse.new(Dat.parse(res), res.status, res.last_modified, res.content_encoding, res.body_size)
 		end
 
@@ -176,7 +181,7 @@ module X2CH
 
 				next unless category
 
-				b = l.match(/<A HREF=(http:\/\/.*(?:\.2ch\.net|\.bbspink\.com).+\/)>(.+)<\/A>/).to_a
+				b = l.match(/<A HREF=(http:\/\/.*(?:\.2ch\.net|\.bbspink\.com|\.machi\.to)[^\s]*).*>(.+)<\/A>/).to_a
 				if b[0]
 					next if IGNORE_BOARDS.include?(b[2])
 
@@ -196,7 +201,7 @@ module X2CH
 		def self.parse(url, subject)
 			threads = []
 			subject.each_line{|l|
-				m = l.match(/^(\d+\.dat)<>(.+)\((\d+)\)$/).to_a
+				m = l.match(/^(\d+\.(?:dat|cgi))(?:<>|,)(.+)\((\d+)\)$/).to_a
 				if m[0]
 					threads << Thread.new(url, m[1], m[2], m[3].to_i)
 				end
@@ -213,9 +218,14 @@ module X2CH
 		def self.parse(dat)
 			posts = []
 			dat.each_line{|l|
-				m = l.match(/^(.+?)<>(.*?)<>(.*?)<>(.+)<>.*$/).to_a
+				m = l.match(/^(\d+)<>(.+?)<>(.*?)<>(.*?)<>(.+)<>.*$/).to_a
 				if m[0]
-					posts << Post.new(m[1], m[2], m[3], m[4])
+					posts << Post.new(m[2], m[3], m[4], m[5])
+				else
+					m = l.match(/^(.+?)<>(.*?)<>(.*?)<>(.+)<>.*$/).to_a
+					if m[0]
+						posts << Post.new(m[1], m[2], m[3], m[4])
+					end
 				end
 			}
 			posts

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: x2ch
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-14 00:00:00.000000000 Z
+date: 2013-10-27 00:00:00.000000000 Z
 dependencies: []
 description: 2ch downloader and parser library
 email: mail@xmisao.com
@@ -19,7 +19,8 @@ extra_rdoc_files: []
 files:
 - lib/x2ch.rb
 homepage: https://github.com/xmisao/x2ch
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths: