data_magic 1.1 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e67b1c5429e8be13be3e344f6ab716a89a26fef2
-  data.tar.gz: 31127c9fe43eb08a7c92abf59a11516d97fce262
+  metadata.gz: e231dc9f35e689aab2f2e5558e962db909db8a54
+  data.tar.gz: 5756c7b84233f4bec53aa8b99bf1cf932cc55ba3
 SHA512:
-  metadata.gz: 625b4ddb46b5f191f1e1dd6f8daa547368385596253bccf090ed704a9e1b79701bce94135dadbba670c805726e1285e7b79461492e5b8db628c58cf7866625e4
-  data.tar.gz: 18ccb17574943c342f5cbe5aad0fb66f364ef2b1a48dd7c94ef66dedec822a9c3de97f31e15b1a8fabed4d6de4135c387063859f0539a13e72cbd15a8c8ade4b
+  metadata.gz: 67be3b00d42169891f063df7f0ec40cdf26811958855cb094e2a345e25ea6afe7f642aa7c55ce671f8cad2250b74fa1d92a71bc238796dde343b0eb203902a82
+  data.tar.gz: 3735825cd564df1788fe528b2bfca277afc147b859d9d91a26eadf3dcf8da8dc6916b39bd1cb5433eed35e91446b7546b6ebb08f066dad9d7eedb764fc506c11

data/.ruby-version

@@ -1 +1 @@
-ruby-2.1.2
+ruby-2.2.7

data/ChangeLog

@@ -1,3 +1,8 @@
+== Version 1.2 / 2017-09-23
+* Enhancements
+  * Data is translated each time a request is made for data (Thanks Vveliev)
+  * Array handling and translation (Thanks Vveliev)
+
 == Version 1.1 / 2016-08-03
 * Fixes
   * Update so it works well on Ruby 2.4 (thanks Robert MacCracken)

data/README.md

@@ -136,7 +136,9 @@ The rdocs for this project can be found at [rubydoc.info](http://rubydoc.info/gi
 
 To see the changes from release to release please look at the [ChangeLog](https://raw.github.com/cheezy/data_magic/master/ChangeLog)
 
+## Older versions of Ruby:
 
+This gem only works with Ruby >= 2.2. Use versions 1.1 or below if you have an older Ruby.
 
 ## Known Issues
 

data/data_magic.gemspec

@@ -11,12 +11,14 @@ Gem::Specification.new do |gem|
   gem.homepage      = "http://github.com/cheezy/data_magic"
   gem.summary       = %q{Provides datasets to application via YAML files}
   gem.description   = %q{Provides datasets to application stored in YAML files}
-  
+
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths = ["lib"]
-  
+
+  gem.required_ruby_version = '>= 2.2'
+
   gem.add_dependency 'faker', '>= 1.1.2'
   gem.add_dependency 'yml_reader', '>= 0.6'
 

data/lib/data_magic.rb

@@ -1,7 +1,8 @@
 require 'data_magic/core_ext/string'
 require 'data_magic/core_ext/integer'
-require "data_magic/version"
-require "data_magic/translation"
+require 'data_magic/core_ext/hash'
+require 'data_magic/version'
+require 'data_magic/translation'
 require 'data_magic/date_translation'
 require 'data_magic/standard_translation'
 require 'yml_reader'
@@ -19,7 +20,7 @@ module DataMagic
   def self.locale=(value)
     Faker::Config.locale = value
   end
-  
+
   def self.included(cls)
     @parent = cls
     translators.each do |translator|
@@ -37,7 +38,7 @@ module DataMagic
     end
     data = DataMagic.yml[record]
     raise ArgumentError, "Undefined key #{key}" unless data
-    additional.key?(record) ? prep_data(data.merge(additional[record]).clone) : prep_data(data.merge(additional).clone)
+    prep_data(data.merge(additional.key?(record) ? additional[record] : additional).deep_copy)
   end
 
   # Given a scenario, load any fixture it needs.
@@ -54,25 +55,25 @@ module DataMagic
   private
 
   def the_file
-    ENV['DATA_MAGIC_FILE'] ? ENV['DATA_MAGIC_FILE'] :  'default.yml'
+    ENV['DATA_MAGIC_FILE'] ? ENV['DATA_MAGIC_FILE'] : 'default.yml'
   end
 
   def prep_data(data)
-    data.each do |key, value|
-      unless value.nil?
-        next if !value.respond_to?('[]') || value.is_a?(Numeric)
-        if value.is_a?(Hash)
-          data[key] = prep_data(value)
-        else  
-          data[key] = translate(value[1..-1]) if value[0,1] == "~"
-        end
-      end
+    case data
+      when Hash
+        data.each {|key, value| data[key] = prep_data(value)}
+      when Array
+        data.each_with_index{|value, i|  data[i] = prep_data(value)}
+      when String
+        return translate(data[1..-1]) if data[0, 1] == '~'
     end
     data
   end
 
   def translate(value)
     translation.send :process, value
+  rescue => error
+    fail "Failed to translate: #{value}\n Reason: #{error.message}\n"
   end
 
   def translation
@@ -88,12 +89,12 @@ module DataMagic
   def self.fixture_files_on(scenario)
     # tags for cuke 2, source_tags for cuke 1
     tags = scenario.send(scenario.respond_to?(:tags) ? :tags : :source_tags)
-    tags.map(&:name).select { |t| t =~ /@datamagic_/ }.map { |t| t.gsub('@datamagic_', '').to_sym }
+    tags.map(&:name).select {|t| t =~ /@datamagic_/}.map {|t| t.gsub('@datamagic_', '').to_sym}
   end
 
   class << self
     attr_accessor :yml
-  
+
     def default_directory
       'config/data'
     end

data/lib/data_magic/core_ext/hash.rb

@@ -0,0 +1,5 @@
+class Hash
+  def deep_copy
+    Marshal.load(Marshal.dump(self))
+  end
+end

data/lib/data_magic/version.rb

@@ -1,3 +1,3 @@
 module DataMagic
-  VERSION = "1.1"
+  VERSION = "1.2"
 end

data/spec/lib/translation_spec.rb

@@ -1,17 +1,12 @@
 require 'spec_helper'
-
-class TestSubject
-  include DataMagic
-end
-
 describe "DataMagic translations" do
   context "when delivering data" do
-    let(:example) { TestSubject.new }
+    let(:example) { (Class.new { include DataMagic }).new }
 
     def set_field_value(value)
       expect(DataMagic).to receive(:yml).twice.and_return({'key' => {'field' => value}})
     end
-    
+
     it "should deliver the hash from the yaml" do
       set_field_value 'value'
       expect(example.data_for('key')).to have_field_value 'value'
@@ -39,7 +34,7 @@ describe "DataMagic translations" do
       expect(yaml).to receive(:merge).and_return(yaml)
       expect(DataMagic).to receive(:yml).twice.and_return(yaml)
       expect(yaml).to receive(:[]).and_return(yaml)
-      expect(yaml).to receive(:clone).and_return({'field' => 'value'})
+      expect(yaml).to receive(:deep_copy).and_return({'field' => 'value'})
       expect(example.data_for('key')).to have_field_value 'value'
     end
 
@@ -48,7 +43,7 @@ describe "DataMagic translations" do
       expect(DataMagic).to receive(:yml).twice.and_return(yaml)
       expect(yaml).to receive(:[]).and_return(yaml)
       expect(yaml).to receive(:merge).and_return(yaml)
-      expect(yaml).to receive(:clone).and_return({'field' => 'value'})
+      expect(yaml).to receive(:deep_copy).and_return({'field' => 'value'})
       expect(example.data_for('key')).to have_field_value 'value'
     end
 
@@ -170,7 +165,7 @@ describe "DataMagic translations" do
         expect(example.data_for('key')).to have_field_value 'very_cheezy'
       end
     end
-    
+
     context "translating phone numbers" do
       it "shold add a phone number" do
         expect(Faker::PhoneNumber).to receive(:phone_number).and_return('555-555-5555')
@@ -312,5 +307,18 @@ describe "DataMagic translations" do
         expect(example.data_for('key')).to have_field_value the_date.strftime('%D')
       end
     end
+    context "should fail when translation call methos is not defined" do
+      it "should fail if method does not exist" do
+        set_field_value '~non_existing_method'
+        expect{example.data_for('key')}.to raise_error(/non_existing_method/)
+      end
+    end
+
+    context "array translation test" do
+      it "should be able to translate " do
+        set_field_value ["~'user' + 'name'", 'second']
+        expect(example.data_for('key')).to have_field_value ['username','second']
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -14,8 +14,9 @@ require 'rspec'
 require 'data_magic'
 
 RSpec::Matchers.define :have_field_value do |expected|
+  supports_block_expectations
   match do |actual|
-    actual['field'] == expected
+    actual['field'] === expected
   end
   
   failure_message do |actual|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_magic
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '1.2'
 platform: ruby
 authors:
 - Jeff Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-03 00:00:00.000000000 Z
+date: 2017-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faker
@@ -95,6 +95,7 @@ files:
 - features/yaml/another.yml
 - features/yaml/example.yml
 - lib/data_magic.rb
+- lib/data_magic/core_ext/hash.rb
 - lib/data_magic/core_ext/integer.rb
 - lib/data_magic/core_ext/string.rb
 - lib/data_magic/date_translation.rb
@@ -116,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="