bookscan 0.4.3 → 0.5.0

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.5.0

data/bookscan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bookscan}
-  s.version = "0.4.3"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yoshihiro TAKAHARA"]
-  s.date = %q{2011-01-19}
+  s.date = %q{2011-01-20}
   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.3.7}
   s.summary = %q{BookScan Scraper}
   s.test_files = [
     "test/helper.rb",
@@ -48,6 +48,7 @@ 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

data/lib/bookscan/agent.rb

@@ -73,15 +73,12 @@ module Bookscan
     end
 
     def tune(book,type,is_premium = true)
-      if is_premium
-        max_queue = 10
-      else
-        max_queue = 1
-      end
+      max_queue = 1
+      max_queue = 10 if is_premium
 
       @tuning = tuning unless @tuning
       # チューニングいっぱい
-      raise "tune queue is full" if @tuning.length >= max_queue
+      raise SystemExit.new(0,"tune queue is full") if @tuning.length >= max_queue
       # チューニング
       return false if tuning?(book,type)
       # tune

data/lib/bookscan/book.rb

@@ -28,8 +28,9 @@ module Bookscan
       a
     end
 
-    def by_id(book_id)
+    def by_id(book_id,type = nil)
       each do |b|
+        next if type and b.tune_type != type
         return b if b.book_id == book_id
       end
       nil

data/lib/bookscan/cache.rb

@@ -25,12 +25,13 @@ module Bookscan
           ts_uniq << t
         end
       }
-      require 'pp'
       return ts_uniq.compact
     end
 
     def tuned?(book,type)
-      tuned.has?(book.book_id) and tuned.by_id(book.book_id).tune_type == type
+      b = tuned.by_id(book.book_id,type)
+      return false unless b
+      b.book_id == book.book_id and b.tune_type == type 
     end
 
     def books(group = nil)

data/lib/bookscan/commands.rb

@@ -240,13 +240,18 @@ module Bookscan
       type = ask_tune_type(@command_options.shift)
 
       if book_id == "all"
-        tuned = @cache.tuned
+        start unless dry_run
+        unless dry_run
+          @cache.transaction do |cache|
+            cache["tuned"] = @agent.tuned
+          end
+        end
         @cache.books.each { |book|
           next unless /#{pattern}/ =~ book.title
           unless @cache.tuned?(book,type)
             # tune
-            start unless dry_run
             puts "tune for %s: %s" % [type, book.title] if dry_run or @agent.tune(book,type)
+            # puts "tune for %s: %s" % [type, book.title]
           end
         }
       else

metadata

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