legion-transport 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff91b1e257e5a3be9580e01bb3517deab0f5f912f031e081469034643e7b1f7a
-  data.tar.gz: f940e2c6821e2015fb29e7d32746d53deaf36ad2fdc8c238c0ee519852b0710c
+  metadata.gz: 567b542ea43b5a232f8abdde592f899666b9dff1e976fe6c14790394ab056bd2
+  data.tar.gz: 103aab3379485b1731119820f26b8b38b25fd8592efe9b1e6c7fa10aa9f629e9
 SHA512:
-  metadata.gz: 379c26d17de282b5342a4300197658ce222a822c2bbe10cffc4f459b7bb13689fe1b145e60237c9579bef58005e37ee60d85c9f18e23292791bfdbddb608604b
-  data.tar.gz: d25558b9a4e10049ba187b4174bebf0e198e1914f08422db97ae79090a67e1150b8b9e5f1b795f55030bf3e2a4a0386ae10b67c1c9a19cddcf83fc67ddc6bba3
+  metadata.gz: 66958af49eba04baee630061c0359078cbf02955392b830e921587044425e7b3333d511198006d7324a49e4364a56ad98b2234a4b55b6724029b5c7f805c0676
+  data.tar.gz: ddeddc83b4a865af2a9ee817732f7102b8bde0ef5b8b729b8959dea1176ab9da945ce42b799a55e6bc5f83101f38a11756a0e519355b9fd296f1de6f353de4fa

data/.rubocop.yml

@@ -6,6 +6,10 @@ Metrics/ClassLength:
   Max: 1500
 Metrics/BlockLength:
   Max: 50
+Metrics/PerceivedComplexity:
+  Max: 15
+Metrics/CyclomaticComplexity:
+  Max: 15
 Layout/SpaceAroundEqualsInParameterDefault:
   EnforcedStyle: space
 Style/SymbolArray:

data/bitbucket-pipelines.yml

@@ -1,4 +1,4 @@
-image: ruby:2.5.0
+image: ruby:2.7.0
 
 pipelines:
   branches:
@@ -8,6 +8,7 @@ pipelines:
         - bundler
         script:
         - gem install bundle rubocop
+        - gem update bundler
         - bundle install
         - rubocop
         - rake

data/lib/legion/transport/connection.rb

@@ -8,7 +8,7 @@ module Legion
           Legion::Transport::CONNECTOR
         end
 
-        def setup # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/MethodLength
+        def setup # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
           Legion::Logging.info("Using transport connector: #{Legion::Transport::CONNECTOR}")
 
           if @session.respond_to?(:value) && session.respond_to?(:closed?) && session.closed?
@@ -26,6 +26,7 @@ module Legion
             @channel_thread = Concurrent::ThreadLocalVar.new(nil)
             session.start
             session.create_channel.basic_qos(1)
+            Legion::Settings[:transport][:connected] = true
           else
             @session ||= Concurrent::Atom.new(
               connector.new(
@@ -37,6 +38,7 @@ module Legion
             @channel_thread = Concurrent::ThreadLocalVar.new(nil)
             session.start
             session.create_channel.basic_qos(20, true)
+            Legion::Settings[:transport][:connected] = true
           end
 
           if session.respond_to? :on_blocked

data/lib/legion/transport/exchange.rb

@@ -27,7 +27,7 @@ module Legion
       end
 
       def default_options
-        hash = {}
+        hash = Concurrent::Hash.new
         hash[:durable] = true
         hash[:auto_delete] = false
         hash[:arguments] = {}
@@ -39,7 +39,7 @@ module Legion
       end
 
       def exchange_options
-        {}
+        Concurrent::Hash.new
       end
 
       def delete(options = {})

data/lib/legion/transport/message.rb

@@ -8,7 +8,7 @@ module Legion
         validate
       end
 
-      def publish(options = @options) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+      def publish(options = @options) # rubocop:disable Metrics/AbcSize
         raise unless @valid
 
         exchange_dest = exchange.respond_to?(:new) ? exchange.new : exchange
@@ -22,12 +22,20 @@ module Legion
                               headers: headers)
       end
 
+      def expiration
+        if @options.key? :expiration
+          @options[:expiration]
+        elsif @options.key? :ttl
+          @options[:ttl]
+        end
+      end
+
       def message
         @options
       end
 
       def routing_key
-        nil
+        @options[:routing_key] if @options.key? :routing_key
       end
 
       def encode_message
@@ -64,7 +72,7 @@ module Legion
       end
 
       def headers
-        @options[:headers] ||= {}
+        @options[:headers] ||= Concurrent::Hash.new
         %i[task_id relationship_id trigger_namespace_id trigger_function_id parent_id master_id runner_namespace runner_class namespace_id function_id function chain_id debug].each do |header| # rubocop:disable Layout/LineLength
           next unless @options.key? header
 
@@ -80,10 +88,6 @@ module Legion
         0
       end
 
-      def expiration
-        nil
-      end
-
       def content_type
         'application/json'
       end

data/lib/legion/transport/messages/task.rb

@@ -0,0 +1,41 @@
+module Legion
+  module Transport
+    module Messages
+      class Task < Legion::Transport::Message
+        def exchange
+          if @options.key?(:exchange) && @options[:exchange].is_a?(String)
+            Legion::Transport::Exchanges.new(@options[:exchange])
+          else
+            Legion::Transport::Exchanges::Task.new
+          end
+        end
+
+        def message
+          @options
+        end
+
+        def routing_key # rubocop:disable Metrics/AbcSize
+          if @options.key? :routing_key
+            @options[:routing_key]
+          elsif @options[:conditions].is_a?(String) && @options[:conditions].length > 2
+            'task.subtask.conditioner'
+          elsif @options[:transformation].is_a?(String) && @options[:transformation].length > 2
+            'task.subtask.transform'
+          elsif @options[:queue].is_a?(String) && @options[:function].is_a?(String)
+            "#{@options[:queue]}.#{@options[:function]}"
+          elsif @options[:queue].is_a?(String) && @options[:function_name].is_a?(String)
+            "#{@options[:queue]}.#{@options[:function_name]}"
+          elsif @options[:queue].is_a?(String) && @options[:name].is_a?(String)
+            "#{@options[:queue]}.#{@options[:name]}"
+          end
+        end
+
+        def validate
+          raise TypeError unless @options[:function].is_a? String
+
+          @valid = true
+        end
+      end
+    end
+  end
+end

data/lib/legion/transport/queue.rb

@@ -20,7 +20,7 @@ module Legion
       end
 
       def default_options
-        hash = {}
+        hash = Concurrent::Hash.new
         hash[:manual_ack] = true
         hash[:durable] = true
         hash[:exclusive] = false
@@ -35,7 +35,7 @@ module Legion
       end
 
       def queue_options
-        {}
+        Concurrent::Hash.new
       end
 
       def queue_name

data/lib/legion/transport/settings.rb

@@ -16,9 +16,10 @@ module Legion
           password: 'guest',
           host: '127.0.0.1',
           port: '5672',
-          vhost: 'legion',
+          vhost: '/',
           recovery_attempts: 0,
-          logger_level: 'info'
+          logger_level: 'info',
+          connected: false
         }.merge(grab_vault_creds)
       end
 

data/lib/legion/transport/version.rb

@@ -1,5 +1,5 @@
 module Legion
   module Transport
-    VERSION = '1.1.5'.freeze
+    VERSION = '1.1.6'.freeze
   end
 end

data/settings/transport.json

@@ -1,5 +1,5 @@
 {
   "transport": {
-    "vhost": "legion"
+    "vhost": "/"
   }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: legion-transport
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Esity
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-15 00:00:00.000000000 Z
+date: 2020-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -191,6 +191,7 @@ files:
 - ".rubocop.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - bin/console
@@ -213,6 +214,7 @@ files:
 - lib/legion/transport/messages/node_health.rb
 - lib/legion/transport/messages/request_cluster_secret.rb
 - lib/legion/transport/messages/subtask.rb
+- lib/legion/transport/messages/task.rb
 - lib/legion/transport/messages/task_log.rb
 - lib/legion/transport/messages/task_update.rb
 - lib/legion/transport/queue.rb