freddy 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6bc65ca5bd7b83078456feddb23cdfed01e1692
-  data.tar.gz: 729f91683409c34baeccfd8a96f52caefda4c363
+  metadata.gz: afcbdc550b2c021be177ce71767e874d88f62266
+  data.tar.gz: b385e9fc1aa1f12d01e42db629c8e669f56c08f8
 SHA512:
-  metadata.gz: 4e3e5d52bbb1c5a5bda1c0611a3e341c71a3b643665b75b2f498de0baeadede350749e5e85b6951db5996e74bfc09cb962f1b5d2b1d3637870aa92caab235ea2
-  data.tar.gz: 599c85f9a1d2b976b6119322c516e6b888f9a02aba7bcad689d92b4c2dfab2f830110f03d83644f948d04ad4827e263c461e6879cd1f40b10910ec840306d222
+  metadata.gz: b850d5ce01a28ee9f1ed0762ac61ca293a36270d754f2065d5cfcfc4f8ee2f666584a0e82d60ebafc1c734692835bd39e38319b63fdbd2509862a4707db5f13d
+  data.tar.gz: 47cf5182652976f7966226142845fd3c64077046d5fbeb5b5627c20a4e2a69936b33f26731344f74273a32b778f01420299b5a80ca9147e802a897e72cb8081a

data/.rubocop.yml

@@ -0,0 +1,49 @@
+require: rubocop-rspec
+
+Metrics/AbcSize:
+  Enabled: no
+
+Metrics/BlockLength:
+  Enabled: no
+
+Metrics/LineLength:
+  Max: 120
+
+Metrics/MethodLength:
+  Enabled: no
+
+Style/Documentation:
+  Enabled: no
+
+RSpec/ExampleLength:
+  Enabled: no
+
+RSpec/MultipleExpectations:
+  Enabled: no
+
+RSpec/MessageSpies:
+  Enabled: no
+
+RSpec/VerifiedDoubles:
+  Enabled: no
+
+RSpec/InstanceVariable:
+  Enabled: no
+
+RSpec/NestedGroups:
+  Enabled: no
+
+RSpec/DescribeClass:
+  Enabled: no
+
+Style/FrozenStringLiteralComment:
+  Enabled: yes
+  EnforcedStyle: always
+  Include:
+    - 'lib/**/*'
+
+Performance/TimesMap:
+  Enabled: no
+
+Naming/FileName:
+  Enabled: no

data/.travis.yml

@@ -10,4 +10,4 @@ services:
 before_script:
   - gem install bundler
   - bundle install
-script: bundle exec rspec
+script: bundle exec rake

data/Gemfile

@@ -1,9 +1,11 @@
 source 'https://rubygems.org'
 
-gem 'rspec'
-gem 'pry'
 gem 'codeclimate-test-reporter'
 gem 'hamster', '~> 3.0'
 gem 'opentracing_test_tracer', '~> 0.1'
+gem 'pry'
+gem 'rspec'
+gem 'rubocop', '~> 0.54.0'
+gem 'rubocop-rspec', '~> 1.24.0'
 
 gemspec

data/Rakefile

@@ -1,7 +1,9 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
-require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 
-task ci: :spec
-task default: :spec
+RuboCop::RakeTask.new(:rubocop)
+
+task default: %i[rubocop spec]

data/freddy.gemspec

@@ -1,36 +1,36 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
-  if RUBY_PLATFORM == 'java'
-    spec.name          = "freddy-jruby"
-  else
-    spec.name          = "freddy"
-  end
-  spec.version       = '1.4.1'
-  spec.authors       = ["Salemove TechMovers"]
-  spec.email         = ["techmovers@salemove.com"]
-  spec.description   = %q{Messaging API}
-  spec.summary       = %q{API for inter-application messaging supporting acknowledgements and request-response}
-  spec.license       = "Private"
+  spec.name = if RUBY_PLATFORM == 'java'
+                'freddy-jruby'
+              else
+                'freddy'
+              end
+  spec.version       = '1.4.2'
+  spec.authors       = ['Salemove TechMovers']
+  spec.email         = ['techmovers@salemove.com']
+  spec.description   = 'Messaging API'
+  spec.summary       = 'API for inter-application messaging supporting acknowledgements and request-response'
+  spec.license       = 'Private'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
 
   if RUBY_PLATFORM == 'java'
     spec.add_dependency 'march_hare', '~> 2.12.0'
     spec.add_dependency 'symbolizer'
   else
-    spec.add_dependency "bunny", "~> 2.11"
-    spec.add_dependency "oj", "~> 2.13"
+    spec.add_dependency 'bunny', '~> 2.11'
+    spec.add_dependency 'oj', '~> 2.13'
   end
 
-  spec.add_dependency "thread", "~> 0.1"
-  spec.add_dependency "opentracing", "~> 0.4"
+  spec.add_dependency 'opentracing', '~> 0.4'
+  spec.add_dependency 'thread', '~> 0.1'
 end

data/lib/freddy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'thread/pool'
 require 'securerandom'
@@ -6,7 +8,7 @@ require 'opentracing'
 Dir[File.dirname(__FILE__) + '/freddy/*.rb'].each(&method(:require))
 
 class Freddy
-  FREDDY_TOPIC_EXCHANGE_NAME = 'freddy-topic'.freeze
+  FREDDY_TOPIC_EXCHANGE_NAME = 'freddy-topic'
   DEFAULT_MAX_CONCURRENCY = 4
 
   # Creates a new freddy instance
@@ -39,9 +41,7 @@ class Freddy
 
   # @deprecated Use OpenTracing ScopeManager instead
   def self.trace=(trace)
-    if OpenTracing.active_span != trace
-      OpenTracing.scope_manager.activate(trace)
-    end
+    OpenTracing.scope_manager.activate(trace) if OpenTracing.active_span != trace
   end
 
   def initialize(connection, logger, max_concurrency)
@@ -156,7 +156,7 @@ class Freddy
   def deliver(destination, payload, options = {})
     timeout = options.fetch(:timeout, 0)
     opts = {}
-    opts[:expiration] = (timeout * 1000).to_i if timeout > 0
+    opts[:expiration] = (timeout * 1000).to_i if timeout.positive?
 
     @send_and_forget_producer.produce(destination, payload, opts)
   end
@@ -194,9 +194,8 @@ class Freddy
     timeout = options.fetch(:timeout, 3)
     delete_on_timeout = options.fetch(:delete_on_timeout, true)
 
-    @send_and_wait_response_producer.produce destination, payload, {
-      timeout_in_seconds: timeout, delete_on_timeout: delete_on_timeout
-    }
+    @send_and_wait_response_producer.produce destination, payload,
+                                             timeout_in_seconds: timeout, delete_on_timeout: delete_on_timeout
   end
 
   # Closes the connection with message queue

data/lib/freddy/adapters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Freddy
   module Adapters
     def self.determine

data/lib/freddy/adapters/bunny_adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bunny'
 
 class Freddy
@@ -38,23 +40,21 @@ class Freddy
           Queue.new(@channel.queue(*args))
         end
 
-        def on_no_route(&block)
-          default_exchange.on_return do |return_info, properties, content|
-            if return_info[:reply_code] == NO_ROUTE
-              block.call(properties[:correlation_id])
-            end
+        def on_no_route
+          default_exchange.on_return do |return_info, properties, _content|
+            yield(properties[:correlation_id]) if return_info[:reply_code] == NO_ROUTE
           end
         end
       end
 
       class Queue < Shared::Queue
-        def subscribe(manual_ack: false, &block)
+        def subscribe(manual_ack: false)
           @queue.subscribe(manual_ack: manual_ack) do |info, properties, payload|
             parsed_payload = Payload.parse(payload)
             delivery = Delivery.new(
               parsed_payload, properties, info.routing_key, info.delivery_tag
             )
-            block.call(delivery)
+            yield(delivery)
           end
         end
       end

data/lib/freddy/adapters/march_hare_adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'march_hare'
 
 class Freddy
@@ -37,23 +39,23 @@ class Freddy
           Queue.new(@channel.queue(*args))
         end
 
-        def on_no_route(&block)
+        def on_no_route
           @channel.on_return do |reply_code, _, exchange_name, _, properties|
             if exchange_name != Freddy::FREDDY_TOPIC_EXCHANGE_NAME && reply_code == NO_ROUTE
-              block.call(properties.correlation_id)
+              yield(properties.correlation_id)
             end
           end
         end
       end
 
       class Queue < Shared::Queue
-        def subscribe(manual_ack: false, &block)
+        def subscribe(manual_ack: false)
           @queue.subscribe(manual_ack: manual_ack) do |meta, payload|
             parsed_payload = Payload.parse(payload)
             delivery = Delivery.new(
               parsed_payload, meta, meta.routing_key, meta.delivery_tag
             )
-            block.call(delivery)
+            yield(delivery)
           end
         end
       end

data/lib/freddy/consumers.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 Dir[File.dirname(__FILE__) + '/consumers/*.rb'].each(&method(:require))

data/lib/freddy/consumers/respond_to_consumer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Freddy
   module Consumers
     class RespondToConsumer
@@ -12,12 +14,12 @@ class Freddy
         @handler_adapter_factory = handler_adapter_factory
       end
 
-      def consume(&block)
+      def consume
         consumer = consume_from_destination do |delivery|
           adapter = @handler_adapter_factory.for(delivery)
 
           msg_handler = MessageHandler.new(adapter, delivery)
-          block.call(delivery.payload, msg_handler)
+          yield(delivery.payload, msg_handler)
         end
 
         ResponderHandler.new(consumer, @consume_thread_pool)
@@ -31,24 +33,19 @@ class Freddy
         end
       end
 
-      def process_message(delivery, &block)
+      def process_message(delivery)
         @consume_thread_pool.process do
           begin
             scope = delivery.build_trace("freddy:respond:#{@destination}",
-              tags: {
-                'peer.address': "#{@destination}:#{delivery.payload[:type]}",
-                'component': 'freddy',
-                'span.kind': 'server' # RPC
-              }
-            )
-            scope.span.log_kv(
-              event: 'Received message through respond_to',
-              queue: @destination,
-              payload: delivery.payload,
-              correlation_id: delivery.correlation_id
-            )
-
-            block.call(delivery)
+                                         tags: {
+                                           'peer.address' => "#{@destination}:#{delivery.payload[:type]}",
+                                           'component' => 'freddy',
+                                           'span.kind' => 'server', # RPC
+                                           'message_bus.destination' => @destination,
+                                           'message_bus.correlation_id' => delivery.correlation_id
+                                         })
+
+            yield(delivery)
           ensure
             @channel.acknowledge(delivery.tag, false)
             scope.close

data/lib/freddy/consumers/response_consumer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Freddy
   module Consumers
     class ResponseConsumer
@@ -5,10 +7,10 @@ class Freddy
         @logger = logger
       end
 
-      def consume(channel, queue, &block)
+      def consume(_channel, queue)
         @logger.debug "Consuming messages on #{queue.name}"
         queue.subscribe do |delivery|
-          block.call(delivery)
+          yield(delivery)
         end
       end
     end

data/lib/freddy/consumers/tap_into_consumer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Freddy
   module Consumers
     class TapIntoConsumer
@@ -39,24 +41,19 @@ class Freddy
         end
       end
 
-      def process_message(queue, delivery, &block)
+      def process_message(_queue, delivery)
         @consume_thread_pool.process do
           begin
             scope = delivery.build_trace("freddy:observe:#{@pattern}",
-              tags: {
-                'message_bus.destination': @pattern,
-                'component': 'freddy',
-                'span.kind': 'consumer' # Message Bus
-              },
-              force_follows_from: true
-            )
-            scope.span.log_kv(
-              event: 'Received message through tap_into',
-              payload: delivery.payload,
-              correlation_id: delivery.correlation_id
-            )
+                                         tags: {
+                                           'message_bus.destination' => @pattern,
+                                           'message_bus.correlation_id' => delivery.correlation_id,
+                                           'component' => 'freddy',
+                                           'span.kind' => 'consumer' # Message Bus
+                                         },
+                                         force_follows_from: true)
 
-            block.call delivery.payload, delivery.routing_key
+            yield delivery.payload, delivery.routing_key
           ensure
             @channel.acknowledge(delivery.tag, false)
             scope.close

data/lib/freddy/delivery.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Freddy
   class Delivery
     attr_reader :routing_key, :payload, :tag

data/lib/freddy/error_response.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Freddy
   class ErrorResponse < StandardError
     DEFAULT_ERROR_MESSAGE = 'Use #response to get the error response'

data/lib/freddy/invalid_request_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'error_response'
 
 class Freddy

data/lib/freddy/message_handler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Freddy
   class MessageHandler
     def initialize(adapter, delivery)
@@ -9,7 +11,7 @@ class Freddy
       @adapter.success(@delivery, response)
     end
 
-    def error(response = {error: "Couldn't process message"})
+    def error(response = { error: "Couldn't process message" })
       @adapter.error(@delivery, response)
     end
   end

data/lib/freddy/message_handler_adapaters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Freddy
   module MessageHandlerAdapters
     class Factory

data/lib/freddy/payload.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 begin
   require 'oj'
 rescue LoadError
@@ -18,12 +20,12 @@ class Freddy
     end
 
     def self.json_handler
-      @_json_handler ||= defined?(Oj) ? OjAdapter : JsonAdapter
+      @json_handler ||= defined?(Oj) ? OjAdapter : JsonAdapter
     end
 
     class OjAdapter
-      PARSE_OPTIONS = { symbol_keys: true }
-      DUMP_OPTIONS = { mode: :compat, time_format: :xmlschema, second_precision: 6 }
+      PARSE_OPTIONS = { symbol_keys: true }.freeze
+      DUMP_OPTIONS = { mode: :compat, time_format: :xmlschema, second_precision: 6 }.freeze
 
       def self.parse(payload)
         Oj.strict_load(payload, PARSE_OPTIONS)