citysdk 0.1.2.1 → 0.1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a488ab3d05dd175923b1d8f53d878bc397e0b0c
-  data.tar.gz: 39c3032f03c84f5970d85be520087d376a9f2d02
+  metadata.gz: be8b1b21e4f34aceb99dff0f1b00ba31083389d5
+  data.tar.gz: d0d5038930d6be84f0b5292dcc4cd083eb088666
 SHA512:
-  metadata.gz: d87ad0933201d94bce82f1a4b680779b6458117e1c9408f530dee1d156021977e37be352d01f5d23f2714985da2968097741408684b90da87090ea09a3fb4e34
-  data.tar.gz: 5272b2895b28c58bf2fdf7ae54d5e39fc505878ac48c519baf3222f2bb617567ec998af8f095192798d95370aa5a3a84666ba1210b90265538e217962e5b470b
+  metadata.gz: b88d51475974d5a76d2564861a1d4b2791d33f73d6ebd6074f50dc6163989445e8ed50b08a785b6f5c89a53f7d89c13f4f7efa93e316766f7d973a6a8b17579e
+  data.tar.gz: 7c10d536d493f0f7e236c93980becfdefa9214dec808500c93931f10ac964fb5466c7df2a2b21baa7a7e2ea4b375bdbf3c8f24437250f6e14b71fe6102e5b4a6

data/.gitignore

@@ -0,0 +1 @@
+*.gem

data/lib/citysdk.rb

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

data/lib/citysdk/file_reader.rb

@@ -320,6 +320,7 @@ module CitySDK
     end
 
     def readShape(path)
+      
       @content = []
       @file = path
       
@@ -353,7 +354,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 +374,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

@@ -116,6 +116,8 @@ module CitySDK
       # elsif @params[:hasaddress] == 'maybe'
       #   failed = addToAddress(dryrun)
       end
+      
+      # TODO: add possibility to add node to postal code
 
       if failed == []
         result[:updated] += @filereader.content.length

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: citysdk
 version: !ruby/object:Gem::Version
-  version: 0.1.2.1
+  version: 0.1.2.2
 platform: ruby
 authors:
 - Tom Demeyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-14 00:00:00.000000000 Z
+date: 2014-02-27 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.
@@ -87,6 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -118,17 +119,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.2.1
 signing_key: 
 specification_version: 4
 summary: Encapsulates the CitySDK api, provides high-level file import functionality.