entity_store 0.3.9 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09a2238ae22b823eb65cacce1f43a7f94733ab5f
-  data.tar.gz: 6d18a742b0e7666363eeac9a4a51e282a90d635b
+  metadata.gz: 3b8ff1e612eb5f628787b5ffbbf7015761ab631b
+  data.tar.gz: 322df7d392825dcd88a5efc2c85caac55e41e6c1
 SHA512:
-  metadata.gz: 238db945f6836367e0c73d5ffdd85886815928134dceb8ad8b50502590fee7d42680abc64b85b2206709cc2b8356054b54ce35a80892d5013af3ff0b36e557d4
-  data.tar.gz: e737e0eb77949e522c6817382a6609394af432d47cf16638ec09ae90f0884cb1820f6384923b0fee0e1c9e14a4cf406c5ff46017c84f707321fc348f2e66f70b
+  metadata.gz: 8358d50054068df7040d96bb2559bc1fa5f63fef6fd31a3fb626151ff88b570c6ecdf623b3bd049bc0d2e562fd57ab2c436874c94f58eaeacd5ad1ac9b9a456c
+  data.tar.gz: 550dc6708c0d5a4acfbd5fe94a5529637c7b145ad948b5d0f041b7aef3a2fdceecb3fb1799fa9ce433310952b2ed27389fa041583220a9ddc272d2a1241cd7ed

data/lib/entity_store/entity.rb

@@ -32,9 +32,18 @@ module EntityStore
     end
 
     def version=(value)
+      @_snapshot_version = value unless @_snapshot_version
       @_version = value
     end
 
+    def snapshot_due?
+      if version % Config.snapshot_threshold == 0
+        true
+      else
+        @_snapshot_version and (version - @_snapshot_version) >= Config.snapshot_threshold
+      end
+    end
+
     def generate_version_incremented_event
       event_class= "#{self.class.name}VersionIncremented".split('::').inject(Object) {|obj, name| obj.const_get(name) }
       event_class.new(:entity_id => id, :version => version)
@@ -61,4 +70,4 @@ module EntityStore
       "<#{self.class.name} #{id} #{self.attributes.inspect}>"
     end
   end
-end
+end

data/lib/entity_store/store.rb

@@ -21,7 +21,9 @@ module EntityStore
 
     def save(entity)
       # need to look at concurrency if we start storing version on client
-      unless entity.pending_events.empty?
+      if entity.pending_events.empty?
+        snapshot_entity(entity) if entity.snapshot_due?
+      else
         entity.version += 1
         if entity.id
           storage_client.save_entity(entity)
@@ -30,7 +32,7 @@ module EntityStore
         end
 
         add_events(entity) do
-          snapshot_entity(entity) if entity.version % Config.snapshot_threshold == 0
+          snapshot_entity(entity) if entity.snapshot_due?
         end
 
         # publish version increment signal event to the bus

data/lib/entity_store/version.rb

@@ -1,3 +1,3 @@
 module EntityStore
-  VERSION = "0.3.9".freeze
+  VERSION = "0.4.0".freeze
 end

data/spec/entity_store/store_spec.rb

@@ -79,7 +79,6 @@ describe Store do
     before(:each) do
       @new_id = random_string
       @entity = DummyEntityForStore.new(:id => random_string)
-      @entity.version = random_integer * EntityStore::Config.snapshot_threshold
       @storage_client = double("StorageClient", :save_entity => true)
       @store = Store.new
       @store.stub(:add_events).and_yield
@@ -139,13 +138,28 @@ describe Store do
     end
 
     context "when entity version is commensurate with snapshotting" do
-      before(:each) do
-        @entity.version = random_integer * EntityStore::Config.snapshot_threshold - 1
+      context "due to modulus of snapshot_threshold" do
+        before(:each) do
+          @entity.version = random_integer * EntityStore::Config.snapshot_threshold - 1
+        end
+
+        it "should snapshot the entity" do
+          @storage_client.should_receive(:snapshot_entity).with(@entity)
+          subject
+        end
       end
 
-      it "should snapshot the entity" do
-        @storage_client.should_receive(:snapshot_entity).with(@entity)
-        subject
+      context "due to more than snapshot_threshold versions having passed since last snapshot" do
+        before(:each) do
+          starting_version = random_integer
+          @entity.version = starting_version
+          @entity.version = starting_version + EntityStore::Config.snapshot_threshold + 1
+        end
+
+        it "should snapshot the entity" do
+          @storage_client.should_receive(:snapshot_entity).with(@entity)
+          subject
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: entity_store
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.0
 platform: ruby
 authors:
 - Adam Bird
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-15 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Event sourced entity store with a replaceable body