sinatra-environments 0.0.1 → 0.0.2

data/CHANGES

@@ -1,3 +1,8 @@
-rel 0.1.0 (2013-07-11)
+rel 0.0.2 (2013-07-11)
+
+* Fix accidental loading of all files in config/environments
+* Fix config directory attribute to avoid collision with Sinatra::Initializers
+
+rel 0.0.1 (2013-07-11)
 
 * intial release of gem / code

data/Gemfile

@@ -1,3 +1,3 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec

data/README.rdoc

@@ -1,6 +1,7 @@
 = Sinatra::Environments
 
-A Sinatra Extension that sets up rails like environments
+A Sinatra Extension that sets up rails like environments base on Chad W Pry's
+work on https://github.com/chadwpry/sinatra-initializers
 
 == Installation
 
@@ -25,7 +26,7 @@ This Gem depends upon the following:
 To view the settings in your app, just require and register the extension 
 in your sub-classed Sinatra app:
   
-  require 'sinatra-environments'
+  require "sinatra-environments"
   
   class YourApp < Sinatra::Base
     
@@ -36,9 +37,9 @@ in your sub-classed Sinatra app:
 
 In your "classic" Sinatra app, you just require the extension like this:
 
-  require 'rubygems'
-  require 'sinatra'
-  require 'sinatra-environments'
+  require "rubygems"
+  require "sinatra"
+  require "sinatra-environments"
   
 
 == Configuration Options

data/Rakefile

@@ -1,12 +1,12 @@
-require 'bundler'
+require "bundler"
 Bundler::GemHelper.install_tasks
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
+require "rspec/core"
+require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-  spec.rspec_opts = ['--backtrace']
-  # spec.ruby_opts = ['-w']    
+  spec.pattern = FileList["spec/**/*_spec.rb"]
+  spec.rspec_opts = ["--backtrace"]
+  spec.ruby_opts = ["-w"]    
 end
 
 task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/sinatra-environments/version.rb

@@ -1,6 +1,6 @@
 module Sinatra
   module Environments
-    VERSION = '0.0.1' unless const_defined?(:VERSION)
+    VERSION = "0.0.2" unless const_defined?(:VERSION)
 
     def self.version
       VERSION

data/lib/sinatra-environments.rb

@@ -1,28 +1,31 @@
-require 'sinatra/base'
-require 'sinatra-environments/version'
+require "sinatra/base"
+require "sinatra-environments/version"
 
 module Sinatra
   class Base
-    set(:config_directory, "config/environments")
+    set(:environments_config_directory, "config/environments")
   end
 
   module Environments
-    def config_directory= path
+    def environments_config_directory=(path)
       super
       register Sinatra::Environments
     end
 
-    def self.registered app
-      environment_file = File.join(app.config_directory, "../environment.rb")
+    def self.registered(app)
+      environment = app.settings.environment.to_s
+      config_dir = app.environments_config_directory
+      parent_dir = File.expand_path(File.join(config_dir, "../"))
+      environment_file = File.join(parent_dir, "environment.rb")
+      specific_file = File.expand_path(File.join(config_dir, "#{environment}.rb"))
 
       if File.exists?(environment_file)
-        require File.join(Dir.pwd, environment_file)
+        require environment_file
       end
 
-      Dir["#{app.config_directory}/**/*.rb"].each do |file_path|
-        require File.join(Dir.pwd, file_path)
+      if File.exists?(specific_file)
+        require specific_file
       end
     end
   end
 end
-

data/sinatra-environments.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra-environments}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Christopher H. Laco", "Chad W Pry"]
@@ -36,8 +36,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{A Sinatra Extension that follows a pattern of rails environments}
   
-  s.add_development_dependency('sinatra')
-  s.add_development_dependency('rake')
-  s.add_development_dependency('rspec')
+  s.add_development_dependency("sinatra")
+  s.add_development_dependency("rake")
+  s.add_development_dependency("rspec")
 end
 

data/spec/sinatra-environments/sinatra-environments_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Sinatra::Environments do
   class TestSinatraApplication < Sinatra::Base
@@ -7,20 +7,20 @@ describe Sinatra::Environments do
 
   describe "using base settings" do
     it "defaults the setting config_directory to config/environments" do
-      Sinatra::Base.config_directory.should == "config/environments"
+      Sinatra::Base.environments_config_directory.should == "config/environments"
     end
   end
 
   describe "using an example environment" do
     it "allows you to override config_directory" do
-      TestSinatraApplication.config_directory = "spec/config/environments"
-      TestSinatraApplication.config_directory.should == "spec/config/environments"
+      TestSinatraApplication.environments_config_directory = "spec/config/environments"
+      TestSinatraApplication.environments_config_directory.should == "spec/config/environments"
     end
 
     it "registers an environment for the test sinatra application" do
-      TestSinatraApplication.config_directory = "spec/config/environments"
-      Test::THAT_ENVIRONMENT_EXISTS.should == true
-      Test::THAT_TEST_ENVIRONMENT_EXISTS.should == true
+      TestSinatraApplication.environments_config_directory = "spec/config/environments"
+      Test::THAT_ENVIRONMENT_EXISTS.should be_true
+      Test::THAT_TEST_ENVIRONMENT_EXISTS.should be_true
     end
   end  
 end

data/spec/sinatra-environments/version_spec.rb

@@ -1,8 +1,8 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Sinatra::Environments do
-  it 'is the latest version' do
-    Sinatra::Environments.version.should == '0.0.1'
+  it "is the latest version" do
+    Sinatra::Environments.version.should == "0.0.2"
   end
 end
 

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 
-require 'rspec'
-require 'sinatra-environments'
+require "rspec"
+require "sinatra-environments"
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-environments
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -80,7 +80,7 @@ files:
 - Gemfile
 - Rakefile
 - spec/config/environment.rb
-- spec/config/environments/test.rb
+- spec/config/environments/development.rb
 - spec/sinatra-environments/sinatra-environments_spec.rb
 - spec/sinatra-environments/version_spec.rb
 - spec/spec_helper.rb
@@ -99,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4023376974684312126
+      hash: 4573804394064464119
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -114,7 +114,7 @@ specification_version: 3
 summary: A Sinatra Extension that follows a pattern of rails environments
 test_files:
 - spec/config/environment.rb
-- spec/config/environments/test.rb
+- spec/config/environments/development.rb
 - spec/sinatra-environments/sinatra-environments_spec.rb
 - spec/sinatra-environments/version_spec.rb
 - spec/spec_helper.rb