eventus 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0510de94abd807d6021a437c50991ee12c0905c2
-  data.tar.gz: 6f0a0ae284f6c1950c64293c746e08395aca4db9
+  metadata.gz: f044a21d912f891cddeb152780b7c9f1f572b8c4
+  data.tar.gz: e129431af35652286f4c2a5a730e722e9087c341
 SHA512:
-  metadata.gz: 7b4ab55c58fdfaf02e5f0a5d143ede5c0439ad76734d36c4ce8fd8e03d671f1348015d442bcdc605ffa67f0930d625e2aaada01bf146177d725a1bcc43a70aaf
-  data.tar.gz: 14e9d30c0dab348d35bdcd3693debb83c0d1f7e40317d6aaa4f50f9bbc38ff31b239abc6ccff80d0be3acd5dd886d496d531b97c98f3b56a36e630d0740b924c
+  metadata.gz: 0a4079431f8c26910a46640182593fd03823547ed26b5a37d10a064fc2ba66417584720a5515387e51a7c0ad46b124f30daeed4fd63b96286c724d6795fdde6c
+  data.tar.gz: 1a7a0edfc561aae0685c85b0ff5cabaa57b9293e70fd4b70b6ce3b9bf6c8a9944d43eb67995c85a03a021a26c8a14e357e9f8f0e338b18cc3eebf38e479410db

data/lib/eventus/persistence/sequel.rb

@@ -25,16 +25,20 @@ module Eventus
       end
 
       def load(sid, min = nil, max = nil)
-        events = @dataset.where(:sid => sid)
-        events = events.where{ sequence >= min } if min
-        events = events.where{ sequence <= max } if max
-        events.order_by(:sequence).all
+        _load(sid, nil, min, max)
       end
 
       def load_undispatched(sid = nil)
-        events = @dataset.where(:dispatched => false)
-        events = events.where(:sid => sid).order_by(:sequence) if sid
-        events.all
+        _load(sid, false)
+      end
+
+      def _load(sid = nil, dispatched = nil, min = nil, max = nil)
+        events = @dataset
+        events = events.where(:sid => sid) unless sid.nil?
+        events = events.where(:dispatched => dispatched) unless dispatched.nil?
+        events = events.where{ sequence >= min } unless min.nil?
+        events = events.where{ sequence <= max } unless max.nil?
+        events.order_by(:sequence).all
       end
 
       def mark_dispatched(sid, sequence)
@@ -44,9 +48,11 @@ module Eventus
       end
 
       def convert_row(row)
-        row.each_with_object({}) do |(k,v), memo|
+        res = row.each_with_object({}) do |(k,v), memo|
           memo[k.to_s] = v
         end
+        res['body'] = res.fetch('body', {}).to_hash
+        res
       end
 
       def self.migrate!(db, target = nil)

data/lib/eventus/version.rb

@@ -1,3 +1,3 @@
 module Eventus
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
 end

data/spec/persistence/sequel_spec.rb

@@ -81,6 +81,11 @@ describe Eventus::Persistence::Sequel do
       expect {persistence.commit create_commit(id, 3, {"foo" => "This is taken"})}.to raise_error(Eventus::ConcurrencyError)
     end
 
+    it "should convert body into a normal hash" do
+      result = persistence.load_undispatched(id)
+      result[0]['body'].class.should == Hash
+    end
+
     it "should rollback changes on concurrency error" do
       begin
         persistence.commit create_commit(id, 3, {"foo" => "first"}, {"foo" => "second"}, {"foo" => "third"})
@@ -103,7 +108,6 @@ describe Eventus::Persistence::Sequel do
 
     it "should load events between minimum and maximum" do
       result = persistence.load id, 10, 15
-      p result
       result.length.should == 6
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eventus
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Jason Staten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-02 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake