bbs2ch 0.0.3 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a038e3331d1a4be3e1fa32b7b41f8f56ad4e0a2c
+  data.tar.gz: ad2649a95581f6be3d595cf7d2a2d6d9de95c0bc
+SHA512:
+  metadata.gz: 73d04c4ea98e1ad4c566a6b961255a933f7e00a0dd9bdb7582cebb4062439674d608f0feba5fca3c44fae78667e524a2975b9a3e0145994e6a6c6db0b7ace80d
+  data.tar.gz: 41c0054c04973b3a63f98ee621fb2d529c06f78362ee2a28341dbb26383f1cbdc58af56e1126cd220b62e2ae68951219a556b20736ecb99c038a271b9ddcb0cd

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

data/Rakefile

@@ -4,7 +4,3 @@ require "bundler/gem_tasks"
 Bundler.setup
 require 'rspec/core/rake_task'
 
-desc 'run spec'
-Rspec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = ['-c', '-fs']
-end

data/bbs2ch.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = BBS2ch::VERSION
 
-  gem.add_dependency "mechanize"
+  gem.add_dependency "faraday",  '~> 0.8.8'
 
   gem.add_development_dependency "rspec"
-  gem.add_development_dependency "fakefs"
+  gem.add_development_dependency "pry"
 end

data/lib/bbs2ch.rb

@@ -1,7 +1,8 @@
 require "bbs2ch/version"
 
-require 'bbs2ch/menu'
+require 'bbs2ch/category'
 require 'bbs2ch/board'
 require 'bbs2ch/thread'
-require 'bbs2ch/response'
-require 'bbs2ch/image'
+require 'bbs2ch/post'
+require 'bbs2ch/client'
+require 'bbs2ch/connection'

data/lib/bbs2ch/board.rb

@@ -1,33 +1,32 @@
-require 'mechanize'
-require 'bbs2ch/thread'
-
-SUBJECT_FILE = "subject.txt"
-
 module BBS2ch
   class Board
-    def initialize(name, url, extra = {})
-      @name = name
-      @url = url
-      @extra = extra
-      @extra[:board] = {url: @url, name: @name}
+    def initialize(name, url)
+      @name    = name
+      @url     = url
+      @threads = nil
     end
 
-    # TODO select
-    def threads(regex = /.*/)
+    attr_accessor :name, :url
 
-      @agent = Mechanize.new
-      page = @agent.get(url + SUBJECT_FILE)
+    def threads(regex = nil)
+      @threads ||= load_threads
+      return @threads unless regex
 
-      threads = []
-      page.body.toutf8.lines{|line|
-        th_dat, th_name = line.chomp.split(/<>/)
-        if th_name =~ regex
-          threads << Thread.new(th_name, "#{@url}dat/#{th_dat}", @extra)
-        end
-      }
-      threads
+      @threads.select { |thread| thread.name.match(regex) }
     end
 
-    attr_accessor :name, :url, :extra
+    def load_threads
+      body = Connection.new(url + '/subject.txt').response_body
+
+      body.each_line.map { |line|
+        line.chomp!
+
+        title_end  = line.rindex(' ')
+        dat, title = line[0...title_end].split('<>')
+        res_count  = line[title_end + 1 .. -1][/[0-9]+/].to_i
+
+        BBS2ch::Thread.new(title, "#{url}/dat/#{dat}", res_count)
+      }
+    end
   end
-end
+end

data/lib/bbs2ch/category.rb

@@ -0,0 +1,10 @@
+module BBS2ch
+  class Category
+    def initialize(name, boards = [])
+      @name   = name
+      @boards = boards
+    end
+
+    attr_accessor :name, :boards
+  end
+end

data/lib/bbs2ch/client.rb

@@ -0,0 +1,56 @@
+require 'faraday'
+require 'kconv'
+
+module BBS2ch
+  class Client
+    def initialize
+      load_menu
+    end
+
+    def categories(regex = nil)
+      load_menu unless @categories
+      return @categories unless regex
+
+      @categories.select { |category| category.name.match(regex) }
+    end
+
+    def boards(regex = nil)
+      load_menu unless @boards
+      return @boards unless regex
+
+      @boards.select { |board| board.name.match(regex) }
+    end
+
+    def load_menu
+      body = Connection.new('http://menu.2ch.net/bbsmenu.html').response_body
+
+      start_pos = body.index('<BR><BR><B>')
+      body = body[start_pos..-1].gsub(/<!--.*-->/m, '')
+
+      @categories = []
+      @boards = []
+
+      category = nil
+      body.each_line do |line|
+        line.chomp!
+
+        if line.match('<BR><BR><B>(.+)</B><BR>')
+          name = $1
+          category = Category.new(name)
+        elsif line.match('<A HREF=(.+)/>(.+)</A>')
+          name = $2
+          url  = $1
+          board = Board.new(name, url)
+          category.boards << board
+          @boards         << board
+        elsif line.length == 0
+          @categories     << category
+        else
+          # break
+        end
+      end
+
+      self
+    end
+  end
+end

data/lib/bbs2ch/connection.rb

@@ -0,0 +1,19 @@
+module BBS2ch
+  class Connection
+    def initialize(url)
+      @conn = Faraday.new(url: url) do |faraday|
+        # faraday.request  :url_encoded             # form-encode POST params
+        # faraday.response :logger                  # log requests to STDOUT
+        faraday.adapter  Faraday.default_adapter  # make requests with Net::HTTP
+      end
+
+      @conn.headers[:user_agent] = 'Monazilla/1.00 (bbs2ch-rubygems/0.1.0)'
+    end
+
+    attr_accessor :conn
+
+    def response_body
+      @conn.get.body.toutf8
+    end
+  end
+end

data/lib/bbs2ch/post.rb

@@ -0,0 +1,35 @@
+module BBS2ch
+  class Post
+    def initialize(name, email, time, id, be, body, title)
+      @name  = name
+      @email = email
+      @time  = time
+      @id    = id
+      @be    = be
+      @body  = body
+      @title = title
+    end
+
+    def images
+      fix_ttp @body.scan(%r{ttps?:.*\.(?:jpg|png|gif)})
+    end
+
+    def videos
+      xvideos + fc2
+    end
+
+    def xvideos
+      fix_ttp @body.scan(%r{ttp://(?:www|jp)\.xvideos\.com/video[0-9]+})
+    end
+
+    def fc2
+      fix_ttp @body.scan(%r{ttp://video\.fc2\.com/a/content/[0-9a-zA-Z]+})
+    end
+
+    def fix_ttp(urls)
+      urls.map { |url| url.gsub(/^ttp/, 'http') }
+    end
+
+    attr_accessor :name, :email, :time, :id, :be, :body, :title
+  end
+end

data/lib/bbs2ch/thread.rb

@@ -1,29 +1,41 @@
-require 'mechanize'
-require 'bbs2ch/response'
 require 'time'
 
 module BBS2ch
   class Thread
-    def initialize(name, url, extra = {})
-      @name = name
-      @url = url
-      @extra = extra
-      @extra[:thread] = {name: @name, url: @url}
+    def initialize(name, url, res_count)
+      @name      = name
+      @url       = url
+      @res_count = res_count
+      @posts     = nil
     end
 
-    # TODO select, cache
-    def responses
+    attr_accessor :name, :url, :res_count
 
-      @agent = Mechanize.new
-      page = @agent.get @url
+    def posts
+      @posts ||= load_posts
+    end
+
+    def load_posts
+      body = Connection.new(@url).response_body
+      body.each_line.map { |line|
+        line.chomp!
+        # [名前]<>[メール]<>[日付] [ID] [BE-ID]<>[本文]<>[スレッドタイトル]
+        name, email, time_and_id, body, title = line.split('<>')
+
+        body.gsub!('<BR>', "\n")
 
-      responses = []
-      page.body.toutf8.lines{|line|
-        responses << Response.parse(line)
+        begin
+          time = Time.parse(time_and_id)
+        rescue ArgumentError
+          time = nil
+        end
+        time_and_id.match('ID:(\S+)')
+        id = $1
+        time_and_id.match('BE:(\S+)')
+        be = $1
+
+        Post.new(name, email, time, id, be, body, title)
       }
-      responses
     end
-
-    attr_accessor :name, :url, :extra
   end
-end
+end

data/lib/bbs2ch/version.rb

@@ -1,3 +1,3 @@
 module BBS2ch
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/sample/cat.rb

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+
+require 'bbs2ch'
+
+client = BBS2ch::Client.new
+board  = client.boards(/犬猫/).first #=> board: "犬猫大好き"
+thread = board.threads(/猫画像/).first
+posts  = thread.posts
+puts posts.map(&:images).flatten

data/spec/bbs2ch/board_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe BBS2ch::Board do
+  describe '#new' do
+    before do
+      @board = BBS2ch::Board.new('foo', 'http://example.com')
+    end
+
+    it 'has name' do
+      expect(@board.name).to eq('foo')
+    end
+
+    it 'has url' do
+      expect(@board.url).to eq('http://example.com')
+    end
+  end
+end

data/spec/bbs2ch/category_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe BBS2ch::Category do
+  describe '#new' do
+    before do
+      @category = BBS2ch::Category.new('地震', ['board1'])
+    end
+
+    it 'has name' do
+      expect(@category.name).to eq('地震')
+    end
+
+    it 'has boards' do
+      expect(@category.boards.length).to be > 0
+    end
+  end
+end

data/spec/bbs2ch/client_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe BBS2ch::Client do
+  before(:all) do
+    @client = BBS2ch::Client.new
+  end
+
+  describe '#new' do
+    it 'has categories' do
+      expect(@client.categories.length).to be > 0
+    end
+
+    it 'has boards' do
+      expect(@client.boards.length).to be > 0
+    end
+  end
+
+  describe '2ch' do
+    it 'first category name' do
+      expect(@client.categories.first.name).to eq('地震')
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,18 @@
+require 'bbs2ch'
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# Require this file using `require "spec_helper"` to ensure that it is only
+# loaded once.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+end

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: bbs2ch
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - fukayatsu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-16 00:00:00.000000000 Z
+date: 2013-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: mechanize
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.8
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fakefs
+  name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A gem to read 2ch BBS
@@ -67,6 +60,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
 - LICENSE
 - README.md
@@ -74,42 +68,43 @@ files:
 - bbs2ch.gemspec
 - lib/bbs2ch.rb
 - lib/bbs2ch/board.rb
-- lib/bbs2ch/image.rb
-- lib/bbs2ch/menu.rb
-- lib/bbs2ch/response.rb
+- lib/bbs2ch/category.rb
+- lib/bbs2ch/client.rb
+- lib/bbs2ch/connection.rb
+- lib/bbs2ch/post.rb
 - lib/bbs2ch/thread.rb
 - lib/bbs2ch/version.rb
 - memo.md
-- spec/bbs2ch_spec.rb
+- sample/cat.rb
+- spec/bbs2ch/board_spec.rb
+- spec/bbs2ch/category_spec.rb
+- spec/bbs2ch/client_spec.rb
+- spec/spec_helper.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3642638197611839710
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3642638197611839710
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A gem to read 2ch BBS
 test_files:
-- spec/bbs2ch_spec.rb
+- spec/bbs2ch/board_spec.rb
+- spec/bbs2ch/category_spec.rb
+- spec/bbs2ch/client_spec.rb
+- spec/spec_helper.rb

data/lib/bbs2ch/image.rb

@@ -1,13 +0,0 @@
-require 'mechanize'
-
-
-module BBS2ch
-  class Image
-    def initialize(url, extra={})
-      @url = url
-      @extra = extra
-    end
-
-    attr_accessor :url, :extra
-  end
-end

data/lib/bbs2ch/menu.rb

@@ -1,30 +0,0 @@
-require 'mechanize'
-require 'bbs2ch/board'
-
-module BBS2ch
-  class Menu
-    def initialize(url = nil)
-      @url = url || "http://menu.2ch.net/bbsmenu.html"
-      @extra = {menu: {url: @url}}
-    end
-
-    #TODO select
-    def boards(regex = /.*/)
-
-      @agent = Mechanize.new
-      page = @agent.get url
-
-      boards = []
-      page.links.each{|link|
-        if link.href =~ /[^(www|info)]\.(2ch\.net|bbspink.com|machi\.to|)\//
-          if link.text =~ regex
-            boards << Board.new(link.text, link.href, @extra)
-          end
-        end
-      }
-      boards
-    end
-
-    attr_accessor :url
-  end
-end

data/lib/bbs2ch/response.rb

@@ -1,37 +0,0 @@
-require 'mechanize'
-require 'bbs2ch/image'
-
-module BBS2ch
-  class Response
-    def initialize(name, email, time, message, extra={})
-      @name = name
-      @email = email
-      @time = time
-      @message = message
-      @extra = extra
-      @extra[:response] =
-        {name: @name, email: @email, time: @time, message: @message}
-    end
-
-    def images(regex = /((http|https|ttp):\/\/.*\.(jpg|png|gif))/)
-      images = []
-      @message.split(/<br>/).each{|line|
-        match = line.scan regex
-        if match.size > 0
-          url = match[0][0]
-          url = 'h' + url if url[0] != 'h'
-          images << Image.new(url, @extra)
-        end
-      }
-      images
-    end
-
-    # TODO arrayに対応
-    def self.parse(text, extra={})
-      name, email, time_str, message = text.chomp.split(/<>/)
-      Response.new(name, email, Time.parse(time_str), message, extra)
-    end
-
-    attr_reader :name, :email, :time, :message, :extra
-  end
-end

data/spec/bbs2ch_spec.rb

@@ -1,70 +0,0 @@
-# coding: utf-8
-
-# TODO オフラインでもテストできるようにする
-
-require 'bundler'
-Bundler.setup(:default, :test)
-
-require 'bbs2ch'
-
-describe BBS2ch do
-
-  describe 'Menu' do
-
-    context '#initialize' do
-      it 'default url' do
-        menu = BBS2ch::Menu.new
-        menu.url.should == "http://menu.2ch.net/bbsmenu.html"
-      end
-
-      it 'custom url' do
-        menu = BBS2ch::Menu.new("http://foo.net")
-        menu.url.should == 'http://foo.net'
-      end
-    end
-
-    context '#boards' do
-      before do
-        @menu = BBS2ch::Menu.new
-      end
-
-      it 'size not 0' do
-        @menu.boards.size.should_not == 0
-        #p @menu.boards(/料理/).first.threads(/料理/).first.responses.first
-      end
-
-    end
-  end
-
-  describe 'Board' do
-    context '#initialize' do
-    end
-  end
-
-  describe 'Thread' do
-    context '#initialize' do
-    end
-  end
-
-  describe 'Response' do
-    context '#initialize' do
-    end
-
-    context '#images' do
-      it 'return 2 images' do
-        response = BBS2ch::Response.new('name', 'email', 'time', '
-          http://hoge.com/hoge/piyo.jpg<br>
-          ttp://hoge.com/hoge/piyo.png<br>')
-        images = response.images
-        images[0].url.should == 'http://hoge.com/hoge/piyo.jpg'
-        images[1].url.should == 'http://hoge.com/hoge/piyo.png'
-      end
-    end
-  end
-
-  describe 'Image' do
-    context '#initialize' do
-    end
-  end
-
-end