bookscan 0.2.2 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/bookscan.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bookscan}
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yoshihiro TAKAHARA"]
@@ -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

data/lib/bookscan/book.rb

@@ -32,6 +32,7 @@ module Bookscan
       each do |b|
         return b if b.book_id == book_id
       end
+      nil
     end
 
     def has?(book_id)

data/lib/bookscan/cache.rb

@@ -19,7 +19,14 @@ module Bookscan
       transaction do |ps|
         ts = ps["tuned"]
       end
-      ts
+      ts_uniq = Books.new
+      ts.each { |t|
+        unless ts_uniq.find { |i| i.title == t.title }
+          ts_uniq << t
+        end
+      }
+      require 'pp'
+      return ts_uniq.compact
     end
 
     def tuned?(book,type)
@@ -34,9 +41,9 @@ module Bookscan
       else
         bs = Books.new
         groups.each do |g|
-          bs += g.books
+          g.books.each { |b| bs << b }
         end
-        bs
+        return bs
       end
     end
 

data/lib/bookscan/commands.rb

@@ -109,70 +109,13 @@ module Bookscan
         hash = v
       end
       opt.parse!(@command_options)
-
-      unless hash
-        puts gs.to_s
-        hash = ask('Enter hash: ',gs.hashes) do |q|
-          q.validate = /\w+/
-          q.readline = true
-        end
-      end
-
-      g = gs.by_hash(hash)
-      puts g.books.to_s
-    end
-
-    def ask_tuned_book_id(book_id,type)
-      unless type
-        type = ask('Enter tune type: ',TUNE_TYPES) do |q|
-          q.validate = /\w+/
-          q.readline = true
-        end
-      end
-      ts = @cache.tuned
-      ts.collect! do |i|
-        i if i.tune_type == type
-      end.compact!
-      raise "No tuned in cache. Exceute 'bookscan update' first." unless ts.length > 0
-      unless book_id
-        puts ts.to_s
-        book_id = ask('Enter book id: ',ts.ids) do |q|
-          q.validate = /\w+/
-          q.readline = true
-        end
-      end
-      ts.by_id(book_id)
-    end
-
-    def ask_book_id(book_id,hash)
-      gs = @cache.groups
-      unless book_id
-        unless hash
-          puts gs.to_s
-          hash = ask('Enter hash: ',gs.hashes) do |q|
-            q.validate = /\w+/
-            q.readline = true
-          end
-          g = gs.by_hash(hash)
-
-          puts g.books.to_s
-
-          book_id = ask('Enter book id: ',g.books.ids) do |q|
-            q.validate = /\w+/
-            q.readline = true
-          end
-
-        end
-      end
-      gs.book(book_id)
+      puts ask_group(hash,gs).books.to_s
     end
 
     def download
       opt = OptionParser.new
       directory = "."
-      hash = nil
-      type = nil
-      dry_run = false
+      hash = nil;type = nil;pattern = ".*"; dry_run = false
       opt.on('-d DIR','--directory=DIR', 'download directory') do |v|
         directory = v
       end
@@ -182,6 +125,9 @@ module Bookscan
       opt.on('-t TYPE','--tuned=TYPE', 'download tuned') do |v|
         type = v
       end
+      opt.on('-m PATTERN','--match=PATTERN','pattern match') do |v|
+        pattern  = v
+      end
       opt.on('--dry-run', 'dry-run mode') do |v|
         dry_run = true
       end
@@ -190,9 +136,13 @@ module Bookscan
 
       if book_id == "all"
         if type
-          bs = @cache.tuned
+          bs = @cache.tuned.select { |i|
+            /#{pattern}/ =~ i.title
+          }
         else
-          bs = @cache.books
+          bs = @cache.books.select { |i|
+            /#{pattern}/ =~ i.title
+          }
         end
         bs.each { |book|
           next unless book.tune_type == type
@@ -207,9 +157,9 @@ module Bookscan
         }
       else
         if type
-          book = ask_tuned_book_id(book_id,type)
+          book = ask_tuned_book_id(book_id,type,pattern)
         else
-          book = ask_book_id(book_id,hash)
+          book = ask_book_id(book_id,hash,pattern)
         end
         
         # download
@@ -225,38 +175,32 @@ module Bookscan
 
     def tune
       opt = OptionParser.new
-      hash = nil
-      dry_run = false
+      hash = nil; pattern = ".*"; dry_run = false
       opt.on('-g HASH','--group=HASH', 'group hash') do |v|
         hash = v
       end
       opt.on('--dry-run', 'dry-run mode') do |v|
         dry_run = true
       end
+      opt.on('-m PATTERN','--match=PATTERN','pattern match') do |v|
+        pattern  = v
+      end
       opt.parse!(@command_options)
       book_id = @command_options.shift
