sosowa 1.1.2 → 2.0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.0
+
+* 処理をmegalith gemに任せる形に
+* Novel.ps => Novel.aft
+
 ## 1.1
 
 * コメント関連のバグを修成

data/lib/sosowa/version.rb

@@ -1,3 +1,3 @@
 module Sosowa
-  VERSION = "1.1.2"
+  VERSION = "2.0"
 end

data/lib/sosowa.rb

@@ -1,64 +1,21 @@
 # coding: utf-8
 
-require "kconv"
-require "nokogiri"
-require "net/http"
-require "time"
-require "uri"
+require "megalith"
 
 $LOAD_PATH.unshift(File.expand_path("../", __FILE__))
 require "sosowa/version"
-require "sosowa/scheme"
-require "sosowa/parser"
 
 module Sosowa
-  BASE_URL = URI.parse("http://coolier.sytes.net:8080/sosowa/ssw_l/")
-
-  protected
-  
-  # @param [Hash] parameter
-  # @return [String] URL Serialized parameters
-  def self.serialize_parameter(parameter, add_prefix=true)
-    return "" unless parameter.class == Hash
-    ant = Hash.new
-    parameter.each do |key, value|
-      ant[key.to_sym] = value.to_s
-    end
-    param = ant.inject(""){|k,v|k+"&#{v[0]}=#{URI.escape(v[1])}"}
-    if add_prefix
-      param.sub!(/^&/,"?") 
-    else
-      param.sub!(/^&/,"") 
-    end
-    return param ? param : ""
-  end
-
-  def self.send_req(args)
-    params = serialize_parameter(args)
-    path = File.join(BASE_URL.path, params)
-
-    Net::HTTP.version_1_2
-    Net::HTTP.start(BASE_URL.host, BASE_URL.port) do |http|
-      response = http.get(path, 'User-Agent' => "Sosowa Ruby Wrapper #{Sosowa::VERSION}")
-      return Nokogiri::HTML(response.body.toutf8)
-    end
-    return false
-  end
-
-  public
+  BASE_URL = "http://coolier.sytes.net:8080/sosowa/ssw_l/"
   
   def self.get(args={})
     args[:log] ||= 0
-    parser = Parser.new
-    if args.has_key?(:key)
-      parser.fetch_novel(args[:log], args[:key])
-    else
-      parser.fetch_index(args[:log])
-    end
+    megalith = Megalith.new(BASE_URL)
+    megalith.get args
   end
   
-  def self.search(query, args={})
-    parser = Parser.new
-    parser.search(query, args)
-  end
+  #def self.search(query, args={})
+  #  parser = Parser.new
+  #  parser.search(query, args)
+  #end
 end

data/sosowa.gemspec

@@ -14,5 +14,5 @@ Gem::Specification.new do |gem|
   gem.name          = "sosowa"
   gem.require_paths = ["lib"]
   gem.version       = Sosowa::VERSION
-  gem.add_dependency "nokogiri"
+  gem.add_dependency "megalith"
 end

data/spec/sosowa_spec.rb

@@ -8,35 +8,35 @@ describe Sosowa, "が #get, :log => 0 を呼ぶ時は" do
     @log = Sosowa.get :log => 0
   end
   
-  it "Sosowa::Logを返すこと" do
-    @log.class.should == Sosowa::Log
+  it "Megalith::Subjectを返すこと" do
+    @log.class.should == Megalith::Subject
   end
 
-  it "最初がSosowa::Indexであること" do
-    @log.first.class.should == Sosowa::Index
+  it "最初がMegalith::Indexであること" do
+    @log.first.class.should == Megalith::Index
   end
 
   it "最初のタイトルがStringであること" do
     @log.first.title.class.should == String
   end
 
-  it "#next_pageがSosowa::Logを返すこと" do
-    @log.next_page.class.should == Sosowa::Log
+  it "#next_pageがMegalith::Subjectを返すこと" do
+    @log.next_page.class.should == Megalith::Subject
   end
 
-  it "#prev_pageがSosowa::Logを返すこと" do
-    @log.prev_page.class.should == Sosowa::Log
+  it "#prev_pageがMegalith::Subjectを返すこと" do
+    @log.prev_page.class.should == Megalith::Subject
   end
 
   it "#latest_logがFixnumを返すこと" do
     @log.latest_log.class.should == Fixnum
   end
 
-  it "最初を#fetchしたらSosowa::Novelを返すこと" do
-    @log.first.fetch.class.should == Sosowa::Novel
+  it "最初を#fetchしたらMegalith::Novelを返すこと" do
+    @log.first.fetch.class.should == Megalith::Novel
   end
 
-  it "最初を#fetchしたSosowa::Novel#titleがStringなこと" do
+  it "最初を#fetchしたMegalith::Novel#titleがStringなこと" do
     @log.first.fetch.title.class.should == String
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sosowa
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: '2.0'
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-22 00:00:00.000000000 Z
+date: 2012-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: megalith
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -43,8 +43,6 @@ files:
 - README.md
 - Rakefile
 - lib/sosowa.rb
-- lib/sosowa/parser.rb
-- lib/sosowa/scheme.rb
 - lib/sosowa/version.rb
 - samples/chara_recognize.rb
 - samples/feature-0.3.rb
@@ -68,7 +66,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4539044172263954536
+      hash: 3888570212557509469
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -77,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4539044172263954536
+      hash: 3888570212557509469
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/sosowa/parser.rb

@@ -1,85 +0,0 @@
-# coding: utf-8
-
-module Sosowa
-  class Parser
-    def initialize
-      
-    end
-    
-    def search(query, args={})
-      page = Sosowa.send_req({:mode => :search, :type => (args[:type] ? args[:type] : :insubject), :query => query.tosjis})
-      parse_index(page)
-    end
-    
-    def fetch_index(log)
-      page = Sosowa.send_req({:log => log})
-      indexes = parse_index(page)
-      abs_log_num = parse_absolute_log_number(page)
-      Log.new(indexes, page, abs_log_num)
-    end
-
-    def parse_absolute_log_number(page)
-      li = page.search(%{ul[@id="pages"] li > *})
-      log = li.size
-      li.each do |l|
-        if l.attributes["id"] && l.attributes["id"].value == "selectedPage"
-          return log
-        end
-        log -= 1
-      end
-    end
-    
-    def parse_latest_log_number(page)
-      li = page.search(%{ul[@id="pages"] li > *})
-      return li.size
-    end
-    
-    def parse_index(page)
-      indexes = []
-      tr = page.search("tr")
-      tr = tr[1, tr.size-1]
-      num = 1
-      tr.each do |tr|
-        unless (tr/%{td[@class="tags"]}).size > 0
-          title = tr.search(%{td[@class="title cell_title"] > a})[0].children[0].text.strip
-          tags = tr.search(%{td[@class="title cell_title"] > a})[0].attributes["title"].value.split(" / ").reject{|n| n == ""}
-          log = parse_absolute_log_number(page)
-          key = tr.search(%{td[@class="title cell_title"] > a})[0].attributes["href"].value.gsub(/^.+key=(.+?)&.+$/, '\1').to_i
-          author = tr.search(%{td[@class="cell_author"]})[0].inner_html.to_s.strip
-          created_at = Time.parse(tr.search(%{td[@class="cell_created"]})[0].inner_html.to_s.strip).strftime("%Y/%m/%d %H:%M:%S")
-          updated_at = Time.parse(tr.search(%{td[@class="cell_lastup"]})[0].inner_html.to_s.strip).strftime("%Y/%m/%d %H:%M:%S")
-          eval = tr.search(%{td[@class="cell_eval"]})[0].inner_html.to_s.strip.split("/")
-          review_count = eval[1].to_i
-          comment_count = eval[0].to_i
-          point = tr.search(%{td[@class="cell_point"]})[0].inner_html.to_s.strip.to_i
-          rate = tr.search(%{td[@class="cell_rate"]})[0].inner_html.to_s.strip.to_f
-          size = tr.search(%{td[@class="cell_size"]})[0].inner_html.to_s.strip
-          url = tr.search(%{td[@class="title cell_title"] > a})[0].attributes["href"].value
-          index = {
-            :log => log,
-            :key => key,
-            :title => title,
-            :author => author,
-            :created_at => created_at,
-            :updated_at => updated_at,
-            :review_count => review_count,
-            :comment_count => comment_count,
-            :point => point,
-            :tags => tags,
-            :rate => rate,
-            :size => size,
-            :url => URI.join(Sosowa::BASE_URL, "?mode=read&key=#{key}&log=#{log}").to_s
-          }
-          indexes << Index.new(index)
-        end
-        num += 1
-      end
-      return indexes
-    end
-    
-    def fetch_novel(log, key)
-      novel = Novel.new(:log => log, :key => key)
-      return novel
-    end
-  end
-end

data/lib/sosowa/scheme.rb

@@ -1,194 +0,0 @@
-# coding: utf-8
-
-module Sosowa
-  class Scheme
-    attr_reader :element
-    
-    def initialize(element)
-      @element = element  
-    end
-    
-    def method_missing(action, *args)
-      return @element[action.to_s.to_sym] rescue nil
-    end
-    
-    def params() @element.keys.map{|k|k.to_sym} ; end
-    alias_method :available_methods, :params
-    
-    def to_hash
-      @element
-    end
-  end
-  
-  class Novel < Scheme
-    attr_reader :log
-    attr_reader :key
-    attr_reader :page
-
-    def initialize(args)
-      @log = args[:log] || 0
-      @key = args[:key]
-      @page = nil
-      super(fetch(@log, @key))
-    end
-    
-    def fetch(log, key)
-      @page = Sosowa.send_req({:mode => :read, :log => log, :key => key})
-      title = (@page/%{div[@class="header"] > h1})[0].inner_html.to_s.toutf8.strip
-      tags = (@page/%{dl[@class="info"][1] > dd > a}).map{|t| t.inner_html.to_s.toutf8 }
-      text = ""
-      text_node = @page/%{div[@class="contents ss"]}
-      text_node.children.each do |node|
-        text += node.inner_html.to_s.toutf8.strip
-      end
-      aft = @page/%{div[@class="aft"]}
-      ps = (aft.size > 0) ? aft[0].inner_html.to_s.toutf8 : ""
-      author_name = (@page/%{div[@class="author"] b})[0].inner_html.to_s.toutf8
-      author_email, author_website = (@page/%{div[@class="author"] a}).map{|e| e.attributes["href"].value}
-      author = Author.new(:name => author_name, :email => (author_email ? author_email.gsub(/^mailto:/, "") : nil), :website => author_website)
-      header = (@page/%{div[@class="header"] > span})[0].inner_html.to_s.toutf8.split(/\r?\n/).map{|n| n.strip}.reject{|n| n == ""}.map{|n| n.split(": ")}
-      review = header[3][1].split("/")
-      comments = []
-      comment_element = (@page/%{div[@class="comments"] > dl > *})
-      if comment_element.size > 0
-        comment_element[1, comment_element.size-1].each_slice(2) do |element|
-          bobj = element[0].search("b").map{|n| n.inner_html.to_s.toutf8.strip}
-          point = element[0].search("span").inner_html.to_s.toutf8.to_i
-          id = element[0].inner_html.to_s.toutf8.split(/\r?\n/).map{|n| n.strip}[1].to_i
-          comment = Comment.new(
-            :id => id,
-            :point => point,
-            :name => bobj[0],
-            :created_at => bobj[1] ? Time.parse(bobj[1].gsub(/[^\/\d\s:]/, "")) : nil,
-            :text => element[1] ? element[1].inner_html.to_s.toutf8.strip : nil
-          )
-          comments << comment
-        end
-      end
-      novel = {
-        :title => title,
-        :text => text,
-        :ps => ps,
-        :author => author,
-        :tags => tags,
-        :log => log,
-        :key => key,
-        :created_at => Time.parse(header[1][1]).strftime("%Y/%m/%d %H:%M:%S"),
-        :updated_at => Time.parse(header[2][1]).strftime("%Y/%m/%d %H:%M:%S"),
-        :review_count => review[1].to_i,
-        :comment_count => review[0].to_i,
-        :point => header[4][1].to_i,
-        :rate => header[5][1].to_f,
-        :comments => comments
-      }
-      return novel
-    end
-    
-    def simple_rating(point)
-      # Get cookie
-      get_params = Sosowa.serialize_parameter({
-        :mode => :read,
-        :key => @key,
-        :log => @log
-      })
-      http = Net::HTTP.new(BASE_URL.host, BASE_URL.port)
-      req = Net::HTTP::Get.new(BASE_URL.path)
-      req["User-Agent"] = "Sosowa Ruby Wrapper #{Sosowa::VERSION}"
-      res = http.request(req, get_params)
-      cookie = res["Set-Cookie"]
-
-      # Post Comment
-      post_uri_params = Sosowa.serialize_parameter({
-        :mode => :update,
-        :key => @key,
-        :log => @log,
-        :target => :res
-      })
-      post_params = Sosowa.serialize_parameter({:body => "#EMPTY#".tosjis, :point => point}, false)
-      req = Net::HTTP::Post.new(File.join(BASE_URL.path, post_uri_params))
-      req["Cookie"] = cookie
-      req["User-Agent"] = "Sosowa Ruby Wrapper #{Sosowa::VERSION}"
-      res = http.request(req, post_params)
-      return res
-    end
-    
-    def comment(text, params={})
-      # Get cookie
-      get_params = Sosowa.serialize_parameter({
-        :mode => :read,
-        :key => @key,
-        :log => @log
-      })
-      http = Net::HTTP.new(BASE_URL.host, BASE_URL.port)
-      req = Net::HTTP::Get.new(BASE_URL.path)
-      req["User-Agent"] = "Sosowa Ruby Wrapper #{Sosowa::VERSION}"
-      res = http.request(req, get_params)
-      cookie = res["Set-Cookie"]
-
-      # Post Comment
-      post_uri_params = Sosowa.serialize_parameter({
-        :mode => :update,
-        :key => @key,
-        :log => @log,
-        :target => :res
-      })
-      params.each do |k, v|
-        params[k] = v.tosjis
-      end
-      post_params = Sosowa.serialize_parameter({:body => text.tosjis}.update(params), false)
-      req = Net::HTTP::Post.new(File.join(BASE_URL.path, post_uri_params))
-      req["Cookie"] = cookie
-      req["User-Agent"] = "Sosowa Ruby Wrapper #{Sosowa::VERSION}"
-      res = http.request(req, post_params)
-      return res
-    end
-    
-    def plain
-      return @element[:text].gsub(/(<br>|\r?\n)/, "")
-    end
-  end
-  
-  class Comment < Scheme
-    
-  end
-  
-  class Author < Scheme
-    
-  end
-  
-  class Index < Scheme    
-    def fetch
-      Novel.new(:log => @element[:log], :key => @element[:key])
-    end
-    alias_method :get, :fetch
-  end
-
-  class Log < Array
-    attr_accessor :element
-    attr_reader :log
-    
-    def initialize(element, page, log=0)
-      super(element)
-      @element = element
-      @page = page
-      @log = log
-    end
-
-    def next_page
-      parser = Parser.new
-      parser.fetch_index(@log-1)
-    end
-    alias_method :next, :next_page
-
-    def prev_page
-      parser = Parser.new
-      parser.fetch_index(@log+1)
-    end
-    alias_method :prev, :prev_page
-    
-    def latest_log
-      parser = Parser.new
-      parser.parse_latest_log_number(@page)
-    end
-  end
-end