apidae 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53e626dd8145c8030532064c825d7170f96f18aa
-  data.tar.gz: 4b41767bda21a36f83402066638a5e9656e4677a
+  metadata.gz: 92ec7ce5a586513ed8c0ba161d3d9484555f9668
+  data.tar.gz: f000d972759069c7c6a1ad8eb6a7048c728212f6
 SHA512:
-  metadata.gz: 2609dced9fe025ff9e3f7d410482bd6ce67eb621d05668be49568db75cd207d0ad437bff3e1d7301b5c8add6eb0fe81ae7ec3d713285ddbc872fdf7bb77c6cf4
-  data.tar.gz: ff23e2f694ef53d0ab543945b9267b394f88d5c430a67cb6427f87636a4917dacf299c94d2cc14c08404d1fd5c9b1a72a6aae3eb6111d5f81317bb30b5134ccb
+  metadata.gz: ea85265ae673330192ee48320ceb138831144be753063290280ee37f2dd87435c09485a21c62fff2977c3e091a376e265e8ed5be2f4a8af4969d3048e960e4f9
+  data.tar.gz: f235d3f3cae3c8f1cfffc09bedae71e7592849baccc240077bd033633453e43d19f6797f356bf646344d5afcb78b4fe562000949aef9937160dbcdea533c31ff

data/app/controllers/apidae/import_controller.rb

@@ -33,20 +33,27 @@ module Apidae
     def run
       success = true
       Export.pending.each do |e|
-        open(e.file_url) do |f|
-          begin
-            FileImport.import(f)
-            uri = URI(e.confirm_url)
-            req = Net::HTTP::Post.new(uri)
-            Net::HTTP.start(uri.hostname, uri.port) do |http|
-              http.request(req)
+        begin
+          open(e.file_url) do |f|
+            begin
+              FileImport.import(f)
+              uri = URI(e.confirm_url)
+              req = Net::HTTP::Post.new(uri)
+              Net::HTTP.start(uri.hostname, uri.port) do |http|
+                http.request(req)
+              end
+              e.update(status: Export::COMPLETE)
+            rescue Exception => ex
+              logger.error("Failed to import export file : #{e.file_url}")
+              logger.error("Error is : #{ex}")
+              success = false
             end
-            e.update(status: Export::COMPLETE)
-          rescue Exception => ex
-            logger.error("Failed to retrieve export file : #{ex.file_url}")
-            logger.error("Error is : #{ex}")
-            success = false
           end
+        rescue OpenURI::HTTPError => err
+          logger.error("Failed to download export file : #{e.file_url}")
+          logger.error("Error is : #{err}")
+          success = false
+          e.update(status: Export::CANCELLED)
         end
       end
       render nothing: true, status: (success ? :ok : :internal_server_error)

data/app/models/apidae/export.rb

@@ -3,6 +3,7 @@ module Apidae
 
     PENDING = 'pending'
     COMPLETE = 'complete'
+    CANCELLED = 'cancelled'
 
     # Note : handle reset case
     def self.pending

data/lib/apidae/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-02 00:00:00.000000000 Z
+date: 2018-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -206,70 +206,70 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A Ruby on Rails engine for projects that involve Apidae data
 test_files:
-- test/apidae_test.rb
-- test/controllers/apidae/dashboard_controller_test.rb
-- test/controllers/apidae/import_controller_test.rb
-- test/controllers/apidae/objects_controller_test.rb
-- test/controllers/apidae/selections_controller_test.rb
-- test/data/delete_selections.json
-- test/data/deletion.json
-- test/data/json_export.zip
-- test/data/selections.json
-- test/data/structure.json
-- test/data/update_selections.json
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/views/layouts/application.html.erb
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/bin/bundle
-- test/dummy/bin/rails
 - test/dummy/bin/rake
 - test/dummy/bin/setup
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
+- test/dummy/bin/bundle
+- test/dummy/bin/rails
+- test/dummy/config/secrets.yml
+- test/dummy/config/routes.rb
+- test/dummy/config/locales/en.yml
 - test/dummy/config/environments/production.rb
+- test/dummy/config/environments/development.rb
 - test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/assets.rb
+- test/dummy/config/environment.rb
+- test/dummy/config/application.rb
+- test/dummy/config/database.yml
+- test/dummy/config/boot.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/to_time_preserves_timezone.rb
 - test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/config/secrets.yml
+- test/dummy/config/initializers/assets.rb
+- test/dummy/config/initializers/cookies_serializer.rb
+- test/dummy/config/initializers/to_time_preserves_timezone.rb
+- test/dummy/config/initializers/inflections.rb
 - test/dummy/config.ru
-- test/dummy/db/schema.rb
-- test/dummy/log/development.log
-- test/dummy/log/test.log
-- test/dummy/public/404.html
+- test/dummy/Rakefile
+- test/dummy/public/favicon.ico
 - test/dummy/public/422.html
 - test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/Rakefile
+- test/dummy/public/404.html
+- test/dummy/db/schema.rb
+- test/dummy/log/test.log
+- test/dummy/log/development.log
 - test/dummy/README.rdoc
-- test/fixtures/apidae/attached_files.yml
-- test/fixtures/apidae/exports.yml
-- test/fixtures/apidae/objects.yml
-- test/fixtures/apidae/selections.yml
-- test/fixtures/apidae/towns.yml
 - test/integration/navigation_test.rb
-- test/models/apidae/attached_file_test.rb
-- test/models/apidae/export_test.rb
-- test/models/apidae/file_import_test.rb
 - test/models/apidae/object_test.rb
 - test/models/apidae/selection_test.rb
+- test/models/apidae/file_import_test.rb
+- test/models/apidae/export_test.rb
+- test/models/apidae/attached_file_test.rb
 - test/models/apidae/town_test.rb
+- test/fixtures/apidae/towns.yml
+- test/fixtures/apidae/objects.yml
+- test/fixtures/apidae/selections.yml
+- test/fixtures/apidae/attached_files.yml
+- test/fixtures/apidae/exports.yml
 - test/test_helper.rb
+- test/apidae_test.rb
+- test/controllers/apidae/selections_controller_test.rb
+- test/controllers/apidae/objects_controller_test.rb
+- test/controllers/apidae/dashboard_controller_test.rb
+- test/controllers/apidae/import_controller_test.rb
+- test/data/update_selections.json
+- test/data/json_export.zip
+- test/data/delete_selections.json
+- test/data/structure.json
+- test/data/deletion.json
+- test/data/selections.json