cartodb-importer 0.2.2 → 0.2.3

data/cartodb-importer.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.name        = "cartodb-importer"
   s.version     = CartoDB::Importer::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Fernando Blat"]
-  s.email       = ["ferblape@gmail.com"]
+  s.authors     = ["Fernando Blat", "Andrew Hill", "Javier de la Torre"]
+  s.email       = ["andrew@vizzuality.com"]
   s.homepage    = ""
   s.summary     = %q{Import CSV, SHP, and other files with data into a PostgreSQL table}
   s.description = %q{Import CSV, SHP, and other files with data into a PostgreSQL table}
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_runtime_dependency "pg", "0.11"
+  s.add_runtime_dependency "pg", '~> 0.11'
   s.add_runtime_dependency "sequel"
   s.add_runtime_dependency "roo"
   s.add_runtime_dependency "spreadsheet"

data/lib/cartodb-importer/importer.rb

@@ -150,7 +150,7 @@ module CartoDB
         random_table_name = "importing_#{Time.now.to_i}_#{@suggested_name}"
 
         normalizer_command = "#{python_bin_path} -Wignore #{File.expand_path("../../../misc/shp_normalizer.py", __FILE__)} #{path} #{random_table_name}"
-        shp_args_command = `#{normalizer_command}`
+        shp_args_command = `#{normalizer_command}` 
         if shp_args_command.strip.blank?
         raise "Error running python shp_normalizer script: #{normalizer_command}"
         end
@@ -159,7 +159,7 @@ module CartoDB
         %x[#{full_shp_command}]
 
         @db_connection.run("CREATE TABLE #{@suggested_name} AS SELECT * FROM #{random_table_name}")
-        @db_connection.run("DROP TABLE #{random_table_name}")
+        #@db_connection.run("DROP TABLE #{random_table_name}")
         @table_created = true
         
         entries.each{ |e| FileUtils.rm_rf(e) } if entries.any?

data/lib/cartodb-importer/version.rb

@@ -1,6 +1,6 @@
 module CartoDB
   class Importer
-    VERSION = "0.2.2"
+    VERSION = "0.2.3"
   end
 end
     

data/misc/shp_normalizer.py

@@ -15,9 +15,7 @@ name = sys.argv[2]
 dbf_file = shp_file[0:-4] + '.dbf'
 prj_file = shp_file[0:-4] + '.prj'
 
-
-#Try detecting the SRID, by default we set to 4326 and hope the best
-#srid=4326
+#Try detecting the SRID
 if os.path.isfile(prj_file):
   prj_filef = open(prj_file, 'r')
   prj_txt = prj_filef.read()

data/spec/import_spec.rb

@@ -249,4 +249,24 @@ describe CartoDB::Importer do
       result.import_type.should == '.tif'
     end
   end  
+  describe "Extended" do
+    it "should import 1 SHP file" do
+      importer = CartoDB::Importer.new :import_from_file => File.expand_path("../../../vm-cartodb/extended_tests/cua2005index_sp.zip", __FILE__),
+                                       :database => "cartodb_importer_test", :username => 'postgres', :password => '',
+                                       :host => 'localhost', :port => 5432
+      result = importer.import!
+      result.name.should == 'cua2005index_sp_shp'
+      result.rows_imported.should == 4365
+      result.import_type.should == '.shp'
+    end
+    it "should import 2 SHP file" do
+      importer = CartoDB::Importer.new :import_from_file => File.expand_path("../../../vm-cartodb/extended_tests/cua2005index_utm.zip", __FILE__),
+                                       :database => "cartodb_importer_test", :username => 'postgres', :password => '',
+                                       :host => 'localhost', :port => 5432
+      result = importer.import!
+      result.name.should == 'cua2005index_utm_shp'
+      result.rows_imported.should == 4528
+      result.import_type.should == '.shp'
+    end
+  end  
 end

metadata

@@ -1,31 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: cartodb-importer
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
 - Fernando Blat
+- Andrew Hill
+- Javier de la Torre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-12 00:00:00.000000000 -06:00
-default_executable: 
+date: 2011-09-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70149885580060 !ruby/object:Gem::Requirement
+  requirement: &70326945028900 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.11'
   type: :runtime
   prerelease: false
-  version_requirements: *70149885580060
+  version_requirements: *70326945028900
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70149885579640 !ruby/object:Gem::Requirement
+  requirement: &70326945028480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70149885579640
+  version_requirements: *70326945028480
 - !ruby/object:Gem::Dependency
   name: roo
-  requirement: &70149885579160 !ruby/object:Gem::Requirement
+  requirement: &70326945028020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70149885579160
+  version_requirements: *70326945028020
 - !ruby/object:Gem::Dependency
   name: spreadsheet
-  requirement: &70149885578740 !ruby/object:Gem::Requirement
+  requirement: &70326945027600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +56,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70149885578740
+  version_requirements: *70326945027600
 - !ruby/object:Gem::Dependency
   name: google-spreadsheet-ruby
-  requirement: &70149885578300 !ruby/object:Gem::Requirement
+  requirement: &70326945027180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70149885578300
+  version_requirements: *70326945027180
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70149885577880 !ruby/object:Gem::Requirement
+  requirement: &70326945026760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +78,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70149885577880
+  version_requirements: *70326945026760
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70149885577460 !ruby/object:Gem::Requirement
+  requirement: &70326945026340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +89,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70149885577460
+  version_requirements: *70326945026340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70149885577020 !ruby/object:Gem::Requirement
+  requirement: &70326945025920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +100,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70149885577020
+  version_requirements: *70326945025920
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70149885576580 !ruby/object:Gem::Requirement
+  requirement: &70326945025500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +111,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70149885576580
+  version_requirements: *70326945025500
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70149885576160 !ruby/object:Gem::Requirement
+  requirement: &70326945025080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +122,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70149885576160
+  version_requirements: *70326945025080
 description: Import CSV, SHP, and other files with data into a PostgreSQL table
 email:
-- ferblape@gmail.com
+- andrew@vizzuality.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -153,7 +154,6 @@ files:
 - spec/export_spec.rb
 - spec/import_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: ''
 licenses: []
 post_install_message: 
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: cartodb-importer
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Import CSV, SHP, and other files with data into a PostgreSQL table