ocean-rails 5.3.1 → 5.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9966cbcd3df009602977ca27cdc0933f17ecf9e6
-  data.tar.gz: e499281233517f7e2e5cd3608cb4d5678a9eeba0
+  metadata.gz: e221c7b67dd6a2c387854ebe06f2ccb361c2b79c
+  data.tar.gz: 6afd1f9c7294a6a9eae821589166526816c2a603
 SHA512:
-  metadata.gz: 49ca85b7e76937b7517cd8d78a50855b4b0200e9ec1b5f3e915a5d14ca3614b70f9a302c0602401f9c0aad835855824f8a929e482a757745c9b3c6991cc37428
-  data.tar.gz: 26268bfb60bc7c8f378bb3d6ac1e1cdba05d6f1f662dd6419e29db4c4a3062f3ac0a0cdf89a57606c33cc282e90bf25fb0f26ed46b72f53a0918e3f1a7357c2e
+  metadata.gz: c04e247e67366e3c98ec4884de480af548a38579faacc42f7d33043de4681e3944357f233e0de2a148204a4e93283f93f6b250df95add29df0df576908dc42cd
+  data.tar.gz: 781c92646ef8a41e80ed5c703a53bd5d3d04084b64b1268369648803e3f8576860816fceb560f1247a0fb88ee2d4da23396136c15b3f418f4a254307a8138d3d

data/config/initializers/_aws_config.rb

@@ -22,16 +22,19 @@ else
 
     # If there is a file to process, do so
     if f
-      options = YAML.load(File.read(f))[Rails.env]
-      ENV['AWS_ACCESS_KEY_ID'] = options[:access_key_id] || options['access_key_id']
-      ENV['AWS_SECRET_ACCESS_KEY'] = options[:secret_access_key] || options['secret_access_key']
-      ENV['AWS_REGION'] = options[:region] || options['region']
-      Aws.config.update(
-        region: options["region"],
-        credentials: Aws::Credentials.new(options["access_key_id"], options["secret_access_key"]),
-        endpoint: options["endpoint"]
-      )
-      AWS.config(options)
+      cfg = YAML.load(File.read(f))[Rails.env]
+      # Set the ENV variables
+      ENV['AWS_ACCESS_KEY_ID'] = cfg[:access_key_id] || cfg['access_key_id']
+      ENV['AWS_SECRET_ACCESS_KEY'] = cfg[:secret_access_key] || cfg['secret_access_key']
+      ENV['AWS_REGION'] = cfg[:region] || cfg['region']
+      # Configure AWS with the raw cfg data
+      AWS.config(cfg)
+      # Configure Aws with a massaged version of the cfg data
+      config = { region: cfg["region"],
+                 credentials: Aws::Credentials.new(cfg["access_key_id"], cfg["secret_access_key"])
+      }
+      config[:endpoint] = cfg["endpoint"] if cfg["endpoint"]
+      Aws.config.update(config)
     else
       # Otherwise print an error message and abort.
       puts

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "5.3.1"
+  VERSION = "5.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 5.3.1
+  version: 5.3.2
 platform: ruby
 authors:
 - Peter Bengtson