apidae 1.2.4 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e45899b8d14f77793f2dc9d928f2c2aa6eba0dad
-  data.tar.gz: 3123ee0afa071eea4db09c3484de7916be2c6529
+  metadata.gz: ecf4dc2ccc60bf43998df20e62627e9f4ae8db4e
+  data.tar.gz: 716a338e66bba90e698ff4352c1bb81d398937fc
 SHA512:
-  metadata.gz: '059806981d7ed7c469a45cda41072dceb8384d1cc5943089f42e766378a444d516a2e728d48e0335eea1da411673053e296ed6cf3c4cf309f4c9f45ccbb2faaf'
-  data.tar.gz: fde56d7ce57fef6fc0b984cfba695e80e22d63b52d4b258807edabedb3952f2ca5adbcca3510512445a4a90e4361f54c51142318a836e2f6cb8ad0db880d914d
+  metadata.gz: 3f15e2f455ad96b75a6f9173b3626c5d5252eac4b57ef2df292b0a713d3a38d397d1091f7e3ab39f549bc73a8737158b1f77d0cb987148d255104ee87a77dc5d
+  data.tar.gz: 0f72c91e82ad9dc80bd70202fc67e0818583a5567e2e10985ed6d89b1b2ccba74a0d0452103e23a4652dc65a0ba730139148d743dd04f8575f5f61cf5c2a4373

data/app/controllers/apidae/import_controller.rb

@@ -37,7 +37,7 @@ module Apidae
     def run
       success = true
       Export.pending.each do |e|
-        success &&= import_data(e)
+        success &&= e.import_data
       end
       success ? head(:ok) : head(:internal_server_error)
     end
@@ -48,7 +48,7 @@ module Apidae
 
     def create
       @export = Export.new(export_params)
-      if @export.save && import_data(@export)
+      if @export.save && @export.import_data
         redirect_to apidae.root_url, notice: 'Le fichier a bien été importé.'
       else
         flash.now[:alert] = "Une erreur s'est produite lors de l'import du fichier."
@@ -61,43 +61,5 @@ module Apidae
     def export_params
       params.require(:export).permit(:project_id, :file_url, :status)
     end
-
-    def import_data(e)
-      success = true
-      begin
-        open(e.file_url) do |f|
-          begin
-            FileImport.import(f, e.project_id)
-            unless e.confirm_url.blank?
-              uri = URI(e.confirm_url)
-              req = Net::HTTP::Post.new(uri)
-              Net::HTTP.start(uri.hostname, uri.port) do |http|
-                http.request(req)
-              end
-            end
-            e.update(status: Export::COMPLETE)
-            if Rails.application.config.respond_to?(:apidae_import_callback)
-              Rails.application.config.apidae_import_callback.call(e)
-            end
-          rescue Exception => ex
-            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
-        logger.error("Failed to download export file : #{e.file_url}")
-        logger.error("Error is : #{err}")
-        success = false
-        e.update(status: Export::CANCELLED)
-      rescue Exception => e
-        logger.error "Failed to import file : #{e.file_url}"
-        logger.error("Error is : #{err}")
-        success = false
-        e.update(status: Export::CANCELLED)
-      end
-      success
-    end
   end
 end

data/app/helpers/apidae/application_helper.rb

@@ -1,6 +1,6 @@
 module Apidae
   module ApplicationHelper
-    include Apidae::ApidaeHelper
+    include ApidaeHelper
 
     def apidae_user
       send(Rails.application.config.apidae_user) if Rails.application.config.respond_to?(:apidae_user)

data/app/helpers/apidae/extendable_helper.rb

@@ -0,0 +1,4 @@
+module Apidae
+  module ExtendableHelper
+  end
+end

data/app/models/apidae/export.rb

@@ -1,3 +1,6 @@
+require 'uri'
+require 'net/http'
+
 module Apidae
   class Export < ActiveRecord::Base
 
@@ -20,5 +23,43 @@ module Apidae
     def self.pending
       where(remote_status: 'SUCCESS', status: PENDING).order(:id)
     end
+
+    def import_data
+      success = true
+      begin
+        open(file_url) do |f|
+          begin
+            FileImport.import(f, project_id)
+            unless confirm_url.blank?
+              uri = URI(confirm_url)
+              req = Net::HTTP::Post.new(uri)
+              Net::HTTP.start(uri.hostname, uri.port) do |http|
+                http.request(req)
+              end
+            end
+            update(status: Export::COMPLETE)
+            if Rails.application.config.respond_to?(:apidae_import_callback)
+              Rails.application.config.apidae_import_callback.call(self)
+            end
+          rescue Exception => ex
+            logger.error("Failed to import export file : #{file_url}")
+            logger.error("Error is : #{ex} \n#{ex.backtrace.join("\n") unless ex.backtrace.blank?}")
+            success = false
+            update(status: Export::CANCELLED)
+          end
+        end
+      rescue OpenURI::HTTPError => err
+        logger.error("Failed to download export file : #{file_url}")
+        logger.error("Error is : #{err}")
+        success = false
+        update(status: Export::CANCELLED)
+      rescue Exception => e
+        logger.error "Failed to import file : #{e.file_url}"
+        logger.error("Error is : #{err}")
+        success = false
+        e.update(status: Export::CANCELLED)
+      end
+      success
+    end
   end
 end

data/app/models/apidae/selection.rb

@@ -92,9 +92,10 @@ module Apidae
       query_api(query_args, true, false)
     end
 
-    def add_or_refresh_obj(apidae_obj_id)
+    # Note : WARNING - updated obj will only contain the provided fields
+    def add_or_refresh_obj(apidae_obj_id, fields = ["@all"])
       if valid_api?
-        res = api_object(apidae_obj_id)
+        res = api_object(apidae_obj_id, fields)
         if res[:results] && res[:results].length == 1
           obj_data = res[:results].first.deep_symbolize_keys
           add_or_refresh(obj_data)
@@ -102,6 +103,7 @@ module Apidae
       end
     end
 
+    # Note : WARNING - updated objs will only contain the provided fields
     def add_or_refresh_objs(fields = ["@all"])
       if valid_api?
         res = api_objects({fields: fields})

data/app/models/apidae/territory.rb

@@ -0,0 +1,17 @@
+module Apidae
+  class Territory < ApplicationRecord
+    def self.import(territories_json)
+      territories_hashes = JSON.parse(territories_json, symbolize_names: true)
+      territories_hashes.each do |t_data|
+        t = Territory.find_or_initialize_by(apidae_id: t_data[:id])
+        t.name = t_data.dig(:nom, :libelleFr)
+        t.save!
+      end
+    end
+
+    def self.import_file(json_file)
+      territories_json = File.read(json_file)
+      import(territories_json)
+    end
+  end
+end

data/db/migrate/20201112080847_create_apidae_territories.rb

@@ -0,0 +1,10 @@
+class CreateApidaeTerritories < ActiveRecord::Migration[6.0]
+  def change
+    create_table :apidae_territories do |t|
+      t.integer :apidae_id
+      t.string :name
+    end
+
+    add_index :apidae_territories, :apidae_id
+  end
+end

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "1.2.4"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.3.1
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-06 00:00:00.000000000 Z
+date: 2020-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -31,6 +31,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,20 +41,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +97,7 @@ files:
 - app/helpers/apidae/apidae_helper.rb
 - app/helpers/apidae/application_helper.rb
 - app/helpers/apidae/dashboard_helper.rb
+- app/helpers/apidae/extendable_helper.rb
 - app/helpers/apidae/import_helper.rb
 - app/helpers/apidae/objects_helper.rb
 - app/helpers/apidae/references_helper.rb
@@ -104,6 +111,7 @@ files:
 - app/models/apidae/reference.rb
 - app/models/apidae/selection.rb
 - app/models/apidae/selection_object.rb
+- app/models/apidae/territory.rb
 - app/models/apidae/town.rb
 - app/views/apidae/dashboard/index.html.erb
 - app/views/apidae/import/_form.html.erb
@@ -181,6 +189,7 @@ files:
 - db/migrate/20200312150904_add_version_index_on_apidae_objs.rb
 - db/migrate/20200522124205_rename_objs_contact_to_contact_data.rb
 - db/migrate/20200528101957_add_is_active_to_apidae_references.rb
+- db/migrate/20201112080847_create_apidae_territories.rb
 - lib/apidae.rb
 - lib/apidae/engine.rb
 - lib/apidae/version.rb