figaro 0.3.0 → 0.4.0

data/.travis.yml

@@ -9,5 +9,3 @@ rvm:
   - 1.9.2
   - 1.9.3
   - ruby-head
-env:
-  secure: "SBq3viHypfDJrrU0dRw6U+tNZFVb3NjMHWN1HROgZ+ecF0ycRKDxHZQCHWg2\nV0FwRDb/pd6eZgk12Yxp0PyE2rxtiU/LulQkp0EvpcGXjuQHudWXTZ2c/RiY\n7FVwvy6SYB6D/3pDmVEtTRu/BQjgE9fMlLaaZms64+t5MtRFSCU="

data/README.md

@@ -44,6 +44,18 @@ Pusher.key    = ENV["PUSHER_KEY"]
 Pusher.secret = ENV["PUSHER_SECRET"]
 ```
 
+If your app requires Rails-environment-specific configuration, you can also namespace your configuration under a key for `Rails.environment`. For instance:
+
+```yaml
+HELLO: world
+development:
+  HELLO: developers
+production:
+  HELLO: users
+```
+
+In this case, `ENV["HELLO"]` will produce `"developers"` in development, `"users"` in production and `"world"` otherwise.
+
 ## How does it work with Heroku?
 
 Heroku's beautifully simple application configuration was the [inspiration](http://laserlemon.com/blog/2011/03/08/heroku-friendly-application-configuration/) for Figaro.

data/features/rails.feature

@@ -15,36 +15,70 @@ Feature: Rails
     Then the output should be "Hello!"
 
   Scenario: Has application.yml without requested key
-    When I create "config/application.yml" with:
+    Given I create "config/application.yml" with:
       """
       GOODBYE: Ruby Tuesday
       """
-    And I run "rake hello"
+    When I run "rake hello"
     Then the output should be "Hello!"
 
   Scenario: Has blank application.yml
-    When I create "config/application.yml" with:
+    Given I create "config/application.yml" with:
       """
       """
-    And I run "rake hello"
+    When I run "rake hello"
     Then the output should be "Hello!"
 
   Scenario: Has commented application.yml
-    When I create "config/application.yml" with:
+    Given I create "config/application.yml" with:
       """
       # Comment
       """
-    And I run "rake hello"
+    When I run "rake hello"
     Then the output should be "Hello!"
 
   Scenario: Has application.yml with requested key
-    When I create "config/application.yml" with:
+    Given I create "config/application.yml" with:
       """
       HELLO: world
       """
-    And I run "rake hello"
+    When I run "rake hello"
     Then the output should be "Hello, world!"
 
+  Scenario: Has application.yml with a RAILS_ENV
+    Given I create "config/application.yml" with:
+      """
+      HELLO: world
+      development:
+        HELLO: developers
+      """
+    When I run "rake hello RAILS_ENV=development"
+    Then the output should be "Hello, developers!"
+
+  Scenario: Has application.yml without a RAILS_ENV, but has env variables set
+    Given I create "config/application.yml" with:
+      """
+      HELLO: world
+      development:
+        HELLO: developers
+      """
+    When I run "rake hello"
+    Then the output should be "Hello, world!"
+
+  Scenario: Has application.yml with a RAILS_ENV, with multiple envs configured.
+    Given I create "config/application.yml" with:
+      """
+      HELLO: world
+      development:
+        HELLO: developers
+      production:
+        HELLO: users
+      """
+    When I run "rake hello RAILS_ENV=development"
+    Then the output should be "Hello, developers!"
+    When I run "rake hello RAILS_ENV=production"
+    Then the output should be "Hello, users!"
+
   Scenario: Generator creates and ignores application.yml file
     When I run "rails generate figaro:install"
     Then "config/application.yml" should exist

data/features/support/env.rb

@@ -1,5 +1,3 @@
 require "pathname"
 
 ROOT = Pathname.new(File.expand_path("../../..", __FILE__))
-
-puts "Travis ENV test: #{ENV["TRAVIS_ENV_TEST"].inspect}"

data/figaro.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name    = "figaro"
-  gem.version = "0.3.0"
+  gem.version = "0.4.0"
 
   gem.authors     = ["Steve Richert"]
   gem.email       = ["steve.richert@gmail.com"]

data/lib/figaro.rb

@@ -4,6 +4,10 @@ module Figaro
   extend self
 
   def env
+    flatten(raw).merge(raw.fetch(environment, {}))
+  end
+
+  def raw
     yaml && YAML.load(yaml) || {}
   end
 
@@ -14,4 +18,14 @@ module Figaro
   def path
     Rails.root.join("config/application.yml")
   end
+
+  def environment
+    ENV["RAILS_ENV"] || ENV["RACK_ENV"]
+  end
+
+  private
+
+  def flatten(hash)
+    hash.reject{|_,v| Hash === v }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: figaro
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors: