rservicebus2 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cf46f6455ed14f25642855bd4839b0c910447bb07007bdb2dba0c9a65b7f4d0
-  data.tar.gz: 5ef71ec901e2d142d731d2dd8be176b297116ef8b6b07ab182c295496f1dfd85
+  metadata.gz: dd8b2dfcd1227fbfa6285ecee4096a893a6f034c9bb7106564da2423a7344c8e
+  data.tar.gz: de0f4dbbf5ac8f3b683485577a73f4f40d19f10705b2d487e13dbf2acd637ef4
 SHA512:
-  metadata.gz: 35999f1a63cf911f2dc2d2d9580dc3afd26f70203db43bf7c58ee079606bb318246e292ffd382ceadfe4747d37a826a0784b3407d611c1957d61b7ea266aef05
-  data.tar.gz: c19a66ce0e83b4c2ae617ed0e8b9827f91cf31c9820e7f0e8ba5f405f83792b097e5ed0bd9769faf331bd15c4bdfeaf9748cea40677c29e050f4f3d1d6e58815
+  metadata.gz: a0214102bf52760d3b773ef194cde8718ba6113637f65e4791329109b3ba3fbe05ab9b94e4f9dffc0d39d55f9e2530d5ddfd64629b9ed6916f5cf2b9ee4d38f2
+  data.tar.gz: 329306b143ee14af68664432dfa7d541f82ef55d1695dd16f77ebb03dd3ffbd28a7bd19f1c6a116d2220bfad302903da6569b717b36e91980bb334eb1f2773d8

data/lib/rservicebus2/agent.rb

@@ -33,8 +33,8 @@ module RServiceBus2
         q = queue_name
       else
         parts = queueName.split('@')
-        msg.set_remote_queue_name(parts[0])
-        msg.set_remote_host_name(parts[1])
+        msg.remote_queue_name = parts[0]
+        msg.remote_host_name = parts[1]
         q = 'transport-out'
       end
 

data/lib/rservicebus2/errormessage.rb

@@ -6,7 +6,7 @@ module RServiceBus2
     attr_reader :occurredat, :source_queue, :error_msg
 
     def initialize(source_queue, error_msg)
-      @occurredat = DateTime.now
+      @occurredat = Time.now
 
       @source_queue = source_queue
       @error_msg = error_msg

data/lib/rservicebus2/host.rb

@@ -339,8 +339,8 @@ module RServiceBus2
         RServiceBus2.rlog "Sending, #{msg.class.name} to, #{queue_name}"
       else
         parts = queue_name.split('@')
-        r_msg.set_remote_queue_name(parts[0])
-        r_msg.set_remote_host_name(parts[1])
+        r_msg.remote_queue_name = parts[0]
+        r_msg.remote_host_name = parts[1]
         q = 'transport-out'
         RServiceBus2.rlog "Sending, #{msg.class.name} to, #{queue_name}, via #{q}"
       end
@@ -370,11 +370,11 @@ module RServiceBus2
     # Reply queues are specified in each msg. It works like
     # email, where the reply address can actually be anywhere
     # @param [RServiceBus2::Message] msg msg to be sent
-    def reply(msg)
+    def reply(msg, timestamp = nil)
       RServiceBus2.rlog "Reply with: #{msg.class.name} To: #{@msg.return_address}"
       @stats.inc_total_reply
 
-      queue_msg_for_send_on_complete(msg, @msg.return_address)
+      queue_msg_for_send_on_complete(msg, @msg.return_address, timestamp)
     end
 
     def get_endpoint_for_msg(msg_name)

data/lib/rservicebus2/message.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'zlib'
 require 'yaml'
 require 'uuidtools'
@@ -5,10 +7,12 @@ require 'uuidtools'
 module RServiceBus2
   # This is the top level message that is passed around the bus
   class Message
-    attr_reader :return_address, :msg_id, :remote_queue_name, :remote_host_name,
+    attr_reader :return_address, :msg_id,
                 :last_error_source_queue, :last_error_string, :correlation_id,
                 :sendat, :error_list
 
+    attr_accessor :remote_host_name, :remote_queue_name, :send_at
+
     # Constructor
     #
     # @param [Object] msg The msg to be sent
@@ -26,7 +30,7 @@ module RServiceBus2
       @correlation_id = correlation_id
       @return_address = return_address
 
-      @createdat = DateTime.now
+      @createdat = Time.now
 
       @msg_id = UUIDTools::UUID.random_create
       @error_list = []
@@ -47,25 +51,11 @@ module RServiceBus2
       @error_list << RServiceBus2::ErrorMessage.new(source_queue, error_string)
     end
 
-    def set_remote_host_name(host_name)
-      @remote_host_name = host_name
-    end
-
-    def set_remote_queue_name(queue_name)
-      @remote_queue_name = queue_name
-    end
-
-    def send_at(timestamp)
-      @send_at = timestamp
-    end
-
     # @return [Object] The msg to be sent
     def msg
