theman 0.1.2 → 0.1.3

data/README.rdoc

@@ -10,7 +10,8 @@ Theman lets you import lots of data into PostgreSQL very fast.
 
 == Basic usage
 
-Say we have a csv file called <tt>sample.csv</tt> with 220 rows:
+Say we have a csv file called <tt>sample.csv</tt> and we want to count how many 
+rows we created:
 
   conn  = PGconn.open(:dbname => 'test')
   
@@ -38,7 +39,7 @@ Theman will call the <tt>create!</tt> method if you pass in a block.
 
   agent = Theman::Agency.new conn, 'ugly.csv' do |smith|
     smith.nulls /"N"/, /"UNKNOWN"/, /""/
-    smith.seds "-n -e :a -e '1,15!{P;N;D;};N;ba'"
+    smith.chop 15
     smith.delimiter "|"
     smith.table do |t|
       t.string :name, :limit => 50
@@ -117,10 +118,12 @@ dd/mm/yyyy
 
 mm/dd/yyyy
 
-== My table is empty?
+== Errors
 
 PostgreSQL <tt>COPY</tt> requires that the data be well formed, any rows that 
-are different to what is expected by the table and the whole import will fail. 
+are different to what is expected by the table the import will raise a 
+<tt>Theman::Agency::Error</tt>.
+
 If you are importing very large files and the import fails space on disc will still
 be used untill <tt>VACUUM</tt>.
 

data/lib/theman/agency.rb

@@ -77,6 +77,11 @@ module Theman
     def seds(*args)
       @seds = args
     end
+    
+    # line to finish copy at
+    def chop(line = 1)
+      @chop = line
+    end
 
     # delimter used in stream - comma is the default
     def delimiter(arg)
@@ -100,8 +105,13 @@ module Theman
     def sed_command(sed = []) #:nodoc:
       sed << nulls_to_sed unless @nulls.nil?
       sed << @seds unless @seds.nil?
+      sed << chop_to_sed unless @chop.nil?
       sed
     end
+    
+    def chop_to_sed #:nodoc:
+      "-n -e :a -e '1,#{@chop}!{P;N;D;};N;ba'"
+    end
 
     def nulls_to_sed #:nodoc:
       @nulls.map do |regex|
@@ -162,6 +172,25 @@ module Theman
         f.close
       end
       connection.put_copy_end
+      res = connection.get_result
+      status_code = res.result_status
+      if status_code != 1
+        raise Error.new status_code, res.res_status(status_code), res.result_error_message
+      end
+    end
+
+    class Error < Exception
+      attr_accessor :code, :constant, :error, :context
+
+      def initialize(code, constant, message)
+        @code = code
+        @constant = constant
+        @error, @context = message.split(/\n/)
+      end
+      
+      def to_s
+        @error
+      end
     end
   end
 end

data/lib/theman/version.rb

@@ -1,3 +1,3 @@
 module Theman
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/agency_spec.rb

@@ -6,7 +6,7 @@ describe Theman::Agency, "sed chomp" do
     csv   = File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec', 'fixtures', 'temp_two.csv'))
     
     agent = ::Theman::Agency.new conn, csv do |agent|
-      agent.seds "-n -e :a -e '1,15!{P;N;D;};N;ba'"
+      agent.chop 15
     end
 
     @model = Theman::Object.new(agent.table_name, ActiveRecord::Base)
@@ -123,7 +123,7 @@ describe Theman::Agency, "procedural" do
   it "should be able to be called procedural" do
     smith = ::Theman::Agency.new @conn, @csv
     smith.datestyle "European"
-    smith.seds "-n -e :a -e '1,15!{P;N;D;};N;ba'"
+    smith.chop 15
     smith.nulls /"XXXX"/
     
     smith.table do |t|
@@ -244,3 +244,18 @@ describe Theman::Agency, "data types" do
     end
   end
 end
+
+describe Theman::Agency, "data types" do
+  before do
+    @conn = ActiveRecord::Base.connection.raw_connection
+    @csv  = File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec', 'fixtures', 'temp_one.csv'))
+  end
+  
+  it "should raise an error if the columns are wrong" do
+    agent = ::Theman::Agency.new @conn, @csv
+    agent.table do |t|
+      t.date :column_not_in_csv
+    end
+    lambda{ @agent.create! }.should raise_error
+  end
+end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: theman
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Rufus Post
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-28 00:00:00 +11:00
+date: 2011-03-09 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 2
         - 0
@@ -58,7 +55,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 3
         - 0
@@ -74,7 +70,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -88,7 +83,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -143,7 +137,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -152,7 +145,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
       segments: 
       - 1
       - 3
@@ -161,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: theman
-rubygems_version: 1.5.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: PostgreSQL AR temporary table generator using PostgreSQL COPY