ocean-rails 1.22.8 → 1.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c50ab1b13f8a43e5f81ec8b40d7b87a2b58ddd53
-  data.tar.gz: 381cd76a1991ad97a346116547388e834ef0c056
+  metadata.gz: aa74489b2e95cf9784f9a4d43c87298865e4c41d
+  data.tar.gz: 1464ba97f4c0a785947f9e412d8b88831d4076ef
 SHA512:
-  metadata.gz: a83b9f37f7ee95dec92b898918d28a935036b5be284fe0f82a5f91b4bafdd79ce60fb0d0f3670be350a2abb668d643f0b889cc3576ccad3ab755a319e3c768d4
-  data.tar.gz: 276a8b34e00e39447ec24c107af508177f15dd1ef3bf10f8d0c5a83ce43ee6aaf745d60c8adcd6f1e0f1d724df7095cca4f6b3fb510c3ba3344dee9c0b37153c
+  metadata.gz: 77f8e945949e311cb05ee4a3b395c122384344141ceeb05ff8760fb6ee5fce6479826e2456b795741934ac4ffe319002f6414b227460d40cf96b202c95cec2cb
+  data.tar.gz: 8533c9aa7fdf99d731221f6f91543068a56a143da5ff5970b7d1c055c1028a0ff5024164df5fbde92563f542262b4b6799a6f90341641716a2c1e6826eb7b522

data/config/initializers/api_constants.rb

@@ -1,5 +1,17 @@
 f = File.join(Rails.root, "config/config.yml")
-unless File.exists?(f)
+ef = File.join(Rails.root, "config/config.yml.example")
+
+f = File.exists?(f) && f || 
+    File.exists?(ef) && Rails.env == 'production' && ef
+
+if f
+  cfg = YAML.load(File.read(f))
+  cfg.merge! cfg.fetch(Rails.env, {}) if cfg.fetch(Rails.env, {})
+  cfg.each do |k, v|
+    next if k =~ /[a-z]/
+    eval "#{k} = #{v.inspect}"
+  end
+else
   puts
   puts "-----------------------------------------------------------------------"
   puts "Constant definition file missing. Please copy config/config.yml.example"
@@ -11,9 +23,3 @@ unless File.exists?(f)
   puts
   abort
 end
-cfg = YAML.load(File.read(f))
-cfg.merge! cfg.fetch(Rails.env, {}) if cfg.fetch(Rails.env, {})
-cfg.each do |k, v|
-  next if k =~ /[a-z]/
-  eval "#{k} = #{v.inspect}"
-end

data/config/initializers/aws_constants.rb

@@ -0,0 +1,22 @@
+f = File.join(Rails.root, "config/aws.yml")
+ef = File.join(Rails.root, "config/aws.yml.example")
+
+f = File.exists?(f) && f || 
+    File.exists?(ef) && Rails.env == 'production' && ef
+
+if f
+  AWS.config YAML.load(File.read(f))[Rails.env]
+else
+  puts
+  puts "-----------------------------------------------------------------------"
+  puts "AWS config file missing. Please copy config/aws.yml.example"
+  puts "to config/aws.yml and tailor its contents to suit your dev setup."
+  puts
+  puts "NB: aws.yml is excluded from git version control as it will contain"
+  puts "    data private to your Ocean system."
+  puts "-----------------------------------------------------------------------"
+  puts
+  abort
+end
+
+

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "1.22.8"
+  VERSION = "1.23.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 1.22.8
+  version: 1.23.0
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2013-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -66,6 +66,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: ffi-rzmq
   requirement: !ruby/object:Gem::Requirement
@@ -247,6 +261,7 @@ files:
 - app/controllers/errors_controller.rb
 - app/helpers/application_helper.rb
 - config/initializers/api_constants.rb
+- config/initializers/aws_constants.rb
 - config/initializers/ocean_constants.rb
 - config/initializers/zeromq_logger.rb
 - config/routes.rb