epub-search 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 536544d7de71e3a8248d0dfde581b2cf23a32cc1
-  data.tar.gz: dea71df17f48c5d10fa7b767904259db9021a057
+  metadata.gz: 8b13b7b323e7bac69c408b9fddae5c6a1032336b
+  data.tar.gz: 5b365484dc01ebb3e354e9997121f0df75bbefa0
 SHA512:
-  metadata.gz: 5d77aeba6dfcaff267d8e15577ad0fc5438039cabbb1badee432456906b4b3be780fcca4ea8be15235286205e34efa929bfa85526a1b0c49a927a49292aad345
-  data.tar.gz: 42f255473c9386d092b1d1d6b15cbfd081b729abf4a694321302c845e3778e14c807a65e108343c2f0a4cdb63d1718aeece69c0b3be3a6787a1d85d16565d7f3
+  metadata.gz: a8c64c2c72bd1907bc4b20c1a4e66e147c3165a463dc9bbf7dd7bf7604e990bb2b566d1ca4e69af559bbafc9a310d964c851498b5696df6b584bf6b8313d82f0
+  data.tar.gz: 31067155ad835d1d717fadd98b64b0ede7d3accb9886d8a8dad7784fd5d08c5a83fd2a94ec1561757faa4476d6e7bbaf11c01515eaad5db89731f7c9aff8ae5b

data/CHANGELOG.markdown

@@ -1,6 +1,10 @@
 Change Log
 ==========
 
+0.0.3
+-----
+* Specify the version of Listen gem as '>= 1.0.0' to aopt to changed API
+
 0.0.2
 -----
 * Ruby vertion limited to 2.0

data/README.markdown

@@ -46,6 +46,9 @@ Configuration file should be written as YAML and you can set properties below:
 ChangeLog
 ---------
 
+### 0.0.3
+* Specify the version of Listen gem
+
 ### 0.0.2
 * Ruby vertion limited to 2.0
 * Database directory changed

data/app/watch.rb

@@ -26,17 +26,18 @@ class Watch
     end
     Process.daemon if @daemonize
     write_pid_file
+
+    EPUB::Search::Database::Actor.supervise_as :db, @db
+
     catch_up
     begin
-      Listen.to *@directories, :filter => EPUB_RE do |modified, added, removed|
+      Listen.to! *@directories, :filter => EPUB_RE do |modified, added, removed|
         modified.each do |file_path|
           next unless file_path =~ EPUB_RE
           file_path.force_encoding 'UTF-8'
           begin
-            $stderr.puts "remove #{file_path}"
-            @db.remove file_path
-            $stderr.puts "add #{file_path}"
-            @db.add file_path
+            $stderr.puts "update #{file_path}"
+            Celluloid::Actor[:db].async.update file_path
             title = EPUB::Parser.parse(file_path).title
             notify %Q|UPDATED: #{title}\n#{file_path}|
             FileUtils.touch exit_time_file
@@ -49,7 +50,7 @@ class Watch
           next unless file_path =~ EPUB_RE
           file_path.force_encoding 'UTF-8'
           begin
-            @db.add file_path
+            Celluloid::Actor[:db].async.add file_path
             title = EPUB::Parser.parse(file_path).title
             notify %Q|ADDED: #{title}\n#{file_path}|
             FileUtils.touch exit_time_file
@@ -62,7 +63,7 @@ class Watch
           next unless file_path =~ EPUB_RE
           file_path.force_encoding 'UTF-8'
           begin
-            @db.remove file_path
+            Celluloid::Actor[:db].async.remove file_path
             notify %Q|REMOVED:\n#{file_path}|
             FileUtils.touch exit_time_file
           rescue => error
@@ -100,8 +101,8 @@ class Watch
       Dir["#{dir}/**/*.epub"].each do |file_path|
         next if File.file? exit_time_file and File.mtime(file_path) < exit_time
         begin
-          removed = @db.remove(file_path)
-          @db.add file_path
+          removed = Celluloid::Actor[:db].remove(file_path)
+          Celluloid::Actor[:db].async.add file_path
           operation = removed.zero? ? 'ADDED' : 'UPDATED'
           title = EPUB::Parser.parse(file_path).title
           notify "#{operation}: #{title}\n#{file_path}"

data/epub-search.gemspec

@@ -22,12 +22,12 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'epub-parser'
   gem.add_runtime_dependency 'rroonga'
   gem.add_runtime_dependency 'thor'
-  gem.add_runtime_dependency 'rb-inotify'
-  gem.add_runtime_dependency 'listen'
+  gem.add_runtime_dependency 'listen', '~> 1.0.0'
   gem.add_runtime_dependency 'highline'
   gem.add_runtime_dependency 'notify', '0.5.0'
   gem.add_runtime_dependency 'rack'
   gem.add_runtime_dependency 'tilt'
+  gem.add_runtime_dependency 'celluloid'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'bundler'

data/lib/epub/search.rb

@@ -4,7 +4,9 @@ require 'epub/parser'
 require 'groonga'
 require 'listen'
 require 'highline'
+require 'celluloid'
 require 'epub/search/database'
+require 'epub/search/database/actor'
 require 'epub/search/formatter'
 require 'epub/search/server'
 

data/lib/epub/search/database/actor.rb

@@ -0,0 +1,26 @@
+module EPUB
+  module Search
+    class Database
+      class Actor
+        include Celluloid
+
+        def initialize(db)
+          @db = db
+        end
+
+        def add(file_path)
+          @db.add file_path
+        end
+
+        def remove(file_path)
+          @db.remove file_path
+        end
+
+        def update(file_path)
+          @db.remove file_path
+          @db.add file_path
+        end
+      end
+    end
+  end
+end

data/lib/epub/search/version.rb

@@ -1,5 +1,5 @@
 module EPUB
   module Search
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epub-search
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - KITAITI Makoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: epub-parser
@@ -52,34 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rb-inotify
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +122,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: celluloid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -246,6 +246,7 @@ files:
 - epub-search.gemspec
 - lib/epub/search.rb
 - lib/epub/search/database.rb
+- lib/epub/search/database/actor.rb
 - lib/epub/search/formatter.rb
 - lib/epub/search/formatter/cli.rb
 - lib/epub/search/server.rb