fig_newton 0.7 → 0.8

data/.rvmrc

@@ -1 +1 @@
-rvm 1.9.3-p194@data_magic --create
+rvm 1.9.3-p392@fig_newton --create

data/ChangeLog

@@ -1,3 +1,7 @@
+=== Version 0.8 / 2013-3-28
+* Enhancements
+  * Added ability to provide default values for any element (Thanks Peter Hartman)
+
 === Version 0.7 / 2013-1-1
 * Enhancements
   * Added a to_hash method to Node

data/README.md

@@ -8,7 +8,9 @@ Manages configuration for test suites.  It is common to need different configura
 
 Using FigNewton is as simple as specifying the directory to use, loading a file from that directory, and then calling methods on the module that match the keys in the file.  Let's look at an example.
 
-By default the FigNewton gem will look for files in the 'config/environments' directory.  Let's assume that we have files named ci.yml, test.yml, and system_test.yml in that directory.  All we need to do is call the `load` method in order to begin using a file:
+By default the FigNewton gem will look for files in the 'config/environments' directory.  If you wish to use a different directory you simply set the correct directory like this - `FigNewton.yml_directory = 'other_directory'`.  
+
+By default, FigNewton will read a file named `default.yml` but you can name your _yml_ files anything you want.  Let's assume that we have files named ci.yml, test.yml, and system_test.yml in that directory.  All we need to do is call the `load` method in order to begin using a file:
 
 ````ruby
 FigNewton.load('system_test.yml')
@@ -30,6 +32,15 @@ class MyPage
 end
 ````
 
+We can also supply default values which will be returned if the property does not exist:
+````ruby
+class MyPage
+  include PageObject
+  
+  page_url "#{FigNewton.base_url("http://cheezyworld.com")}/my_page.html"
+end
+````
+
 If you have an environment variable `FIG_NEWTON_FILE` set then it will read that file by default.  This makes it easy to set the environment via your `cucumber.yml` file like this:
 
 ````
@@ -41,6 +52,8 @@ 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.
 
+Another way to set the file to use is to create a file based on the hostname of the computers on which it will run.  For example, if we have an environment named _development.mydomain.com_ and another environment named _test.mydomain.com_ and yet another named _systemtest.mydomain.com_ we can create files named the same as the domain with the yml extension.
+
 
 ## Installation
 

data/features/fig_newton.feature

@@ -53,4 +53,23 @@ Feature: Functionality of the fig_newton gem
       | username | steve  |
       | password | secret |
 
+  Scenario: Requesting data that does not exist but has a default value should return the default value
+    Given I have read the configuration file
+    When I ask for a value that does not exist named "does_not_exist" that has a default value "the default value"
+    Then I should see "the default value"
+  
+  Scenario: Requesting data that does not exist but has a default block should return the block result
+    Given I have read the configuration file
+    When I ask for a value that does not exist named "does_not_exist" that has a default block returning "the default value"
+    Then I should see "the default value"
+  
+  Scenario: Requesting data that does not exist but has a default lambda should return the lambda result
+    Given I have read the configuration file
+    When I ask for a value that does not exist named "does_not_exist" that has a default lambda returning "the default value"
+    Then I should see "the default value"
+    And the lambda should be passed the property "does_not_exist"
     
+  Scenario: Requesting data that does not exist but has a default proc should return the proc result
+    Given I have read the configuration file
+    When I ask for a value that does not exist named "does_not_exist" that has a default proc returning "the default value"
+    Then I should see "the default value"

data/features/step_definitions/fig_newton_steps.rb

@@ -60,3 +60,28 @@ end
 Then /^I should remove the file$/ do
   File.delete("config/yaml/#{@hostname}.yml")
 end
+
+When(/^I ask for a value that does not exist named "(.+)" that has a default value "(.+)"$/) do |key, value|
+  @value = FigNewton.send key, value
+end
+
+When(/^I ask for a value that does not exist named "(.+)" that has a default block returning "(.+)"$/) do |key, value|
+  @value = FigNewton.send(key) {
+    value
+  }    
+end
+
+When(/^I ask for a value that does not exist named "(.+)" that has a default lambda returning "(.+)"$/) do |key, value|
+  mylambda = lambda {|property| @lambda_property = property; return value}
+  @value = FigNewton.send key, &mylambda
+end
+
+When(/^I ask for a value that does not exist named "(.+)" that has a default proc returning "(.+)"$/) do |key, value|
+  myproc = Proc.new {value}
+  @value = FigNewton.send(key, &myproc)  
+end
+
+Then(/^the lambda should be passed the property "(.+)"$/) do |expected_property|
+  expect(@lambda_property).to eq(expected_property)
+end
+

data/lib/fig_newton/missing.rb

@@ -6,6 +6,8 @@ module FigNewton
       read_file unless @yml
       m = args.first
       value = @yml[m.to_s]
+      value = args[1] unless value
+      value = block.call(m.to_s) unless value or block.nil?
       super unless value
       value = FigNewton::Node.new(value) unless type_known? value
       value

data/lib/fig_newton/version.rb

@@ -1,3 +1,3 @@
 module FigNewton
-  VERSION = "0.7"
+  VERSION = "0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fig_newton
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: '0.8'
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-01 00:00:00.000000000 Z
+date: 2013-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yml_reader
@@ -107,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3950624979441891503
+      hash: -3441503605915492035
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -116,10 +116,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3950624979441891503
+      hash: -3441503605915492035
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Provides a simple mechanism to maintain and use different configurations