armoire 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16046f7dc3cfc111e688f040ceedc6d4ce5fe27d
-  data.tar.gz: 829927c14622774dabeaea3cf570e95e5f51d32e
+  metadata.gz: a263f7ddf3ce8f483ec067a5ecb465fddd6717bb
+  data.tar.gz: 95a65f417aebde97343c57f1ca1fe655877a061d
 SHA512:
-  metadata.gz: aed809c5f2fe6d9bf1a5a9ae9d505118d7cf7b9bf6ce67225529f9fa557b545c49938c917f17d6af19a57e3ed3a1a009c93b7aedae1619122ab6691d93bf875e
-  data.tar.gz: 74b8b0200c547f30fb1896671a45386f46322d33779e4cc3a1f602e8eb8c8f7cf1d946bec2f27dfadd05fe25686d467f25de95e8df35f976c136e6815d9ceb13
+  metadata.gz: f66b78e05f8f27501337d14ea691c7a945dcd912b143e275c58fe840ce5848f1b7f4e7423d8830b7ad991cd4b6eb7bb2d96fe32cccaf105d5cef16e647fedd30
+  data.tar.gz: 0a1b4276b5286aed8e14a4dce4bd2869e7f8ff89ed5459d1bc7dba416a2b9af3db2a0d3222323b1a5bb2409dfed593b8c5da3b50e452c99ef8ed61e7e284ecb5

data/README.md

@@ -42,7 +42,9 @@ Simply call `Armoire["foo"]` to get `"bar"` or `Armoire["nested_options"]["neste
 
 You may also call keys with any object that responds to `#to_s` and armoire will work correctly, e.g. `Armoire[:foo]`.
 
-The configuration environment will initially be taken from `ENV['RAILS_ENV']`, then `ENV['RACK_ENV']` and if neither exist then it will fall back to `development`
+The configuration environment will initially be taken from `ENV['RAILS_ENV']`, then `ENV['RACK_ENV']` and if neither exist then it will fall back to `development`.  Environment can also be set explicitly, but must be set prior to calling `load!`
+
+    Armoire.environment = 'not_rack'
 
 ### Usage in Rails
 

data/lib/armoire/version.rb

@@ -1,3 +1,3 @@
 class Armoire
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

data/lib/armoire.rb

@@ -15,10 +15,7 @@ class Armoire
   include Singleton
 
   attr_accessor :settings
-
-  def environment
-    ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
-  end
+  attr_writer :environment
 
   def self.[](key)
     instance.settings[key]
@@ -28,6 +25,14 @@ class Armoire
     instance.settings = Setting.new(instance.load_settings(path_to_config_file))
   end
 
+  def self.environment=(environment)
+    instance.environment = environment
+  end
+
+  def environment
+    @environment ||= ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
+  end
+
   def load_settings(path_to_config_file)
     YAML.load(ERB.new(File.read(path_to_config_file)).result)[environment]
   rescue Errno::ENOENT => e

data/spec/lib/armoire_spec.rb

@@ -4,6 +4,10 @@ describe Armoire do
   describe '#.environment' do
     subject { described_class.instance.environment }
 
+    before do
+      described_class.environment = nil
+    end
+
     context "ENV['RAILS_ENV'] is set" do
       before do
         @prev_rails_env = ENV['RAILS_ENV']
@@ -37,6 +41,27 @@ describe Armoire do
       end
     end
 
+    context "environment is explicitly set" do
+      before do
+        @prev_rails_env = ENV['RAILS_ENV']
+        @prev_rack_env = ENV['RACK_ENV']
+        ENV['RAILS_ENV'] = nil
+        ENV['RACK_ENV'] = nil
+        described_class.environment = 'no_rack'
+      end
+
+      it "returns the explicitly set environment" do
+        expect(subject).to eql("no_rack")
+      end
+
+      after do
+        ENV['RAILS_ENV'] = @prev_rails_env
+        ENV['RACK_ENV'] = @prev_rack_env
+        described_class.environment = nil
+      end
+    end
+
+
     context "nothing is set" do
       before do
         @prev_rails_env = ENV['RAILS_ENV']
@@ -54,6 +79,10 @@ describe Armoire do
         ENV['RACK_ENV'] = @prev_rack_env
       end
     end
+
+    after do
+      described_class.environment = nil
+    end
   end
 
   describe '#[]' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: armoire
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Michael Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-21 00:00:00.000000000 Z
+date: 2014-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler