citysdk 0.1.1.6 → 0.1.1.7

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 4bfcffbf3d68ab140fcff49bef32b00b36267fce
-  data.tar.gz: c5d29f8b530f05f958ab7a381cd32f8d6c140f3d
-SHA512:
-  metadata.gz: a2f13274d614ed901a5921813d3d43cd4c34cb4c80335880a78c9c5251fadf99a53b5b962528d837c808af3247f23b6adcacc7aba0f4a95a1165470d951aff3d
-  data.tar.gz: 9eb12eef8f05b1b9cd58ea1e7525ed3d5e04b5d471571b73f103c5bb4e7348292eeb4ed00b27ced26cc360cabb73b1459b5310502b16c61b8cd6cab4044a0a8b
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OWRlYTFkMjY1YmY2M2E5MTBhYzZhM2NhZDIyOTc1MTY0ZGRiNjM5Mw==
+  data.tar.gz: !binary |-
+    YWRjOWZiNWFjNzBlNmEzYWRmOTdjMjQxNzZjYjdkNGQ3ZmNmNjU3YQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MmY0NzZlMGEzYzYzYmQxNmFhM2MwNTU1NjFjY2ExMTAwNzVjMTFhYjZkY2E0
+    NzFlM2RlZDllZDVlZjFlMTYyNDliMDM0YzI1ZWNlYzIxOWQ4NTJjN2IyZWE1
+    MDZkNWYzZTNhYTcxN2Y4OGNmZGRhZTdkMjNiYjZiNzA3NjRmYTg=
+  data.tar.gz: !binary |-
+    NWIwZWQyOWIxNTUwZWZjNDMyM2U5ZGU1ZjM1NmNhZjgxNWZmMWU5YWJiMTg5
+    MDQ1MzI3YzI5MjBkZmU2N2QwY2U3OGZmOGZiZDUzZjg2NzdlMzQ1YWNiNGI1
+    M2NiZDQzNzA1ZGUzZDgzNjc3ZmNlNTQ3NTFiNzQxNjc1NmIyMDM=

data/lib/citysdk.rb

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

data/lib/citysdk/file_reader.rb

@@ -55,7 +55,7 @@ module CitySDK
       pd = pc = hn = ad = false
       @params[:fields].reverse.each do |f|
         pd = f if ( f.to_s =~ /postcode|post/i )
-        pc = f if ( f.to_s =~ /^postcode$/i )
+        pc = f if ( f.to_s =~ /^(post|zip)code$/i )
         hn = f if ( f.to_s =~ /huisnummer|housenumber|(house|huis)(nr|no)|number/i)
         ad = f if ( f.to_s =~ /address|street|straat|adres/i)
       end
@@ -178,6 +178,7 @@ module CitySDK
       xfield = nil; xs = true
       yfield = nil; ys = true
       @content[0][:properties].each do |k,v|
+        next if k.nil?
         if k.to_s =~ RE_GEO
           srid,g_type = isWkbGeometry(v)
           if(srid)
@@ -347,8 +348,8 @@ module CitySDK
     
     def readZip(path)
       begin 
-        Dir.mktmpdir("cdkfi_#{File.basename(path)}") do |dir| 
-          raise "Error unzipping #{path}." if not system "unzip #{path} -d #{dir} > /dev/null 2>&1"
+        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"
           Dir.foreach(dir) do |f|
             next if f =~ /^\./
             case File.extname(f)

data/lib/citysdk/importer.rb

@@ -202,6 +202,8 @@ module CitySDK
         else
           raise Exception.new("Cannot import. Geometry or uniuque id is not known for records.") if failed.nil?
         end
+      rescue => e
+        raise Exception.new(e.message)
       ensure
         a = sign_out
         result[:updated] += a[0]

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: citysdk
 version: !ruby/object:Gem::Version
-  version: 0.1.1.6
+  version: 0.1.1.7
 platform: ruby
 authors:
 - Tom Demeyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-28 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dbf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: georuby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.5
 - !ruby/object:Gem::Dependency
   name: charlock_holmes
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.6.9.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.6.9.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Encapsulates the CitySDK api.
@@ -117,17 +117,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: Encapsulates the CitySDK api, provides high-level file import functionality.