mantle 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdccc55225f39ead845fc2df598e40f569dee404
-  data.tar.gz: b4757cb21b7bf07b2473c42795ff10d990802bb0
+  metadata.gz: 2e24cffc1a3d9c51dc93dd6aa0fd396e24aeff9a
+  data.tar.gz: 57e10d3a48e432da1b359c17126b6fd7eb367f6e
 SHA512:
-  metadata.gz: 129ba6fad4bbcc3f2012f6eb6536281b3a0052ef5fb959d7f42add356473c14de3a3602f12022dee9871dfd996f5133adfe96da7cad1c9810c1035fd7a49b654
-  data.tar.gz: 35975a18ca3c6b767f294217b71c92d6884cc50ab1023ccd0979aa12429c226301cb5e4e3f33d4a723a3fdfa1f52c18846ea676e352529ff9482ae1ca9e08881
+  metadata.gz: 17b7275b739d2086b3fa22b2730dfc0b72c8ade28d440d00210ddc7810f833210cd14330bee417c09e0dcd68e114f1047cf375ec323082177c069c716ad5471e
+  data.tar.gz: a42c3207857ebf616388d30780341a853fa8e9218e81b2332caedddb6db3afe1c16f93e03d59a910f75c94245011efdb9cd1b5b99642b6c8a7c4ca915f004e6e

data/CHANGELOG.md

@@ -1,3 +1,30 @@
+2.3.0
+-----------
+
+- Requires `sidekiq` versions `5.x` (previous releases required versions `4.x`)
+
+2.2.4
+-----------
+
+- Add `whoami` to mantle config so an app can tag published messages
+- Add `message_source` as a `__MANTLE__` payload so consumers can identify sender
+
+2.2.3
+-----------
+
+- Remove reference to `Celluloid` as Sidekiq no longer depends on it
+
+2.2.2
+-----------
+
+- Better formatted error messages
+
+2.2.1
+-----------
+
+- Message router traps exception when enqueuing Sidekiq job and sends to
+    logger
+
 2.2.0
 -----------
 

data/Gemfile.lock

@@ -1,69 +1,25 @@
 PATH
   remote: .
   specs:
-    mantle (2.1.2)
+    mantle (2.3.0)
       redis
