data_magic 0.13 → 0.14

data/ChangeLog

@@ -1,3 +1,10 @@
+=== Version 0.14 / 2013-2-14
+* Enhancements
+  * Added months_abbr translator
+  * Added day_of_week translator
+  * Added day_of_week_abbr translator
+  * Changed so translator methods are not call after mixing with class
+
 === Version 0.13 / 2013-2-7
 * Enhancements
   * Added add_translator method to DataMagic to allow custom translators to be added

data/features/data_magic.feature

@@ -94,6 +94,15 @@ Feature: Functionality of the data_magic gem
 
   Scenario: Getting a random month name
     Then the value for "some_month" should be a valid month
+    
+  Scenario: Getting a random month abbreviation
+    Then the value for "month_abbr" should be a valid month abbreviation
+
+  Scenario: Getting a random day name
+    Then the value for "some_day" should be a valid day
+
+  Scenario: Getting a random day abbreviation
+    Then the value for "day_abbr" should be a valid day abbreviation
 
   Scenario: It should allow one to add new translator methods
     When I add the blah translator

data/features/step_definitions/data_magic_steps.rb

@@ -103,6 +103,20 @@ Then /^the value for "(.*?)" should be a valid month$/ do |key|
   months.should include @data[key]
 end
 
+Then /^the value for "(.*?)" should be a valid month abbreviation$/ do |key|
+  months = %w[Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec]
+  months.should include @data[key]
+end
+
+Then /^the value for "(.*?)" should be a valid day$/ do |key|
+  days = %w[Sunday Monday Tuesday Wednesday Thursday Friday Saturday]
+  days.should include @data[key]
+end
+
+Then /^the value for "(.*?)" should be a valid day abbreviation$/ do |key|
+  days = %w[Sun Mon Tue Wed Thu Fri Sat]
+  days.should include @data[key]
+end
 
 When /^I add the blah translator$/ do
   module Blah

data/features/yaml/example.yml

@@ -40,6 +40,9 @@ dm:
   5daysfromtoday: ~5.days_from_today
   5daysago: ~5.days_ago
   some_month: ~month
+  month_abbr: ~month_abbr
+  some_day: ~day_of_week
+  day_abbr: ~day_of_week_abbr
 
 dynamic:
   blah: ~blah

data/lib/data_magic.rb

@@ -2,19 +2,15 @@ require 'data_magic/core_ext/string'
 require 'data_magic/core_ext/fixnum'
 require "data_magic/version"
 require "data_magic/translation"
-require "data_magic/date_translation"
 require 'yml_reader'
-
 require 'faker'
 
 module DataMagic
-  include Translation
-  include DateTranslation
   extend YmlReader
 
   def self.included(cls)
     translators.each do |translator|
-      cls.send :include, translator
+      Translation.send :include, translator
     end
   end
 
@@ -30,12 +26,16 @@ module DataMagic
     data.each do |key, value|
       unless value.nil?
         next unless value.respond_to? '[]'
-        data[key] = eval(value[1..-1]) if value[0,1] == "~"
+        data[key] = translate(value[1..-1]) if value[0,1] == "~"
       end
     end
     data
   end
 
+  def translate(value)
+    Translation.new.send :process, value
+  end
+
   class << self
     attr_accessor :yml
   

data/lib/data_magic/date_translation.rb

@@ -40,5 +40,34 @@ module DataMagic
       yesterday.strftime(format)
     end
     alias_method :dm_yesterday, :yesterday
+
+    #
+    # return a month
+    #
+    def month
+      randomize(Date::MONTHNAMES[1..-1])
+    end
+    alias_method :dm_month, :month
+
+    #
+    # return a month abbreviation
+    #
+    def month_abbr
+      randomize(Date::ABBR_MONTHNAMES[1..-1])
+    end
+    alias_method :dm_month_abbr, :month_abbr
+
+    #
+    # return a day of the week
+    #
+    def day_of_week
+      randomize(Date::DAYNAMES)
+    end
+    alias_method :dm_day_of_week, :day_of_week
+
+    def day_of_week_abbr
+      randomize(Date::ABBR_DAYNAMES)
+    end
+    alias_method :dm_day_of_week_abbr, :day_of_week_abbr
   end
 end

data/lib/data_magic/translation.rb

@@ -1,5 +1,9 @@
+require 'data_magic/date_translation'
+
 module DataMagic
-  module Translation
+  class Translation
+    include DateTranslation
+    
     #
     # return a random name (first and last)
     #
@@ -243,12 +247,14 @@ module DataMagic
     end
     alias_method :dm_mask, :mask
 
-    def month
-      randomize(%w[January February March April May June July August September October November December])
-    end
+
 
     private
 
+    def process(value)
+      eval value
+    end
+
     def remove_extension(phone)
       index = phone.index('x')
       phone = phone[0, (index-1)] if index

data/lib/data_magic/version.rb

@@ -1,3 +1,3 @@
 module DataMagic
-  VERSION = "0.13"
+  VERSION = "0.14"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_magic
 version: !ruby/object:Gem::Version
-  version: '0.13'
+  version: '0.14'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faker
@@ -124,7 +124,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2833217716898042459
+      hash: 2289410552337863128
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2833217716898042459
+      hash: 2289410552337863128
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24