messaging 3.4.1 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cd652caf5be10317afbfc217864ac1fa01ed0297
-  data.tar.gz: 729a4cefa5be12f689c670f5aa468641de2d9b46
+SHA256:
+  metadata.gz: 4e2d081991ad2e8413244571ae8c9f9d3d3d5af9ce48bfcbff424e968c1d5c18
+  data.tar.gz: 8ca81941ebd45f6daad6a6c08435598a8b9f0bd3dede7fb99e9cc859a56bb6de
 SHA512:
-  metadata.gz: c7c2f6359c96e306acefa7df23306c0816da4badccb446a3f0be46a6d39328fb08d8bf5fceb09d450cc34ee41d43d8629c61c0b462c5ebe73c28a967862d355d
-  data.tar.gz: 3397a6507517bcbc5b599a68cf1bf7920134d60e89f1d8f901a610cb835cfc11d9ac2d3cbc38bf6f3f411b4d9b5466927ccaa87a82049dd8feba5f5fdef34a21
+  metadata.gz: d932b1bfe5c5456e681c21280efbb055eb12acd6bcf5358dfe36d7afaca1bae61da98fbc994ea830a68c2db91230ef6883182b86d482201ae5242f38d19b3280
+  data.tar.gz: 6bcf879f6c3a9f2e8353c8877c81340d64e7418b85c84a9003337927402314d4a2cc3b6d279faf25b0ba1d0209a45ef510dd9067cc23bf48cc60a1bd0ab3852c

data/.circleci/config.yml

@@ -58,7 +58,7 @@ jobs:
           name: run tests
           command: |
             ./cc-test-reporter before-build
-            bundle exec rspec --format RspecJunitFormatter
+            bundle exec rspec
             ./cc-test-reporter after-build --exit-code $?
 
 workflows:

data/Gemfile.lock

@@ -15,7 +15,7 @@ GIT
 PATH
   remote: .
   specs:
-    messaging (3.4.0)
+    messaging (3.4.2)
       activerecord
       activesupport
       bukowskis_after_transaction

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

@@ -23,6 +23,7 @@ module Messaging
           self.expected_version = message.expected_version
           self.message_type = message.message_type
           self.stream = message.stream_name
+          self.stream_category, self.stream_id = message.stream_name.split('$')
           self.uuid = message.uuid
         end
 

data/lib/messaging/base_handler.rb

@@ -29,7 +29,7 @@ module Messaging
       def listen_on(topic:)
         topics = Array(topic).map(&:to_s)
         Messaging.routes.consumer(name, group_id: group_id) do |c|
-          topics.each { |t| c.on(/.*/, topic: t, call: self) }
+          topics.each { |t| c.on(->(m) { m.topic == t }, call: self) }
         end
       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

@@ -25,9 +25,9 @@ module Messaging
     # 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,13 @@
 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
+    # 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 +37,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) }
+      routes.map { |route| route.call(message) }
       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,14 +3,14 @@ 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)
+      def initialize(pattern, handler)
+        @matcher = MessageMatcher.new(pattern: pattern)
         @handler = handler
         verify_handler!
       end

data/lib/messaging/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: messaging
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.2
 platform: ruby
 authors:
 - Bukowskis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-03 00:00:00.000000000 Z
+date: 2019-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -315,10 +315,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 +340,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