apidae 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac2dde55728a2ef67871f3ecd89b52df6b5e581b
-  data.tar.gz: 574d98fc4ec4fad54047351cd013771fea652c8e
+  metadata.gz: b3644f42dd516b2548c328c4e9327f88f4079d26
+  data.tar.gz: aba6633606b59b4bba585827b520c7a4fb790e16
 SHA512:
-  metadata.gz: ba9e5bd5d67b024c42bd1c6589437c473b754e63c7bc3ee65dc0b0fbc4c725e8fa7b058d12ce9de6feb87259a54a410b80ac6ae43316f68b537ad516036b3c23
-  data.tar.gz: c5d16ba012ea42919d153da8062b82d26df6a7eff14fbed5af749326680995d3e4d1aa3e4dfe4d0cc0599210fb3d2f802b0f8d33350631815e2043049a0daa5b
+  metadata.gz: f4ed7a50ddff8eee0e28fd37cabbf07fda681560096d7538d75c10120988694da76d41f9b4ccee68daf67a4d1c9b5bd6b71cf9a93947e08ea1dc99cf64eeaba1
+  data.tar.gz: ed3d91aa7a890f3e1476fd1ff6fb76af19bb8caced7383ac103d39ea5705791cd4afe674255f2ad27ad1f25879d450eb90abbd48de498e2147bc7caad1ec4504

data/app/controllers/apidae/import_controller.rb

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

data/app/models/apidae/file_import.rb

@@ -18,11 +18,18 @@ module Apidae
       Zip::File.open(zip_file) do |zfile|
         result = {created: 0, updated: 0, deleted: 0, selections: []}
         project = Project.find_or_create_by(apidae_id: project_id)
-        Reference.import(zfile.read(REFERENCES_FILE))
-        Reference.import_internal(zfile.read(INTERNAL_FILE))
-        logger.info "Completed #{Reference.count} references update"
-        Town.import(zfile.read(TOWNS_FILE))
-        logger.info "Completed #{Town.count} towns update"
+        entries = zfile.entries.map {|e| e.name}
+        if entries.include?(REFERENCES_FILE)
+          Reference.import(zfile.read(REFERENCES_FILE))
+        end
+        if entries.include?(INTERNAL_FILE)
+          Reference.import_internal(zfile.read(INTERNAL_FILE))
+        end
+        logger.info "Completed #{Reference.count} references update" if entries.include?(REFERENCES_FILE) || entries.include?(INTERNAL_FILE)
+        if entries.include?(TOWNS_FILE)
+          Town.import(zfile.read(TOWNS_FILE))
+          logger.info "Completed #{Town.count} towns update"
+        end
         zfile.each do |file|
           if file.file? && file.name.end_with?('.json')
             logger.info "Processing file : #{file.name}"

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "0.9.7"
+  VERSION = "0.9.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-18 00:00:00.000000000 Z
+date: 2019-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails