postgres-copy 0.3.2 → 0.3.3

data/Gemfile

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

data/Gemfile.lock

@@ -1,21 +1,78 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
+    abstract (1.0.0)
+    actionmailer (3.0.6)
+      actionpack (= 3.0.6)
+      mail (~> 2.2.15)
+    actionpack (3.0.6)
+      activemodel (= 3.0.6)
+      activesupport (= 3.0.6)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.6)
+      activesupport (= 3.0.6)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.6)
+      activemodel (= 3.0.6)
+      activesupport (= 3.0.6)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activesupport (3.0.3)
-    arel (2.0.6)
+    activeresource (3.0.6)
+      activemodel (= 3.0.6)
+      activesupport (= 3.0.6)
+    activesupport (3.0.6)
+    arel (2.0.9)
     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)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
     pg (0.10.1)
-    tzinfo (0.3.23)
+    polyglot (0.3.1)
+    rack (1.2.2)
+    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)
+      bundler (~> 1.0)
+      railties (= 3.0.6)
+    railties (3.0.6)
+      actionpack (= 3.0.6)
+      activesupport (= 3.0.6)
+      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)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.5.0)
+    thor (0.14.6)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.26)
 
 PLATFORMS
   ruby
@@ -23,3 +80,7 @@ PLATFORMS
 DEPENDENCIES
   activerecord
   pg
+  rails
+  rake
+  rspec (~> 2.5)
+  rspec-core (~> 2.5)

data/Rakefile

@@ -19,26 +19,16 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+require "rspec/core/rake_task" # RSpec 2.0
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = 'spec/*_spec.rb'
+  spec.rspec_opts = ["--backtrace", "--color", "--format progress", "-r ./spec/spec_helper.rb"]
 end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :spec => :check_dependencies
-
 task :default => :spec
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "activerecord-postgres-copy #{version}"
   rdoc.rdoc_files.include('README*')

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/lib/postgres-copy/active_record.rb

@@ -33,7 +33,7 @@ module ActiveRecord
         if block_given?
           row = line.strip.split(options[:delimiter])
           yield(row)
-          line = row.join(options[:delimiter])
+          line = row.join(options[:delimiter]) + "\n"
         end
         connection.raw_connection.put_copy_data line
       end

data/postgres-copy.gemspec

@@ -1,60 +1,59 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{postgres-copy}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Diogo Biazus"]
-  s.date = %q{2011-03-17}
+  s.date = %q{2011-04-11}
   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 = [
     "LICENSE",
-     "README.md"
+    "README.md"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "Gemfile",
-     "Gemfile.lock",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "lib/postgres-copy.rb",
-     "lib/postgres-copy/active_record.rb",
-     "lib/postgres-copy/csv_responder.rb",
-     "lib/postgres-copy/zip_responder.rb",
-     "postgres-copy.gemspec",
-     "spec/fixtures/extra_field.rb",
-     "spec/fixtures/semicolon_with_different_header.csv",
-     "spec/fixtures/semicolon_with_header.csv",
-     "spec/fixtures/tab_only_data.csv",
-     "spec/fixtures/tab_with_different_header.csv",
-     "spec/fixtures/tab_with_error.csv",
-     "spec/fixtures/tab_with_extra_line.csv",
-     "spec/fixtures/tab_with_header.csv",
-     "spec/fixtures/test_model.rb",
-     "spec/pg_copy_from_spec.rb",
-     "spec/pg_copy_to_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "lib/postgres-copy.rb",
+    "lib/postgres-copy/active_record.rb",
+    "lib/postgres-copy/csv_responder.rb",
+    "lib/postgres-copy/zip_responder.rb",
+    "postgres-copy.gemspec",
+    "spec/fixtures/extra_field.rb",
+    "spec/fixtures/semicolon_with_different_header.csv",
+    "spec/fixtures/semicolon_with_header.csv",
+    "spec/fixtures/tab_only_data.csv",
+    "spec/fixtures/tab_with_different_header.csv",
+    "spec/fixtures/tab_with_error.csv",
+    "spec/fixtures/tab_with_extra_line.csv",
+    "spec/fixtures/tab_with_header.csv",
+    "spec/fixtures/tab_with_two_lines.csv",
+    "spec/fixtures/test_model.rb",
+    "spec/pg_copy_from_spec.rb",
+    "spec/pg_copy_to_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/diogob/postgres-copy}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Put COPY command functionality in ActiveRecord's model class}
   s.test_files = [
-    "spec/spec_helper.rb",
-     "spec/pg_copy_from_spec.rb",
-     "spec/pg_copy_to_spec.rb",
-     "spec/fixtures/test_model.rb",
-     "spec/fixtures/extra_field.rb"
+    "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
@@ -62,13 +61,31 @@ Gem::Specification.new do |s|
     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<rspec>, ["~> 2.5"])
+      s.add_runtime_dependency(%q<rspec-core>, ["~> 2.5"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0"])
     else
+      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<rspec>, ["~> 2.5"])
+      s.add_dependency(%q<rspec-core>, ["~> 2.5"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<activerecord>, [">= 3.0.0"])
     end
   else
+    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<rspec>, ["~> 2.5"])
+    s.add_dependency(%q<rspec-core>, ["~> 2.5"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<activerecord>, [">= 3.0.0"])
   end

data/spec/fixtures/tab_with_two_lines.csv

@@ -0,0 +1,3 @@
+id	data
+1	test data 1
+2	test data 2

data/spec/pg_copy_from_spec.rb

@@ -35,6 +35,14 @@ describe "COPY FROM" do
     TestModel.order(:id).all.map{|r| r.attributes}.should == [{'id' => 1, 'data' => 'changed this data'}]
   end
 
+  it "should import 2 lines and allow changes in block" do
+    TestModel.pg_copy_from(File.open(File.expand_path('spec/fixtures/tab_with_two_lines.csv'), 'r')) do |row|
+      row[1] = 'changed this data'
+    end
+    TestModel.order(:id).first.attributes.should == {'id' => 1, 'data' => 'changed this data'}
+    TestModel.count.should == 2
+  end
+
   it "should be able to copy from using custom set of columns" do
     TestModel.pg_copy_from(File.open(File.expand_path('spec/fixtures/tab_only_data.csv'), 'r'), :columns => ["data"])
     TestModel.order(:id).all.map{|r| r.attributes}.should == [{'id' => 1, 'data' => 'test data 1'}]

data/spec/spec_helper.rb

@@ -2,10 +2,10 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'fixtures/test_model'
 require 'fixtures/extra_field'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
+require 'rspec/autorun'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.before(:suite) do
     # we create a test database if it does not exist
     # I do not use database users or password for the tests, using ident authentication instead

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: postgres-copy
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Diogo Biazus
@@ -15,13 +15,100 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-17 00:00:00 -03:00
+date: 2011-04-11 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: pg
+  version_requirements: &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
+  name: activerecord
+  version_requirements: &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
+  name: rails
+  version_requirements: &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
+  name: rake
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
   name: rspec
+  version_requirements: &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
+  name: rspec-core
+  version_requirements: &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
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: rspec
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,12 +119,12 @@ dependencies:
         - 2
         - 9
         version: 1.2.9
-  type: :development
-  version_requirements: *id001
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  name: activerecord
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: activerecord
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -48,8 +135,7 @@ dependencies:
         - 0
         - 0
         version: 3.0.0
-  type: :runtime
-  version_requirements: *id002
+  requirement: *id008
 description: Now you can use the super fast COPY for import/export data directly from your AR models.
 email: diogob@gmail.com
 executables: []
@@ -61,7 +147,6 @@ extra_rdoc_files:
 - README.md
 files: 
 - .document
-- .gitignore
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -81,6 +166,7 @@ files:
 - spec/fixtures/tab_with_error.csv
 - spec/fixtures/tab_with_extra_line.csv
 - spec/fixtures/tab_with_header.csv
+- spec/fixtures/tab_with_two_lines.csv
 - spec/fixtures/test_model.rb
 - spec/pg_copy_from_spec.rb
 - spec/pg_copy_to_spec.rb
@@ -91,8 +177,8 @@ homepage: http://github.com/diogob/postgres-copy
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -121,8 +207,8 @@ signing_key:
 specification_version: 3
 summary: Put COPY command functionality in ActiveRecord's model class
 test_files: 
-- spec/spec_helper.rb
+- spec/fixtures/extra_field.rb
+- spec/fixtures/test_model.rb
 - spec/pg_copy_from_spec.rb
 - spec/pg_copy_to_spec.rb
-- spec/fixtures/test_model.rb
-- spec/fixtures/extra_field.rb
+- spec/spec_helper.rb

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC