rack-environment 1.0.1 → 1.1.0

data/README.rdoc

@@ -1,7 +1,6 @@
 = rack-environment
 
-Rack::Environment is useful for getting ENVironment variables set for your
-application.
+Sets ENVironment variables around your app.
 
 This can help you to more closely simulate your Heroku environment in
 development.

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.0

data/lib/rack_environment.rb

@@ -33,7 +33,8 @@ private ######################################################################
   end
 
   def read_config_file(filename)
-    YAML::load_file(filename)
+    config = YAML::load_file(filename)
+    config.is_a?(Hash) ? config : {}
   end
 
   def update_environment!

data/rack-environment.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-environment}
-  s.version = "1.0.1"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Dollar"]
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
      "lib/rack-environment.rb",
      "lib/rack_environment.rb",
      "rack-environment.gemspec",
+     "spec/config/blank.yml",
      "spec/config/environment.yml",
      "spec/rack_environment_spec.rb",
      "spec/rcov.opts",

data/spec/rack_environment_spec.rb

@@ -3,17 +3,38 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe "RackEnvironment" do
   include Rack::Test::Methods
 
+  def rack_environment_with_filename(filename)
+    Rack::Builder.new do
+      use RackEnvironment, :file => File.join(File.dirname(__FILE__), 'config', filename)
+      run TestApplication.new
+    end
+  end
+
+  def rack_environment_with_environment(environment)
+    Rack::Builder.new do
+      use RackEnvironment, :environment => environment
+      run TestApplication.new
+    end
+  end
+
   before :each do
     get "/"
     @environment = last_response.headers['X-Rack-Environment']
   end
 
+  describe "with specified environment" do
+    def app
+      rack_environment_with_environment :ONE => 'one_value'
+    end
+
+    it "should have the proper environment set" do
+      @environment['ONE'].should == 'one_value'
+    end
+  end
+
   describe "with specified config file" do
     def app
-      Rack::Builder.new do
-        use RackEnvironment, :file => File.expand_path(File.dirname(__FILE__) + '/config/environment.yml')
-        run TestApplication.new
-      end
+      rack_environment_with_filename 'environment.yml'
     end
 
     it "should have the proper environment set" do
@@ -26,16 +47,13 @@ describe "RackEnvironment" do
     end
   end
 
-  describe "with specified environment" do
+  describe "with blank config file" do
     def app
-      Rack::Builder.new do
-        use RackEnvironment, :environment => { :ONE => 'one_value' }
-        run TestApplication.new
-      end
+      rack_environment_with_filename 'blank.yml'
     end
 
-    it "should have the proper environment set" do
-      @environment['ONE'].should == 'one_value'
+    it "should not raise an error" do
+      @environment.should_not be_nil
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-environment
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors: 
 - David Dollar
@@ -51,6 +51,7 @@ files:
 - lib/rack-environment.rb
 - lib/rack_environment.rb
 - rack-environment.gemspec
+- spec/config/blank.yml
 - spec/config/environment.yml
 - spec/rack_environment_spec.rb
 - spec/rcov.opts