-      if @compressed == true
-        return YAML.load(Zlib::Inflate.inflate(@_msg))
-      else
-        return YAML.load( @_msg )
-      end
+      return YAML.load(Zlib::Inflate.inflate(@_msg)) if @compressed == true
+
+      YAML.load(@_msg)
     rescue ArgumentError => e
       raise e if e.message.index('undefined class/module ').nil?
 

data/lib/rservicebus2/monitor/dir.rb

@@ -124,7 +124,7 @@ module RServiceBus2
 
         unless @archivedir.nil?
           basename = File.basename(file_path)
-          new_file_path = "#{@archivedir}/#{basename}.#{DateTime.now.strftime('%Y%m%d%H%M%S%L')}.zip"
+          new_file_path = "#{@archivedir}/#{basename}.#{Time.now.strftime('%Y%m%d%H%M%S%L')}.zip"
           RServiceBus2.log "Writing to archive, #{new_file_path}"
 
           Zip::ZipOutputStream.open(new_file_path) do |zos|

data/lib/rservicebus2/mq/beanstalk.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'beanstalk-client'
 require 'rservicebus2/mq'
 
@@ -34,6 +36,7 @@ module RServiceBus2
         abort
       end
     end
+    # rubocop:enable Metrics/AbcSize,Metrics/MethodLength
 
     def subscribe(queuename)
       @beanstalk.watch(queuename)
@@ -45,6 +48,7 @@ module RServiceBus2
         @job = @beanstalk.reserve @timeout
       rescue StandardError => e
         raise NoMsgToProcess if e.message == 'TIMED_OUT'
+
         raise e
       end
       @job.body
@@ -63,7 +67,7 @@ module RServiceBus2
       if msg.length > @max_job_size
         puts '***Attempting to send a msg which will not fit on queue.'
         puts "***Msg size, #{msg.length}, max msg size, #{@max_job_size}."
-        fail JobTooBigError, "Msg size, #{msg.length}, max msg size,
+        raise JobTooBigError, "Msg size, #{msg.length}, max msg size,
               #{@max_job_size}"
       end
       @beanstalk.use(queue_name)

data/lib/rservicebus2/saga/data.rb

@@ -5,7 +5,7 @@ module RServiceBus2
     attr_accessor :finished
 
     def initialize(saga)
-      @createdat = DateTime.now
+      @createdat = Time.now
       @correlation_id = UUIDTools::UUID.random_create
       @saga_class_name = saga.class.name
       @finished = false

data/lib/rservicebus2/sendat_manager.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rservicebus2/sendat_storage'
 
 module RServiceBus2
@@ -16,9 +18,9 @@ module RServiceBus2
     end
 
     def process
-      now = DateTime.now
-      @sendat_storage.get_all.each_with_index do |row, idx|
-        next if row['timestamp'] <= now
+      now = Time.now
+      @sendat_storage.all.each_with_index do |row, idx|
+        next if now <= row['timestamp']
 
         @bus._send_needs_wrapping(row['msg'], row['queue_name'],
                                   row['correlation_id'])

data/lib/rservicebus2/sendat_storage.rb

@@ -1,20 +1,22 @@
+# frozen_string_literal: true
 
 module RServiceBus2
   # Send At Storage
   class SendAtStorage
+    # rubocop:disable Metrics/MethodLength
     def self.get(uri)
       case uri.scheme
       when 'file'
         require 'rservicebus2/sendat_storage/file'
-        return SendAtStorageFile.new(uri)
+        SendAtStorageFile.new(uri)
       when 'inmem'
         require 'rservicebus2/sendat_storage/inmemory'
-        return SendAtStorageInMemory.new(uri)
+        SendAtStorageInMemory.new(uri)
       else
         abort("Scheme, #{uri.scheme}, not recognised when configuring
           SendAtStorage, #{uri}")
       end
     end
-
+    # rubocop:enable Metrics/MethodLength
   end
 end

data/lib/rservicebus2/sendat_storage/file.rb

@@ -1,8 +1,13 @@
+# frozen_string_literal: true
+
 module RServiceBus2
   # Send at storage file
   class SendAtStorageFile
     def initialize(uri)
+      RServiceBus2.log "SendAtStorageFile configured: #{uri.path}"
       @list = load(uri.path)
+      puts "@list: #{@list.class.name}"
+      @path = uri.path
     end
 
     def load(path)
@@ -20,7 +25,7 @@ module RServiceBus2
       save
     end
 
-    def get_all
+    def all
       @list
     end
 
@@ -31,7 +36,7 @@ module RServiceBus2
 
     def save
       content = YAML.dump(@list)
-      File.open(@uri.path, 'w') { |f| f.write(YAML.dump(content)) }
+      File.open(@path, 'w') { |f| f.write(content) }
     end
   end
 end

data/lib/rservicebus2/sendat_storage/inmemory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RServiceBus2
   # Send at storage in memory
   class SendAtStorageInMemory

data/lib/rservicebus2/state_manager.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 require 'rservicebus2/state_storage'
 
 module RServiceBus2
-
   # State Manager
   class StateManager
     def required

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus2
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Guy Irvine