disk_store 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b80a1438fb5454793cd77e6fa2371638c6055664
-  data.tar.gz: 4c015900c8c3f0db8e7ecd47aab6300ef4348b4c
+  metadata.gz: a169969f0a6815116676b69bccfada6d9c021c00
+  data.tar.gz: 4047279dfc9bc369a3012e495b73a5d22e5e4f59
 SHA512:
-  metadata.gz: 6e8c657344f7039344dd09019d44de1d5f75750ea87f29c5fb49f8d16340cba53b6c407db96fcd614bf9676445e2fe9cde2b89fb96bfae2c0a0feccf1e94c98b
-  data.tar.gz: 158f6cedb964548dd86bc52b7bbe52e1cc4ac00325a54b3e313f74f73b86da3cd9577938e532b5c4b003d5245cd8b21947fed7ebed768ddd6b2ac15195b91d03
+  metadata.gz: bfbbe98e30b10f1790fc29d4136df196063eccacbf7d47dd2f28bca6e62e130c88136d79f41ceb9b2d33e341b91e5a4852803f5155ec3789ca342846fcdcbf79
+  data.tar.gz: d9d4184f527e83e14102b6347bb40906047581f84497bdc21533246c9aefeb8b9fd8e53ed4228874057cd521925630b8c40ba98199a6bd59d8d85fc864f23d9b

data/Gemfile.lock

@@ -1,12 +1,15 @@
 PATH
   remote: .
   specs:
-    disk_store (0.2.2)
+    disk_store (0.3.0)
+      celluloid
       rake
 
 GEM
   remote: https://rubygems.org/
   specs:
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
     diff-lcs (1.2.5)
     rake (10.3.2)
     rspec (2.14.1)
@@ -17,6 +20,7 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
+    timers (1.1.0)
 
 PLATFORMS
   ruby

data/disk_store.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency "rake"
+  gem.add_dependency "celluloid"
 
   gem.test_files = Dir.glob("spec/**/*")
   gem.add_development_dependency "rspec"

data/lib/disk_store/reaper.rb

@@ -1,7 +1,11 @@
+require 'celluloid'
+
 Dir[File.join(File.dirname(__FILE__), "eviction_strategies", "*.rb")].each { |f| require f }
 
 class DiskStore
   class Reaper
+    include Celluloid
+
     DEFAULT_OPTS = {
       cache_size: 1073741824, # 1 gigabyte
       reaper_interval: 10, # seconds,
@@ -12,27 +16,18 @@ class DiskStore
 
     # Spawn exactly 1 reaper for each cache path
     def self.spawn_for(path, opts = {})
-      return @reapers[path] if @reapers.has_key?(path)
-
-      reaper = Reaper.new(path, opts)
-      reaper.spawn!
-
-      @reapers[path] = reaper
-      reaper
-    end
-
-    # Mostly useful for testing purposes
-    def self.kill_all!
-      @reapers.each { |path, reaper| reaper.thread.kill }
-      @reapers = {}
+      return Celluloid::Actor[path] if !Celluloid::Actor[path].nil?
+      
+      Reaper.supervise_as(path, path, opts)
+      Celluloid::Actor[path].async.start!
+      Celluloid::Actor[path]
     end
 
-    attr_reader :path, :thread
+    attr_reader :path
 
     def initialize(path, opts = {})
       @path = path
       @options = DEFAULT_OPTS.merge(opts)
-      @thread = nil
 
       set_eviction_strategy(@options[:eviction_strategy])
     end
@@ -42,23 +37,13 @@ class DiskStore
       self.class.send :prepend, DiskStore::Reaper.const_get(strategy)
     end
 
-    def spawn!
-      @thread = Thread.new do
-        loop do
-          perform_sweep! if needs_eviction?
-          wait_for_next
-        end
+    def start!
+      loop do
+        perform_sweep! if needs_eviction?
+        wait_for_next
       end
     end
 
-    def alive?
-      @thread && @thread.alive?
-    end
-
-    def running?
-      @thread && !@thread.stop?
-    end
-
     private
 
     def perform_sweep!

data/lib/disk_store/version.rb

@@ -1,3 +1,3 @@
 class DiskStore
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/spec/reaper_spec.rb

@@ -6,6 +6,9 @@ describe DiskStore::Reaper do
   let(:key) { "doge" }
 
   before(:each) do
+    @reaper = nil
+    DiskStore::Reaper.stub(:spawn_for) { |path, opts| @reaper ||= DiskStore::Reaper.new(path, opts) }
+
     file.write file_contents
     file.flush
     file.rewind
@@ -18,10 +21,6 @@ describe DiskStore::Reaper do
     end
   end
 
-  after(:each) do
-    DiskStore::Reaper.kill_all!
-  end
-
   it 'is spawned with a new cache' do
     cache = DiskStore.new(@tmpdir)
     expect(cache.reaper).to_not be_nil
@@ -85,9 +84,6 @@ describe DiskStore::Reaper do
       let (:reaper) { cache.reaper }
 
       before(:each) do
-        # Kill the thread so we can test without it getting
-        # in the way
-        reaper.thread.kill
         cache.write key, file
 
         file2.write file2_contents

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: disk_store
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Kelly Sutton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -24,6 +24,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: rspec
   requirement: !ruby/object:Gem::Requirement