shp2geocouch 0.0.4 → 0.0.5

data/README.textile

@@ -29,7 +29,7 @@ example: @shp2geocouch /sweet_geo_data/Portland_Oregon_Public_Libraries.shp@
 another possible example: @shp2geocouch /zipped_shapfiles/US_Railroads.zip http://myusername.couchone.com/railroads@
 
 Once completed, you can run bounding box queries against your data! Visit the following link to receive a dump of your entire dataset as GeoJSON (a bounding box that covers the entire planet):
-@http://localhost:5984/your_db_name/_design/geojson/_spatial/points?bbox=-180,180,-90,90@
+@http://localhost:5984/your_db_name/_design/geojson/_spatial/points?bbox=-180,-90,180,90@
 
 If you uploaded a large dataset, you may experience a delay on the first ever spatial query as GeoCouch builds it's spatial index. You can check the status of the indexer by visiting @http://localhost:5984/_utils/status.html@
 

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/bin/shp2geocouch

@@ -3,19 +3,22 @@ require 'httparty'
 require 'couchrest'
 require 'optparse'
 require 'iconv'
+require 'net/http'
+require 'uri'
 
 class ShapefileToGeoCouch
-  attr_accessor :path, :extension, :name, :couch_url, :cleanup, :verbose, :chunksize
+  attr_accessor :path, :extension, :name, :database_url, :cleanup, :verbose, :chunksize, :uri
   
   def initialize(options)
     set_accessors(options)
-    @db = CouchRest.database! @couch_url
+    @uri = parse_database_url
+    @db = CouchRest.database! @database_url
     verify_dependencies
     convert
     upload
     add_ddoc
     cleanup if @cleanup
-    puts "Upload complete. Test your data at #{database_url}/_design/geojson/_spatial/points?bbox=-180,180,-90,90" if @verbose
+    puts "Upload complete. Test your data at #{@database_url}/_design/geo/_spatial/full?bbox=-180,180,-90,90" if @verbose
   end
   
   def set_accessors(options)
@@ -30,8 +33,13 @@ class ShapefileToGeoCouch
     end
   end
   
-  def database_url
-    @couch_url
+  def parse_database_url
+    URI.parse(@database_url)
+  end
+  
+  def couch_url
+    port = @uri.port && @uri.port != 80 ? ":#{@uri.port}" : ""
+    "#{@uri.scheme}://#{@uri.host}#{port}"
   end
 
   def output_folder
@@ -72,11 +80,11 @@ class ShapefileToGeoCouch
   def post(string)
     ic = Iconv.new('UTF-8//IGNORE', 'UTF-8') # disregard all UTF8 characters
     valid_string = ic.iconv(string[0..-3] + '  ')[0..-3] # http://po-ru.com/diary/fixing-invalid-utf-8-in-ruby-revisited/
-    HTTParty.post(database_url + '/_bulk_docs', :body => '{"docs": [' + valid_string + "]}", :headers => {'content-type' => "application/json"})
+    HTTParty.post(@database_url + '/_bulk_docs', :body => '{"docs": [' + valid_string + "]}", :headers => {'content-type' => "application/json"})
   end
   
   def upload
-    puts "Bulk loading data into GeoCouch... view progress at #{@couch_url}/_utils" if @verbose
+    puts "Bulk loading data into GeoCouch... view progress at #{@database_url}/_utils" if @verbose
     group = []
     length = File.open(bulk).lines.count - 1
     File.open(bulk).each_with_index do |line, index|
@@ -94,17 +102,26 @@ class ShapefileToGeoCouch
     end
   end
   
+  # replicates geocouch-utils into the db via http://max.iriscouch.com/apps/_design/geo
   def add_ddoc
-    puts "Adding spatial index design document..." if @verbose
-    view_exists = @db.get('_design/geojson') rescue false
-    unless view_exists
-      @db.save_doc({
-        "_id" => "_design/geojson",
-        "spatial" => {
-          :points => "function(doc) { emit(doc.geometry, {id: doc._id, geometry: doc.geometry}) };"
-        }
-      })
-    end
+    puts "Replicating http://github.com/maxogden/geocouch-utils..." if @verbose
+    view_exists = @db.get('_design/geo') rescue false
+    internet_connection = HTTParty.get('http://localhost:5984') rescue false
+    if !view_exists && internet_connection
+      resp = HTTParty.post(couch_url + '/_replicate', 
+        :body => '{"source":"http://localhost:5984/catmapper","target":"' + @name + '", "doc_ids":["_design/geo"]}', 
+        :headers => {'content-type' => "application/json"}
+      )
+      resp = JSON.parse(resp)
+      if ((resp.keys.include? 'ok') && (resp['ok'] == true))
+        puts "View your data at #{@database_url}/_design/geo/_rewrite"
+      else
+        puts "View your data at http://#{couch_url}/_utils"
+      end
+    elsif @verbose
+      puts "Did not push geocouch-utils -- either it already exists or internet is off"
+      puts "You can get geocouch-utils from http://github.com/maxogden/geocouch-utils"
+    end 
   end
   
   def cleanup
@@ -137,6 +154,6 @@ raise "You must specify a .shp or a .zip" unless extension =~ /zip|shp/i
 name = ARGV[0].split('/')[-1].split('.')[0]
 
 options = {:path => ARGV[0], :name => name.downcase, :extension => extension}.merge(defaults)
-options[:couch_url] = ARGV[1] || "http://localhost:5984/#{name.downcase}"
+options[:database_url] = ARGV[1] || "http://localhost:5984/#{name.downcase}"
 
 ShapefileToGeoCouch.new(options)

data/shp2geocouch.gemspec

@@ -0,0 +1,50 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{shp2geocouch}
+  s.version = "0.0.5"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Max Ogden"]
+  s.date = %q{2011-04-21}
+  s.default_executable = %q{shp2geocouch}
+  s.description = %q{rubygem that converts Shapefiles into GeoCouch databases}
+  s.email = %q{max@maxogden.com}
+  s.executables = ["shp2geocouch"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.textile"
+  ]
+  s.files = [
+    "LICENSE",
+    "README.textile",
+    "Rakefile",
+    "VERSION",
+    "bin/shp2geocouch",
+    "pkg/shp2geocouch-0.0.5.gem",
+    "shp2geocouch.gemspec"
+  ]
+  s.homepage = %q{http://github.com/maxogden/shp2geocouch}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.4.2}
+  s.summary = %q{rubygem that converts Shapefiles into GeoCouch databases}
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<httparty>, [">= 0"])
+      s.add_runtime_dependency(%q<couchrest>, [">= 0"])
+    else
+      s.add_dependency(%q<httparty>, [">= 0"])
+      s.add_dependency(%q<couchrest>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<httparty>, [">= 0"])
+    s.add_dependency(%q<couchrest>, [">= 0"])
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shp2geocouch
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 21
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Max Ogden
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 -07:00
+date: 2011-04-21 00:00:00 -07:00
 default_executable: shp2geocouch
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,19 +56,20 @@ extra_rdoc_files:
 - LICENSE
 - README.textile
 files: 
-- .gitignore
 - LICENSE
 - README.textile
 - Rakefile
 - VERSION
 - bin/shp2geocouch
+- pkg/shp2geocouch-0.0.5.gem
+- shp2geocouch.gemspec
 has_rdoc: true
 homepage: http://github.com/maxogden/shp2geocouch
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -92,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: rubygem that converts Shapefiles into GeoCouch databases

data/.gitignore

@@ -1 +0,0 @@
-.DS_Store