citysdk 0.1.2.3 → 0.1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50392a4353759cbdeadbc49b11ad29e4e9482a42
-  data.tar.gz: ca0cc2ccf7195e1b3e34aef4f79d1c87c182695a
+  metadata.gz: 58306c956c274844ad933ff23bd13e62d79159f3
+  data.tar.gz: c234c0246373f380e2a83049c8a75086bac4315d
 SHA512:
-  metadata.gz: 3be7a3a660bd3af033bf796f646623ef9c458175762daeb91a2f1045cb8a35d7b0f2d013b3246efa1ff739d73777778b5227f18b543f99c63d3e9079572477cd
-  data.tar.gz: 10aafccd5dcb61cc1a2d0ce3f822f5e86b732360a88dc162e9f432e638bbc048f3879769ae291a68fe96f22f29a3d1743e70e511c9bacd17b181cc288ea2f1d3
+  metadata.gz: c57cd31732c470c46eb1693f07c7b5c53c1894faeb619509e07b64419b741cf832d09a54fcf92c95a6cc62e351c554aca9bc597285da0372ad604bd91edbaaba
+  data.tar.gz: 44e380a5950dcd4ab3c9f075fd5f5bc2019cd10f87c3ae975a19384299d0aadca3fdd14ac4435254d304f691668cf438c7c35ff53a8d64daea421b7d9017835d

data/lib/citysdk/api.rb

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

data/lib/citysdk/file_reader.rb

@@ -320,7 +320,6 @@ module CitySDK
     end
 
     def readShape(path)
-      
       @content = []
       @file = path
       
@@ -338,9 +337,7 @@ module CitySDK
           h[:properties] = {}
           att_data = shape.data #a Hash
           shp.fields.each do |field|
-            s = att_data[field.name]
-            s = s.force_encoding('ISO8859-1') if s.class == String
-            h[:properties][field.name.to_sym] = s
+            h[:properties][field.name.to_sym] = att_data[field.name]
           end
           @content << h
         end
@@ -356,10 +353,7 @@ module CitySDK
     def readZip(path)
       begin 
         Dir.mktmpdir("cdkfi_#{File.basename(path).gsub(/\A/,'')}") do |dir| 
-          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
+          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)
@@ -376,9 +370,8 @@ module CitySDK
           end
         end
       rescue Exception => e
-        raise CitySDK::Exception.new(e.message, {:originalfile => path}, __FILE__,__LINE__)
+        raise CitySDK::Exception(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.rb

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

metadata

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