Merge pull request #87 from twingly/fix-warnings

Remove requires from individual components
twingly · Nov 3, 2020 · bb1b0cd · bb1b0cd
2 parents 7b8fa54 + 191c9aa
commit bb1b0cd
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 23 deletions.
diff --git a/lib/twingly/amqp.rb b/lib/twingly/amqp.rb
@@ -8,7 +8,10 @@
 require "twingly/amqp/default_exchange_publisher"
 require "twingly/amqp/topic_exchange_publisher"
 require "twingly/amqp/null_logger"
+require "twingly/amqp/message"
 
+require "bunny"
+require "json"
 require "ostruct"
 
 module Twingly

diff --git a/lib/twingly/amqp/connection.rb b/lib/twingly/amqp/connection.rb
@@ -1,5 +1,3 @@
-require "twingly/amqp"
-
 module Twingly
   module AMQP
     class Connection

diff --git a/lib/twingly/amqp/default_exchange_publisher.rb b/lib/twingly/amqp/default_exchange_publisher.rb
@@ -1,6 +1,3 @@
-require "twingly/amqp/publisher"
-require "twingly/amqp/connection"
-
 module Twingly
   module AMQP
     class DefaultExchangePublisher

diff --git a/lib/twingly/amqp/message.rb b/lib/twingly/amqp/message.rb
@@ -1,5 +1,3 @@
-require "json"
-
 module Twingly
   module AMQP
     class Message

diff --git a/lib/twingly/amqp/pinger.rb b/lib/twingly/amqp/pinger.rb
@@ -1,8 +1,3 @@
-require "twingly/amqp/connection"
-require "twingly/amqp/ping_options"
-require "twingly/amqp/default_exchange_publisher"
-require "json"
-
 module Twingly
   module AMQP
     class Pinger

diff --git a/lib/twingly/amqp/publisher.rb b/lib/twingly/amqp/publisher.rb
@@ -1,6 +1,3 @@
-require "json"
-require "ostruct"
-
 module Twingly
   module AMQP
     module Publisher

diff --git a/lib/twingly/amqp/session.rb b/lib/twingly/amqp/session.rb
@@ -1,5 +1,3 @@
-require "bunny"
-
 module Twingly
   module AMQP
     class Session

diff --git a/lib/twingly/amqp/subscription.rb b/lib/twingly/amqp/subscription.rb
@@ -1,6 +1,3 @@
-require "twingly/amqp/connection"
-require "twingly/amqp/message"
-
 module Twingly
   module AMQP
     class Subscription
@@ -13,6 +10,7 @@ def initialize(queue_name:, exchange_topic: nil, routing_key: nil,
         @consumer_threads = consumer_threads
         @prefetch         = prefetch
         @max_length       = max_length
+        @cancel           = false
 
         if routing_key
           warn "[DEPRECATION] `routing_key` is deprecated. "\

diff --git a/lib/twingly/amqp/topic_exchange_publisher.rb b/lib/twingly/amqp/topic_exchange_publisher.rb
@@ -1,6 +1,3 @@
-require "twingly/amqp/publisher"
-require "twingly/amqp/connection"
-
 module Twingly
   module AMQP
     class TopicExchangePublisher