apidae 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60148050e39da7ee11f5ad3b5763f8974359e97c
-  data.tar.gz: 676823e12e5f3672229f13c2b5f6fff6ec83ddf6
+  metadata.gz: 116c4fc04f1af63f1892adfafb06a177bbc3aa50
+  data.tar.gz: 9748bc3233c9d8642bf4dce9ea3cfcdfc439781f
 SHA512:
-  metadata.gz: cd2224c5903a85ea614d39f360c27d02fb1d71fd40de52bd62101f84feb8d62c898736da212abf136287b7290685edf025fd4c2e358670953107b1376a15e5ad
-  data.tar.gz: 503d4a38cbcf23e52a101ead6eedcbb901566143e75bb04cf1e9f3b93c999871b686bfc924bcce5266e67e7f84116858a20dbd939ca8ac68a5a8e983b97acc98
+  metadata.gz: b6263a273094aa44cf41eae72de8e9c548d3827b45f6f6e5c21c710e990e099ec3f48476eb6be1fd7ea89f5dd22699e6275a25fda8dc26e71b32f472a814f3ec
+  data.tar.gz: 9e8ac681286c83c69f401384373ef154e6de10dbd9a475c191d06769dfa4960fe526114ce84eee4505ff8e41c4dc68bfaef6929aa11f5ef43c21c2ff44f1052c

data/app/controllers/apidae/import_controller.rb

@@ -43,6 +43,9 @@ module Apidae
                 http.request(req)
               end
               e.update(status: Export::COMPLETE)
+              if Rails.application.config.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?}")

data/app/models/apidae/reference.rb

@@ -3,12 +3,16 @@ module Apidae
 
     INTERNAL = 'internal'
 
+    store_accessor :meta_data, :category, :parent
+
     def self.import(refs_json)
       refs_hashes = JSON.parse(refs_json, symbolize_names: true)
       if refs_hashes.length != where("apidae_type != ?", INTERNAL).count
         refs_hashes.each do |ref_data|
           ref = Reference.find_or_initialize_by(apidae_id: ref_data[:id], apidae_type: ref_data[:elementReferenceType])
           ref.label_data = ref_data.slice(:libelleFr, :libelleEn)
+          ref.parent = ref_data[:parent][:id] if ref_data[:parent]
+          ref.category = ref_data[:familleCritere] ? ref_data[:familleCritere][:id] : (ref_data[:typeLabel] ? ref_data[:typeLabel][:id] : nil)
           ref.save!
         end
       end
@@ -33,5 +37,9 @@ module Apidae
     def label(language)
       label_data["libelle#{language.to_s.upcase_first}"]
     end
+
+    def detailed_label(language)
+      category ? "#{Apidae::Reference.find_by_apidae_id(category).label(language)} - #{label(language)}" : label(language)
+    end
   end
 end

data/db/migrate/20180424141656_add_meta_data_to_apidae_references.rb

@@ -0,0 +1,5 @@
+class AddMetaDataToApidaeReferences < ActiveRecord::Migration[5.1]
+  def change
+    add_column :apidae_references, :meta_data, :jsonb
+  end
+end

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-18 00:00:00.000000000 Z
+date: 2018-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -142,6 +142,7 @@ files:
 - db/migrate/20180417171344_remove_lat_lng_from_apidae_objects.rb
 - db/migrate/20180418141248_add_description_data_to_apidae_objects.rb
 - db/migrate/20180418141305_remove_desc_columns_from_apidae_objects.rb
+- db/migrate/20180424141656_add_meta_data_to_apidae_references.rb
 - lib/apidae.rb
 - lib/apidae/engine.rb
 - lib/apidae/version.rb