data_magic 0.2 → 0.3

data/ChangeLog

@@ -1,3 +1,6 @@
+=== Version 0.3 / 2012-2-5
+* Added additional data merge to #data_for
+
 === Version 0.2 / 2012-1-26
 * Defaulted yaml file to 'default.yaml'
 * Cloned hash so data can be reused

data/lib/data_magic.rb

@@ -8,10 +8,10 @@ require 'faker'
 module DataMagic
   include Translation
 
-  def data_for(key)
+  def data_for(key, additional={})
     DataMagic.load('default.yml') unless DataMagic.yml
     data = DataMagic.yml[key]
-    prep_data data.clone
+    prep_data data.merge(additional).clone
   end
 
   private

data/lib/data_magic/version.rb

@@ -1,3 +1,3 @@
 module DataMagic
-  VERSION = "0.2"
+  VERSION = "0.3"
 end

data/spec/lib/translation_spec.rb

@@ -17,7 +17,6 @@ describe "DataMagic translations" do
       example.data_for('key').should have_field_value 'value'
     end
 
-
     it "should default to use a file named 'default.yml'" do
       DataMagic::Config.yml_directory = 'test'
       YAML.should_receive(:load_file).with("test/default.yml").and_return({})
@@ -27,9 +26,19 @@ describe "DataMagic translations" do
     end
 
     it "should clone the data returned so it can be resued" do
+      yaml = double('yaml')
+      yaml.stub(:merge).and_return(yaml)
+      DataMagic.should_receive(:yml).twice.and_return(yaml)
+      yaml.should_receive(:[]).and_return(yaml)
+      yaml.should_receive(:clone).and_return({'field' => 'value'})
+      example.data_for('key').should have_field_value 'value'
+    end
+
+    it "should merge the provided data with the yaml data" do
       yaml = double('yaml')
       DataMagic.should_receive(:yml).twice.and_return(yaml)
       yaml.should_receive(:[]).and_return(yaml)
+      yaml.should_receive(:merge).and_return(yaml)
       yaml.should_receive(:clone).and_return({'field' => 'value'})
       example.data_for('key').should have_field_value 'value'
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_magic
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000 Z
+date: 2012-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &70313484608100 !ruby/object:Gem::Requirement
+  requirement: &70184023220840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70313484608100
+  version_requirements: *70184023220840
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70313484607300 !ruby/object:Gem::Requirement
+  requirement: &70184023220040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70313484607300
+  version_requirements: *70184023220040
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70313484606540 !ruby/object:Gem::Requirement
+  requirement: &70184023219280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70313484606540
+  version_requirements: *70184023219280
 description: Provides datasets to application stored in YAML files
 email:
 - jeff.morgan@leandog.com