-      type =  @command_options.shift
-      unless type
-        type = ask('Enter tune type: ',TUNE_TYPES) do |q|
-          q.validate = /\w+/
-          q.readline = true
-        end
-      end
+      type = ask_tune_type(@command_options.shift)
 
       if book_id == "all"
         tuned = @cache.tuned
-        bs = @cache.books
-        bs.each { |book|
+        @cache.books.each { |book|
+          next unless /#{pattern}/ =~ book.title
           unless @cache.tuned?(book,type)
             # tune
-            unless dry_run
-              start
-            end
+            start unless dry_run
             puts "tune for %s: %s" % [type, book.title] if dry_run or @agent.tune(book,type)
           end
         }
       else
-        book = ask_book_id(book_id,hash)
+        book = ask_book_id(book_id,hash,pattern)
         # tune
         puts "tune for %s: %s" % [type, book.title]
         unless dry_run
@@ -276,5 +220,75 @@ module Bookscan
       puts @cache.tuned.to_s
     end
 
+    private
+
+    def ask_group(hash,gs)
+      unless hash
+        puts gs.to_s
+        hash = ask('Enter hash ([q]uit): ',gs.hashes << 'q') do |q|
+          q.validate = /\w+/
+          q.readline = true
+        end
+      end
+      raise SystemExit if hash == "q"
+
+      gs.by_hash(hash)
+    end
+
+    def ask_tune_type(type)
+      unless type
+        type = ask('Enter tune type ([q]uit): ',TUNE_TYPES.clone << 'q') do |q|
+          q.validate = /\w+/
+          q.readline = true
+        end
+      end
+      raise SystemExit if type == "q"
+      type
+    end
+
+    def ask_tuned_book_id(book_id,type,pattern)
+      type = ask_tune_type(type)
+
+      ts = @cache.tuned.delete_if do |i|
+        i.tune_type != type
+      end
+
+      raise "No tuned in cache. Exceute 'bookscan update' first." unless ts.length > 0
+      return ask_book_id_pattern(book_id,ts,pattern)
+    end
+
+    def ask_book_id_pattern(book_id,books,pattern)
+      bs = books.clone.delete_if { |i|
+        !(/#{pattern}/ =~ i.title)
+      }
+      unless book_id
+        puts bs.to_s
+        book_id = ask('Enter book id ([q]uit): ',bs.ids << 'q') do |q|
+          q.validate = /\w+/
+          q.readline = true
+        end
+        raise SystemExit if book_id == "q"
+      end
+      bs.by_id(book_id)
+    end
+
+    def ask_book_id(book_id,hash,pattern)
+      unless  pattern == ".*"
+        return ask_book_id_pattern(book_id,@cache.books,pattern)
+      end
+
+      gs = @cache.groups
+      unless book_id
+        g = ask_group(hash,gs)
+        puts g.books.to_s
+        book_id = ask('Enter book id ([q]uit): ',g.books.ids << 'q') do |q|
+          q.validate = /\w+/
+          q.readline = true
+        end
+        raise SystemExit if book_id == "q"
+      end
+      gs.book(book_id)
+    end
+
   end
 end

metadata

@@ -2,12 +2,12 @@
 name: bookscan
 version: !ruby/object:Gem::Version 
   hash: 19
-  prerelease: false
+  prerelease: 
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Yoshihiro TAKAHARA
@@ -19,7 +19,7 @@ date: 2011-01-19 00:00:00 +09:00
 default_executable: bookscan
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  type: :development
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -30,10 +30,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id001
+  prerelease: false
   name: shoulda
-  type: :development
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  type: :development
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,10 +46,10 @@ dependencies:
         - 0
         version: 1.0.0
   requirement: *id002
+  prerelease: false
   name: bundler
-  type: :development
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  type: :development
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -62,10 +62,10 @@ dependencies:
         - 2
         version: 1.5.2
   requirement: *id003
+  prerelease: false
   name: jeweler
-  type: :development
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  type: :development
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -76,10 +76,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id004
+  prerelease: false
   name: rcov
-  type: :development
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  type: :runtime
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -90,10 +90,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id005
+  prerelease: false
   name: mutter
-  type: :runtime
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  type: :runtime
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -105,10 +105,10 @@ dependencies:
         - 1
         version: "0.1"
   requirement: *id006
+  prerelease: false
   name: keystorage
-  type: :runtime
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  type: :runtime
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -121,10 +121,10 @@ dependencies:
         - 0
         version: 1.0.0
   requirement: *id007
+  prerelease: false
   name: mechanize
-  type: :runtime
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  type: :runtime
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -136,8 +136,8 @@ dependencies:
         - 6
         version: "1.6"
   requirement: *id008
+  prerelease: false
   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.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: BookScan Scraper