fig_newton 0.3 → 0.4

data/ChangeLog

@@ -1,3 +1,8 @@
+=== Version 0.4 / 2012-6-9
+* Fixes
+  * Updated yml_reader dependency to fix issue with using default directory
+  * Made change to the way files are read - default directory and file work properly now.
+
 === Version 0.3 / 2012-5-22
 * Enhancements
   * Added support for reading filename from environment variable FIG_NEWTON_FILE

data/README.md

@@ -16,9 +16,9 @@ FigNewton.load('system_test.yml')
 
 Next we simply begin calling methods on the FigNewton module that match our keys.  Let's assume the system_test.yml file contains the following entries:
 
-base_url:  http://system_test.mycompany.com
-database_user: cheezy
-database_password: secret
+    base_url:  http://system_test.mycompany.com
+    database_user: cheezy
+    database_password: secret
 
 In our code we can call methods that match the keys.  Here is an example PageObject where we are using the `base_url` entry:
 
@@ -37,6 +37,7 @@ default:  FIG_NEWTON_FILE=local.yml --color --format pretty
 ci:       FIG_NEWTON_FILE=ci.yml --color --format pretty
 test:     FIG_NEWTON_FILE=test.yml --color --format pretty
 staging:  FIG_NEWTON_FILE=staging.yml --color --format pretty
+````
 
 When you run the cucumber command you can easily select the correct profile which in turn will select the correct configuration file for your environment.
 

data/config/environments/default.yml

@@ -0,0 +1,2 @@
+base_url: 'http://cheezyworld.com'
+

data/features/fig_newton.feature

@@ -28,3 +28,9 @@ Feature: Functionality of the fig_newton gem
     And I ask for the node value for "second"
     Then the "third" value for the node should be "foo"
     And the "fourth" value for the node should be "bar"
+
+  Scenario: Using default directory and file
+    Given I have read the default file from the default directory
+    When I ask for the value for "base_url"
+    Then I should see "http://cheezyworld.com"
+    

data/features/step_definitions/fig_newton_steps.rb

@@ -1,7 +1,12 @@
 Given /^I have read the configuration file$/ do
+  FigNewton.yml_directory = 'config/yaml'
   FigNewton.load 'test_config.yml'
 end
 
+When /^I have read the default file from the default directory$/ do
+  FigNewton.yml = nil
+end
+
 When /^I ask for the value for "([^\"]*)"$/ do |key|
   @value = FigNewton.send key
 end
@@ -32,5 +37,6 @@ end
 
 Given /^I have an environment variable named "([^\"]*)" set to "([^\"]*)"$/ do |env_name, filename|
   ENV[env_name] = filename
+  FigNewton.yml_directory = 'config/yaml'
   FigNewton.instance_variable_set(:@yml, nil)
 end

data/features/support/env.rb

@@ -3,4 +3,9 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '../../', 'lib'))
 require 'rspec/expectations'
 require 'fig_newton'
 
-FigNewton.yml_directory = 'config/yaml'
+Before do
+  FigNewton.yml_directory = nil
+  ENV.delete 'FIG_NEWTON_FILE'
+end
+
+

data/fig_newton.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = FigNewton::VERSION
   
-  gem.add_dependency 'yml_reader', '>= 0.1'
+  gem.add_dependency 'yml_reader', '>= 0.2'
   
   gem.add_development_dependency 'rspec', '>= 2.8.0'
   gem.add_development_dependency 'cucumber', '>= 1.1.0'

data/lib/fig_newton/missing.rb

@@ -1,7 +1,7 @@
 module FigNewton
   module Missing
     def method_missing(*args, &block)
-      read_env_file unless @yml
+      read_file unless @yml
       m = args.first
       value = @yml[m.to_s]
       super unless value
@@ -9,8 +9,9 @@ module FigNewton
       value
     end
 
-    def read_env_file
-      @yml = YAML.load_file "#{@yml_directory}/#{ENV['FIG_NEWTON_FILE']}"
+    def read_file
+      @yml = YAML.load_file "#{@yml_directory}/#{ENV['FIG_NEWTON_FILE']}" if ENV['FIG_NEWTON_FILE']
+      FigNewton.load('default.yml') unless ENV['FIG_NEWTON_FILE']
     end
   end
 end

data/lib/fig_newton/version.rb

@@ -1,3 +1,3 @@
 module FigNewton
-  VERSION = "0.3"
+  VERSION = "0.4"
 end

data/lib/fig_newton.rb

@@ -7,8 +7,12 @@ module FigNewton
   extend YmlReader
   extend FigNewton::Missing
 
-  def self.default_directory
-    'config/environments'
-  end
 
+  class << self
+    attr_accessor :yml
+
+    def default_directory
+      'config/environments'
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fig_newton
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-22 00:00:00.000000000 Z
+date: 2012-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yml_reader
-  requirement: &70201006592140 !ruby/object:Gem::Requirement
+  requirement: &70200586622860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70201006592140
+  version_requirements: *70200586622860
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70201006591640 !ruby/object:Gem::Requirement
+  requirement: &70200586621460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70201006591640
+  version_requirements: *70200586621460
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70201006591180 !ruby/object:Gem::Requirement
+  requirement: &70200586620520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70201006591180
+  version_requirements: *70200586620520
 description: Provides a simple mechanism to maintain and use different configurations
   stored in yml files.
 email:
@@ -62,6 +62,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- config/environments/default.yml
 - config/yaml/sample.yml
 - config/yaml/test_config.yml
 - cucumber.yml