em-bucketer 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c433f1cc453123f151e4a89363b6a6ebcb02e991
-  data.tar.gz: a541740a352cdc8c3a4e6474d6a7f0d69b4979a2
+  metadata.gz: 5d547634ad86e1896fe07ea84d2fbe3c6811982e
+  data.tar.gz: 3e43af63f440f32ee6ab7a7c725ad4abdb58f7af
 SHA512:
-  metadata.gz: fa4fcfa73e8d0311c2534cdd759fd8150a2fc96868faa271b96b26f12a125084822cd131816dd886df66e95ebecc89a0b474ae1297843b3bc5f5c5db5a3de50a
-  data.tar.gz: 39cd7430e0855f9048e6294cfa38cf7137d83172a6e5af997c4b7b14b4919bdf411a0d25838336325fe99695b02c7593f232373ad7cc5bee6f08c9f9eed8eefc
+  metadata.gz: dba33622fb1b8c81c227b106df449b71c05c258d21044fe7ae3634b498c7ffbae561a74a4722c7a50d1974a5ee339647039ce443974def220ffdd3926982b30d
+  data.tar.gz: c02603694010d1b0e470a04d7dd774837a3f60dcf10b2bcb840baf862fb8ac77b06828f9d9a0963fb07c77bcf85a23fee832aae19f9ee37c5d9d573e90bbd9b6

data/README.md

@@ -28,8 +28,10 @@ order in which they were put in.
 ### Usage
 
 ```ruby
-require 'em-bucketer'
+require 'em-bucketer/ordered'
 EM.run do
+
+  ## InMemory with pop_all example
   bucketer = EM::Bucketer::Ordered::InMemory.new(:bucket_threshold_size => 5)
 
   bucketer.on_bucket_full do |bucket_id|
@@ -48,6 +50,26 @@ EM.run do
   bucketer.add_item("1", {:foo => :bar})
   bucketer.add_item("1", {:bar => :foo})
   bucketer.add_item("1", {:bar => :foo})
+
+  ## Redis with pop_count example
+  bucketer = EM::Bucketer::Ordered::Redis.new("my_prefix", :bucket_threshold_size => 5)
+
+  bucketer.on_bucket_full do |bucket_id|
+    p "yay bucket #{bucket_id} filled up!"
+
+    bucketer.pop_count(bucket_id, 5) do |items|
+      EM.stop
+      items.each do |item|
+        p "got back #{item}"
+      end
+    end
+  end
+
+  bucketer.add_item("1", {:foo => :bar})
+  bucketer.add_item("1", {:foo => :bar})
+  bucketer.add_item("1", {:foo => :bar})
+  bucketer.add_item("1", {:bar => :foo})
+  bucketer.add_item("1", {:bar => :foo})
 end
 ```
 
@@ -62,6 +84,7 @@ not guarantee that you get back items in the same order that they went in.
 ```ruby
 require 'em-bucketer'
 EM.run do
+
   bucketer = EM::Bucketer::InMemory.new(:bucket_threshold_size => 5)
 
   bucketer.on_bucket_full do |bucket_id|

data/lib/em-bucketer/ordered/base.rb

@@ -42,10 +42,10 @@ module EventMachine::Bucketer
     # @yield [Array] the first `count`
     # items in the bucket
     def pop_count(bucket_id, count, reset_timer: true, &blk)
+      reset_timer(bucket_id) if reset_timer
       EM::Completion.new.tap do |c|
         c.callback(&blk) if block_given?
-        pop_count_from_db(bucket_id, count, &blk).callback do |items|
-          reset_timer(bucket_id) if reset_timer
+        pop_count_from_db(bucket_id, count).callback do |items|
           c.succeed items
         end.errback do |e|
           c.fail e
@@ -63,7 +63,7 @@ module EventMachine::Bucketer
       clear_timer(bucket_id)
       EM::Completion.new.tap do |c|
         c.callback(&blk) if block_given?
-        pop_all_from_db(bucket_id, &blk).callback do |items|
+        pop_all_from_db(bucket_id).callback do |items|
           c.succeed items
         end.errback do |e|
           c.fail e
@@ -152,6 +152,12 @@ module EventMachine::Bucketer
       end
     end
 
+    def bucket_empty?(bucket_id, &blk)
+      bucket_size_from_db(bucket_id).callback do |size|
+        blk.call size == 0
+      end
+    end
+
     def check_bucket_full(bucket_id)
       bucket_full?(bucket_id) do |is_full|
         if is_full
@@ -184,7 +190,9 @@ module EventMachine::Bucketer
     def reset_timer(bucket_id)
       return unless @bucket_max_age
       clear_timer(bucket_id)
-      @timers[bucket_id] = EM::Timer.new(@bucket_max_age, timeout_callback(bucket_id))
+      bucket_empty?(bucket_id) do |is_empty|
+        @timers[bucket_id] = EM::Timer.new(@bucket_max_age, timeout_callback(bucket_id)) unless is_empty
+      end
     end
   end
 end

data/lib/em-bucketer/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   module Bucketer
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-bucketer
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Richard Heycock
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-03 00:00:00.000000000 Z
+date: 2014-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine