populator 0.2.1 → 0.2.2

data/CHANGELOG

@@ -1,3 +1,9 @@
+*0.2.2* (September 1st, 2008)
+
+* performance improvements
+
+* improving inline documentation
+
 *0.2.1* (August 30th, 2008)
 
 * wrap sqlite inserts in transaction to improve performance
@@ -10,9 +16,9 @@
 
 * improving performance when nesting factories
 
-* adding Populate.sentences to generate a lot of text
+* adding Populator.sentences to generate a lot of text
 
-* adding Populate.words to fetch some random words
+* adding Populator.words to fetch some random words
 
 *0.1.0* (August 27th, 2008)
 

data/Manifest

@@ -9,6 +9,7 @@ lib/populator.rb
 LICENSE
 Manifest
 populator.gemspec
+Rakefile
 README
 spec/database.yml
 spec/example_database.yml

data/README

@@ -10,7 +10,7 @@ this code is loosely based on.
 
 Install the gem:
 
-	gem install ryanb-populator --source http://gems.github.com
+  gem install populator
 
 And then load it in your project:
 
@@ -64,7 +64,7 @@ If you need to generate fake data, there are a few methods to do this.
 
 For fancier data generation, try the Faker gem.
 
-  http://faker.rubyforge.org
+http://faker.rubyforge.org
 
 
 == Important
@@ -80,7 +80,7 @@ See spec/README for instructions on running specs.
 
 This project can be found on github at the following URL.
 
-http://github.com/ryanb/populator/
+http://github.com/ryanb/populator
 
 If you would like to contribute to this project, please fork the 
 repository and send me a pull request.

data/Rakefile

@@ -2,13 +2,13 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('populator', '0.2.1') do |p|
+Echoe.new('populator', '0.2.2') do |p|
   p.summary        = "Mass populate an Active Record database."
   p.description    = "Mass populate an Active Record database."
   p.url            = "http://github.com/ryanb/populator"
   p.author         = 'Ryan Bates'
   p.email          = "ryan (at) railscasts (dot) com"
-  p.ignore_pattern = ["script/*", "**/*.sqlite3"]
+  p.ignore_pattern = ["script/*", "**/*.sqlite3", "tmp/*"]
 end
 
 Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }

data/TODO

@@ -8,8 +8,6 @@ Possible
 - add random_foo method to record for randomly generating content
 
 Performance
-- ruby-prof to see where the bottlenecks are
-- benchmark to find faster solutions
 - ensure instantiating the model is really that much of a performance hit.
 
 Support Environments

data/lib/populator.rb

@@ -6,3 +6,7 @@ require 'populator/random'
 
 require 'populator/adapters/abstract'
 require 'populator/adapters/sqlite'
+
+# Populator is made up of several parts. To start, see Populator::ModelAdditions.
+module Populator
+end

data/lib/populator/adapters/abstract.rb

@@ -13,6 +13,6 @@ module Populator
   end
 end
 
-class ActiveRecord::ConnectionAdapters::AbstractAdapter
+ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval do
   include Populator::Adapters::Abstract
 end

data/lib/populator/adapters/sqlite.rb

@@ -21,6 +21,11 @@ module Populator
   end
 end
 
-class ActiveRecord::ConnectionAdapters::SQLiteAdapter < ActiveRecord::ConnectionAdapters::AbstractAdapter
-  include Populator::Adapters::Sqlite
+# TODO find a better way to load the SQLite adapter
+module ActiveRecord # :nodoc: all
+  module ConnectionAdapters
+    class SQLiteAdapter < ActiveRecord::ConnectionAdapters::AbstractAdapter
+      include Populator::Adapters::Sqlite
+    end
+  end
 end

data/lib/populator/factory.rb

@@ -1,14 +1,19 @@
 module Populator
+  # Builds multiple Populator::Record instances and saves them to the database
   class Factory
     DEFAULT_RECORDS_PER_QUERY = 1000
     
     @factories = {}
     @depth = 0
     
+    # Fetches the factory dedicated to a given model class. You should always use this
+    # method instead of instatiating a factory directly so that a single factory is
+    # shared on multiple calls.
     def self.for_model(model_class)
       @factories[model_class] ||= new(model_class)
     end
     
+    # Find all remaining factories and call save_records on them.
     def self.save_remaining_records
       @factories.values.each do |factory|
         factory.save_records
@@ -16,6 +21,9 @@ module Populator
       @factories = {}
     end
     
+    # Keep track of nested factory calls so we can save the remaining records once we
+    # are done with the base factory. This makes Populator more efficient when nesting
+    # factories.
     def self.remember_depth
       @depth += 1
       yield
@@ -23,17 +31,21 @@ module Populator
       save_remaining_records if @depth.zero?
     end
     
+    # Use for_model instead of instatiating a record directly.
     def initialize(model_class)
       @model_class = model_class
       @records = []
     end
     
+    # Entry method for building records. Delegates to build_records after remember_depth.
     def populate(amount, options = {}, &block)
       self.class.remember_depth do
         build_records(Populator.interpret_value(amount), options[:per_query] || DEFAULT_RECORDS_PER_QUERY, &block)
       end
     end
     
+    # Builds multiple Populator::Record instances and calls save_records them when
+    # :per_query limit option is reached.
     def build_records(amount, per_query, &block)
       amount.times do
         record = Record.new(@model_class, last_id_in_database + @records.size + 1)
@@ -43,6 +55,7 @@ module Populator
       end
     end
     
+    # Saves the records to the database by calling populate on the current database adapter.
     def save_records
       unless @records.empty?
         @model_class.connection.populate(@model_class.quoted_table_name, columns_sql, rows_sql_arr, "#{@model_class.name} Populate")

data/lib/populator/model_additions.rb

@@ -1,11 +1,32 @@
 module Populator
   module ModelAdditions
+    # Call populate on any ActiveRecord model to fill it with data.
+    # Pass the number of records you want to create, and a block to
+    # set the attributes. You can nest calls to handle associations
+    # and use ranges or arrays to randomize the values.
+    #
+    #   Person.populate(3000) do |person|
+    #     person.name = "John Doe"
+    #     person.gender = ['male', 'female']
+    #     Project.populate(10..30, :per_query => 100) do |project|
+    #       project.person_id = person.id
+    #       project.due_at = 5.days.from_now..2.years.from_now
+    #       project.name = Populator.words(1..3).titleize
+    #       project.description = Populator.sentences(2..10)
+    #     end
+    #   end
+    #
+    # The following options are supported.
+    #
+    # * <tt>:per_query</tt> - limit how many records are inserted per query, defaults to 1000
+    #
+    # Populator::Factory is where all the work happens.
     def populate(amount, options = {}, &block)
       Factory.for_model(self).populate(amount, options, &block)
     end
   end
 end
 
-class ActiveRecord::Base
+ActiveRecord::Base.class_eval do
   extend Populator::ModelAdditions
 end

data/lib/populator/random.rb

@@ -1,7 +1,10 @@
 module Populator
+  # This module adds several methods for generating random data which can be
+  # called directly on Populator.
   module Random
     WORDS = %w(alias consequatur aut perferendis sit voluptatem accusantium doloremque aperiam eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo aspernatur aut odit aut fugit sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt neque dolorem ipsum quia dolor sit amet consectetur adipisci velit sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem ut enim ad minima veniam quis nostrum exercitationem ullam corporis nemo enim ipsam voluptatem quia voluptas sit suscipit laboriosam nisi ut aliquid ex ea commodi consequatur quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae et iusto odio dignissimos ducimus qui blanditiis praesentium laudantium totam rem voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident sed ut perspiciatis unde omnis iste natus error similique sunt in culpa qui officia deserunt mollitia animi id est laborum et dolorum fuga et harum quidem rerum facilis est et expedita distinctio nam libero tempore cum soluta nobis est eligendi optio cumque nihil impedit quo porro quisquam est qui minus id quod maxime placeat facere possimus omnis voluptas assumenda est omnis dolor repellendus temporibus autem quibusdam et aut consequatur vel illum qui dolorem eum fugiat quo voluptas nulla pariatur at vero eos et accusamus officiis debitis aut rerum necessitatibus saepe eveniet ut et voluptates repudiandae sint et molestiae non recusandae itaque earum rerum hic tenetur a sapiente delectus ut aut reiciendis voluptatibus maiores doloribus asperiores repellat)
     
+    # Pick a random value out of a given range.
     def value_in_range(range)
       case range.first
       when Integer then number_in_range(range)
@@ -11,16 +14,22 @@ module Populator
       end
     end
     
+    # Generate a given number of words. If a range is passed, it will generate
+    # a random number of words within that range.
     def words(total)
       (1..interpret_value(total)).map { WORDS.rand }.join(' ')
     end
     
+    # Generate a given number of sentences. If a range is passed, it will generate
+    # a random number of sentences within that range.
     def sentences(total)
       (1..interpret_value(total)).map do
         words(5..20).capitalize
       end.join('. ')
     end
     
+    # If an array or range is passed, a random value will be selected to match.
+    # All other values are simply returned.
     def interpret_value(value)
       case value
       when Array then value.rand

data/lib/populator/record.rb

@@ -1,7 +1,15 @@
 module Populator
+  # This is what is passed to the block when calling populate.
   class Record
     attr_accessor :attributes
     
+    # Creates a new instance of Record. Some attributes are set by default:
+    #
+    # * <tt>id</tt> - defaults to id passed
+    # * <tt>created_at</tt> - defaults to current time
+    # * <tt>updated_at</tt> - defaults to current time
+    # * <tt>created_on</tt> - defaults to current date
+    # * <tt>updated_on</tt> - defaults to current date
     def initialize(model_class, id)
       @attributes = { :id => id }
       @columns = model_class.column_names
@@ -12,22 +20,34 @@ module Populator
         if column == 'created_on' || column == 'updated_on'
           @attributes[column.to_sym] = Date.today
         end
-        self.instance_eval <<-EOS
-          def #{column}=(value)
-            @attributes[:#{column}] = Populator.interpret_value(value)
-          end
-          
-          def #{column}
-            @attributes[:#{column}]
-          end
-        EOS
       end
     end
     
+    # override id since method_missing won't catch this column name
+    def id
+      @attributes[:id]
+    end
+    
+    # Return values for all columns inside an array.
     def attribute_values
       @columns.map do |column|
         @attributes[column.to_sym]
       end
     end
+    
+    private
+    
+    def method_missing(sym, *args, &block)
+      name = sym.to_s
+      if @columns.include?(name.sub('=', ''))
+        if name.include? '='
+          @attributes[name.sub('=', '').to_sym] = Populator.interpret_value(args.first)
+        else
+          @attributes[sym]
+        end
+      else
+        super
+      end
+    end
   end
 end

data/populator.gemspec

@@ -1,11 +1,11 @@
 
-# Gem::Specification for Populator-0.2.1
+# Gem::Specification for Populator-0.2.2
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: populator
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Ryan Bates
@@ -57,6 +57,7 @@ files:
 - LICENSE
 - Manifest
 - populator.gemspec
+- Rakefile
 - README
 - spec/database.yml
 - spec/example_database.yml
@@ -72,7 +73,6 @@ files:
 - tasks/deployment.rake
 - tasks/spec.rake
 - TODO
-- Rakefile
 has_rdoc: true
 homepage: http://github.com/ryanb/populator
 post_install_message: 

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@ require 'active_record'
 require File.dirname(__FILE__) + '/../lib/populator.rb'
 
 adapter = ENV['POPULATOR_ADAPTER'] || 'sqlite3'
-puts "Running specs on #{adapter}"
+puts "Running on #{adapter}"
 
 # setup database adapter
 ActiveRecord::Base.establish_connection(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: populator
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Ryan Bates
@@ -54,6 +54,7 @@ files:
 - LICENSE
 - Manifest
 - populator.gemspec
+- Rakefile
 - README
 - spec/database.yml
 - spec/example_database.yml
@@ -69,7 +70,6 @@ files:
 - tasks/deployment.rake
 - tasks/spec.rake
 - TODO
-- Rakefile
 has_rdoc: true
 homepage: http://github.com/ryanb/populator
 post_install_message: