citysdk 0.1.2.4 → 0.1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58306c956c274844ad933ff23bd13e62d79159f3
-  data.tar.gz: c234c0246373f380e2a83049c8a75086bac4315d
+  metadata.gz: f0fd4a218a56d9c50a060909e9d27308f7262b72
+  data.tar.gz: dbcead5631b8cd87d3844d319e51843ec3b859c6
 SHA512:
-  metadata.gz: c57cd31732c470c46eb1693f07c7b5c53c1894faeb619509e07b64419b741cf832d09a54fcf92c95a6cc62e351c554aca9bc597285da0372ad604bd91edbaaba
-  data.tar.gz: 44e380a5950dcd4ab3c9f075fd5f5bc2019cd10f87c3ae975a19384299d0aadca3fdd14ac4435254d304f691668cf438c7c35ff53a8d64daea421b7d9017835d
+  metadata.gz: 3c9c553e8e707ca27f07c12d57700c219471b60a5c1efeab62148f2912ab196cfd98739294143432cc6f63097d22beadeb5d10b0e5266e0ff91a56c8562327d1
+  data.tar.gz: 1ffd5cd48feaabef893c68b558e6e6ace96a3a2de6cbed74d9ef8ab4a6c76c3424c466b207ab7760dffb7e0006c374d5da436939a8b516ba815ba2a1c1472dec

data/lib/citysdk/api.rb

@@ -69,17 +69,11 @@ module CitySDK
           @port = $2
           @host = $1
         else
-          @port = (host =~ /^https/)? 443 : 80
+          @port = 80
         end
       end
       
-      @host = $2 if @host =~ /^(http|https):\/\/(.*)$/
-      
-      if host =~ /^https/
-        @connection = Faraday.new :url => "https://#{@host}:#{@port}", :ssl => {:verify => false}
-      else
-        @connection = Faraday.new :url => "http://#{@host}:#{@port}"
-      end
+      @connection = Faraday.new :url => "http://#{@host}:#{@port}"
       @connection.headers = {
         :user_agent => 'CitySDK_API GEM ' + CitySDK::VERSION,
         :content_type => 'application/json'

data/lib/citysdk/file_reader.rb

@@ -43,11 +43,11 @@ module CitySDK
       
 
       @params[:rowcount] = @content.length
-      getFields if not @params[:fields]
-      guessName if not @params[:name]
-      guessSRID if not @params[:srid]
-      findUniqueField  if not @params[:unique_id]
-      getAddress if not @params[:hasaddress]
+      getFields unless @params[:fields]
+      guessName unless @params[:name]
+      guessSRID unless @params[:srid]
+      findUniqueField  unless @params[:unique_id]
+      getAddress unless @params[:hasaddress]
       @params[:hasgeometry] = 'unknown' if @params[:hasgeometry].nil?
     end
     
@@ -320,6 +320,7 @@ module CitySDK
     end
 
     def readShape(path)
+      
       @content = []
       @file = path
       
@@ -337,7 +338,9 @@ module CitySDK
           h[:properties] = {}
           att_data = shape.data #a Hash
           shp.fields.each do |field|
-            h[:properties][field.name.to_sym] = att_data[field.name]
+            s = att_data[field.name]
+            s = s.force_encoding('ISO8859-1') if s.class == String
+            h[:properties][field.name.to_sym] = s
           end
           @content << h
         end
@@ -353,7 +356,10 @@ module CitySDK
     def readZip(path)
       begin 
         Dir.mktmpdir("cdkfi_#{File.basename(path).gsub(/\A/,'')}") do |dir| 
-          raise "Error unzipping #{path}." if not system "unzip '#{path}' -d '#{dir}' > /dev/null 2>&1"
+          raise CitySDK::Exception.new("Error unzipping #{path}.", {:originalfile => path}, __FILE__,__LINE__) if not system "unzip '#{path}' -d '#{dir}' > /dev/null 2>&1"
+          if File.directory?(dir + '/' + File.basename(path).chomp(File.extname(path)))
+            dir = dir + '/' + File.basename(path).chomp(File.extname(path) )
+          end
           Dir.foreach(dir) do |f|
             next if f =~ /^\./
             case File.extname(f)
@@ -370,8 +376,9 @@ module CitySDK
           end
         end
       rescue Exception => e
-        raise CitySDK::Exception(e.message, {:originalfile => path}, __FILE__,__LINE__)
+        raise CitySDK::Exception.new(e.message, {:originalfile => path}, __FILE__,__LINE__)
       end
+      raise CitySDK::Exception.new("Could not proecess file #{path}", {:originalfile => path}, __FILE__,__LINE__)
     end
 
     def write(path=nil)

data/lib/citysdk/importer.rb

@@ -101,8 +101,12 @@ module CitySDK
       # puts "data: \n#{data}"
       data
     end
+    
+    
+    
+    
   
-    def doImport(dryrun=false)
+    def doImport(dryrun=false, &block)
       result = {
         :updated => 0,
         :created => 0,
@@ -112,9 +116,7 @@ module CitySDK
       failed = nil
       
       if @params[:hasaddress] == 'certain'
-        failed = addToAddress(dryrun)
-      # elsif @params[:hasaddress] == 'maybe'
-      #   failed = addToAddress(dryrun)
+        failed = addToAddress(dryrun, &block)
       end
       
       # TODO: add possibility to add node to postal code
@@ -123,6 +125,7 @@ module CitySDK
         result[:updated] += @filereader.content.length
         return result
       end
+      
       if failed 
         result[:updated] += (@filereader.content.length - failed.length)
       end
@@ -235,7 +238,9 @@ module CitySDK
             end
             if qres[:status]=='success' and qres[:results] and qres[:results][0]
               url = '/' + qres[:results][0][:cdk_id] + '/' + @params[:layername]
-              n = @api.put(url,{'data'=>filterFields(row)}) if not dryrun
+              data = filterFields(row)
+              yield({addto: qres[:results][0][:cdk_id], data: data}) if block_given?
+              n = @api.put(url,{'data'=>data}) if not dryrun
             else
               failed << rec
             end

data/lib/citysdk.rb

@@ -4,6 +4,6 @@ require 'citysdk/file_reader.rb'
 require 'citysdk/importer.rb'
 
 module CitySDK
-  VERSION = "0.1.2.4"
+  VERSION = "0.1.2.5"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: citysdk
 version: !ruby/object:Gem::Version
-  version: 0.1.2.4
+  version: 0.1.2.5
 platform: ruby
 authors:
 - Tom Demeyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dbf