rack-env 0.0.3 → 0.1.0

data/README.md

@@ -52,7 +52,7 @@ end
 ```
 # config.ru
 Rack::Builder.new
-  use Rack::Env, envfile: 'config/.env' if ENV['RACK_ENV'] == 'development'
+  use Rack::Env, envfile: 'somewhere/to/.env.development' if ENV['RACK_ENV'] == 'development'
   run MyApplication.new
 end
 ```

data/examples/sample-sinatra-application/.env

@@ -0,0 +1 @@
+FOO=bar

data/examples/sample-sinatra-application/Gemfile

@@ -0,0 +1,4 @@
+source :rubygems
+
+gem 'sinatra'
+gem 'rack-env', path: "/Users/banyan/git/rack-env"

data/examples/sample-sinatra-application/app.rb

@@ -0,0 +1,8 @@
+require 'sinatra'
+
+require 'rack/env'
+use Rack::Env
+
+get '/' do
+  ENV['FOO']
+end

data/examples/sample-sinatra-application/config.ru

@@ -0,0 +1,5 @@
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$:.unshift(File.dirname(__FILE__))
+
+require './app.rb'
+run Sinatra::Application

data/lib/rack/env.rb

@@ -4,7 +4,6 @@ require "rack/env/version"
 
 module Rack
   class Env
-
     def initialize(app, options = {})
       @app     = app
       @options = options
@@ -30,6 +29,7 @@ module Rack
 
     def read_env_file(envfile)
       ::File.readlines(envfile).each {|line|
+        next if line.chomp == "" || line =~ /^#/
         key, value = line.chomp.split('=')
         ENV[key] = value
       } if ::File.exist?(envfile)

data/lib/rack/env/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class Env
-    VERSION = "0.0.3"
+    VERSION = "0.1.0"
   end
 end

data/spec/rack/env_spec.rb

@@ -1,37 +1,39 @@
 require File.dirname(File.dirname(__FILE__)) + '/spec_helper'
 
-current_dir = Dir.getwd
+CURRENT_DIR = Dir.getwd
 
-describe 'Rack::Env' do
-  include Rack::Test::Methods
-
-  before do
-    # move current_dir as ./spec
-    Dir::chdir(File.dirname(File.dirname(__FILE__)) + '/tmp')
+def without_rack_env_app
+  Rack::Builder.new do
+    run TestRackApp.new
   end
+end
 
-  after(:all) do
-    Dir::chdir(current_dir)
+def rack_env_app
+  Rack::Builder.new do
+    use Rack::Env
+    run TestRackApp.new
   end
+end
 
-  def without_rack_env_app
-    Rack::Builder.new do
-      run TestRackApp.new
-    end
+def rack_env_app_with_argument
+  Rack::Builder.new do
+    use Rack::Env, envfile: ".envfile"
+    run TestRackApp.new
   end
+end
 
-  def rack_env_app
-    Rack::Builder.new do
-      use Rack::Env
-      run TestRackApp.new
-    end
+describe 'Rack::Env' do
+  include Rack::Test::Methods
+
+  let(:request) { get '/' }
+
+  before do
+    # move current_dir to ./spec/tmp as root_dir
+    Dir::chdir(File.dirname(File.dirname(__FILE__)) + '/tmp')
   end
 
-  def rack_env_app_with_argument
-    Rack::Builder.new do
-      use Rack::Env, envfile: ".envfile"
-      run TestRackApp.new
-    end
+  after(:all) do
+    Dir::chdir(CURRENT_DIR)
   end
 
   context "When not using Rack::Env" do
@@ -39,32 +41,44 @@ describe 'Rack::Env' do
       without_rack_env_app
     end
 
-    it "should ENV['FOO'] is nil" do
-      get '/'
+    it "should not load environment variable" do
+      request
       expect(ENV['FOO']).to eq nil
     end
   end
 
   context "When using Rack::Env" do
-    context "without argument" do
+    context "default envfile" do
       def app
         rack_env_app
       end
 
-      it "should ENV['FOO'] == 'bar'" do
-        get '/'
-        expect(ENV['FOO']).to eq "bar"
+      it "should ignore empty line and commented out line" do
+        expect{
+          request
+        }.to change{ ENV.size }.by(2)
+      end
+
+      it "should load environment variable" do
+        request
+        expect(ENV['JAPAN']).to eq "Tokyo"
       end
     end
 
-    context "with argument" do
+    context "specified envfile" do
       def app
         rack_env_app_with_argument
       end
 
-      it "should ENV['BAZ'] == 'qux'" do
-        get '/'
-        expect(ENV['BAZ']).to eq "qux"
+      it "should ignore empty line and commented out line" do
+        expect{
+          request
+        }.to change{ ENV.size }.by(2)
+      end
+
+      it "should load environment variable" do
+        request
+        expect(ENV['INDIA']).to eq "Delhi"
       end
     end
   end

data/spec/tmp/.env

@@ -1 +1,4 @@
-FOO=bar
+JAPAN=Tokyo
+
+BRAZIL=Brasilia
+# AUSTRARIA=Canberra

data/spec/tmp/.envfile

@@ -1 +1,4 @@
-BAZ=qux
+ENGLAND=London
+
+INDIA=Delhi
+# THAILAND=Bangkok

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-env
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-23 00:00:00.000000000 Z
+date: 2012-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -89,6 +89,10 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- examples/sample-sinatra-application/.env
+- examples/sample-sinatra-application/Gemfile
+- examples/sample-sinatra-application/app.rb
+- examples/sample-sinatra-application/config.ru
 - lib/rack/env.rb
 - lib/rack/env/version.rb
 - rack-env.gemspec
@@ -110,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1717073382629567647
+      hash: -1732855213985109025
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -119,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1717073382629567647
+      hash: -1732855213985109025
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23