-      sidekiq
+      sidekiq (~> 5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    celluloid (0.17.1.2)
-      bundler
-      celluloid-essentials
-      celluloid-extras
-      celluloid-fsm
-      celluloid-pool
-      celluloid-supervision
-      dotenv
-      nenv
-      rspec-logsplit (>= 0.1.2)
-      timers (>= 4.1.1)
-    celluloid-essentials (0.20.2.1)
-      bundler
-      dotenv
-      nenv
-      rspec-logsplit (>= 0.1.2)
-      timers (>= 4.1.1)
-    celluloid-extras (0.20.1)
-      bundler
-      dotenv
-      nenv
-      rspec-logsplit (>= 0.1.2)
-      timers (>= 4.1.1)
-    celluloid-fsm (0.20.1)
-      bundler
-      dotenv
-      nenv
-      rspec-logsplit (>= 0.1.2)
-      timers (>= 4.1.1)
-    celluloid-pool (0.20.1)
-      bundler
-      dotenv
-      nenv
-      rspec-logsplit (>= 0.1.2)
-      timers (>= 4.1.1)
-    celluloid-supervision (0.20.1.1)
-      bundler
-      dotenv
-      nenv
-      rspec-logsplit (>= 0.1.2)
-      timers (>= 4.1.1)
     coderay (1.1.0)
-    connection_pool (2.2.0)
+    connection_pool (2.2.2)
     diff-lcs (1.2.5)
-    dotenv (2.0.2)
-    hitimes (1.2.3)
-    json (1.8.3)
     method_source (0.8.2)
-    nenv (0.2.0)
     pry (0.10.0)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    redis (3.2.1)
-    redis-namespace (1.5.2)
-      redis (~> 3.0, >= 3.0.4)
+    rack (2.0.9)
+    rack-protection (2.0.8.1)
+      rack
+    redis (4.1.3)
     rspec (3.2.0)
       rspec-core (~> 3.2.0)
       rspec-expectations (~> 3.2.0)
@@ -73,20 +29,16 @@ GEM
     rspec-expectations (3.2.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
-    rspec-logsplit (0.1.3)
     rspec-mocks (3.2.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
     rspec-support (3.2.2)
-    sidekiq (3.5.0)
-      celluloid (~> 0.17.0)
-      connection_pool (~> 2.2, >= 2.2.0)
-      json (~> 1.0)
-      redis (~> 3.2, >= 3.2.1)
-      redis-namespace (~> 1.5, >= 1.5.2)
+    sidekiq (5.2.8)
+      connection_pool (~> 2.2, >= 2.2.2)
+      rack (< 2.1.0)
+      rack-protection (>= 1.5.0)
+      redis (>= 3.3.5, < 5)
     slop (3.5.0)
-    timers (4.1.1)
-      hitimes
 
 PLATFORMS
   ruby
@@ -97,4 +49,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   1.10.6
+   2.1.4

data/bin/mantle

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'celluloid'
 require 'sidekiq/cli'
 require 'sidekiq/processor'
 

data/lib/mantle/configuration.rb

@@ -2,7 +2,8 @@ module Mantle
   class Configuration
     attr_accessor :message_bus_redis,
                   :logger,
-                  :redis_namespace
+                  :redis_namespace,
+                  :whoami
 
     attr_reader :message_handlers
 

data/lib/mantle/message.rb

@@ -10,6 +10,7 @@ module Mantle
     end
 
     def publish(message)
+      message = message.merge(__MANTLE__: { message_source: whoami }) if whoami
       message_bus.publish(channel, message)
       catch_up.add_message(channel, message)
     end
@@ -17,5 +18,9 @@ module Mantle
     private
 
     attr_reader :message_bus, :catch_up
+
+    def whoami
+      Mantle.configuration.whoami
+    end
   end
 end

data/lib/mantle/message_router.rb

@@ -10,7 +10,16 @@ module Mantle
       Mantle.logger.debug("Routing message for #{@channel}")
       Mantle.logger.debug("Message: #{@message}")
 
-      Mantle::Workers::ProcessWorker.perform_async(@channel, @message)
+      begin
+        Mantle::Workers::ProcessWorker.perform_async(@channel, @message)
+      rescue => e
+        msg = "Unable to process Mantle message\n"
+        msg += "#{e.class} #{e}\n"
+        msg += "#{e.backtrace.nil? ? '' : e.backtrace.join("\n")}\n"
+        msg += "Channel => #{@channel}\n"
+        msg += "Message => #{@message}\n"
+        Mantle.logger.error msg
+      end
     end
   end
 end

data/lib/mantle/version.rb

@@ -1,3 +1,3 @@
 module Mantle
-  VERSION = '2.2.0'
+  VERSION = '2.3.0'
 end

data/mantle.gemspec

@@ -6,8 +6,8 @@ require 'mantle/version'
 Gem::Specification.new do |gem|
   gem.name          = "mantle"
   gem.version       = Mantle::VERSION
-  gem.authors       = ["Grant Ammons", "Brandon Hilkert"]
-  gem.email         = ["gammons@gmail.com", "brandonhilkert@gmail.com"]
+  gem.authors       = ["Grant Ammons", "Brandon Hilkert", "Scott Gibson", "Frank Hmeidan"]
+  gem.email         = ["gammons@gmail.com", "brandonhilkert@gmail.com", "sevgibson@gmail.com", "frank.hmeidan@gmail.com"]
   gem.description   = %q{Ruby application message bus subscriptions with Sidekiq and Redis Pubsub.}
   gem.summary       = %q{Ruby application message bus subscriptions with Sidekiq and Redis Pubsub.}
   gem.homepage      = "https://github.com/PipelineDeals/mantle"
@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency('redis')
-  gem.add_dependency('sidekiq')
+  gem.add_dependency('sidekiq', '~> 5.0')
 
   gem.add_development_dependency('rspec')
   gem.add_development_dependency('pry')

data/spec/lib/mantle/configuration_spec.rb

@@ -14,6 +14,12 @@ describe Mantle::Configuration do
     expect(config.message_handlers).to eq({'a_channel' => 'FakeHandler'})
   end
 
+  it 'can set/get whoami' do
+    config = Mantle::Configuration.new
+    config.whoami = 'SantaClaus'
+    expect(config.whoami).to eq('SantaClaus')
+  end
+
   it 'configures default message handler' do
     config = Mantle::Configuration.new
     expect(config.message_handlers).to be_instance_of(Mantle::MessageHandlers)

data/spec/lib/mantle/message_router_spec.rb

@@ -57,5 +57,16 @@ describe Mantle::MessageRouter do
         expect(args.last).to eq(message)
       end
     end
+
+    context "processing malformed messages" do
+      it "logs to error log" do
+        fake_process_worker = Class.new
+        stub_const("Mantle::Workers::ProcessWorker", fake_process_worker)
+        allow(fake_process_worker).to receive(:perform_async) { raise JSON::GeneratorError }
+
+        expect(Mantle.logger).to receive(:error)
+        Mantle::MessageRouter.new("user:login", message).route
+      end
+    end
   end
 end

data/spec/lib/mantle/message_spec.rb

@@ -12,12 +12,34 @@ describe Mantle::Message do
       mantle_message.message_bus = bus
       mantle_message.catch_up = catch_up
 
-      expect(bus).to receive(:publish).with(channel, message)
-      expect(catch_up).to receive(:add_message).with(channel, message)
+      allow(bus).to receive(:publish)
+      allow(catch_up).to receive(:add_message)
 
       mantle_message.publish(message)
+
+      expect(bus).to have_received(:publish).with(channel, message)
+      expect(catch_up).to have_received(:add_message).with(channel, message)
     end
-  end
-end
 
+    it "published message includes message_source" do
+      Mantle.configure { |config| config.whoami = 'SantaClaus' }
+      bus = double("message bus")
+      catch_up = double("catch up")
+      channel = "create:person"
+      message = { id: 1 }
+      actual_message = message.merge(__MANTLE__: { message_source: 'SantaClaus' })
 
+      mantle_message = Mantle::Message.new(channel)
+      mantle_message.message_bus = bus
+      mantle_message.catch_up = catch_up
+
+      allow(bus).to receive(:publish)
+      allow(catch_up).to receive(:add_message)
+
+      mantle_message.publish(message)
+
+      expect(bus).to have_received(:publish).with(channel, actual_message)
+      expect(catch_up).to have_received(:add_message).with(channel, actual_message)
+    end
+  end
+end

metadata

@@ -1,15 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: mantle
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Grant Ammons
 - Brandon Hilkert
+- Scott Gibson
+- Frank Hmeidan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-29 00:00:00.000000000 Z
+date: 2020-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -29,16 +31,16 @@ dependencies:
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -71,6 +73,8 @@ description: Ruby application message bus subscriptions with Sidekiq and Redis P
 email:
 - gammons@gmail.com
 - brandonhilkert@gmail.com
+- sevgibson@gmail.com
+- frank.hmeidan@gmail.com
 executables:
 - mantle
 extensions: []
@@ -158,4 +162,3 @@ test_files:
 - spec/lib/mantle/workers/process_worker_spec.rb
 - spec/lib/mantle_spec.rb
 - spec/spec_helper.rb
-has_rdoc: