apidae 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bacffbefd10b3a83d529b47c6a6e633a750a16a0
-  data.tar.gz: c9854183498dc623b805a06a7ccaebf387e9df32
+  metadata.gz: ac2dde55728a2ef67871f3ecd89b52df6b5e581b
+  data.tar.gz: 574d98fc4ec4fad54047351cd013771fea652c8e
 SHA512:
-  metadata.gz: dd7a3409f95af7415eb4144479c16d3956f50738462a81bafc9ab87b49bc7379148a3a73c0024f02c47b3a355ace3bd6de693ba6d7f39409b7b1e76a68c1e2ce
-  data.tar.gz: 64f4fff6724b1aa3ce02eebf96658451295a07a0a58e7bb96b93ca8174187cf30bd72d65768ad3086e49e781efd9382ea4c1e8bcdf6ffa5498fe76e7b5f108b3
+  metadata.gz: ba9e5bd5d67b024c42bd1c6589437c473b754e63c7bc3ee65dc0b0fbc4c725e8fa7b058d12ce9de6feb87259a54a410b80ac6ae43316f68b537ad516036b3c23
+  data.tar.gz: c5d16ba012ea42919d153da8062b82d26df6a7eff14fbed5af749326680995d3e4d1aa3e4dfe4d0cc0599210fb3d2f802b0f8d33350631815e2043049a0daa5b

data/app/models/apidae/file_import.rb

@@ -66,22 +66,27 @@ module Apidae
 
     def self.add_or_update_objects(objects_json, result, locales, versions)
       objects_hashes = JSON.parse(objects_json, symbolize_names: true)
-      objects_hashes.each do |object_data|
-        begin
-          existing = Obj.find_by_apidae_id(object_data[:id])
-          if existing
-            Obj.update_object(existing, object_data, locales, versions)
-            result[:updated] += 1
-          else
-            Obj.add_object(object_data, locales, versions)
-            result[:created] += 1
+      if objects_hashes.is_a?(Array)
+        objects_hashes.each do |object_data|
+          begin
+            existing = Obj.find_by_apidae_id(object_data[:id])
+            if existing
+              Obj.update_object(existing, object_data, locales, versions)
+              result[:updated] += 1
+            else
+              Obj.add_object(object_data, locales, versions)
+              result[:created] += 1
+            end
+          rescue Exception => e
+            puts "Failed to import object #{object_data[:id]}"
+            puts e.message
+            puts e.backtrace.join("\n")
+            raise e
           end
-        rescue Exception => e
-          puts "Failed to import object #{object_data[:id]}"
-          puts e.message
-          puts e.backtrace.join("\n")
-          raise e
         end
+      else
+        puts "Unsupported file format - Exported objects should be grouped"
+        raise Exception.new('Unsupported objects format - Exported objects should be grouped')
       end
     end
 

data/app/models/apidae/obj.rb

@@ -185,7 +185,7 @@ module Apidae
           pictures_array.select { |p| p.is_a?(Hash) && !p[:traductionFichiers].blank? }.each do |pic|
             pics_data[locale] << {
                 name: localized_value(pic, :nom, locale),
-                url: pic[:traductionFichiers][0][:url],
+                url: pic[:traductionFichiers][0][:url].gsub('http:', 'https:'),
                 description: localized_value(pic, :legende, locale),
                 credits: localized_value(pic, :copyright, locale)
             }
@@ -204,7 +204,7 @@ module Apidae
           attachments_array.select { |att| att.is_a?(Hash) && !att[:traductionFichiers].blank? }.each do |att|
             atts_data[locale] << {
                 name: localized_value(att, :nom, locale),
-                url: att[:traductionFichiers][0][:url],
+                url: att[:traductionFichiers][0][:url].gsub('http:', 'https:'),
                 type: att[:type],
                 description: localized_value(att, :legende, locale)
             }

data/db/migrate/20190418133435_add_index_on_apidae_obj.rb

@@ -0,0 +1,6 @@
+class AddIndexOnApidaeObj < ActiveRecord::Migration[5.2]
+  def change
+    add_index :apidae_objs, :apidae_id, unique: false, name: 'apidae_objs_apidae_id'
+    add_index :apidae_objs, :root_obj_id, unique: false, name: 'apidae_objs_root_obj_id'
+  end
+end

data/lib/apidae/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-07 00:00:00.000000000 Z
+date: 2019-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -169,6 +169,7 @@ files:
 - db/migrate/20190127210921_migrate_localized_apidae_obj_fields.rb
 - db/migrate/20190127213602_migrate_localized_apidae_references.rb
 - db/migrate/20190304142446_migrate_desc_apidae_obj_fields.rb
+- db/migrate/20190418133435_add_index_on_apidae_obj.rb
 - lib/apidae.rb
 - lib/apidae/engine.rb
 - lib/apidae/version.rb