bookscan 0.5.2 → 0.5.3

data/Gemfile

@@ -2,6 +2,12 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
+gem 'mutter'
+gem 'keystorage', '> 0.1'
+gem 'mechanize', '>= 1.0.0'
+gem 'highline', '> 1.6'
+gem 'progressbar', '>= 0.9.0'
+gem 'httpclient', '>= 2.1.6.1'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Rakefile

@@ -21,12 +21,6 @@ Jeweler::Tasks.new do |gem|
   gem.authors = ["Yoshihiro TAKAHARA"]
   # Include your dependencies below. Runtime dependencies are required when using your gem,
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  gem.add_runtime_dependency 'mutter'
-  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.2
+0.5.3

data/bookscan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bookscan}
-  s.version = "0.5.2"
+  s.version = "0.5.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yoshihiro TAKAHARA"]
-  s.date = %q{2011-01-21}
+  s.date = %q{2011-02-06}
   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.4.2}
+  s.rubygems_version = %q{1.5.0}
   s.summary = %q{BookScan Scraper}
   s.test_files = [
     "test/helper.rb",
@@ -51,39 +51,39 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      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"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_runtime_dependency(%q<mutter>, [">= 0"])
       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"])
+      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"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<mutter>, [">= 0"])
       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"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<mutter>, [">= 0"])
     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"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<rcov>, [">= 0"])
   end
 end
 

data/lib/bookscan.rb

@@ -2,5 +2,5 @@
 module Bookscan
   BSURL = "http://system.bookscan.co.jp"
   TUNE_TYPES = ["ipad","iphone4","kindle3","kindledx","android","sonyreader","nook","jpg"]
-  TUNED_PATTERN = /((iphone4|ipad|kindle3|kindledx|android|sonyreader|nook|jpg)_([^>%]*\.pdf))/
+  TUNED_PATTERN = /((iphone4|ipad|kindle3|kindledx|android|sonyreader|nook|jpg)_([^>]*\.pdf))/
 end

data/lib/bookscan/agent.rb

@@ -161,9 +161,7 @@ module Bookscan
 
       length = 0;total = 0
       res = cli.head(url)
-      if res.status == 302
-        url = URI.parse(res.header["Location"].to_s)
-      end
+      url = URI.parse(res.header["Location"].to_s) if res.status == 302
       total = cli.head(url).header["Content-Length"].to_s.to_i
       t = Thread.new {
         conn = cli.get_async(url)

data/lib/bookscan/commands.rb

@@ -11,7 +11,7 @@ require "bookscan/cache"
 
 module Bookscan
   COMMANDS = ["list","help", "login","logout","download","tune","update",
-             "groups","tuned"]
+             "groups","tuned","tuning"]
 
   class Commands
     def initialize(cmd_options,options)

data/test/test_bookscan.rb

@@ -1,7 +1,14 @@
+# -*- coding: utf-8 -*-
 require 'helper'
-
+require 'bookscan/agent'
+require 'pp'
 class TestBookscan < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
+  context "Bookscan::Agent" do
+    should "access to bookscan" do
+      Bookscan::Agent.new {|agent|
+        agent.getr("/")
+        assert(/ブックスキャン/ =~ agent.page.body,"access to top")
+      }
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookscan
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Yoshihiro TAKAHARA
@@ -15,13 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-21 00:00:00 +09:00
+date: 2011-02-06 00:00:00 +09:00
 default_executable: bookscan
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
-  name: shoulda
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,15 +28,30 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  version_requirements: *id001
+  name: mutter
   prerelease: false
-  requirement: *id001
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  type: :development
-  name: bundler
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">"
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 1
+        version: "0.1"
+  version_requirements: *id002
+  name: keystorage
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 23
         segments: 
@@ -46,74 +59,77 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  version_requirements: *id003
+  name: mechanize
   prerelease: false
-  requirement: *id002
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  type: :development
-  name: jeweler
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">"
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
         - 1
-        - 5
-        - 2
-        version: 1.5.2
+        - 6
+        version: "1.6"
+  version_requirements: *id004
+  name: highline
   prerelease: false
-  requirement: *id003
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  type: :development
-  name: rcov
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 59
         segments: 
         - 0
-        version: "0"
+        - 9
+        - 0
+        version: 0.9.0
+  version_requirements: *id005
+  name: progressbar
   prerelease: false
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  name: mutter
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 125
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 1
+        - 6
+        - 1
+        version: 2.1.6.1
+  version_requirements: *id006
+  name: httpclient
   prerelease: false
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  name: keystorage
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 3
         segments: 
         - 0
-        - 1
-        version: "0.1"
+        version: "0"
+  version_requirements: *id007
+  name: shoulda
   prerelease: false
-  requirement: *id006
+  type: :development
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  name: mechanize
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 23
         segments: 
@@ -121,56 +137,40 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  version_requirements: *id008
+  name: bundler
   prerelease: false
-  requirement: *id007
+  type: :development
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  name: highline
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">"
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
         - 1
-        - 6
-        version: "1.6"
+        - 5
+        - 2
+        version: 1.5.2
+  version_requirements: *id009
+  name: jeweler
   prerelease: false
-  requirement: *id008
+  type: :development
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  name: progressbar
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 59
+        hash: 3
         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
+        version: "0"
+  version_requirements: *id010
+  name: rcov
   prerelease: false
-  requirement: *id010
+  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: 
@@ -228,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: BookScan Scraper