shp2geocouch 0.0.7 → 0.0.8

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/bin/shp2geocouch

@@ -12,6 +12,7 @@ class ShapefileToGeoCouch
   def initialize(options)
     set_accessors(options)
     @uri = parse_database_url
+    @name = @uri.path[1..-1]
     @db = CouchRest.database! @database_url
     @geocouch_utils = "http://max.iriscouch.com/apps"
     verify_dependencies
@@ -36,10 +37,12 @@ class ShapefileToGeoCouch
   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}"
+    user = @uri.user ? "#{@uri.user}:" : ""
+    password = @uri.password ? "#{@uri.password}@" : ""
+    "#{@uri.scheme}://#{user}#{password}#{@uri.host}#{port}"
   end
 
   def output_folder
@@ -114,7 +117,7 @@ class ShapefileToGeoCouch
       if !view_exists?
         puts "Replicating geocouch-utils + map browser from #{@geocouch_utils}..."
         HTTParty.post(couch_url + '/_replicate', 
-          :body => '{"source":"' + @geocouch_utils + '","target":"' + @name + '", "doc_ids":["_design/geo"]}', 
+          :body => '{"source":"' + @geocouch_utils + '","target":"' + couch_url + "/" + @name + '", "doc_ids":["_design/geo"]}', 
           :headers => {'content-type' => "application/json"}
         ) rescue timeout = true
         if timeout  
@@ -161,7 +164,7 @@ 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 = {:path => ARGV[0], :extension => extension}.merge(defaults)
 options[:database_url] = ARGV[1] || "http://localhost:5984/#{name.downcase}"
 
 ShapefileToGeoCouch.new(options)

data/shp2geocouch.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shp2geocouch}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   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.date = %q{2011-04-23}
   s.default_executable = %q{shp2geocouch}
   s.description = %q{rubygem that converts Shapefiles into GeoCouch databases}
   s.email = %q{max@maxogden.com}
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "bin/shp2geocouch",
-    "pkg/shp2geocouch-0.0.7.gem",
+    "pkg/shp2geocouch-0.0.8.gem",
     "shp2geocouch.gemspec"
   ]
   s.homepage = %q{http://github.com/maxogden/shp2geocouch}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shp2geocouch
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Max Ogden
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-21 00:00:00 -07:00
+date: 2011-04-23 00:00:00 -07:00
 default_executable: shp2geocouch
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,7 +61,7 @@ files:
 - Rakefile
 - VERSION
 - bin/shp2geocouch
-- pkg/shp2geocouch-0.0.7.gem
+- pkg/shp2geocouch-0.0.8.gem
 - shp2geocouch.gemspec
 has_rdoc: true
 homepage: http://github.com/maxogden/shp2geocouch