messaging 3.4.1 → 3.5.3

data/lib/messaging/adapters/postgres/serialized_message.rb

@@ -23,6 +23,8 @@ module Messaging
           self.expected_version = message.expected_version
           self.message_type = message.message_type
           self.stream = message.stream_name
+          self.stream_category = message.stream_category
+          self.stream_id = message.stream_id
           self.uuid = message.uuid
         end
 

data/lib/messaging/adapters/postgres/store.rb

@@ -1,3 +1,5 @@
+require_relative 'category'
+require_relative 'categories'
 require_relative 'stream'
 require_relative 'streams'
 
@@ -20,11 +22,16 @@ module Messaging
         # @see Streams
         attr_reader :streams
 
+        # @return [Categories] all the stream categories in the store
+        # @see Categories
+        attr_reader :categories
+
         # Should not be used directly. Access the store though
         # Messaging.message_store or Messaging::Adapters::Store[:postgres]
         # @api private
         def initialize
           @streams = Streams.new
+          @categories = Categories.new
         end
 
         # Get a specific stream by name
@@ -34,6 +41,13 @@ module Messaging
           streams[name]
         end
 
+        # Get a specific category by name
+        # @return [Stream]
+        # @see Messaging.category
+        def category(name)
+          categories[name]
+        end
+
         # Access to all messages.
         # Use with caution in production as there are probably
         # a lot of messages so queries could take a long time or timeout.
@@ -48,6 +62,15 @@ module Messaging
           SerializedMessage
         end
 
+        # Access to all messages in the given streams
+        #
+        # @param streams [Array<String, Stream>] List of one or more streams to get messages from
+        # @return [ActiveRecord::Relation]
+        # @see Messaging.messages_in_streams
+        def messages_in_streams(*streams)
+          SerializedMessage.where(stream: streams.flatten.map(&:to_s)).order(:id)
+        end
+
         # Writes the message to Postgres
         # Skips messages that hasn't defined a stream name
         # We do this to begin with so PG is opt-in per message

data/lib/messaging/adapters/postgres/stream.rb

@@ -27,6 +27,10 @@ module Messaging
           messages.maximum(:stream_position) || -1
         end
 
+        def to_s
+          name
+        end
+
         def inspect
           info = "current_position: #{current_position}"
           "#<Stream:#{name}> #{info}>"

data/lib/messaging/adapters/test/categories.rb

@@ -0,0 +1,19 @@
+module Messaging
+  module Adapters
+    class Test
+      class Categories
+        def initialize
+          clear!
+        end
+
+        def [](name)
+          @categories[name]
+        end
+
+        def clear!
+          @categories = Hash.new { |h, k| h[k] = Category.new(k) }
+        end
+      end
+    end
+  end
+end

data/lib/messaging/adapters/test/category.rb

@@ -0,0 +1,21 @@
+module Messaging
+  module Adapters
+    class Test
+      class Category
+        attr_accessor :name
+
+        def initialize(name)
+          self.name = name
+        end
+
+        def messages
+          @messages ||= []
+        end
+
+        def delete_messages_older_than!(time)
+          messages.delete_if { |m| m.timestamp < time }
+        end
+      end
+    end
+  end
+end

data/lib/messaging/adapters/test/store.rb

@@ -1,4 +1,6 @@
 require_relative 'stream'
+require_relative 'category'
+require_relative 'categories'
 
 module Messaging
   module Adapters
@@ -29,7 +31,10 @@ module Messaging
         # @see Stream
         attr_reader :streams
 
+        attr_reader :categories
+
         def initialize
+          @categories = Categories.new
           clear!
         end
 
@@ -40,8 +45,21 @@ module Messaging
           streams[name]
         end
 
+        def category(name)
+          categories[name]
+        end
+
+        # Access to all messages in the given streams
+        #
+        # @param streams [Array<String>] List of one or more streams to get messages from
+        # @return [Array<Messaging::Message>]
+        def messages_in_streams(*streams)
+          messages.select { |m| streams.flatten.map(&:to_s).include? m.stream_name }
+        end
+
         def clear!
           @streams = Hash.new { |h, k| h[k] = Stream.new(k) }
+          categories.clear!
           @messages = []
         end
 
@@ -55,10 +73,12 @@ module Messaging
           return message unless message.stream_name
 
           stream = stream(message.stream_name)
+          category = category(message.stream_name.split('$').first)
           ExpectedVersion.new(message.expected_version || :any).match!(stream.current_position)
           persisted_message = message.class.new(message.attributes.merge(stream_position: stream.current_position + 1))
           @messages << persisted_message
           stream.messages << persisted_message
+          category.messages << persisted_message
           persisted_message
         end
       end

data/lib/messaging/adapters/test/stream.rb

@@ -12,6 +12,10 @@ module Messaging
           @messages ||= []
         end
 
+        def to_s
+          name
+        end
+
         def current_position
           messages.length - 1
         end

data/lib/messaging/message.rb

@@ -92,6 +92,18 @@ module Messaging
       nil
     end
 
+    def stream_category
+      return unless stream_name
+
+      stream_name.split('$').first
+    end
+
+    def stream_id
+      return unless stream_name
+
+      stream_name.split('$').last
+    end
+
     def message_type
       self.class.to_s
     end

data/lib/messaging/rails/railtie.rb

@@ -28,7 +28,7 @@ module Messaging
       # the class has been unloaded and update the consumer with the reloaded classes.
       initializer 'messaging.add_reloader' do |app|
         app.reloader.after_class_unload do
-          Messaging.routes.reload_consumer_subscriptions!
+          Messaging.routes.reload_consumer_routes!
         end
       end
     end

data/lib/messaging/routes.rb

@@ -22,12 +22,25 @@ module Messaging
       end
     end
 
+    def inline!(&block)
+      current_routes = @routes.dup
+      consumer_definitions.each do |_, definition|
+        definition.fetch(:block)&.call(self)
+      end
+
+      block.call
+
+    ensure
+      clear_routes!
+      @routes = current_routes
+    end
+
     # Keeps the consumers, but reload their subscriptions so code reloading works.
     # The consumer has a reference to the class name of each of its handlers,
     # if the handler is reloaded the reference would point to an old instance.
-    def reload_consumer_subscriptions!
+    def reload_consumer_routes!
       consumers.each do |c|
-        c.clear_subscribers!
+        c.clear_routes!
         consumer_definitions[c.name].fetch(:block)&.call(c)
       end
     end

data/lib/messaging/routing.rb

@@ -1,13 +1,39 @@
 require 'messaging/routing/message_matcher'
-require 'messaging/routing/subscriber'
-require 'messaging/routing/background_job_subscriber'
+require 'messaging/routing/route'
+require 'messaging/routing/enqueued_route'
 require 'messaging/routing/enqueue_message_handler'
 
 module Messaging
   module Routing
-    # Public: Sets up subscribers for the events that matches the given pattern
+    def self.included(base)
+      base.send :extend, ClassMethods
+    end
+
+    module ClassMethods
+      def definitions
+        @definitions ||= []
+      end
+
+      def on(pattern, **options, &block)
+        definitions << { pattern: pattern, options: options, block: block }
+      end
+
+      def new(*args, &block)
+        instance = allocate
+
+        # Pre-initialize
+        definitions.each do |definition|
+          instance.on(definition[:pattern], definition[:options], &definition[:block])
+        end
+
+        instance.send(:initialize, *args, &block)
+        instance
+      end
+    end
+
+    # Public: Sets up routes for the events that matches the given pattern
     #
-    # pattern  - Which messages to subscribe to. Can be a string, a regexp,
+    # pattern  - Which messages to route. Can be a string, a regexp,
     #            a Message class, a module or anything that responds to call.
     #
     # call:    -  Any object that responds to call.
@@ -37,31 +63,31 @@ module Messaging
     #   on ->(m) { m.topic == 'my-topic' }, call: DoSometing, enqueue: DoSomethingElseWithSidekiq
     # end
     #
-    def on(pattern = /.*/, topic: nil, call: nil, enqueue: nil, &block)
-      subscribers << Subscriber.new(pattern, topic, call) if call
-      subscribers << Subscriber.new(pattern, topic, block) if block_given?
-      subscribers << BackgroundJobSubscriber.new(pattern, topic, enqueue) if enqueue
+    def on(pattern = /.*/, call: nil, enqueue: nil, &block)
+      routes << Route.new(pattern, call) if call
+      routes << Route.new(pattern, block) if block_given?
+      routes << EnqueuedRoute.new(pattern, enqueue) if enqueue
     end
 
     # Internal: Handles the message with the matching subscribers
-    def handle(message)
-      subscribers.map { |subscriber| subscriber.call(message) }
+    def handle(message, context = self)
+      routes.map { |route| route.call(message, context) }
       message
     end
 
     # Internal: Used by Rails reloading in development.
-    def clear_subscribers!
-      @subscribers = Set.new
+    def clear_routes!
+      @routes = Set.new
     end
 
     private
 
-    def subscribers
-      @subscribers ||= Set.new
+    def routes
+      @routes ||= Set.new
     end
 
     def topics
-      subscribers.flat_map(&:topics).map(&:to_s).uniq
+      routes.flat_map(&:topics).map(&:to_s).uniq
     end
   end
 end

data/lib/messaging/routing/{background_job_subscriber.rb → enqueued_route.rb}

@@ -1,8 +1,8 @@
 module Messaging
   module Routing
     # Internal: Used for enqueing background jobs instead of calling the handler directly
-    class BackgroundJobSubscriber < Subscriber
-      def initialize(pattern, topic, handler)
+    class EnqueuedRoute < Route
+      def initialize(pattern, handler)
         super
         @handler = EnqueueMessageHandler.new(handler)
       end

data/lib/messaging/routing/message_matcher.rb

@@ -3,21 +3,17 @@ module Messaging
   module Routing
     # Internal: Used by subscribers to match messages.
     class MessageMatcher
-      include Dry::Equalizer(:pattern, :topic_pattern)
+      include Dry::Equalizer(:pattern)
 
       attr_accessor :pattern
-      attr_accessor :topic_pattern
 
-      def initialize(pattern:, topic: nil)
+      def initialize(pattern:)
         self.pattern = pattern
-        self.topic_pattern = topic
       end
 
       # Internal: See routing.rb for examples on how it is used.
-
-      # Med case statement
       def matches?(message)
-        matches_topic?(message) && matches_pattern?(message)
+        matches_pattern?(message)
       end
 
       def matches_pattern?(message)
@@ -33,16 +29,6 @@ module Messaging
         end
       end
 
-      def matches_topic?(message)
-        return true unless topic_pattern
-
-        case message.topic.to_s
-        when topic_pattern then true
-        else
-          false
-        end
-      end
-
       def call(message)
         matches?(message)
       end
@@ -55,7 +41,7 @@ module Messaging
       #
       # Used by the Kafka adapter to setup consumers.
       def topics
-        (Array(topic_pattern) + all_matching_messages.map(&:topic)).uniq
+        all_matching_messages.map(&:topic).uniq
       end
     end
   end

data/lib/messaging/routing/{subscriber.rb → route.rb}

@@ -3,22 +3,22 @@ require 'dry-equalizer'
 module Messaging
   module Routing
     # Internal: Used by routing to match a pattern against a callable (handler)
-    class Subscriber
+    class Route
       include Dry::Equalizer(:matcher, :handler)
 
       attr_reader :matcher
       attr_reader :handler
 
-      def initialize(pattern, topic, handler)
-        @matcher = MessageMatcher.new(pattern: pattern, topic: topic)
-        @handler = handler
+      def initialize(pattern, handler)
+        @matcher = MessageMatcher.new(pattern: pattern)
+        @handler = handler.respond_to?(:to_proc) ? handler : handler.method(:call)
         verify_handler!
       end
 
-      def call(message)
+      def call(message, context = self)
         return unless @matcher.matches?(message)
 
-        @handler.call(message)
+        context.instance_exec(message, &@handler)
       end
 
       def topics

data/lib/messaging/version.rb

@@ -1,3 +1,3 @@
 module Messaging
-  VERSION = '3.4.1'.freeze
+  VERSION = '3.5.3'.freeze
 end

data/messaging.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activerecord'
   spec.add_dependency 'activesupport'
-  spec.add_dependency 'bukowskis_after_transaction'
+  spec.add_dependency 'after_transaction'
   spec.add_dependency 'method_object'
   spec.add_dependency 'concurrent-ruby', '>= 1.0.2'
   spec.add_dependency 'concurrent-ruby-ext', '>= 1.0.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: messaging
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.5.3
 platform: ruby
 authors:
 - Bukowskis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-03 00:00:00.000000000 Z
+date: 2020-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bukowskis_after_transaction
+  name: after_transaction
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -279,8 +279,16 @@ files:
 - README.md
 - Rakefile
 - _config.yml
+- _data/navigation.yml
+- _layouts/single.html
 - bin/console
 - bin/setup
+- docs/adapters.md
+- docs/consuming.md
+- docs/installation.md
+- docs/messages.md
+- docs/publishing.md
+- docs/routing_and_handlers.md
 - exe/messaging
 - lib/messaging.rb
 - lib/messaging/adapters.rb
@@ -289,15 +297,18 @@ files:
 - lib/messaging/adapters/kafka/producer.rb
 - lib/messaging/adapters/postgres.rb
 - lib/messaging/adapters/postgres/advisory_transaction_lock.rb
+- lib/messaging/adapters/postgres/categories.rb
+- lib/messaging/adapters/postgres/category.rb
 - lib/messaging/adapters/postgres/serialized_message.rb
 - lib/messaging/adapters/postgres/store.rb
 - lib/messaging/adapters/postgres/stream.rb
 - lib/messaging/adapters/postgres/streams.rb
 - lib/messaging/adapters/test.rb
+- lib/messaging/adapters/test/categories.rb
+- lib/messaging/adapters/test/category.rb
 - lib/messaging/adapters/test/consumer.rb
 - lib/messaging/adapters/test/store.rb
 - lib/messaging/adapters/test/stream.rb
-- lib/messaging/base_handler.rb
 - lib/messaging/cli.rb
 - lib/messaging/config.rb
 - lib/messaging/consumer_supervisor.rb
@@ -315,10 +326,10 @@ files:
 - lib/messaging/resque_worker.rb
 - lib/messaging/routes.rb
 - lib/messaging/routing.rb
-- lib/messaging/routing/background_job_subscriber.rb
 - lib/messaging/routing/enqueue_message_handler.rb
+- lib/messaging/routing/enqueued_route.rb
 - lib/messaging/routing/message_matcher.rb
-- lib/messaging/routing/subscriber.rb
+- lib/messaging/routing/route.rb
 - lib/messaging/sidekiq_worker.rb
 - lib/messaging/version.rb
 - messaging.gemspec
@@ -340,8 +351,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A library for decoupling applications by using messaging to communicate between