postgres-copy 0.3.3 → 0.3.4

data/Gemfile

@@ -3,6 +3,6 @@ source :gemcutter
 gem 'pg'
 gem 'activerecord'
 gem 'rails'
-gem 'rake'
+gem 'rake', '0.8.7'
 gem 'rspec', '~> 2.5'
 gem 'rspec-core', '~> 2.5'

data/Gemfile.lock

@@ -2,12 +2,12 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.6)
-      actionpack (= 3.0.6)
+    actionmailer (3.0.7)
+      actionpack (= 3.0.7)
       mail (~> 2.2.15)
-    actionpack (3.0.6)
-      activemodel (= 3.0.6)
-      activesupport (= 3.0.6)
+    actionpack (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)
@@ -15,64 +15,64 @@ GEM
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.6)
-      activesupport (= 3.0.6)
+    activemodel (3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.6)
-      activemodel (= 3.0.6)
-      activesupport (= 3.0.6)
+    activerecord (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.6)
-      activemodel (= 3.0.6)
-      activesupport (= 3.0.6)
-    activesupport (3.0.6)
-    arel (2.0.9)
+    activeresource (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+    activesupport (3.0.7)
+    arel (2.0.10)
     builder (2.1.2)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     i18n (0.5.0)
-    mail (2.2.15)
+    mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    pg (0.10.1)
+    pg (0.11.0)
     polyglot (0.3.1)
-    rack (1.2.2)
+    rack (1.2.3)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.6)
-      actionmailer (= 3.0.6)
-      actionpack (= 3.0.6)
-      activerecord (= 3.0.6)
-      activeresource (= 3.0.6)
-      activesupport (= 3.0.6)
+    rails (3.0.7)
+      actionmailer (= 3.0.7)
+      actionpack (= 3.0.7)
+      activerecord (= 3.0.7)
+      activeresource (= 3.0.7)
+      activesupport (= 3.0.7)
       bundler (~> 1.0)
-      railties (= 3.0.6)
-    railties (3.0.6)
-      actionpack (= 3.0.6)
-      activesupport (= 3.0.6)
+      railties (= 3.0.7)
+    railties (3.0.7)
+      actionpack (= 3.0.7)
+      activesupport (= 3.0.7)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
-    rake (0.8.7)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
+    rake (0.9.0)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.3)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
+    rspec-mocks (2.6.0)
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.26)
+    tzinfo (0.3.27)
 
 PLATFORMS
   ruby

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/lib/postgres-copy/active_record.rb

@@ -27,7 +27,7 @@ module ActiveRecord
       line = io.gets
       columns_list = options[:columns] || line.strip.split(options[:delimiter])
       columns_list = columns_list.map{|c| options[:map][c.to_s] } if options[:map]
-      connection.execute "COPY #{quoted_table_name} (#{columns_list.join(",")}) FROM STDIN WITH DELIMITER '#{options[:delimiter]}' CSV"
+      connection.execute %{COPY #{quoted_table_name} ("#{columns_list.join('","')}") FROM STDIN WITH DELIMITER '#{options[:delimiter]}' CSV}
       while line = io.gets do
         next if line.strip.size == 0
         if block_given?

data/postgres-copy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{postgres-copy}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Diogo Biazus"]
-  s.date = %q{2011-04-11}
+  s.date = %q{2011-05-26}
   s.description = %q{Now you can use the super fast COPY for import/export data directly from your AR models.}
   s.email = %q{diogob@gmail.com}
   s.extra_rdoc_files = [
@@ -30,6 +30,8 @@ Gem::Specification.new do |s|
     "lib/postgres-copy/zip_responder.rb",
     "postgres-copy.gemspec",
     "spec/fixtures/extra_field.rb",
+    "spec/fixtures/reserved_word_model.rb",
+    "spec/fixtures/reserved_words.csv",
     "spec/fixtures/semicolon_with_different_header.csv",
     "spec/fixtures/semicolon_with_header.csv",
     "spec/fixtures/tab_only_data.csv",
@@ -46,25 +48,17 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/diogob/postgres-copy}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.7.2}
   s.summary = %q{Put COPY command functionality in ActiveRecord's model class}
-  s.test_files = [
-    "spec/fixtures/extra_field.rb",
-    "spec/fixtures/test_model.rb",
-    "spec/pg_copy_from_spec.rb",
-    "spec/pg_copy_to_spec.rb",
-    "spec/spec_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<pg>, [">= 0"])
       s.add_runtime_dependency(%q<activerecord>, [">= 0"])
       s.add_runtime_dependency(%q<rails>, [">= 0"])
-      s.add_runtime_dependency(%q<rake>, [">= 0"])
+      s.add_runtime_dependency(%q<rake>, ["= 0.8.7"])
       s.add_runtime_dependency(%q<rspec>, ["~> 2.5"])
       s.add_runtime_dependency(%q<rspec-core>, ["~> 2.5"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
@@ -73,7 +67,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<pg>, [">= 0"])
       s.add_dependency(%q<activerecord>, [">= 0"])
       s.add_dependency(%q<rails>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<rake>, ["= 0.8.7"])
       s.add_dependency(%q<rspec>, ["~> 2.5"])
       s.add_dependency(%q<rspec-core>, ["~> 2.5"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
@@ -83,7 +77,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<pg>, [">= 0"])
     s.add_dependency(%q<activerecord>, [">= 0"])
     s.add_dependency(%q<rails>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<rake>, ["= 0.8.7"])
     s.add_dependency(%q<rspec>, ["~> 2.5"])
     s.add_dependency(%q<rspec-core>, ["~> 2.5"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])

data/spec/fixtures/reserved_word_model.rb

@@ -0,0 +1,5 @@
+require 'postgres-copy'
+
+class ReservedWordModel < ActiveRecord::Base
+end
+

data/spec/fixtures/reserved_words.csv

@@ -0,0 +1,2 @@
+id	select	group
+1	test select	group name

data/spec/pg_copy_from_spec.rb

@@ -74,5 +74,10 @@ describe "COPY FROM" do
     end.should raise_error
     TestModel.order(:id).all.map{|r| r.attributes}.should == []
   end
+
+  it "should copy from even when table fields need identifier quoting" do
+    ReservedWordModel.pg_copy_from File.expand_path('spec/fixtures/reserved_words.csv')
+    ReservedWordModel.order(:id).all.map{|r| r.attributes}.should == [{"group"=>"group name", "id"=>1, "select"=>"test select"}]
+  end
 end
 

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'fixtures/test_model'
 require 'fixtures/extra_field'
+require 'fixtures/reserved_word_model'
 require 'rspec'
 require 'rspec/autorun'
 
@@ -19,11 +20,13 @@ RSpec.configure do |config|
         SET client_min_messages TO warning;
         DROP TABLE IF EXISTS test_models; 
         DROP TABLE IF EXISTS extra_fields; 
+        DROP TABLE IF EXISTS reserved_word_models; 
         CREATE TABLE test_models (id serial PRIMARY KEY, data text);
+        CREATE TABLE reserved_word_models (id serial PRIMARY KEY, "select" text, "group" text);
         CREATE TABLE extra_fields (id serial PRIMARY KEY, data text, created_at timestamp, updated_at timestamp);
 }
     rescue Exception => e
-      puts "RESCUE"
+      puts "Exception: #{e}"
       ActiveRecord::Base.establish_connection(
         :adapter  => "postgresql",
         :host     => "localhost",

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: postgres-copy
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 3
-  version: 0.3.3
+  prerelease: 
+  version: 0.3.4
 platform: ruby
 authors: 
 - Diogo Biazus
@@ -15,127 +10,96 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-11 00:00:00 -03:00
-default_executable: 
+date: 2011-05-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
   name: pg
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: activerecord
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rails
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rake
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+        version: 0.8.7
   type: :runtime
   prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: rspec
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 5
         version: "2.5"
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: rspec-core
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 5
         version: "2.5"
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
-  type: :development
+  type: :runtime
   prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: rspec
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 2
-        - 9
         version: 1.2.9
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
-  type: :runtime
+  type: :development
   prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: activerecord
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
-  requirement: *id008
+  type: :runtime
+  prerelease: false
+  version_requirements: *id008
 description: Now you can use the super fast COPY for import/export data directly from your AR models.
 email: diogob@gmail.com
 executables: []
@@ -159,6 +123,8 @@ files:
 - lib/postgres-copy/zip_responder.rb
 - postgres-copy.gemspec
 - spec/fixtures/extra_field.rb
+- spec/fixtures/reserved_word_model.rb
+- spec/fixtures/reserved_words.csv
 - spec/fixtures/semicolon_with_different_header.csv
 - spec/fixtures/semicolon_with_header.csv
 - spec/fixtures/tab_only_data.csv
@@ -172,7 +138,6 @@ files:
 - spec/pg_copy_to_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/diogob/postgres-copy
 licenses: []
 
@@ -186,29 +151,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Put COPY command functionality in ActiveRecord's model class
-test_files: 
-- spec/fixtures/extra_field.rb
-- spec/fixtures/test_model.rb
-- spec/pg_copy_from_spec.rb
-- spec/pg_copy_to_spec.rb
-- spec/spec_helper.rb
+test_files: []
+