configy 1.1.1 → 1.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    configy (1.1.0)
+    configy (1.1.2)
       hashie (~> 1.2.0)
 
 GEM

data/HISTORY.md

@@ -1,3 +1,7 @@
+## 1.1.2 (2012-03-30)
+
+* If CONFIGY_ENV is set, use that to determine config section to use.
+
 ## 1.1.1 (2012-03-18)
 
 * Allow Configy to define configs within other modules

data/README.md

@@ -56,6 +56,8 @@ It doesn't allow to change the values in the application code, BTW.
 * Gabe Varela
 * Ben Marini
 * Chip Miller
+* Bram Swenson
+* Jeremy Ruppel
 
 ## History
 

data/Rakefile

@@ -3,8 +3,8 @@ Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/*_test.rb'
+  test.libs << 'lib' << 'spec'
+  test.pattern = 'spec/**/*_spec.rb'
   test.verbose = true
 end
 

data/configy.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name     = "configy"
-  s.version  = "1.1.1"
+  s.version  = "1.1.2"
 
-  s.authors  = [ "Gabe Varela", "Ben Marini", "Chip Miller" ]
+  s.authors  = [ "Gabe Varela", "Ben Marini", "Chip Miller", "Bram Swenson", "Jeremy Ruppel" ]
   s.date     = "2012-03-18"
   s.email    = "bmarini@gmail.com"
   s.summary  = "Simple yaml driven configuration gem"

data/lib/configy.rb

@@ -26,6 +26,8 @@ module Configy
     def section
       if @section
         @section
+      elsif defined? CONFIGY_ENV
+        CONFIGY_ENV
       elsif defined? Rails
         Rails.env
       elsif defined? RAILS_ENV

data/{test/base_test.rb → spec/base_spec.rb}

@@ -1,7 +1,7 @@
-require 'test_helper'
+require 'spec_helper'
 require 'erb'
 
-class ConfigFileTest < MiniTest::Unit::TestCase
+describe Configy::Base do
   MAIN_CONFIG = <<-EOS
 common:
   a: 1
@@ -23,40 +23,40 @@ special:
   e: <%= 6 * 7 %>
   EOS
 
-  def test_top_level_configs_should_be_accesssible_as_methods
+  it "test top level configs should be accesssible as methods" do
     with_config_file(MAIN_CONFIG, 'config') do
       config = Configy::Base.new('config', 'special', scratch_dir)
-      assert_equal 1, config.a
+      config.a.must_equal 1
     end
   end
 
-  def test_method_missing
+  it "test method missing" do
     config = Configy::Base.new('config', 'special', scratch_dir)
     assert_raises NoMethodError do
       config.nope = "oops"
     end
   end
 
-  def test_should_override_params_with_another_file_and_use_proper_section
+  it "test should override params with another file and use proper section" do
     with_config_file(MAIN_CONFIG, 'config') do
       with_config_file(LOCAL_CONFIG, 'config.local') do
         config = Configy::Base.new('config', 'special', scratch_dir)
-        assert_equal '2', config.a
-        assert_equal 8,   config.b
-        assert_equal 2,   config.c
-        assert_equal 6,   config.d
-        assert_equal 42,  config.e
+        config.a.must_equal '2'
+        config.b.must_equal 8
+        config.c.must_equal 2
+        config.d.must_equal 6
+        config.e.must_equal 42
       end
     end
   end
 
-  def test_should_reload_a_config_file_if_changed
+  it "test should reload a config file if changed" do
     with_config_file({ 'common' => {'a' => 'foo'} }, 'config') do |file1, hash1|
       with_config_file({ 'special' => {'b' => 'bar'} }, 'config.local') do |file2, hash2|
 
         config = Configy::Base.new('config', 'special', scratch_dir)
-        assert_equal 'foo', config.a
-        assert_equal 'bar', config.b
+        config.a.must_equal 'foo'
+        config.b.must_equal 'bar'
 
         # Simulate 1 second going by
         config.send(:config).mtime -= 1
@@ -65,7 +65,7 @@ special:
           f.puts( {'common' => {'a' => 'foo*'} }.to_yaml )
         end
 
-        assert_equal 'foo*', config.a
+        config.a.must_equal 'foo*'
 
         # Simulate 1 second going by
         config.send(:config).mtime -= 1
@@ -74,19 +74,19 @@ special:
           f.puts( {'special' => {'b' => 'bar*'} }.to_yaml )
         end
 
-        assert_equal 'bar*', config.b
+        config.b.must_equal 'bar*'
 
       end
     end
   end
 
-  def test_should_not_reload_a_config_file_if_changed_and_cache_config_is_true
+  it "test should not reload a config file if changed and cache config is true" do
     with_config_file({ 'common' => {'a' => 'foo'} }, 'config') do |file1, hash1|
       with_config_file({ 'special' => {'b' => 'bar'} }, 'config.local') do |file2, hash2|
 
         config = Configy::Base.new('config', 'special', scratch_dir, true)
-        assert_equal 'foo', config.a
-        assert_equal 'bar', config.b
+        config.a.must_equal 'foo'
+        config.b.must_equal 'bar'
 
         # Simulate 1 second going by
         config.send(:config).mtime -= 1
@@ -95,7 +95,7 @@ special:
           f.puts( {'common' => {'a' => 'foo*'} }.to_yaml )
         end
 
-        assert_equal 'foo', config.a
+        config.a.must_equal 'foo'
 
         # Simulate 1 second going by
         config.send(:config).mtime -= 1
@@ -104,7 +104,7 @@ special:
           f.puts( {'special' => {'b' => 'bar*'} }.to_yaml )
         end
 
-        assert_equal 'bar', config.b
+        config.b.must_equal 'bar'
 
       end
     end

data/{test/config_file_test.rb → spec/config_file_spec.rb}

@@ -1,27 +1,28 @@
-require 'test_helper'
+require 'spec_helper'
 
-class ConfigFileTest < MiniTest::Unit::TestCase
-  def test_should_load_a_config_from_a_file
+describe Configy::ConfigFile do
+
+  it "test should load a config from a file" do
     with_config_file( { 'common' => {'a' => '1', 'b' => '2' } }, 'app_config' ) do |file, hash|
       configfile = Configy::ConfigFile.new(file, 'development')
-      assert_equal hash, configfile.load_file
+      configfile.load_file.must_equal hash
     end
   end
 
-  def test_should_create_an_instance_of_config_store
+  it "test should create an instance of config store" do
     with_config_file( { 'common' => {'a' => '1', 'b' => '2' } }, 'app_config' ) do |file, hash|
       configfile = Configy::ConfigFile.new(file, 'development')
-      assert_instance_of Configy::ConfigStore, configfile.config
+      configfile.config.must_be_instance_of Configy::ConfigStore
     end
   end
 
-  def test_should_be_aware_of_a_files_mtime
+  it "test should be aware of a files mtime" do
     configfile = Configy::ConfigFile.new('nonexistent/file', 'development')
-    assert_equal Time.at(0), configfile.mtime
+    configfile.mtime.must_equal Time.at(0)
 
     with_config_file( { 'common' => {'a' => '1', 'b' => '2' } }, 'app_config' ) do |file, hash|
       configfile = Configy::ConfigFile.new(file, 'development')
-      assert_equal File.mtime(file), configfile.mtime
+      configfile.mtime.must_equal File.mtime(file)
     end
   end
 

data/{test/config_store_test.rb → spec/config_store_spec.rb}

@@ -1,13 +1,14 @@
-require 'test_helper'
+require 'spec_helper'
 
-class ConfigStoreTest < MiniTest::Unit::TestCase
-  def test_should_initialize_with_a_hash
+describe Configy::ConfigStore do
+
+  it "test should initialize with a hash" do
     hash   = {'common' => {'a' => 1, 'b' => 2} }
     config = Configy::ConfigStore.new(hash)
-    assert_equal hash, config.to_hash
+    config.to_hash.must_equal hash
   end
 
-  def test_should_compile_a_selected_section_with_the_common_section
+  it "test_should_compile_a_selected_section_with_the_common_section" do
     hash1 = {
       'common'      => { 'a' => "A",  'b' => "B" },
       'development' => { 'a' => "A*", 'c' => "C" }
@@ -15,12 +16,12 @@ class ConfigStoreTest < MiniTest::Unit::TestCase
 
     config = Configy::ConfigStore.new(hash1).compile('development')
 
-    assert_equal "A*", config['a']
-    assert_equal "B",  config['b']
-    assert_equal "C",  config['c']
+    config['a'].must_equal "A*"
+    config['b'].must_equal "B"
+    config['c'].must_equal "C"
   end
 
-  def test_should_merge_two_configs_together
+  it "test should merge two configs together" do
     hash1 = {
       'common'      => { 'a' => "A",  'b' => "B", 'c' => "C" },
       'development' => { 'a' => "A*", 'c' => "C*", 'd' => "D", 'e' => "E" }
@@ -35,15 +36,15 @@ class ConfigStoreTest < MiniTest::Unit::TestCase
     config2 = Configy::ConfigStore.new(hash2).compile('development')
     config  = config1.merge(config2)
 
-    assert_equal "A*",  config['a']
-    assert_equal "B",   config['b']
-    assert_equal "C**", config['c']
-    assert_equal "D",   config['d']
-    assert_equal "E*",  config['e']
-    assert_equal "F",   config['f']
+    config['a'].must_equal "A*"
+    config['b'].must_equal "B"
+    config['c'].must_equal "C**"
+    config['d'].must_equal "D"
+    config['e'].must_equal "E*"
+    config['f'].must_equal "F"
   end
 
-  def test_should_raise_an_exception_if_config_is_missing
+  it "test should raise an exception if config is missing" do
     assert_raises Configy::ConfigParamNotFound do
       Configy::ConfigStore.new({})['oops']
     end

data/spec/configy_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe Configy do
+  before do
+    Configy.load_path    = scratch_dir
+    Configy.cache_config = nil
+  end
+
+  it "should camelize" do
+    Configy.camelize('config').must_equal 'Config'
+    Configy.camelize('some_config').must_equal 'SomeConfig'
+    Configy.camelize('some-other_config').must_equal 'SomeOtherConfig'
+  end
+
+  it "should create a configuration class based on a yaml file" do
+    with_config_file( {'common' => {'a' => '1', 'b' => '2' }}, 'app_config' ) do |file, hash|
+      Configy.create('app_config')
+      Object.const_defined?(:AppConfig).must_equal true
+      AppConfig.b.must_equal '2'
+    end
+  end
+
+  it "test should create a configuration class based on a yaml file within a parent module" do
+    with_config_file( {'common' => {'a' => '1', 'b' => '2' }}, 'app_config' ) do |file, hash|
+      Object.const_set('MyApp', Module)
+      Configy.create('app_config', MyApp)
+      MyApp.const_defined?(:AppConfig).must_equal true
+      MyApp::AppConfig.b.must_equal '2'
+    end
+  end
+
+  it "test cache config always defaults to false" do
+    Configy.section = 'production'
+    Configy.cache_config.must_equal false
+
+    Configy.section = 'development'
+    Configy.cache_config.must_equal false
+  end
+
+  it "test should be able to manually set cache config" do
+    Configy.cache_config = true
+    Configy.create('dummy')
+
+    Configy.cache_config.must_equal true
+    Dummy.cache_config?.must_equal true
+  end
+
+end

data/spec/load_path_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe "Configy.load_path" do
+  before do
+    Configy.load_path = nil
+  end
+
+  it "should default to config" do
+    Configy.load_path.must_equal "config"
+  end
+
+  it "should detect rails 3 config dir" do
+    rails3_obj = MiniTest::Mock.new
+    rails3_obj.expect :root, Pathname.new("path/to/rails/root")
+
+    with_const(:Rails, rails3_obj) do
+      Configy.load_path.must_equal Rails.root.join("config")
+    end
+  end
+
+  it "should detect rails 2 config dir" do
+    with_const( :RAILS_ROOT, "path/to/rails/root" ) do
+      Configy.load_path.must_equal "#{RAILS_ROOT}/config"
+    end
+  end
+
+  it "should detect rack config dir" do
+    with_const( :RACK_ROOT, "path/to/rack/root" ) do
+      Configy.load_path.must_equal "#{RACK_ROOT}/config"
+    end
+  end
+end

data/spec/nested_config_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe Configy do
+  describe "with nested configurations" do
+    before do
+      Configy.load_path    = scratch_dir
+      Configy.cache_config = nil
+    end
+
+    it "should be accessbile as methods" do
+      with_config_file({
+        'common' => {
+          'level1' => {
+            'level2' => {
+              'level3' => 'whynot',
+              'falsekey' => false,
+              'truekey' => true
+            }
+          }
+        }
+      }, 'nested_config') do
+        Configy.create('nested_config')
+        NestedConfig.level1.level2.level3.must_equal "whynot"
+        NestedConfig.level1.level2.nokey?.must_equal false
+        NestedConfig.level1.level2.falsekey?.must_equal false
+        NestedConfig.level1.level2.truekey?.must_equal true
+      end
+    end
+  end
+end

data/spec/section_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+describe "Configy.section" do
+  before do
+    Configy.section = nil
+  end
+
+  it "should default to development" do
+    Configy.section.must_equal "development"
+  end
+
+  it "should detect configy environment" do
+    with_const( :CONFIGY_ENV, "staging" ) do
+      Configy.section.must_equal "staging"
+    end
+  end
+
+  it "should detect rails 3 environment" do
+    rails3_obj = MiniTest::Mock.new
+    rails3_obj.expect :env, "staging"
+
+    with_const(:Rails, rails3_obj) do
+      Configy.section.must_equal "staging"
+    end
+  end
+
+  it "should detect rails 2 environment" do
+    with_const( :RAILS_ENV, "test" ) do
+      Configy.section.must_equal "test"
+    end
+  end
+
+  it "should detect rack environment" do
+    with_const( :RACK_ENV, "production" ) do
+      Configy.section.must_equal "production"
+    end
+  end
+
+  it "should be able to override" do
+    Configy.section = "custom"
+    Configy.section.must_equal "custom"
+  end
+end

metadata

@@ -1,21 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: configy
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
 - Gabe Varela
 - Ben Marini
 - Chip Miller
+- Bram Swenson
+- Jeremy Ruppel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-18 00:00:00.000000000 Z
+date: 2012-03-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70109332176180 !ruby/object:Gem::Requirement
+  requirement: &2155296220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +25,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70109332176180
+  version_requirements: *2155296220
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70109332175720 !ruby/object:Gem::Requirement
+  requirement: &2155295760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +36,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70109332175720
+  version_requirements: *2155295760
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70109332175340 !ruby/object:Gem::Requirement
+  requirement: &2155295380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,7 +47,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70109332175340
+  version_requirements: *2155295380
 description: 
 email: bmarini@gmail.com
 executables: []
@@ -72,15 +74,15 @@ files:
 - lib/generators/configy/install/templates/config/app_config.yml.tt
 - lib/generators/configy/install/templates/config/initializers/configy.rb.tt
 - lib/generators/configy_generator.rb
-- test/base_test.rb
-- test/config_file_test.rb
-- test/config_store_test.rb
-- test/configy_test.rb
-- test/load_path_test.rb
-- test/nested_config_test.rb
-- test/scratch/.gitkeep
-- test/section_test.rb
-- test/test_helper.rb
+- spec/base_spec.rb
+- spec/config_file_spec.rb
+- spec/config_store_spec.rb
+- spec/configy_spec.rb
+- spec/load_path_spec.rb
+- spec/nested_config_spec.rb
+- spec/scratch/.gitkeep
+- spec/section_spec.rb
+- spec/spec_helper.rb
 homepage: http://github.com/bmarini/configy
 licenses: []
 post_install_message: 
@@ -102,8 +104,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Simple yaml driven configuration gem
 test_files: []
+has_rdoc: 

data/test/configy_test.rb

@@ -1,49 +0,0 @@
-require 'test_helper'
-
-class ConfigyTest < MiniTest::Unit::TestCase
-
-  def setup
-    Configy.load_path    = scratch_dir
-    Configy.cache_config = nil
-  end
-
-  def test_camelize
-    assert_equal 'Config', Configy.camelize('config')
-    assert_equal 'SomeConfig', Configy.camelize('some_config')
-    assert_equal 'SomeOtherConfig', Configy.camelize('some-other_config')
-  end
-
-  def test_should_create_a_configuration_class_based_on_a_yaml_file
-    with_config_file( {'common' => {'a' => '1', 'b' => '2' }}, 'app_config' ) do |file, hash|
-      Configy.create('app_config')
-      assert Object.const_defined?(:AppConfig)
-      assert_equal AppConfig.b, '2'
-    end
-  end
-
-  def test_should_create_a_configuration_class_based_on_a_yaml_file_within_a_parent_module
-    with_config_file( {'common' => {'a' => '1', 'b' => '2' }}, 'app_config' ) do |file, hash|
-      Object.const_set('MyApp', Module)
-      Configy.create('app_config', MyApp)
-      assert MyApp.const_defined?(:AppConfig)
-      assert_equal MyApp::AppConfig.b, '2'
-    end
-  end
-
-  def test_cache_config_always_defaults_to_false
-    Configy.section = 'production'
-    assert_equal false, Configy.cache_config
-
-    Configy.section = 'development'
-    assert_equal false, Configy.cache_config
-  end
-
-  def test_should_be_able_to_manually_set_cache_config
-    Configy.cache_config = true
-    Configy.create('dummy')
-
-    assert_equal true, Configy.cache_config
-    assert_equal true, Dummy.cache_config?
-  end
-
-end

data/test/load_path_test.rb

@@ -1,32 +0,0 @@
-require 'test_helper'
-
-class LoadPathTest < MiniTest::Unit::TestCase
-  def setup
-    Configy.load_path = nil
-  end
-
-  def test_should_default_to_config
-    assert_equal "config", Configy.load_path
-  end
-
-  def test_should_detect_rails3_config_dir
-    rails3_obj = MiniTest::Mock.new
-    rails3_obj.expect :root, Pathname.new("path/to/rails/root")
-
-    with_const(:Rails, rails3_obj) do
-      assert_equal Rails.root.join("config"), Configy.load_path
-    end
-  end
-
-  def test_should_detect_rails2_config_dir
-    with_const( :RAILS_ROOT, "path/to/rails/root" ) do
-      assert_equal "#{RAILS_ROOT}/config", Configy.load_path
-    end
-  end
-
-  def test_should_detect_rack_config_dir
-    with_const( :RACK_ROOT, "path/to/rack/root" ) do
-      assert_equal "#{RACK_ROOT}/config", Configy.load_path
-    end
-  end
-end

data/test/nested_config_test.rb

@@ -1,23 +0,0 @@
-require 'test_helper'
-
-class NestedConfigTest < MiniTest::Unit::TestCase
-  def setup
-    Configy.load_path    = scratch_dir
-    Configy.cache_config = nil
-  end
-
-  def test_nested_configs_should_be_accessible_as_methods
-    with_config_file({
-      'common' => {
-        'level1' => {
-          'level2' => {
-            'level3' => 'whynot'
-          }
-        }
-      }
-    }, 'nested_config') do
-      Configy.create('nested_config')
-      assert_equal 'whynot', NestedConfig.level1.level2.level3
-    end
-  end
-end

data/test/section_test.rb

@@ -1,37 +0,0 @@
-require 'test_helper'
-
-class SectionTest < MiniTest::Unit::TestCase
-  def setup
-    Configy.section = nil
-  end
-
-  def test_should_default_to_development
-    assert_equal "development", Configy.section
-  end
-
-  def test_should_detect_rails3_environment
-    rails3_obj = MiniTest::Mock.new
-    rails3_obj.expect :env, "staging"
-
-    with_const(:Rails, rails3_obj) do
-      assert_equal "staging", Configy.section
-    end
-  end
-
-  def test_should_detect_rails2_environment
-    with_const( :RAILS_ENV, "test" ) do
-      assert_equal "test", Configy.section
-    end
-  end
-
-  def test_should_detect_rack_environment
-    with_const( :RACK_ENV, "production" ) do
-      assert_equal "production", Configy.section
-    end
-  end
-
-  def test_should_be_able_to_override
-    Configy.section = "custom"
-    assert_equal "custom", Configy.section
-  end
-end