apidae 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00c5440bf5cc07ac54d62f31b012b69d4653eb9e
-  data.tar.gz: 8720b15b69d1fd67f213e2495cd9ca1a827fe5c2
+  metadata.gz: 2fe1287369b7529aaf7d00240f5b8bd0c8c4e384
+  data.tar.gz: 86c492805ce1a12a864e8491708ac029506608a3
 SHA512:
-  metadata.gz: 02ed64fabb54ccb594370a02a2b22c587de4fde8b8701d7ed380ae60a740bb9cc23d9608f80b58efdbf8f1fee4b0bff44dc80dccc964bd098028901ebb16478a
-  data.tar.gz: c5a291714515a4f732bfec066780e5dd85b32e57397fc73ebe3547fd11fd732090793d256e942608d77b5f7788882f49883440e0dc6db159a4808c8c170c92a2
+  metadata.gz: b311d3795cd80311cc707abda6538dceb1b17bb58586264cd78d85a9776c9b7ceec75a128b178a404b8f3e23029fd56cbf55eec7aa48804c9399429f124d368c
+  data.tar.gz: 4967af4e9d2548a079573e415a4452ef43e2312260a0998e2852693ef7baa4703cc26f30f29901a047df425f3b504f3c30c6da1f21f6dee411277244648bd9c4

data/app/models/apidae/selection.rb

@@ -29,7 +29,11 @@ module Apidae
 
       added.each do |o|
         obj = Obj.find_by_apidae_id(o)
-        SelectionObject.create(apidae_selection_id: apidae_sel.id, apidae_object_id: obj.id)
+        if obj
+          SelectionObject.create(apidae_selection_id: apidae_sel.id, apidae_object_id: obj.id)
+        else
+          logger.error "Object #{o} referenced in selection #{apidae_sel.apidae_id} and project #{apidae_proj_id} is unknown"
+        end
       end
 
       removed_ids = Obj.where(apidae_id: removed).map {|o| o.id}

data/db/migrate/20190127210921_migrate_localized_apidae_obj_fields.rb

@@ -1,17 +1,17 @@
 class MigrateLocalizedApidaeObjFields < ActiveRecord::Migration[5.2]
   def change
     Apidae::Obj.all.each do |o|
-      o.short_desc = {'fr' => o.description_data['short_desc']} unless (o.description_data.blank? || o.description_data['short_desc'].blank? || o.description_data['short_desc'].is_a?(Hash))
-      o.long_desc = {'fr' => o.description_data['long_desc']} unless (o.description_data.blank? || o.description_data['long_desc'].blank? || o.description_data['long_desc'].is_a?(Hash))
-      o.theme_desc = {'fr' => o.description_data['theme_desc']} unless (o.description_data.blank? || o.description_data['theme_desc'].blank? || o.description_data['theme_desc'].is_a?(Hash))
-      o.private_desc = {'fr' => o.description_data['private_desc']} unless (o.description_data.blank? || o.description_data['private_desc'].blank? || o.description_data['private_desc'].is_a?(Hash))
-      o.pictures = {'fr' => o.pictures_data['pictures']} unless (o.pictures_data.blank? || o.pictures_data['pictures'].blank? || o.pictures_data['pictures'].is_a?(Hash))
-      o.attachments = {'fr' => o.attachments_data['attachments']} unless (o.attachments_data.blank? || o.attachments_data['attachments'].blank? || o.attachments_data['attachments'].is_a?(Hash))
-      o.openings_desc = {'fr' => o.openings_data['openings_desc']} unless (o.openings_data.blank? || o.openings_data['openings_desc'].blank? || o.openings_data['openings_desc'].is_a?(Hash))
-      o.rates_desc = {'fr' => o.rates_data['rates_desc']} unless (o.rates_data.blank? || o.rates_data['rates_desc'].blank? || o.rates_data['rates_desc'].is_a?(Hash))
-      o.includes = {'fr' => o.rates_data['includes']} unless (o.rates_data.blank? || o.rates_data['includes'].blank? || o.rates_data['includes'].is_a?(Hash))
-      o.excludes = {'fr' => o.rates_data['excludes']} unless (o.rates_data.blank? || o.rates_data['excludes'].blank? || o.rates_data['excludes'].is_a?(Hash))
-      o.extra = {'fr' => o.type_data['extra']} unless (o.type_data.blank? || o.type_data['extra'].blank? || o.type_data['extra'].is_a?(Hash))
+      o.short_desc = {'fr' => o.description_data['short_desc']} unless (o.description_data.blank? || !o.description_data.has_key?('short_desc') || o.description_data['short_desc'].is_a?(Hash))
+      o.long_desc = {'fr' => o.description_data['long_desc']} unless (o.description_data.blank? || !o.description_data.has_key?('long_desc') || o.description_data['long_desc'].is_a?(Hash))
+      o.theme_desc = {'fr' => o.description_data['theme_desc']} unless (o.description_data.blank? || !o.description_data.has_key?('theme_desc') || o.description_data['theme_desc'].is_a?(Hash))
+      o.private_desc = {'fr' => o.description_data['private_desc']} unless (o.description_data.blank? || !o.description_data.has_key?('private_desc') || o.description_data['private_desc'].is_a?(Hash))
+      o.pictures = {'fr' => o.pictures_data['pictures']} unless (o.pictures_data.blank? || !o.pictures_data.has_key?('pictures') || o.pictures_data['pictures'].is_a?(Hash))
+      o.attachments = {'fr' => o.attachments_data['attachments']} unless (o.attachments_data.blank? || !o.attachments_data.has_key?('attachments') || o.attachments_data['attachments'].is_a?(Hash))
+      o.openings_desc = {'fr' => o.openings_data['openings_desc']} unless (o.openings_data.blank? || !o.openings_data.has_key?('openings_desc') || o.openings_data['openings_desc'].is_a?(Hash))
+      o.rates_desc = {'fr' => o.rates_data['rates_desc']} unless (o.rates_data.blank? || !o.rates_data.has_key?('rates_desc') || o.rates_data['rates_desc'].is_a?(Hash))
+      o.includes = {'fr' => o.rates_data['includes']} unless (o.rates_data.blank? || !o.rates_data.has_key?('includes') || o.rates_data['includes'].is_a?(Hash))
+      o.excludes = {'fr' => o.rates_data['excludes']} unless (o.rates_data.blank? || !o.rates_data.has_key?('excludes') || o.rates_data['excludes'].is_a?(Hash))
+      o.extra = {'fr' => o.type_data['extra']} unless (o.type_data.blank? || !o.type_data.has_key?('extra') || o.type_data['extra'].is_a?(Hash))
       o.save!
     end
   end

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-29 00:00:00.000000000 Z
+date: 2019-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails