Nobody likes a .x.0 release anyway...

karmajunkie · May 26, 2014 · da9e3fd · da9e3fd
1 parent 6ba0a7d
commit da9e3fd
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/lib/replay/backends.rb b/lib/replay/backends.rb
@@ -28,8 +28,8 @@ def clear
       end
 
       def published(envelope)
-        @store[stream_id] ||= []
-        @store[stream_id] << envelope
+        @store[envelope.stream_id] ||= []
+        @store[envelope.stream_id] << envelope
       end
 
       def event_stream(stream_id)

diff --git a/lib/replay/repository.rb b/lib/replay/repository.rb
@@ -25,7 +25,7 @@ def repository_load(klass_or_instance, stream_id, options={})
           raise Errors::EventStreamNotFoundError.new("Could not find any events for stream identifier #{stream_id}") if options[:create].nil?
         end
 
-        obj = klass_or_instance.is_a?(Class) ? prepare(klass.new, options[:metadata]) : klass_or_instance
+        obj = klass_or_instance.is_a?(Class) ? prepare(klass_or_instance.new, options[:metadata]) : klass_or_instance
         obj.create(stream_id) if options[:create] && stream.empty?
         obj.apply(stream.map(&:event))
 
@@ -41,7 +41,7 @@ def self.refresh(obj)
       end
 
       def prepare(obj, metadata={})
-        obj.subscription_manager = SubscriptionManager.new(configuration.logger, metadata)
+        obj.subscription_manager = SubscriptionManager.new(configuration.logger, metadata || {})
         @configuration.subscribers.each do |subscriber|
           obj.add_subscriber(subscriber)
         end

diff --git a/lib/replay/repository/configuration.rb b/lib/replay/repository/configuration.rb
@@ -2,6 +2,7 @@ module Replay
   module Repository
     class Configuration
       attr_accessor :logger
+      attr_writer :reject_load_on_empty_stream
       def initialize(logger = nil)
         @default_subscribers =[]
         @logger = logger
@@ -28,6 +29,11 @@ def store=(store)
         add_default_subscriber(@store)
       end
 
+      def reject_load_on_empty_stream?
+        @reject_load_on_empty_stream ||= true
+        @reject_load_on_empty_stream
+      end
+
       def store
         @store
       end

diff --git a/lib/replay/subscription_manager.rb b/lib/replay/subscription_manager.rb
@@ -17,7 +17,7 @@ def add_subscriber(subscriber)
     def notify_subscribers(stream_id, event, metadata = {})
       @subscribers.each do |sub|
         begin
-          meta = metadata.merge(@session_metadata)
+          meta = metadata.merge(@session_metadata || {}) 
           sub.published(EventEnvelope.new(stream_id, event, meta))
           #sub.published(stream_id, event, metadata)
         rescue Exception => e