apidae 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92ec7ce5a586513ed8c0ba161d3d9484555f9668
-  data.tar.gz: f000d972759069c7c6a1ad8eb6a7048c728212f6
+  metadata.gz: 87cd9a41caead065a805e975fbe7fc5f4227cfdf
+  data.tar.gz: bf3ac2b75b2e4a2ee96d5a0a0298ce105460afc4
 SHA512:
-  metadata.gz: ea85265ae673330192ee48320ceb138831144be753063290280ee37f2dd87435c09485a21c62fff2977c3e091a376e265e8ed5be2f4a8af4969d3048e960e4f9
-  data.tar.gz: f235d3f3cae3c8f1cfffc09bedae71e7592849baccc240077bd033633453e43d19f6797f356bf646344d5afcb78b4fe562000949aef9937160dbcdea533c31ff
+  metadata.gz: 16697f8ea3872f0b10db80aa23df7f7e475945b56787b131d89875fdb31c4a340729376f35160fbc715af0f2da68a862c3336334a8e34fb699d3ea6fbea2f098
+  data.tar.gz: 89856a0a71ddf723f2a8dffd3631d9950d93523e406c63a1032bf1fdd761fb5f6310aab7440f863dbdd6ceb7b0f7803d7e8cdf00d0e24b457ef925b184f253c2

data/app/controllers/apidae/import_controller.rb

@@ -45,7 +45,7 @@ module Apidae
               e.update(status: Export::COMPLETE)
             rescue Exception => ex
               logger.error("Failed to import export file : #{e.file_url}")
-              logger.error("Error is : #{ex}")
+              logger.error("Error is : #{ex} \n#{ex.backtrace.join("\n") unless ex.backtrace.blank?}")
               success = false
             end
           end

data/app/models/apidae/object.rb

@@ -112,24 +112,30 @@ module Apidae
 
     def self.address(address_hash)
       computed_address = []
-      computed_address << address_hash[:adresse1] unless address_hash[:adresse1].blank?
-      computed_address << address_hash[:adresse2] unless address_hash[:adresse2].blank?
-      computed_address << address_hash[:adresse3] unless address_hash[:adresse3].blank?
+      unless address_hash.blank?
+        computed_address << address_hash[:adresse1] unless address_hash[:adresse1].blank?
+        computed_address << address_hash[:adresse2] unless address_hash[:adresse2].blank?
+        computed_address << address_hash[:adresse3] unless address_hash[:adresse3].blank?
+      end
       {address_fields: computed_address}
     end
 
-    def self.town(address_hash)
-      address_hash[:commune] ? Town.find_by_apidae_id(address_hash[:commune][:id]) : nil
+    def self.town(address_hash = {})
+      (!address_hash.blank? && address_hash[:commune]) ? Town.find_by_apidae_id(address_hash[:commune][:id]) : nil
     end
 
     def self.latitude(location_hash)
-      geoloc_details = location_hash[:geolocalisation]
-      (geoloc_details && geoloc_details[:valide] && geoloc_details[:geoJson]) ? geoloc_details[:geoJson][:coordinates][1] : nil
+      unless location_hash.blank?
+        geoloc_details = location_hash[:geolocalisation]
+        (geoloc_details && geoloc_details[:valide] && geoloc_details[:geoJson]) ? geoloc_details[:geoJson][:coordinates][1] : nil
+      end
     end
 
-    def self.longitude(location_hash)
-      geoloc_details = location_hash[:geolocalisation]
-      (geoloc_details && geoloc_details[:valide] && geoloc_details[:geoJson]) ? geoloc_details[:geoJson][:coordinates][0] : nil
+    def self.longitude(location_hash = {})
+      unless location_hash.blank?
+        geoloc_details = location_hash[:geolocalisation]
+        (geoloc_details && geoloc_details[:valide] && geoloc_details[:geoJson]) ? geoloc_details[:geoJson][:coordinates][0] : nil
+      end
     end
 
     def self.openings(openings_hash)

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Ruby on Rails engine for projects that involve Apidae data