dummy 0.5.2 → 0.6

data/CHANGELOG.md

@@ -27,7 +27,29 @@ Features:
 
 Features:
   - added tests for the data generators and rails generator
-  - fixed multiple bugs and added small improvements
+  - small improvements
   - added documentation
   
+Fixes:
+  - various minor bugs
+  
+## 0.5.1 (July 29, 2010)
+
+Fixes:
+  - fixed a bug where magic integers were being returned as strings
+  
+## 0.5.2 (July 30, 2010)
+
+Features:
+  - added option to manually configure the amount of records to generate for each model
+  
+## 0.6 (July 31, 2010)
+
+Features:
+  - added option to define the output folder where the YAML files are placed
+  
+Fixes:
+  - Removed unused core extensions (for now)
+  - fixed some outdated tests
+  
 

data/README.md

@@ -18,8 +18,15 @@ Add the following to the Gemfile of your Rails 3 application:
 Now you have access to the generator:
     rails generate dummy:data
     
-You can also change the base amount of records and the growth ratio (what these mean exactly is explained latter on):
-    rails generate dummy:data --base-amount=5 --growth-ratio=1.5
+You can change the base amount of records and the growth ratio (what these mean exactly is explained latter on):
+    rails generate dummy:data --base-amount 5 --growth-ratio 1.5
+    
+Also, you can manually define the amount of records to generate for each model (or just accept the defaults):
+    rails generate dummy:data --manual-amounts
+    
+And you can manually set the output folder for the YAML files (which defaults to test/dummy/data):
+    rails generate dummy:data --output-folder test/awesome_fixtures
+
     
 The fixtures are stored in _test/dummy/_ while a rake file is placed in _lib/tasks/dummy.rake_. It allows you to import the generated data into the database:
     RAILS_ENV="dummy" rake dummy:data:import
@@ -32,11 +39,11 @@ Another less conventional way of using dummy is to directly use its magic data g
 Example:
     require "dummy"
     
-    Dummy.magic_data("mail", :string) => "nyasia@hotmail.com" 
-    Dummy.magic_data("company_motto", :string) => "engineer intuitive functionalities" 
-    Dummy.magic_data("state", :string) => "Louisiana" 
-    Dummy.magic_data("lat", :float) => -86.718683637 
-    Dummy.magic_data("phone", :integer) => "9462876293" 
+    Dummy.magic_data("mail", :string) => "nyasia@hotmail.com"
+    Dummy.magic_data("company_motto", :string) => "engineer intuitive functionalities"
+    Dummy.magic_data("state", :string) => "Louisiana"
+    Dummy.magic_data("lat", :float) => -86.718683637
+    Dummy.magic_data("phone", :integer) => 9462876293
 
 
 ## More information

data/lib/dummy/address.rb

@@ -3,7 +3,7 @@ module Dummy
     extend self
     
     def zip_code
-      Dummy.numerify ZIP_FORMATS.rand
+      ZIP_FORMATS.rand.numerify
     end
 
     def us_state
@@ -28,7 +28,7 @@ module Dummy
     def street_address
       str = ("#" * rand(3)) << "### #{street_name}"
 
-      Dummy.numerify(str)
+      str.numerify
     end
 
     def neighborhood

data/lib/dummy/core_ext/array.rb

@@ -0,0 +1,5 @@
+class Array
+  def rand
+    self[super(self.length)]
+  end
+end

data/lib/dummy/core_ext/string.rb

@@ -0,0 +1,5 @@
+class String
+  def numerify
+    gsub(/#/) { rand(10).to_s }
+  end
+end

data/lib/dummy/core_ext.rb

@@ -0,0 +1,2 @@
+require "dummy/core_ext/array"
+require "dummy/core_ext/string"

data/lib/dummy/phone_number.rb

@@ -3,7 +3,7 @@ module Dummy
     extend self
 
     def phone_number
-      Dummy.numerify case rand(20)
+      format = case rand(20)
       when      0 then "###-###-#### x#####"
       when      1 then "###-###-#### x####"
       when      2 then "###-###-#### x###"
@@ -21,10 +21,12 @@ module Dummy
       when     17 then "1-###-###-#### x###"
       when 18..19 then "1-###-###-####"
       end
+      
+      format.numerify
     end
 
     def phone_number_short
-      Dummy.numerify("###-###-####")
+      "###-###-####".numerify
     end
   end
 end

data/lib/dummy.rb

@@ -1,4 +1,5 @@
 require "rubygems"
+require "dummy/core_ext"
 require "dummy/address"
 require "dummy/company"
 require "dummy/internet"
@@ -10,18 +11,6 @@ require "generators/dummy_generator"
 
 module Dummy
   class << self
-
-    def numerify(number_string)
-      number_string.gsub(/#/) { rand(10).to_s }
-    end
-
-    def letterify(letter_string)
-      letter_string.gsub(/\?/) { ("a".."z").to_a.rand }
-    end
-
-    def bothify(string)
-      letterify(numerify(string))
-    end
     
     def magic_data(field, type)
       case type
@@ -122,7 +111,7 @@ module Dummy
         (z = z.to_i + 10000) if z[0] == "0"
         z.to_i
       when /street|road|address|residence|residency/
-        Dummy.numerify(("#" * rand(3)) << "###").to_i
+        (("#" * rand(3)) << "###").numerify.to_i
       else
         rand(1000)
       end
@@ -147,15 +136,8 @@ module Dummy
       when /^(.*[-_:+ ])*(lon|lng)/ then
         Dummy::Geolocation.lng
       else 
-        Dummy.numerify(("#" * rand(4)) << "#.#" << ("#" * rand(8))).to_f
+        (("#" * rand(4)) << "#.#" << ("#" * rand(8))).numerify.to_f
       end
     end
   end
 end
-
-class Array
-  def rand
-    self[super(self.length)]
-  end
-end
-

data/lib/generators/dummy_generator.rb

@@ -15,6 +15,8 @@ module Dummy
                 :desc => "The growth ratio of each model, according to its associations."
     class_option :manual_amounts, :type => :boolean, :default => false,
                 :desc => "Manually set the amount of records for each model."
+    class_option :output_folder, :type => :string, :default => "test/dummy/data",
+                :desc => "Folder to use when outputting the resulting YAML files."
 
     def install_dummy
       initialize_application
@@ -111,7 +113,7 @@ module Dummy
     end
 
     def generate_and_write_data
-      empty_directory "test/dummy"
+      empty_directory options.output_folder
       data = Hash.new
 
       @models.each do |model, info|
@@ -138,7 +140,7 @@ module Dummy
         
         content << YAML.dump(fixtures)
         
-        create_file "test/dummy/#{name}.yml", content
+        create_file "#{options.output_folder}/#{name}.yml", content
       end
       say_status :successful, "store fixtures"
     end
@@ -185,7 +187,7 @@ module Dummy
     end
 
     def copy_rake_file
-      copy_file "dummy.rake", "lib/tasks/dummy.rake"
+      template "dummy.rake", "lib/tasks/dummy.rake"
     end
   end
 end

data/lib/generators/templates/dummy.rake

@@ -5,7 +5,7 @@ namespace :dummy do
     desc "Load the generated dummy data into the current environment's database."
     task :import => :environment do
       Fixtures.reset_cache
-      fixtures_folder = File.join(Rails.root, 'test', 'dummy')
+      fixtures_folder = File.join(Rails.root, "<%= options.output_folder %>")
       fixtures = Dir[File.join(fixtures_folder, '*.yml')].map {|f| File.basename(f, '.yml') }
       Fixtures.create_fixtures(fixtures_folder, fixtures)
     end

metadata

@@ -4,9 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 2
-  version: 0.5.2
+  - 6
+  version: "0.6"
 platform: ruby
 authors: 
 - "Gon\xC3\xA7alo Silva"
@@ -14,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-30 00:00:00 +01:00
+date: 2010-07-31 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,10 +42,13 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/dummy/core_ext.rb
 - lib/dummy/lorem.rb
 - lib/dummy/address.rb
 - lib/dummy/company.rb
 - lib/dummy/name.rb
+- lib/dummy/core_ext/string.rb
+- lib/dummy/core_ext/array.rb
 - lib/dummy/internet.rb
 - lib/dummy/geolocation.rb
 - lib/dummy/phone_number.rb