data_magic 0.17 → 0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81b0e8f317deaf614ba8cc6819d2548030bcb3bb
-  data.tar.gz: b27293e3d326a4a575417314cd1791e3c2b1d84a
+  metadata.gz: a04c1cb00c09395692bea5fc105c5ae9ee5eb390
+  data.tar.gz: e6b7181c7c446e504ff85e57f9b6b4496e16309a
 SHA512:
-  metadata.gz: b51f8804aa18e0583dd5b1c1f95e7a78c57f381445f68e5e7e1a5339b47018d4a375fc0ba694a0ffada2e7fda3eed1f278dc3ed698edbb7030c968f14b51f31e
-  data.tar.gz: 607ddbca817918b2eca1e26a4022c85e48b94ea203ac5536f9af9837076f6d7d508eea2749c9cba28331cfe828eb4df5c97b968e58ef4a7152ad0dfc49369315
+  metadata.gz: b35cd92595c0b2258cccd45cf5825ec668bea1c49d3bc01628f1f77a2b8be9ea8d60c8b24ccc063cd845f654f25f575efa8785621b6a5795bb4b9f7bf70ed4e7
+  data.tar.gz: 1b333b8c0d3230f392ca046e8c3019aef74bf85c9be1aea6ee027097241915dfaaa830943e955bc579cbae6e77492d271f0e341b9dc9337732c7b1551e534d45

data/ChangeLog

@@ -1,3 +1,9 @@
+=== Version 0.18 / 2014-3-2
+* Enhancements
+  * Can now set the file to be used by setting a DATA_MAGIC_FILE environment file
+* Fixes
+  * Only forcing available locales if it is available
+
 === Version 0.17 / 2014-1-22
 * Fixes
   * Eliminated the deprecation message from I18n

data/README.md

@@ -23,7 +23,9 @@ DataMagic.load 'filename.yml'
 
 If you do not specify a filename the gem will attempt to use a file named _default.yml_.  If you are using this for testing you will more than likely want to call load before each test to load the proper data for the specific test, or use the namespaced keys method, detailed below.
 
-The final thing to do is use the data.  The gem has a _data_for_ method that will return the data for a specific key.  The most common way to use this is to include the _DataMagic_ module in a [page-object](https://github.com/cheezy/page-object) and then populate a page with the data.  Here's an example:
+Another option is to set an environment variable DATA_MAGIC_FILE.  When this is set it will be used instead of the _default.yml_ file.
+
+The final thing to do is use the data.  The gem has a `data_for` method that will return the data for a specific key.  The most common way to use this is to include the _DataMagic_ module in a [page-object](https://github.com/cheezy/page-object) and then populate a page with the data.  Here's an example:
 
 ````ruby
 class MyPage

data/lib/data_magic.rb

@@ -10,7 +10,7 @@ module DataMagic
 
   attr_reader :parent
 
-  I18n.enforce_available_locales = false
+  I18n.enforce_available_locales = false if I18n.respond_to? :enforce_available_locales
 
   def self.included(cls)
     @parent = cls
@@ -25,7 +25,7 @@ module DataMagic
       DataMagic.load("#{filename}.yml")
     else
       record = key.to_s
-      DataMagic.load('default.yml') unless DataMagic.yml
+      DataMagic.load(the_file) unless DataMagic.yml
     end
     data = DataMagic.yml[record]
     raise ArgumentError, "Undefined key #{key}" unless data
@@ -34,6 +34,10 @@ module DataMagic
 
   private
 
+  def the_file
+    ENV['DATA_MAGIC_FILE'] ? ENV['DATA_MAGIC_FILE'] :  'default.yml'
+  end
+
   def prep_data(data)
     data.each do |key, value|
       unless value.nil?

data/lib/data_magic/version.rb

@@ -1,3 +1,3 @@
 module DataMagic
-  VERSION = "0.17"
+  VERSION = "0.18"
 end

data/spec/lib/data_magic_spec.rb

@@ -1,5 +1,9 @@
 require 'spec_helper'
 
+class UserPage
+  include DataMagic
+end
+
 describe DataMagic do
   context "when configuring the yml directory" do
     before(:each) do
@@ -22,14 +26,27 @@ describe DataMagic do
       YAML.should_receive(:load_file).with("test/fname").and_return({})
       DataMagic.load("fname")
     end
+
+    it "should default to reading a file named default.yml" do
+      DataMagic.yml_directory = 'config/data'
+      DataMagic.yml = nil
+      data = UserPage.new.data_for :dm
+      expect(data.keys).to include('value1')
+    end
+
+    it "should use the value of DATA_MAGIC_FILE if it exists" do
+      DataMagic.yml_directory = 'config/data'
+      DataMagic.yml = nil
+      ENV['DATA_MAGIC_FILE'] = 'user.yml'
+      data = UserPage.new.data_for "valid"
+      expect(data.keys.sort).to eq(['job','name'])
+      ENV['DATA_MAGIC_FILE'] = nil
+    end
   end
 
   context "namespaced keys" do
     it "loads correct file and retrieves data" do
       DataMagic.yml_directory = 'config/data'
-      class UserPage
-        include DataMagic
-      end
       data = UserPage.new.data_for "user/valid"
       expect(data.keys.sort).to eq(['job','name'])
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_magic
 version: !ruby/object:Gem::Version
-  version: '0.17'
+  version: '0.18'
 platform: ruby
 authors:
 - Jeff Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faker