bookscan 0.5.0 → 0.5.2

data/Rakefile

@@ -25,6 +25,8 @@ Jeweler::Tasks.new do |gem|
   gem.add_runtime_dependency 'keystorage', '> 0.1'
   gem.add_runtime_dependency 'mechanize', '>= 1.0.0'
   gem.add_runtime_dependency 'highline', '> 1.6'
+  gem.add_runtime_dependency 'progressbar', '>= 0.9.0'
+  gem.add_runtime_dependency 'httpclient', '>= 2.1.6.1'
   #  gem.add_development_dependency 'rspec', '> 1.2.3'
 end
 Jeweler::RubygemsDotOrgTasks.new

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.2

data/bin/bookscan

@@ -5,19 +5,4 @@ require 'bookscan/cli'
 Bookscan::CLI::run(ARGV)
 exit
 
-require 'optparse'
-
-
-require 'rubygems'
-require 'highline'
-require 'mutter'
-
-require 'moat';include Moat
-
-load_passwords
-
-Moat::SITES[@site] = {:username => username, :password => password }
-show_credentials_for(@site) if @generated
-save_passwords
-
 

data/bookscan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bookscan}
-  s.version = "0.5.0"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yoshihiro TAKAHARA"]
-  s.date = %q{2011-01-20}
+  s.date = %q{2011-01-21}
   s.default_executable = %q{bookscan}
   s.description = %q{This is a scraper of Bookscan (http://www.bookscan.co.jp) Service.This is *NOT* a official software of Bookscan.}
   s.email = %q{y.takahara@gmail.com}
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/tumf/bookscan}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{BookScan Scraper}
   s.test_files = [
     "test/helper.rb",
@@ -48,7 +48,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
@@ -60,6 +59,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<keystorage>, ["> 0.1"])
       s.add_runtime_dependency(%q<mechanize>, [">= 1.0.0"])
       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"])
     else
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -69,6 +70,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<keystorage>, ["> 0.1"])
       s.add_dependency(%q<mechanize>, [">= 1.0.0"])
       s.add_dependency(%q<highline>, ["> 1.6"])
+      s.add_dependency(%q<progressbar>, [">= 0.9.0"])
+      s.add_dependency(%q<httpclient>, [">= 2.1.6.1"])
     end
   else
     s.add_dependency(%q<shoulda>, [">= 0"])
@@ -79,6 +82,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<keystorage>, ["> 0.1"])
     s.add_dependency(%q<mechanize>, [">= 1.0.0"])
     s.add_dependency(%q<highline>, ["> 1.6"])
+    s.add_dependency(%q<progressbar>, [">= 0.9.0"])
+    s.add_dependency(%q<httpclient>, [">= 2.1.6.1"])
   end
 end
 

data/lib/bookscan/agent.rb

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 require "rubygems"
 require "mechanize"
+require 'httpclient'
+require 'progressbar'
 
 require "bookscan"
 require "bookscan/groups"
@@ -151,20 +153,35 @@ module Bookscan
     end
 
     def download(url,path)
-      get(url)
-      page.save(path)
-    end
+      url = URI.parse(url)
+      cli = HTTPClient.new
+      @cookie_jar.cookies(url).each do |cookie|
+        cli.cookie_manager.parse(cookie.to_s,url)
+      end
 
-    def download2 isbn,type,dir
-      getr("/tunelablist.php")
-      page.search("a[@class=download]").each do |a|
-        if /^#{type}_.*_#{isbn}.*\.pdf$/ =~ a.text
-          click(a)
-          path =  dir + "/" + a.text
-          puts "Download %s" % [path]
-          page.save(path)
-        end
+      length = 0;total = 0
+      res = cli.head(url)
+      if res.status == 302
+        url = URI.parse(res.header["Location"].to_s)
+      end
+      total = cli.head(url).header["Content-Length"].to_s.to_i
+      t = Thread.new {
+        conn = cli.get_async(url)
+        io = conn.pop.content
+        ::File::open(path, "wb") { |f|
+          while str = io.read(40)
+            f.write str
+            length += str.length
+          end
+        }
+      }
+      pbar = ProgressBar.new("Loading",total)
+      while  total > length
+        sleep 1
+        pbar.set(length)
       end
+      pbar.finish
+      t.join
     end
 
   end

data/lib/bookscan/book.rb

@@ -11,11 +11,11 @@ module Bookscan
     def to_s
       table = Mutter::Table.new(:delimiter => '|') do
         column :style => :green
-        column :width => 60
+        column :width => 100
       end
       
       each do |b|
-        table << [b.book_id,b.title]
+        table << [b.book_id,b.title_short]
       end
       table.to_s if length > 0
     end
@@ -60,6 +60,12 @@ module Bookscan
       @title
     end
 
+    def title_short
+      @title.sub(/\.pdf$/,"").
+        sub(/_s$/,"").
+        sub(/_[0-9a-zA-Z]+$/,"")
+    end
+
     def filename
       return @title if isbn
       if /(.*)\.pdf$/ =~ @title

data/lib/bookscan/commands.rb

@@ -195,7 +195,7 @@ module Bookscan
           next unless book.tune_type == type
           if Dir.glob(directory + "/**/*" + book.book_id + "*.pdf").length == 0
             path = directory + "/" +book.filename
-            puts "download: " + path
+            puts "=> " + path
             unless dry_run
               start
               @agent.download(book.url,path)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookscan
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Yoshihiro TAKAHARA
@@ -15,11 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-20 00:00:00 +09:00
+date: 2011-01-21 00:00:00 +09:00
 default_executable: bookscan
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  type: :development
+  name: shoulda
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -29,11 +30,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   requirement: *id001
-  name: shoulda
-  type: :development
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  type: :development
+  name: bundler
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -45,11 +46,11 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  prerelease: false
   requirement: *id002
-  name: bundler
-  type: :development
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  type: :development
+  name: jeweler
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -61,11 +62,11 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
+  prerelease: false
   requirement: *id003
-  name: jeweler
-  type: :development
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  type: :development
+  name: rcov
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -75,11 +76,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   requirement: *id004
-  name: rcov
-  type: :development
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  type: :runtime
+  name: mutter
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -89,11 +90,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   requirement: *id005
-  name: mutter
-  type: :runtime
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  type: :runtime
+  name: keystorage
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -104,11 +105,11 @@ dependencies:
         - 0
         - 1
         version: "0.1"
+  prerelease: false
   requirement: *id006
-  name: keystorage
-  type: :runtime
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  type: :runtime
+  name: mechanize
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -120,11 +121,11 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  prerelease: false
   requirement: *id007
-  name: mechanize
-  type: :runtime
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  type: :runtime
+  name: highline
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -135,9 +136,41 @@ dependencies:
         - 1
         - 6
         version: "1.6"
+  prerelease: false
   requirement: *id008
-  name: highline
+- !ruby/object:Gem::Dependency 
   type: :runtime
+  name: progressbar
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 9
+        - 0
+        version: 0.9.0
+  prerelease: false
+  requirement: *id009
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  name: httpclient
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 125
+        segments: 
+        - 2
+        - 1
+        - 6
+        - 1
+        version: 2.1.6.1
+  prerelease: false
+  requirement: *id010
 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: 
@@ -195,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: BookScan Scraper