theman 0.1.0 → 0.1.1

data/README.rdoc

@@ -2,7 +2,7 @@
 
 The man getting you down?
 
-Theman lets you import lots of data into postgres very fast.
+Theman lets you import lots of data into PostgreSQL very fast.
 
 == Installation
 
@@ -36,7 +36,7 @@ Say we have a csv file called <tt>sample.csv</tt> with 220 rows:
 
 == Advanced usage with Active Record and an existing model
 
-Theman will call the +create!+ method if you pass in a block.
+Theman will call the <tt>create!</tt> method if you pass in a block.
 
   conn  = ActiveRecord::Base.connection.raw_connection
 
@@ -58,28 +58,26 @@ Theman will call the +create!+ method if you pass in a block.
   
   => 220
 
-In the above example we omitted the last 15 rows, made some things null, 
-added a primary key and changed some column data types to something else.
+In the above example we omitted the last 15 rows, made some things null and 
+specified some column data types.
 
 If you do not provide a table block your columns will be VARCHAR(255); you 
 can cherry pick the columns that you want to change the data types for.
 
-The temp table has no id column by default, but you can add one using the options 
-hash or calling +add_primary_key+, this will add the agents_pkey column.
-
-WARNING: if you have user input in your sed commands, don't.
+The temp table has no id column by default, but you can add one by calling 
++add_primary_key!+, this will add the +agents_pkey+ column.
 
 == Drop on commit
 
 If you want to use <tt>ON COMMIT DROP</tt> you will need to pass in 
 <tt>:on_commit => :drop</tt> into options and do everthing inside a transacton.
 
-    agent = Theman::Agency.new conn, csv, :on_commit => :drop
+  agent = Theman::Agency.new conn, 'sample.csv', :on_commit => :drop
 
-    agent.transaction do
-      agent.create!
-      # do stuff
-    end
+  agent.transaction do
+    agent.create!
+    # do stuff
+  end
 
 == No headers
 

data/lib/theman/agency/columns.rb

@@ -35,6 +35,10 @@ module Theman
         end
         @columns << [sym_col, type, *args]
       end
+
+      def include?(sym_col)
+        @columns.map{|column| column[0] }.include?(sym_col)
+      end
       
       def column_to_sql(name, type, options = {}) #:nodoc
         sql = [quote_column_name(name)]

data/lib/theman/agency.rb

@@ -125,9 +125,11 @@ module Theman
       pipe_it
     end
     
-    # adds a serial column called agents_pkey and sets as primary key
+    # adds a serial column called id and sets as primary key
+    # if your data allready has a column called id the column will be called agents_pkey
     def add_primary_key!
-      connection.exec "ALTER TABLE #{table_name} ADD COLUMN agents_pkey serial PRIMARY KEY;"
+      name = @columns.include?(:id) ? "agents_pkey" : "id"
+      connection.exec "ALTER TABLE #{table_name} ADD COLUMN #{name} serial PRIMARY KEY;"
     end
     
     # analyzes the table for efficent query contstruction on tables larger than ~1000 tuples

data/lib/theman/version.rb

@@ -1,3 +1,3 @@
 module Theman
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/agency_spec.rb

@@ -168,7 +168,7 @@ describe Theman::Agency, "add primary key" do
   end
 
   it "should have serial primary key" do
-    @model.first.agents_pkey.should == 1
+    @model.first.id.should == 1
   end
 end
 

data/spec/columns_spec.rb

@@ -73,3 +73,15 @@ describe Theman::Agency::Columns, "data types" do
     @columns.to_sql.should == "\"col_one\" boolean"
   end
 end
+
+describe Theman::Agency::Columns, "data types" do
+  before do
+    @columns = Theman::Agency::Columns.new(ActiveRecord::Base.connection.raw_connection)
+  end
+
+  it "should have include? method" do
+    @columns.boolean :col_one
+    @columns.include?(:col_one).should be_true
+    @columns.include?(:col_two).should be_false
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Rufus Post
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-15 00:00:00 +11:00
+date: 2011-02-18 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency