entity_store 0.0.2 → 0.0.3

data/lib/entity_store/event.rb

@@ -1,13 +1,13 @@
 module EntityStore
   module Event
-    attr_accessor :entity_id
-    
+    attr_accessor :entity_id, :entity_version
+
     def initialize(attrs={})
-      attrs.each_pair do |key, value|         
+      attrs.each_pair do |key, value|
         send("#{key}=", value) if respond_to?("#{key}=")
       end
     end
-    
+
     def receiver_name
       elements = self.class.name.split('::')
       elements[elements.count - 1].
@@ -16,20 +16,20 @@ module EntityStore
          tr("-", "_").
          downcase
     end
-    
+
     def attributes
       Hash[*public_methods.select {|m| m =~ /\w\=$/}.collect do |m|
         attribute_name = m.to_s.chop.to_sym
         [attribute_name, send(attribute_name).respond_to?(:attributes) ? send(attribute_name).attributes : send(attribute_name)]
       end.flatten]
     end
-    
+
     def self.included(klass)
       klass.class_eval do
         extend ClassMethods
       end
     end
-    
+
     module ClassMethods
       def time_attribute(*names)
         class_eval do
@@ -44,7 +44,7 @@ module EntityStore
           end
         end
       end
-      
+
       def entity_value_attribute(name, klass)
         define_method(name) { instance_variable_get("@#{name}") }
         define_method("#{name}=") do |value|

data/lib/entity_store/event_bus.rb

@@ -3,7 +3,9 @@ module EntityStore
     class << self
       def publish(entity_type, event)
         publish_externally entity_type, event
-        
+
+        EntityStore.logger.debug { "publishing #{event.inspect}" }
+
         subscribers_to(event.receiver_name).each do |s|
           begin
             s.new.send(event.receiver_name, event)
@@ -17,15 +19,15 @@ module EntityStore
       def subscribers_to(event_name)
         subscribers.select { |s| s.instance_methods.include?(event_name.to_sym) }
       end
-            
+
       def subscribers
         EntityStore.event_subscribers
       end
-      
+
       def publish_externally(entity_type, event)
         external_store.add_event(entity_type, event)
       end
-      
+
       def external_store
         @_external_store ||= ExternalStore.new
       end

data/lib/entity_store/store.rb

@@ -3,16 +3,16 @@ module EntityStore
     def storage_client
       @storage_client || MongoEntityStore.new
     end
-    
-    def add(entity)      
-      entity.id = storage_client.add_entity(entity)  
+
+    def add(entity)
+      entity.id = storage_client.add_entity(entity)
       add_events(entity)
       return entity
     rescue => e
       EntityStore.logger.error { "Store#add error: #{e.inspect} - #{entity.inspect}" }
       raise e
     end
-    
+
     def save(entity)
       # need to look at concurrency if we start storing version on client
       entity.version += 1
@@ -23,10 +23,11 @@ module EntityStore
       EntityStore.logger.error { "Store#save error: #{e.inspect} - #{entity.inspect}" }
       raise e
     end
-    
+
     def add_events(entity)
       entity.pending_events.each do |e|
         e.entity_id = entity.id.to_s
+        e.entity_version = entity.version
         storage_client.add_event(e)
       end
       entity.pending_events.each {|e| EventBus.publish(entity.type, e) }
@@ -35,22 +36,22 @@ module EntityStore
     def get!(id)
       get(id, true)
     end
-    
+
     def get(id, raise_exception=false)
       if entity = storage_client.get_entity(id, raise_exception)
-        storage_client.get_events(id).each { |e| e.apply(entity) }  
-      end    
+        storage_client.get_events(id).each { |e| e.apply(entity) }
+      end
       return entity
     end
-  
+
     # Public : USE AT YOUR PERIL this clears the ENTIRE data store
-    # 
+    #
     # Returns nothing
     def clear_all
       storage_client.entities.drop
       storage_client.events.drop
       @storage_client = nil
     end
-  
+
   end
 end

data/lib/entity_store/version.rb

@@ -1,3 +1,3 @@
 module EntityStore
-  VERSION = "0.0.2".freeze
+  VERSION = "0.0.3".freeze
 end

data/spec/entity_store/event_spec.rb

@@ -16,18 +16,22 @@ end
 describe Event do
   before(:each) do
     @id = random_integer
+    @version = random_integer
     @name = random_string
     @time = random_time
     @town = random_string
     @county = random_string
   end
   describe "#initialize" do
-    
-    subject { DummyEvent.new({:entity_id => @id, :name => @name, :updated_at => @time, :sent_at => nil, :address => {:town => @town, :county => @county}})}
-    
+
+    subject { DummyEvent.new({:entity_id => @id, :entity_version => @version, :name => @name, :updated_at => @time, :sent_at => nil, :address => {:town => @town, :county => @county}})}
+
     it "should set entity_id" do
       subject.entity_id.should eq(@id)
     end
+    it "should set entity_version" do
+      subject.entity_version.should eq(@version)
+    end
     it "should set name" do
       subject.name.should eq(@name)
     end
