bookscan 0.5.11 → 0.5.12

data/Gemfile

@@ -8,6 +8,7 @@ gem 'mechanize', '>= 2.0.1'
 gem 'highline', '> 1.6'
 gem 'progressbar', '>= 0.9.0'
 gem 'httpclient', '>= 2.1.6.1'
+gem 'rdoc'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Rakefile

@@ -42,7 +42,8 @@ end
 
 task :default => :test
 
-require 'rake/rdoctask'
+# require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.5.11
+0.5.12

data/bookscan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "bookscan"
-  s.version = "0.5.11"
+  s.version = "0.5.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yoshihiro TAKAHARA"]
-  s.date = "2011-09-20"
+  s.date = "2012-02-11"
   s.description = "This is a scraper of Bookscan (http://www.bookscan.co.jp) Service.This is *NOT* a official software of Bookscan."
   s.email = "y.takahara@gmail.com"
   s.executables = ["bookscan"]
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/tumf/bookscan"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.12"
   s.summary = "BookScan Scraper"
   s.test_files = [
     "test/helper.rb",
@@ -56,6 +56,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<highline>, ["> 1.6"])
       s.add_runtime_dependency(%q<progressbar>, [">= 0.9.0"])
       s.add_runtime_dependency(%q<httpclient>, [">= 2.1.6.1"])
+      s.add_runtime_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -67,6 +68,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<highline>, ["> 1.6"])
       s.add_dependency(%q<progressbar>, [">= 0.9.0"])
       s.add_dependency(%q<httpclient>, [">= 2.1.6.1"])
+      s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -79,6 +81,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<highline>, ["> 1.6"])
     s.add_dependency(%q<progressbar>, [">= 0.9.0"])
     s.add_dependency(%q<httpclient>, [">= 2.1.6.1"])
+    s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])

data/lib/bookscan/agent.rb

@@ -136,7 +136,7 @@ module Bookscan
           u.text == "変換"
         book = Book.new
         book.title = u.text.to_s
-        book.url = u.attributes["href"].value.to_s
+        book.url = "/" + u.attributes["href"].value.to_s
         book.group_url = group.url
         bs << book
       end
@@ -152,7 +152,7 @@ module Bookscan
             u.text == "変換"
           book = Book.new
           book.title = u.text.to_s
-          book.url = u.attributes["href"].value.to_s
+          book.url = "/" + u.attributes["href"].value.to_s
           book.group_url = url
           books[book.book_id] = book
         end
@@ -162,19 +162,25 @@ module Bookscan
 
     def download(url,path)
       url = URI.parse(url)
+      url.scheme = "https"
+      url.host = "system.bookscan.co.jp"
+
       cli = HTTPClient.new
-      
-      @cookie_jar && @cookie_jar.cookies(url).each do |cookie|
+      cookie_jar && cookie_jar.cookies(url).each do |cookie|
         cli.cookie_manager.parse(cookie.to_s,url)
       end
 
       length = 0;total = 0
-      res = cli.head(url)
-      url = URI.parse(res.header["Location"].to_s) if res.status == 302
+      res = cli.head(url.to_s)
+
+      if res.status == 302
+        url = URI.parse(res.header["Location"].to_s)
+        res = cli.head(url.to_s)
+      end
 
-      total = cli.head(url).header["Content-Length"].to_s.to_i
+      total = res.header["Content-Length"].to_s.to_i
       t = Thread.new {
-        conn = cli.get_async(url)
+        conn = cli.get_async(url.to_s)
         io = conn.pop.content
         ::File::open(path, "wb") { |f|
           while str = io.read(40)

data/lib/bookscan/book.rb

@@ -13,7 +13,7 @@ module Bookscan
         column :style => :green
         column :width => 100
       end
-      
+
       each do |b|
         table << [b.book_id,b.title_short]
       end

data/lib/bookscan/groups.rb

@@ -36,16 +36,19 @@ module Bookscan
         column
       end
       # table << ["#","Date","num","price","status"]
-      each do |group|
-         table << group.to_a
+
+      sort{ |a,b| a.date <=> b.date}.each do |group|
+        table << group.to_a
       end
       table.to_s if length > 0
     end
 
     def book(book_id)
-      each do |g|
-        return g.books.by_id(book_id) if g.books.has?(book_id)
+      g = find do |g|
+         g.books.has?(book_id)
       end
+      return nil unless g
+      g.books.by_id(book_id)
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookscan
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 5
-  - 11
-  version: 0.5.11
+  - 12
+  version: 0.5.12
 platform: ruby
 authors: 
 - Yoshihiro TAKAHARA
@@ -15,10 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-20 00:00:00 Z
+date: 2012-02-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -27,12 +29,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id001
-  prerelease: false
+  version_requirements: *id001
   name: mutter
-  type: :runtime
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :runtime
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -43,12 +45,12 @@ dependencies:
         - 4
         - 7
         version: 0.4.7
-  requirement: *id002
-  prerelease: false
+  version_requirements: *id002
   name: keystorage
-  type: :runtime
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :runtime
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -59,12 +61,12 @@ dependencies:
         - 0
         - 1
         version: 2.0.1
-  requirement: *id003
-  prerelease: false
+  version_requirements: *id003
   name: mechanize
-  type: :runtime
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :runtime
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -74,12 +76,12 @@ dependencies:
         - 1
         - 6
         version: "1.6"
-  requirement: *id004
-  prerelease: false
+  version_requirements: *id004
   name: highline
-  type: :runtime
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :runtime
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -90,12 +92,12 @@ dependencies:
         - 9
         - 0
         version: 0.9.0
-  requirement: *id005
-  prerelease: false
+  version_requirements: *id005
   name: progressbar
-  type: :runtime
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :runtime
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -107,12 +109,12 @@ dependencies:
         - 6
         - 1
         version: 2.1.6.1
-  requirement: *id006
-  prerelease: false
+  version_requirements: *id006
   name: httpclient
-  type: :runtime
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :runtime
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -121,12 +123,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id007
+  version_requirements: *id007
+  name: rdoc
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: shoulda
   type: :development
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id008
+  name: shoulda
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :development
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -137,12 +153,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id008
-  prerelease: false
+  version_requirements: *id009
   name: bundler
-  type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :development
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -153,12 +169,12 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  requirement: *id009
-  prerelease: false
+  version_requirements: *id010
   name: jeweler
-  type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :development
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -167,10 +183,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id010
-  prerelease: false
+  version_requirements: *id011
   name: rcov
-  type: :development
 description: This is a scraper of Bookscan (http://www.bookscan.co.jp) Service.This is *NOT* a official software of Bookscan.
 email: y.takahara@gmail.com
 executables: 
@@ -227,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: BookScan Scraper