choices 0.3.2 → 0.4.0

data/Rakefile

@@ -1,2 +1,10 @@
 require 'bundler'
+require 'rake/testtask'
+
 Bundler::GemHelper.install_tasks
+
+Rake::TestTask.new do |t|
+end
+
+desc 'Run test suite'
+task :default => :test

data/lib/choices.rb

@@ -1,28 +1,31 @@
 require 'hashie/mash'
 require 'erb'
+require 'yaml'
 
 module Choices
   extend self
   
   def load_settings(filename, env)
-    mash = Hashie::Mash.new(load_settings_hash(filename, env))
+    mash = Hashie::Mash.new(load_settings_hash(filename))
     
-    with_local_settings(filename, env, '.local') do |local|
+    with_local_settings(filename, '.local') do |local|
       mash.update local
     end
-    
-    return mash
+
+    mash.fetch(env) do
+      raise IndexError, %{Missing key for "#{env}" in `#{filename}'}
+    end
   end
-  
-  def load_settings_hash(filename, env)
+
+  def load_settings_hash(filename)
     yaml_content = ERB.new(IO.read(filename)).result
-    yaml_load(yaml_content)[env]
+    yaml_load(yaml_content)
   end
   
-  def with_local_settings(filename, env, suffix)
+  def with_local_settings(filename, suffix)
     local_filename = filename.sub(/(\.\w+)?$/, "#{suffix}\\1")
     if File.exists? local_filename
-      hash = load_settings_hash(local_filename, env)
+      hash = load_settings_hash(local_filename)
       yield hash if hash
     end
   end

data/lib/choices/rails.rb

@@ -39,8 +39,8 @@ module Choices::Rails
   end
 end
 
-if defined? Rails::Application::Configuration
-  Rails::Application::Configuration.send(:include, Choices::Rails)
+if defined? Rails::Engine::Configuration
+  Rails::Engine::Configuration.send(:include, Choices::Rails)
 elsif defined? Rails::Configuration
   Rails::Configuration.class_eval do
     include Choices::Rails

data/test/settings/with_local.local.yml

@@ -0,0 +1,5 @@
+development:
+  name: 'Development'
+
+production:
+  name: 'Production local'

data/test/settings/with_local.yml

@@ -0,0 +1,6 @@
+defaults: &defaults
+  name: 'Defaults'
+
+production:
+  <<: *defaults
+

data/test/settings/without_local.yml

@@ -0,0 +1,13 @@
+defaults: &defaults
+  name: 'Defaults'
+
+development:
+  name: 'Development'
+
+production:
+  <<: *defaults
+  name: 'Production'
+
+test:
+  name: 'Test'
+

data/test/test_load_settings.rb

@@ -0,0 +1,32 @@
+gem 'minitest'
+require 'minitest/autorun'
+require 'choices'
+require 'pathname'
+
+describe Choices do
+  before do
+    path = Pathname.new(__FILE__)
+    @without_local = path + '../settings/without_local.yml'
+    @with_local = path + '../settings/with_local.yml'
+  end
+
+  describe 'when loading a settings file' do
+    it 'should return a mash for the specified environment' do
+      Choices.load_settings(@without_local, 'defaults').name.must_equal 'Defaults'
+      Choices.load_settings(@without_local, 'production').name.must_equal 'Production'
+    end
+
+    it 'should load the local settings' do
+      Choices.load_settings(@with_local, 'defaults').name.must_equal 'Defaults'
+      Choices.load_settings(@with_local, 'development').name.must_equal 'Development'
+      Choices.load_settings(@with_local, 'production').name.must_equal 'Production local'
+    end
+
+    it 'should raise an exception if the environment does not exist' do
+      error = lambda {
+        Choices.load_settings(@with_local, 'nonexistent')
+      }.must_raise(IndexError)
+      error.message.must_equal %{Missing key for "nonexistent" in `#{@with_local}'}
+    end
+  end
+end

metadata

@@ -2,14 +2,14 @@
 name: choices
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Mislav Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-03 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   prerelease: false
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.0
+- !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.0.6
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.0.6
 description: 
 email: mislav.marohnic@gmail.com
 executables: []
@@ -36,6 +52,10 @@ files:
 - Rakefile
 - lib/choices/rails.rb
 - lib/choices.rb
+- test/settings/with_local.local.yml
+- test/settings/with_local.yml
+- test/settings/without_local.yml
+- test/test_load_settings.rb
 - README.md
 - MIT-LICENSE
 homepage: https://github.com/mislav/choices
@@ -63,4 +83,5 @@ rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Easy settings for your app
-test_files: []
+test_files:
+- test/test_load_settings.rb