populator 0.2.2 → 0.2.3

data/CHANGELOG

@@ -1,16 +1,22 @@
-*0.2.2* (September 1st, 2008)
+0.2.3 (September 2nd, 2008)
+
+* support single table inhertance by setting inheritance_column to class name
+
+* support custom primary_key in model if they don't use "id"
+
+0.2.2 (September 1st, 2008)
 
 * performance improvements
 
 * improving inline documentation
 
-*0.2.1* (August 30th, 2008)
+0.2.1 (August 30th, 2008)
 
 * wrap sqlite inserts in transaction to improve performance
 
 * default created_at/on and updated_at/on columns to current time
 
-*0.2.0* (August 30th, 2008)
+0.2.0 (August 30th, 2008)
 
 * adding :per_query option to limit how many inserts are made per query
 
@@ -20,6 +26,6 @@
 
 * adding Populator.words to fetch some random words
 
-*0.1.0* (August 27th, 2008)
+0.1.0 (August 27th, 2008)
 
 * initial release

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('populator', '0.2.2') do |p|
+Echoe.new('populator', '0.2.3') 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"

data/TODO

@@ -1,9 +1,6 @@
 Features
-- get single table inheritance working.
 
 Possible
-- iterate through array instead of selecting at random to ensure all values are chosen
-- if hash is passed, apply given value that number of times: { 'foo' => 3, 'bar' => 2 }
 - randomly fill every column if no block is passed to populate
 - add random_foo method to record for randomly generating content
 

data/lib/populator/record.rb

@@ -10,15 +10,18 @@ module Populator
     # * <tt>updated_at</tt> - defaults to current time
     # * <tt>created_on</tt> - defaults to current date
     # * <tt>updated_on</tt> - defaults to current date
+    # * <tt>type</tt> - defaults to class name (for STI)
     def initialize(model_class, id)
-      @attributes = { :id => id }
+      @attributes = { model_class.primary_key.to_sym => id }
       @columns = model_class.column_names
       @columns.each do |column|
-        if column == 'created_at' || column == 'updated_at'
+        case column
+        when 'created_at', 'updated_at'
           @attributes[column.to_sym] = Time.now
-        end
-        if column == 'created_on' || column == 'updated_on'
+        when 'created_on', 'updated_on'
           @attributes[column.to_sym] = Date.today
+        when model_class.inheritance_column
+          @attributes[column.to_sym] = model_class.to_s
         end
       end
     end
@@ -28,6 +31,11 @@ module Populator
       @attributes[:id]
     end
     
+    # override type since method_missing won't catch this column name
+    def type
+      @attributes[:type]
+    end
+    
     # Return values for all columns inside an array.
     def attribute_values
       @columns.map do |column|

data/populator.gemspec

@@ -1,18 +1,18 @@
 
-# Gem::Specification for Populator-0.2.2
+# Gem::Specification for Populator-0.2.3
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: populator
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Ryan Bates
 autorequire: 
 bindir: bin
 
-date: 2008-09-01 00:00:00 -07:00
+date: 2008-09-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 

data/spec/database.yml

@@ -1,5 +1,3 @@
-# you can add and remove entries to support different databases in tests.
-
 sqlite3:
   adapter: sqlite3
   database: spec/test.sqlite3
@@ -11,3 +9,10 @@ mysql:
   username: populator
   password: 
   host: localhost
+
+postgresql:
+  adapter: postgresql
+  database: populator_test
+  username: populator
+  password: populator
+  host: localhost

data/spec/populator/record_spec.rb

@@ -41,4 +41,21 @@ describe Populator::Record do
     record.created_on.should == Date.today
     record.updated_on.should == Date.today
   end
+  
+  it "should use custom primary_key for auto-increment if specified" do
+    Product.stubs(:primary_key).returns('foo')
+    Product.stubs(:column_names).returns(['foo', 'name'])
+    Populator::Record.new(Product, 123).foo.should == 123
+  end
+  
+  it "should default type to class name" do
+    Product.stubs(:column_names).returns(['id', 'type'])
+    Populator::Record.new(Product, 1).type.should == 'Product'
+  end
+  
+  it "should default specified inheritance_column to class name" do
+    Product.stubs(:inheritance_column).returns('foo')
+    Product.stubs(:column_names).returns(['id', 'foo'])
+    Populator::Record.new(Product, 1).foo.should == 'Product'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: populator
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Ryan Bates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-01 00:00:00 -07:00
+date: 2008-09-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency