ocean-rails 7.4.0 → 7.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ee546b0b0c2b9c6a04425b1ac672389b82fd08fcf55a667b677864513ed514f
-  data.tar.gz: ae8d95eaccc0f63a052b1805e84563677f22bf47614e595a48b3f03b6f68351b
+  metadata.gz: 5434efb6b5ac373b19585426920f41b323de6f895320ea8f8d8a83de9e479247
+  data.tar.gz: 818e5b98c28161297512ce289ad57f4b1816fc4a8caef3f90b21c38921e421fb
 SHA512:
-  metadata.gz: e6a34a0c53ae708c5c383d8c8467fc018f822f2076fea6d2f2740533ed7e9b5c6b5aa60cfb149b6ac829ff1131279e69b3bf1555ad2036c3f28b31db24ca00ca
-  data.tar.gz: 37ea558d5140a78c66e9adabda5a52537874ee43289765e606afe76eb7a62fb96190c4090cce35630f7dc4746208352efa2d6ff2b669167823dfd0a99daa0ecd
+  metadata.gz: eac2a7b3ffccc9250e4e3acf42b65076e9ccf6f7333e70d51768a3bea1661235efb05f2f185899286d0fc327efa953cceb6539fd4d2dc5a1671a41ae65c599be
+  data.tar.gz: 15d0d3b9d04f4caee144823df773714131df669a6bce61ea9bc4a7369d2c4dd4389c11bed2b2be8594ea62df075b6264c6d4fdc280b04b42387a7ec0236a199d

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "7.4.0"
+  VERSION = "7.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 7.4.0
+  version: 7.5.0
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-27 00:00:00.000000000 Z
+date: 2018-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -193,7 +193,6 @@ files:
 - app/controllers/alive_controller.rb
 - app/controllers/errors_controller.rb
 - config/initializers/_api_constants.rb
-- config/initializers/_aws_config.rb
 - config/initializers/_ocean_constants.rb
 - config/initializers/_ocean_logger.rb
 - config/routes.rb

data/config/initializers/_aws_config.rb

@@ -1,35 +0,0 @@
-# Check if the ENV vars are set; if so, don't read any file
-if (ENV['AWS_ACCESS_KEY_ID'].present? &&
-    ENV['AWS_SECRET_ACCESS_KEY'].present? &&
-    ENV['AWS_REGION'].present?)
-  Aws.config
-else
-  f = File.join(Rails.root, "config/aws.yml")
-  if f
-    template = ERB.new(File.read(f))
-    processed = YAML.load(template.result(binding))
-    cfg = processed[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: ENV['AWS_REGION'],
-               credentials: Aws::Credentials.new(ENV['AWS_ACCESS_KEY_ID'], ENV['AWS_SECRET_ACCESS_KEY'])
-    }
-    config[:endpoint] = cfg["endpoint"] if cfg["endpoint"]
-    Aws.config.update(config)
-  else
-    # Otherwise print an error message and exit with an error.
-    puts
-    puts "-----------------------------------------------------------------------"
-    puts "AWS config file missing. Please copy config/aws.yml from the ocean-rails"
-    puts "gem. Alternatively export environment variables AWS_ACCESS_KEY_ID,"
-    puts "AWS_SECRET_ACCESS_KEY, and AWS_REGION."
-    puts "-----------------------------------------------------------------------"
-    puts
-    exit 1
-  end
-end