bbc-cosmos-config 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65576a9095db870fd1b74e0b7aa89a41c888d5e4
-  data.tar.gz: 2dda163f88bb77a9ddebccbe264bca8f620ada17
+  metadata.gz: e7a3406d1d342dfdcb5da6f16df47eae1e69ea76
+  data.tar.gz: 0a432c532e36143fd247538b7a99ff10d859b4f3
 SHA512:
-  metadata.gz: 2428006bfe08f0dd2b85c3aac40cc5bb761925d7857aa8440930901d61f7d4d6c90e69aef270b7fc241d9f303e2b9f5b2ce6b0cd6da875d202fb27c03b1f4697
-  data.tar.gz: 6247e0b3d8c74eec1e7dc3f2e9ccf21e6cdad3f02c35b9ff8d4c92e75b065c8aaf1a06f5bd4d491fd25b10bbcb80ee1f8325ca73783f11859f4f37d1371b20ba
+  metadata.gz: e8e61dc6ea4583c0fa548a3afdeb751506da91a62a7aaaf5fcfa5976a1c56103e6337c7bca45d39ea7d190443b575f9c731ab46bb04e11df42914c7c842953b1
+  data.tar.gz: 68d4193def2ddaf8ec12774b28811c8ba595d5320cb989e1708af2868db9121cafb6dbdfe22ea49d85c6654da9709237a064530e12a1dfd60235b410043232a9

data/lib/bbc/cosmos/config/cosmos.rb

@@ -23,17 +23,21 @@ module BBC
         end
 
         def component_config
-          load_config_from_s3? ? @aws_config.s3_config(parse_component_config) : parse_component_config[:configuration]
+          load_config_from_s3? ? @aws_config.s3_config(config) : config[:configuration]
         end
 
-        private
+        def config
+          @config ||= JSON.parse(app_config_string, :symbolize_names => true)
+        end
 
-        def load_config_from_s3?
-          parse_component_config[:configuration].include?(:config_path) && BBC::Cosmos.production?
+        def environment
+          BBC::Cosmos.production? ? config[:environment] : ENV.fetch('APP_ENV', 'development')
         end
 
-        def parse_component_config
-          @parse_component_config ||= JSON.parse(app_config_string, :symbolize_names => true)
+        private
+
+        def load_config_from_s3?
+          config[:configuration].include?(:config_path) && BBC::Cosmos.production?
         end
 
         def app_config_string

data/lib/bbc/cosmos/config/version.rb

@@ -1,7 +1,7 @@
 module BBC
   module Cosmos
     module Config
-      VERSION = "0.2.0"
+      VERSION = "0.3.0"
     end
   end
 end

data/spec/config_spec.rb

@@ -3,12 +3,22 @@ require "spec_helper"
 describe BBC::Cosmos::Config do
 
   subject { BBC::Cosmos::Config }
-  let (:expected_config) do
+
+  let (:expected_cosmos_config) do
     {
-      :config_key => "config_value"
+      :external_dependencies => {},
+      :secure_configuration  => {},
+      :name                  => "app_name",
+      :environment           => "test",
+      :configuration         => {
+        :config_key => "config_value"
+      },
+      :resources             => {}
     }
   end
 
+  let (:expected_config) { expected_cosmos_config[:configuration] }
+
   describe ".app" do
     describe "application config attribute" do
       it "should be accessible using method notation" do
@@ -24,6 +34,18 @@ describe BBC::Cosmos::Config do
       end
     end
 
+    describe "#config" do
+      it "returns the complete cosmos config" do
+        expect(subject.cosmos.config).to eq(expected_cosmos_config)
+      end
+    end
+
+    describe "#environment" do
+      it "returns the environment from the cosmos config" do
+        expect(subject.cosmos.environment).to eq('test')
+      end
+    end
+
     describe "#stack_name" do
       it "returns the cosmos stack name" do
         expect(subject.cosmos.stack_name).to eq("stack_name")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbc-cosmos-config
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Robert Kenny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2014-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk