sosowa 0.7 → 0.8

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.8
+
+* Mechanizeの代わりにNokogiriを使い始めました。
+* バグ修正
+
 ## 0.7
 
 * 新板創想話レイアウトに対応

data/lib/sosowa/parser.rb

@@ -1,21 +1,18 @@
 # coding: utf-8
 
 module Sosowa
-  class Parser    
-    
+  class Parser
     def initialize
-      @agent = Mechanize.new
-      @agent.user_agent = "Sosowa Ruby #{Sosowa::VERSION}"
+      
     end
     
     def search(query, args={})
-      params = Sosowa.serialize_parameter({:mode => :search, :type => (args[:type] ? args[:type] : :insubject), :query => query.tosjis})
-      parse_index(@agent.get(URI.join(Sosowa::BASE_URL, params)))
+      page = Sosowa.send_req({:mode => :search, :type => (args[:type] ? args[:type] : :insubject), :query => query.tosjis})
+      parse_index(page)
     end
     
     def fetch_index(log)
-      params = Sosowa.serialize_parameter({:log => log})
-      page = @agent.get(URI.join(Sosowa::BASE_URL, params))
+      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)
@@ -43,23 +40,20 @@ module Sosowa
       tr = tr[1, tr.size-1]
       num = 1
       tr.each do |tr|
-        if (tr/%{td[@class="tags"]}).size > 0
-          #tags = (tr/%{td[@class="tags"]})[0].inner_html.to_s.toutf8.strip.gsub(/^.+?: /, "").split(/\s/)
-          #indexes[num-1] << tags
-        else
-          title = tr.search(%{td[@class="title cell_title"] > a}).inner_html.to_s.toutf8.strip
+        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"]}).inner_html.to_s.toutf8.strip
-          created_at = Time.parse(tr.search(%{td[@class="cell_created"]}).inner_html.to_s.toutf8.strip)
-          updated_at = Time.parse(tr.search(%{td[@class="cell_lastup"]}).inner_html.to_s.toutf8.strip)
-          eval = tr.search(%{td[@class="cell_eval"]}).inner_html.to_s.toutf8.strip.split("/")
+          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)
+          updated_at = Time.parse(tr.search(%{td[@class="cell_lastup"]})[0].inner_html.to_s.strip)
+          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"]}).inner_html.to_s.toutf8.strip.to_i
-          rate = tr.search(%{td[@class="cell_rate"]}).inner_html.to_s.toutf8.strip.to_f
-          size = tr.search(%{td[@class="cell_size"]}).inner_html.to_s.toutf8.strip
+          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,

data/lib/sosowa/scheme.rb

@@ -24,14 +24,12 @@ module Sosowa
     def initialize(args)
       @log = args[:log] || 0
       @key = args[:key]
-      @agent = Mechanize.new
       @page = nil
       super(fetch(@log, @key))
     end
     
     def fetch(log, key)
-      params = Sosowa.serialize_parameter({:mode => :read, :log => log, :key => key})
-      @page = @agent.get(URI.join(Sosowa::BASE_URL, params))
+      @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 = ""

data/lib/sosowa/version.rb

@@ -1,3 +1,3 @@
 module Sosowa
-  VERSION = "0.7"
+  VERSION = "0.8"
 end

data/lib/sosowa.rb

@@ -1,7 +1,8 @@
 # coding: utf-8
 
 require "kconv"
-require "mechanize"
+require "nokogiri"
+require "net/http"
 require "time"
 require "uri"
 
@@ -11,7 +12,7 @@ require "sosowa/scheme"
 require "sosowa/parser"
 
 module Sosowa
-  BASE_URL = "http://coolier.sytes.net:8080/sosowa/ssw_l/"
+  BASE_URL = URI.parse("http://coolier.sytes.net:8080/sosowa/ssw_l/")
 
   protected
   
@@ -27,6 +28,18 @@ module Sosowa
     return param ? param : ""
   end
 
+  def self.send_req(args)
+    params = serialize_parameter(args)
+    path = BASE_URL.path.dup.concat(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
   
   def self.get(args={})

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 "mechanize"
+  gem.add_dependency "nokogiri"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sosowa
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: '0.8'
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ cert_chain: []
 date: 2012-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: mechanize
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -68,7 +68,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -181387724163016397
+      hash: 2832224330215287020
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -181387724163016397
+      hash: 2832224330215287020
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24