rservicebus2 0.2.22 → 0.2.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdf786cee730fd3a1cb0ecb384d566ead93171cfa566b2b23bff09ab4dc75116
-  data.tar.gz: 4f8d812c2cf83ce2c1c561038d6d7b545afdb4e8ba5db414554fda52e19eb3d0
+  metadata.gz: 8590b64121dc0528e931b8bad65291c44b80e92d9cf1702ab33aad06ba0d246d
+  data.tar.gz: b737f18b0ab817bdcf0256a67e01a7d1fc19c9564af74b7242d7050fc3655ff3
 SHA512:
-  metadata.gz: 3787ed00c7dd8947ae2e1b000f3953afb34ceb8ffce6925f9c97a3d7ce67cf8d10e2e0d7989da8b7abee110a608066a8e1f95acb752665376beb811a0636d519
-  data.tar.gz: c8f21f22ea7132ecdf43d6a14c681f68071def8e611ab91e1388fa2dbeaf38ad02c2e89ce9ded75551e444ade20eea54d0493f9252fee2dca2e5cab2fd6c3891
+  metadata.gz: b0967729a2066a27fb42723246ff6833e885b9fd8224a71f55086bcff6208b54b606465c3b84301b0ae93c1e99a3ab3d8301173724c49a3186adf09a041bae51
+  data.tar.gz: 827131189ff39fe240a5077c3ff5ced08253718b966a2ff13200b29b3d144543ddd648ad8fb65f7441853a5f0c13423113f4223f87007a2ddaf5857bc55c415d

data/lib/rservicebus2/appresource/awsdynamodb.rb

@@ -6,9 +6,20 @@ module RServiceBus2
   # AppResourceAWSDynamoDb
   class AppResourceAWSDynamoDb < AppResource
     def connect(uri)
-      region = uri.host
+      host_name = uri.host
+      url_port = uri.port.nil? ? '' : ":#{uri.port}"
 
-      Aws::DynamoDB::Client.new(region: region)
+      region = nil
+      unless uri.query.nil?
+        parts = CGI.parse(uri.query)
+        region = parts['region'][0] unless parts['region'].nil?
+      end
+
+      if region.nil?
+        Aws::DynamoDB::Client.new(endpoint: "http://#{host_name}#{url_port}")
+      else
+        Aws::DynamoDB::Client.new(endpoint: "http://#{host_name}#{url_port}", region: region)
+      end
     end
 
     def finished

data/lib/rservicebus2/appresource/awss3.rb

@@ -6,9 +6,23 @@ module RServiceBus2
   # AppResourceAWSDynamoDb
   class AppResourceAWSS3 < AppResource
     def connect(uri)
-      region = uri.host
+      host_name = uri.host
+      url_port = uri.port.nil? ? '' : ":#{uri.port}"
 
-      Aws::S3::Client.new(region: region)
+      region = nil
+      unless uri.query.nil?
+        parts = CGI.parse(uri.query)
+        region = parts['region'][0] unless parts['region'].nil?
+      end
+
+      if region.nil?
+        Aws::S3::Client.new(endpoint: "http://#{host_name}#{url_port}")
+      else
+        puts "region: #{region}"
+        Aws::S3::Client.new(endpoint: "http://#{host_name}#{url_port}", region: region)
+      end
+
+      #Aws::S3::Client.new(region: region)
     end
 
     def finished

data/lib/rservicebus2/helper_functions.rb

@@ -39,6 +39,8 @@ module RServiceBus2
   end
 
   def self.create_anonymous_class(name_for_class)
+    Module.const_get(name_for_class)
+  rescue NameError
     new_anonymous_class = Class.new(Object)
     Object.const_set(name_for_class, new_anonymous_class)
     Object.const_get(name_for_class).new

data/lib/rservicebus2/host.rb

@@ -99,6 +99,7 @@ module RServiceBus2
 
     def initialize
       RServiceBus2.rlog "Current directory: #{Dir.pwd}"
+      YamlSafeLoader.instance
       @config = ConfigFromEnv.new
                              .load_host_section
                              .load_contracts

data/lib/rservicebus2/monitor/awss3.rb

@@ -9,9 +9,21 @@ module RServiceBus2
       @bucket_name = uri.path
       @bucket_name[0] = ''
 
-      @region = uri.host
+      host_name = uri.host
+      url_port = uri.port.nil? ? '' : ":#{uri.port}"
+
+      region = nil
+      unless uri.query.nil?
+        parts = CGI.parse(uri.query)
+        region = parts['region'][0] unless parts['region'].nil?
+      end
+
+      if region.nil?
+        @s3_client = Aws::S3::Client.new(endpoint: "http://#{host_name}#{url_port}")
+      else
+        @s3_client = Aws::S3::Client.new(endpoint: "http://#{host_name}#{url_port}", region: region)
+      end
 
-      @s3_client = Aws::S3::Client.new(region: @region)
       @input_filter = []
     end
 

data/lib/rservicebus2/yaml_safe_loader.rb

@@ -7,27 +7,21 @@ require 'singleton'
 class YamlSafeLoader
   include Singleton
 
-  DEFAULT_PERMITTED_CLASSES = 'RServiceBus2::Message,Time,UUIDTools::UUID,YamlSafeLoader,' \
+  DEFAULT_PERMITTED_CLASSES = 'RServiceBus2::Message,RServiceBus2::ErrorMessage,Time,UUIDTools::UUID,YamlSafeLoader,' \
                               'URI::Generic,URI::RFC3986_Parser,Symbol,Regexp'
 
-  def init
-    return unless @permitted_classes.nil?
-
+  def initialize
     string = "#{RServiceBus2.get_value('PERMITTED_CLASSES_BASE', DEFAULT_PERMITTED_CLASSES)}," \
              "#{RServiceBus2.get_value('PERMITTED_CLASSES', '')}"
     @permitted_classes = CSV.parse(string)[0].reject { |c| c.to_s.rstrip.empty? }
   end
 
   def add_permitted_class(string)
-    init
-
     @permitted_classes << string
     @permitted_classes.uniq!
   end
 
   def load(body)
-    init
-
     YAML.safe_load(body, permitted_classes: @permitted_classes)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus2
 version: !ruby/object:Gem::Version
-  version: 0.2.22
+  version: 0.2.26
 platform: ruby
 authors:
 - Guy Irvine
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-01 00:00:00.000000000 Z
+date: 2021-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beanstalk-client