@@ -41,27 +45,27 @@ describe Event do
       subject.address.county.should eq(@county)
     end
   end
-  
+
   describe "#attributes" do
     before(:each) do
-      @event = DummyEvent.new(:entity_id => @id, :name => @name, :updated_at => @time, :address => DummyValue.new(:town => @town, :county => @county))
+      @event = DummyEvent.new(:entity_id => @id, :entity_version => @version, :name => @name, :updated_at => @time, :address => DummyValue.new(:town => @town, :county => @county))
     end
-    
+
     subject { @event.attributes }
-    
+
     it "returns a hash of the attributes" do
-      subject.should eq({:entity_id => @id, :name => @name, :updated_at => @time, :sent_at => nil, :address => {:town => @town, :county => @county}})
+      subject.should eq({:entity_id => @id, :entity_version => @version, :name => @name, :updated_at => @time, :sent_at => nil, :address => {:town => @town, :county => @county}})
     end
   end
-  
+
   describe ".time_attribute" do
     before(:each) do
       @event = DummyEvent.new
       @time = random_time
     end
-    context "updated_at" do     
+    context "updated_at" do
       subject { @event.updated_at = @time.to_s }
-    
+
       it "parses the time field when added as a string" do
         subject
         @event.updated_at.to_i.should eq(@time.to_i)
@@ -69,14 +73,14 @@ describe Event do
     end
     context "sent_at" do
       subject { @event.updated_at = @time.to_s }
-    
+
       it "parses the time field when added as a string" do
         subject
         @event.updated_at.to_i.should eq(@time.to_i)
       end
     end
   end
-  
+
   describe ".value_attribute" do
     before(:each) do
       @event = DummyEvent.new

data/spec/entity_store/store_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 class DummyEntity
   include Entity
-  
+
   attr_accessor :name
-  
+
   def initialize(name)
     @name = name
   end
@@ -20,9 +20,9 @@ describe Store do
       @store.stub(:add_events)
       @store.stub(:storage_client) { @storage_client }
     end
-    
+
     subject { @store.add(@entity) }
-    
+
     it "adds the new entity to the store" do
       @storage_client.should_receive(:add_entity).with(@entity)
       subject
@@ -33,23 +33,24 @@ describe Store do
     end
     it "returns a reference to the ride" do
       subject.should eq(@entity)
-    end  
+    end
   end
 
   describe "#add_events" do
     before(:each) do
       @entity = DummyEntity.new(random_string)
       @entity.id = random_string
-      @entity.pending_events << mock(Event, :entity_id= => true)
-      @entity.pending_events << mock(Event, :entity_id= => true)
+      @entity.version = random_integer
+      @entity.pending_events << mock(Event, :entity_id= => true, :entity_version= => true)
+      @entity.pending_events << mock(Event, :entity_id= => true, :entity_version= => true)
       @storage_client = mock("StorageClient", :add_event => true)
       @store = Store.new
       @store.stub(:storage_client) { @storage_client }
       EventBus.stub(:publish)
     end
-    
+
     subject { @store.add_events(@entity) }
-    
+
     it "adds each of the events" do
       @entity.pending_events.each do |e|
         @storage_client.should_receive(:add_event).with(e)
@@ -62,15 +63,21 @@ describe Store do
       end
       subject
     end
+    it "should assign the current entity version to each event" do
+      @entity.pending_events.each do |e|
+        e.should_receive(:entity_version=).with(@entity.version)
+      end
+      subject
+    end
     it "publishes each event to the EventBus" do
       @entity.pending_events.each do |e|
         EventBus.should_receive(:publish).with(@entity.type, e)
       end
       subject
     end
-    
+
   end
-  
+
   describe "#save" do
     before(:each) do
       @new_id = random_string
@@ -80,9 +87,9 @@ describe Store do
       @store.stub(:add_events)
       @store.stub(:storage_client) { @storage_client }
     end
-    
+
     subject { @store.save(@entity) }
-    
+
     it "increments the entity version number" do
       @entity.should_receive(:version=).with(@entity.version + 1)
       subject
@@ -99,21 +106,21 @@ describe Store do
       subject.should eq(@entity)
     end
   end
-  
+
   describe "#get" do
     before(:each) do
       @id = random_integer
       @entity = DummyEntity.new(random_string)
       DummyEntity.stub(:new).and_return(@ride)
       @events = [mock("Event", :apply => true), mock("Event", :apply => true)]
-  
+
       @storage_client = mock("StorageClient", :get_entity => @entity, :get_events => @events)
       @store = Store.new
       @store.stub(:storage_client) { @storage_client }
     end
-    
+
     subject { @store.get(@id) }
-    
+
     it "should retrieve object from the storage client" do
       @storage_client.should_receive(:get_entity).with(@id, false)
       subject

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: entity_store
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-30 00:00:00.000000000 Z
+date: 2012-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70160207835100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70160207835100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70160207834240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +37,12 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70160207834240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
 description: Event sourced entity store with a Mongo body
 email: adam.bird@gmail.com
 executables: []
@@ -80,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Event sourced entity store with a Mongo body