using primary_key instead of literal 'id' so custom primary key works

TODO

@@ -2,8 +2,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
 

lib/populator/record.rb

@@ -11,7 +11,7 @@ class Record
     # * <tt>created_on</tt> - defaults to current date
     # * <tt>updated_on</tt> - defaults to current date
     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'
@@ -39,9 +39,10 @@ def attribute_values
 
     def method_missing(sym, *args, &block)
       name = sym.to_s
-      if @columns.include?(name.sub('=', ''))
+      name_without_equal = name.sub('=', '')
+      if @columns.include?(name_without_equal) || @attributes.has_key?(name_without_equal.to_sym)
         if name.include? '='
-          @attributes[name.sub('=', '').to_sym] = Populator.interpret_value(args.first)
+          @attributes[name_without_equal.to_sym] = Populator.interpret_value(args.first)
         else
           @attributes[sym]
         end

spec/populator/record_spec.rb

@@ -41,4 +41,9 @@
     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')
+    Populator::Record.new(Product, 123).foo.should == 123
+  end
 end