entity_store 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d66518229bc1a1e8b67466d02c8da159937290bcb23821e7271d581e8c9ba8e
-  data.tar.gz: 6ad5bb806da6d9741d35171e0833b647e98dab49685b842931641020344f1a06
+  metadata.gz: 1f071fa32e56d2d2754f6ea625d16f5157d672039f605c62d45f06c41c0e9743
+  data.tar.gz: 41e90b5b50d95eddc723e1290638a10cb05a50c49aaf996ea75d4547552d74b7
 SHA512:
-  metadata.gz: bb6bbac0680c5b46ebce882cd171306585dd622cf6fcdaae2dda1e18ca789e072d781654a22ed52f19a90bad8c28bddb1a94987cca9141c904d6d79ef685b5d8
-  data.tar.gz: 7efcc35670e23d51147fa8128fed71dda6308ebe9f5cd2bf934ca928a1006705bea03c80cd621a3ccaed79065ac0393f38963de2c387e45650b03f6d60321695
+  metadata.gz: 352fbec15f059e0401c1e8b0ec99fb07c1abbc3a9ab7da827fba24c60fb947448bca41a3bfe933b88dd815d7173167db1ab17589fa938d96c0038c37a3dd3daa
+  data.tar.gz: 79bf9b0ba01989b8e7b3da3af6a98cb5a6ea4cab703155e1965acbae7baecb421fba71693a901bdcef6258250bb7fa4881a4d9e4e896c5dea6e1075e833cc2e1

data/lib/entity_store.rb

@@ -1,6 +1,4 @@
 module EntityStore
-
-  require_relative 'entity_store/utils'
   require_relative 'entity_store/logging'
   require_relative 'entity_store/config'
   require_relative 'entity_store/time_factory'

data/lib/entity_store/config.rb

@@ -4,9 +4,11 @@ module EntityStore
       # Stores
       attr_accessor :store, :feed_store
 
+      attr_accessor :cache_event_subscribers
+
       # Allows config to pass in a lambda or Proc to use as the type loader in place
-      # of the default. 
-      # Original use case was migration of entity classes to new module namespace when 
+      # of the default.
+      # Original use case was migration of entity classes to new module namespace when
       # extracting to a shared library
       attr_accessor :type_loader
 
@@ -17,15 +19,15 @@ module EntityStore
         yield self
 
         raise StandardError.new("store not assigned") unless store
-        store.open 
+        store.open
         feed_store.open if feed_store
       end
-      
+
       def event_subscribers
         @_event_subscribers ||=[]
       end
-      
-      # Public - indicates the version increment that is used to 
+
+      # Public - indicates the version increment that is used to
       # decided whether a snapshot of an entity should be created when it's saved
       def snapshot_threshold
         @_snapshot_threshold ||= 10
@@ -35,7 +37,6 @@ module EntityStore
         @_snapshot_threshold = value
       end
 
-      
       def load_type(type_name)
         if EntityStore::Config.type_loader
           EntityStore::Config.type_loader.call(type_name)
@@ -50,4 +51,4 @@ module EntityStore
     end
 
   end
-end
+end

data/lib/entity_store/event_bus.rb

@@ -27,18 +27,48 @@ module EntityStore
     end
 
     def subscribers_to(event_name)
-      subscribers.select { |s| s.instance_methods.include?(event_name.to_sym) }
+      subscriber_lookup[event_name.to_sym].dup
     end
 
     def subscribers_to_all
-      subscribers.select { |s| s.instance_methods.include?(ALL_METHOD) }
+      subscribers_to(ALL_METHOD)
+    end
+
+    def subscriber_lookup_cache
+      @@lookup_cache ||= Hash.new
+    end
+
+    def subscriber_lookup
+      return generate_subscriber_lookup unless EntityStore::Config.cache_event_subscribers
+
+      @lookup ||= begin
+        lookup_cache_key = event_subscribers.map(&:to_s).join
+
+        if subscriber_lookup_cache[lookup_cache_key]
+          subscriber_lookup_cache[lookup_cache_key]
+        else
+          subscriber_lookup_cache[lookup_cache_key] = generate_subscriber_lookup
+        end
+      end
+    end
+
+    def generate_subscriber_lookup
+      lookup = Hash.new { |h, k| h[k] = Array.new }
+
+      subscribers.each do |s|
+        s.instance_methods.each do |m|
+          lookup[m] << s
+        end
+      end
+
+      lookup
     end
 
     def subscribers
       event_subscribers.map do |subscriber|
         case subscriber
         when String
-          Utils.get_type_constant(subscriber)
+          EntityStore::Config.load_type(subscriber)
         else
           subscriber
         end

data/lib/entity_store/store.rb

@@ -53,6 +53,33 @@ module EntityStore
       raise e
     end
 
+    # Upsert an entity where events have existed previously
+    # for example when migrating data
+    #
+    # Please note this method requires that the events expose their id property
+    # as a method named _id.
+    #
+    def upsert(entity)
+      unless entity.pending_events.empty?
+        entity.version = entity.pending_events.map(&:entity_version).max || 1
+
+        if entity.id
+          storage_client.save_entity(entity)
+        else
+          entity.id = storage_client.add_entity(entity)
+        end
+
+        upsert_events(entity)
+
+        # publish version increment signal event to the bus
+        event_bus.publish(entity.type, entity.generate_version_incremented_event)
+      end
+      entity
+    rescue => e
+      log_error "Store#upsert error: #{e.inspect} - #{entity.inspect}", e
+      raise e
+    end
+
     def snapshot_entity(entity)
       log_info { "Store#snapshot_entity : Snapshotting #{entity.id}"}
       storage_client.snapshot_entity(entity)
@@ -85,6 +112,22 @@ module EntityStore
       entity.clear_pending_events
     end
 
+    def upsert_events(entity)
+      items = entity.pending_events.map do |event|
+        event.entity_id ||= entity.id.to_s
+        event.entity_version ||= entity.version
+        event
+      end
+
+      filtered_items = storage_client.upsert_events(items)
+
+      yield if block_given?
+
+      filtered_items.each { |e| event_bus.publish(entity.type, e) }
+
+      entity.clear_pending_events
+    end
+
     def get!(id)
       get(id, true)
     end

data/lib/entity_store/version.rb

@@ -1,3 +1,3 @@
 module EntityStore
-  VERSION = "1.3.0".freeze
+  VERSION = "1.4.0".freeze
 end

data/spec/entity_store/store_spec.rb

@@ -74,6 +74,39 @@ describe Store do
 
   end
 
+  describe "#upsert_events" do
+    before(:each) do
+      @entity = DummyEntityForStore.new(:name => random_string)
+      @entity.id = random_string
+      @entity.version = random_integer
+      @entity.pending_events << double(Event, :entity_id => @entity.id, :entity_version => @entity.version)
+      @entity.pending_events << double(Event, :entity_id => @entity.id, :entity_version => @entity.version)
+      @entity.pending_events << double(Event, :entity_id => @entity.id, :entity_version => @entity.version)
+      @storage_client = double("StorageClient", :upsert_events => filtered_events)
+      @store = Store.new
+      @store.stub(:storage_client) { @storage_client }
+      @event_bus = double(EventBus, :publish => true)
+      @store.stub(:event_bus) { @event_bus}
+    end
+
+    subject { @store.upsert_events(@entity) }
+
+    let(:filtered_events) { @entity.pending_events.take(2) }
+
+    it "adds each of the events" do
+      @storage_client.should_receive(:upsert_events).with(@entity.pending_events)
+      subject
+    end
+
+    it "publishes each event to the EventBus" do
+      filtered_events.each do |e|
+        @event_bus.should_receive(:publish).with(@entity.type, e)
+      end
+      subject
+    end
+
+  end
+
   describe "#save" do
 
     before(:each) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: entity_store
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Adam Bird
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-24 00:00:00.000000000 Z
+date: 2018-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -57,7 +57,6 @@ files:
 - lib/entity_store/not_found.rb
 - lib/entity_store/store.rb
 - lib/entity_store/time_factory.rb
-- lib/entity_store/utils.rb
 - lib/entity_store/version.rb
 - lib/tasks/entity_store.rake
 - spec/entity_store/config_spec.rb
@@ -88,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Event sourced entity store with a replaceable body

data/lib/entity_store/utils.rb

@@ -1,8 +0,0 @@
-module EntityStore
-  module Utils
-    def self.get_type_constant(type_name)
-      type_name.split('::').inject(Object) { |obj, name| obj.const_get(name) }
-    end
-  end
-end
-