ocean-rails 1.27.2 → 1.27.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cbf48fd46e3f4235f28ea58917d8811046d3059
-  data.tar.gz: 46c5ee4c5051ce2e1d2f355ab632c77906621806
+  metadata.gz: fbb2caf86b2e021aa91b7b3163d34305a165ec50
+  data.tar.gz: 934c0e1917ee171dab2a9d5d472d5092557248d4
 SHA512:
-  metadata.gz: f54db6bed59e709ac9a82eefe3074a8885fb0078738ef42d4bde6ee6f5aff05449089d0e626dc62f5175f60d19439b15fde1ca59f947dc3fd80cb0696de619a6
-  data.tar.gz: eca84bccf9513402222dc2f63369b843b1b3e6f3cc6b0c4ec9119e6f89d330ea191346b164c094ff22861a984fcc437b89da1428df84e7b9de7ca2bc14cee7cb
+  metadata.gz: 5c9c4cc75ebb65e206386bf14bc45fe24d8bf46782d4aa7b9ab6847897bfb4d502ca1897686965c4bcf2a005ba516aa3f5e343437267f56bd5275f55f8c10cd2
+  data.tar.gz: b859d48b4241d17b38ea4a5e5c60b49f81f9928bf0fa8fea729e6f82a3b2292405cfe613cac9d05f76fbb1ec5e8ae7e980ac9e087ac59822ad00dd483f247867

data/config/initializers/api_constants.rb

@@ -19,8 +19,15 @@ if File.exists?(ef)
     cfg.merge! cfg.fetch(Rails.env, {}) if cfg.fetch(Rails.env, {})
     cfg.each do |k, v|
       next if k =~ /[a-z]/
-      if ENV["OVERRIDE_#{k}"] && ENV["OVERRIDE_#{k}"] != ""
-        eval "#{k} = #{ENV["OVERRIDE_#{k}"].inspect}"
+      override = ENV["OVERRIDE_#{k}"]
+      if override && override != ""
+        master, staging = override.split(',')
+        if staging.present? && k == "API_PASSWORD"
+          pw = (ENV['GIT_BRANCH'] == 'staging' ? staging : master)
+          eval "#{k} = #{pw.inspect}"
+        else
+          eval "#{k} = #{override.inspect}"
+        end
       else
         eval "#{k} = #{v.inspect}"
       end

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "1.27.2"
+  VERSION = "1.27.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 1.27.2
+  version: 1.27.3
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-21 00:00:00.000000000 Z
+date: 2013-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday