apidae 1.3.18 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 404091c3c4aeea7ead657d6f94d1c87729df31a856e1e2c84926e8e9dbe19367
-  data.tar.gz: de47d5b8f2526a44586b55207d3dd466b867590a3ab78874b78d5179a37fdf6c
+  metadata.gz: 7426138fffb907d9917ac5d115a954002023efcc6a2ccbe0d6e27a0ca5f4e85d
+  data.tar.gz: d4716809c8a3bb226d8cf538a23c07e2e926a65b1d396911f680cef4dba8cc3f
 SHA512:
-  metadata.gz: 7dff3c671ee521d5fc73dd9d9a0061bf8d3815f6df24d121e677574d2406d2582533533b46b22505da22d4d639e206d228b66fdfbcfc6cc21bad8a956922c90a
-  data.tar.gz: bad3ccfea997dcc9e2674b9bb0fc882581ef66391c0a11e8fbc3eed79ab599b1fedd2620e70330998d886694c54b9e2575a80497aab11cd8e976b0c676513f00
+  metadata.gz: a0e49d2d72be1d4f9f0036ca7da7138fb778af340a363b97b2a027062d166dfdf88dc7bc9db9ba83b4b66a186290d157767592552eb889f42c4ba8b5a4b0671d
+  data.tar.gz: 44d1a75ac8f9a9a14d3bc54ab31a9b9fdb1bef8bfa35f9edb7d2c19891e1637e89ed6e6f10bd1fd3131966293de66c788508988b1ac3b46cb71017dd3235bb37

data/app/models/apidae/apidae_data_parser.rb

@@ -130,13 +130,15 @@ module Apidae
         l.each do |locale|
           pics_data[locale] = []
           pictures_array.select { |p| p.is_a?(Hash) && !p[:traductionFichiers].blank? }.each do |pic|
+            pic_file = pic[:traductionFichiers][0]
             pics_data[locale] << {
                 id: pic[:identifiant],
                 name: localized_value(pic, :nom, locale),
-                url: pic[:traductionFichiers][0][:url].gsub('http:', 'https:'),
+                url: pic_file[:url].gsub('http:', 'https:'),
                 description: localized_value(pic, :legende, locale),
                 credits: localized_value(pic, :copyright, locale),
-                expiration_date: pic[:dateLimiteDePublication] || ''
+                expiration_date: pic[:dateLimiteDePublication] || '',
+                properties: {size: pic_file[:taille], width: pic_file[:largeur], height: pic_file[:height]}
             }
           end
         end
@@ -214,21 +216,22 @@ module Apidae
     def self.parse_location_data(location_hash, type_data_hash, territories)
       loc_data = {}
       unless location_hash.blank?
-        address_hash = location_hash[:adresse]
+        address_hash = location_hash[:adresse] || {}
         computed_address = []
         unless address_hash.blank?
-          computed_address << address_hash[:adresse1] unless address_hash[:adresse1].blank?
-          computed_address << address_hash[:adresse2] unless address_hash[:adresse2].blank?
-          computed_address << address_hash[:adresse3] unless address_hash[:adresse3].blank?
+          computed_address << address_hash[:adresse1]
+          computed_address << address_hash[:adresse2]
+          computed_address << address_hash[:adresse3]
         end
         loc_data.merge!({address: computed_address})
-        loc_data.merge!({place: type_data_hash[:nomLieu]}) if type_data_hash
+        loc_data.merge!({place: (type_data_hash ? type_data_hash[:nomLieu] : nil) || address_hash[:nomDuLieu]})
         geoloc_details = location_hash[:geolocalisation]
         if geoloc_details && geoloc_details[:valide] && geoloc_details[:geoJson]
           loc_data[:latitude] = geoloc_details[:geoJson][:coordinates][1]
           loc_data[:longitude] = geoloc_details[:geoJson][:coordinates][0]
         end
         loc_data[:map_reference] = geoloc_details[:reperePlan]
+        loc_data[:valid] = geoloc_details[:valide] == true
         loc_data[:altitude] = geoloc_details[:altitude] if geoloc_details
         loc_data[:access] = node_value(geoloc_details, :complement) if geoloc_details
         loc_data[:environments] = location_hash[:environnements].map {|e| e[:id]} if location_hash[:environnements]

data/app/models/apidae/obj.rb

@@ -10,7 +10,7 @@ module Apidae
     attr_accessor :obj_versions
 
     store_accessor :title_data, :title
-    store_accessor :owner_data, :owner_name, :owner_id
+    store_accessor :owner_data, :owner_name, :owner_id, :polls
     store_accessor :description_data, :short_desc, :long_desc, :theme_desc, :private_desc
     store_accessor :pictures_data, :pictures
     store_accessor :attachments_data, :attachments
@@ -28,6 +28,8 @@ module Apidae
     store_accessor :tags_data, :promo, :internal, :linked
     store_accessor :version_data, :versioned_fields
 
+    before_update :archive_updated_fields
+
     ALL_FIELDS.each do |f|
       alias_method :"get_#{f}", :"#{f}"
       alias_method :"set_#{f}", :"#{f}="
@@ -105,6 +107,10 @@ module Apidae
       @obj_versions = {}
     end
 
+    def self.default_scope
+      where(root_obj_id: nil)
+    end
+
     def root_obj
       Obj.unscoped.where(id: root_obj_id).first
     end
@@ -138,12 +144,61 @@ module Apidae
       elsif root_val.respond_to?(:dig)
         root_val.dig(*nested_keys)
       else
-        raise ArgumentError.new('Cannot call dig with these args')
+        raise ArgumentError.new('Cannot call dig with these args: ' + keys.to_s)
       end
     end
 
-    def self.default_scope
-      where(root_obj_id: nil)
+    def archive_updated_fields
+      self.prev_data ||= {}
+      ignored_root_attributes = ['prev_data', 'updated_at']
+      changed_attributes.each_pair do |attr, prev_value|
+        unless ignored_root_attributes.include?(attr)
+          if prev_value.is_a?(Hash)
+            archive_hash_value(prev_value)
+          else
+            self.prev_data[attr] = {'prev' => prev_value, 'ts' => Time.current.to_i}
+          end
+        end
+      end
+    end
+
+    def archive_hash_value(prev_value, parent = nil)
+      ts = Time.current.to_i
+      ignored_sub_attributes = ['opening_days']
+      prev_value.each_pair do |sub_attr, prev_sub_val|
+        if Apidae::ALL_LOCALES.include?(sub_attr) && parent
+          new_val = in_locale(sub_attr).send(parent)
+        elsif /^\d+$/.match?(sub_attr) && parent
+          # Note : email / website / telephone etc... case - To be improved using changes method and a proper Hash/Array diff
+          new_val = in_locale(Apidae::DEFAULT_LOCALE)[parent]
+        else
+          new_val = parent ? in_locale(Apidae::DEFAULT_LOCALE).dig(parent, sub_attr) : (respond_to?(sub_attr) ? in_locale(Apidae::DEFAULT_LOCALE).send(sub_attr) : in_locale(Apidae::DEFAULT_LOCALE)[sub_attr])
+        end
+        unless ignored_sub_attributes.include?(sub_attr) || new_val == prev_sub_val
+          if parent
+            self.prev_data[parent][sub_attr] ||= {}
+          else
+            self.prev_data[sub_attr] ||= {}
+          end
+          if prev_sub_val.is_a?(Hash) && parent.nil?
+            archive_hash_value(prev_sub_val, sub_attr)
+          elsif prev_sub_val.is_a?(Array) && prev_sub_val.all? {|v| v.is_a?(Hash) && (v['id'] || v['identifiant'])}
+            archived_val = {'prev' => prev_sub_val.map {|v| v['id'] || v['identifiant']}, 'ts' => ts}
+            if parent
+              self.prev_data[parent][sub_attr] = archived_val
+            else
+              self.prev_data[sub_attr] = archived_val
+            end
+          else
+            archived_val = {'prev' => prev_sub_val, 'ts' => ts}
+            if parent
+              self.prev_data[parent][sub_attr] = archived_val
+            else
+              self.prev_data[sub_attr] = archived_val
+            end
+          end
+        end
+      end
     end
 
     def self.add_object(object_data, locales, versions)

data/db/migrate/20230206113335_add_prev_data_to_apidae_objs.rb

@@ -0,0 +1,5 @@
+class AddPrevDataToApidaeObjs < ActiveRecord::Migration[6.1]
+  def change
+    add_column :apidae_objs, :prev_data, :jsonb
+  end
+end

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "1.3.18"
+  VERSION = "1.4.1"
 end

data/test/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_06_07_214647) do
+ActiveRecord::Schema.define(version: 2023_02_06_113335) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -69,6 +69,7 @@ ActiveRecord::Schema.define(version: 2021_06_07_214647) do
     t.datetime "last_update"
     t.jsonb "owner_data"
     t.jsonb "version_data"
+    t.jsonb "prev_data"
     t.index ["apidae_id"], name: "apidae_objs_apidae_id"
     t.index ["root_obj_id", "version"], name: "index_apidae_objs_on_root_obj_id_and_version", unique: true
     t.index ["root_obj_id"], name: "apidae_objs_root_obj_id"

data/test/dummy/log/development.log

@@ -19,177 +19,19 @@ callback this way:
 That block runs when the application boots, and every time there is a reload.
 For historical reasons, it may run twice, so it has to be idempotent.
 
-Check the "Autoloading and Reloading Constants" guide to learn more about how
-Rails autoloads and reloads.
- (called from <top (required)> at /Users/jbvilain/workspace/apidae-engine-rails/test/dummy/config/environment.rb:5)
-DEPRECATION WARNING: Initialization autoloaded the constants Apidae::ApidaeHelper, Apidae::ApplicationHelper, Apidae::ApiHelper, Apidae::DashboardHelper, Apidae::ExtendableHelper, Apidae::ImportHelper, Apidae::ObjectsHelper, Apidae::ReferencesHelper, Apidae::SelectionsHelper, and Apidae::ApplicationController.
-
-Being able to do this is deprecated. Autoloading during initialization is going
-to be an error condition in future versions of Rails.
-
-Reloading does not reboot the application, and therefore code executed during
-initialization does not run again. So, if you reload Apidae::ApidaeHelper, for example,
-the expected changes won't be reflected in that stale Module object.
-
-`config.autoloader` is set to `classic`. These autoloaded constants would have been unloaded if `config.autoloader` had been set to `:zeitwerk`.
-
-In order to autoload safely at boot time, please wrap your code in a reloader
-callback this way:
-
-    Rails.application.reloader.to_prepare do
-      # Autoload classes and modules needed at boot time here.
-    end
-
-That block runs when the application boots, and every time there is a reload.
-For historical reasons, it may run twice, so it has to be idempotent.
-
-Check the "Autoloading and Reloading Constants" guide to learn more about how
-Rails autoloads and reloads.
- (called from <top (required)> at /Users/jbvilain/workspace/code/apidae-engine-rails/test/dummy/config/environment.rb:5)
-DEPRECATION WARNING: Initialization autoloaded the constants Apidae::ApidaeHelper, Apidae::ApplicationHelper, Apidae::ApiHelper, Apidae::DashboardHelper, Apidae::ExtendableHelper, Apidae::ImportHelper, Apidae::ObjectsHelper, Apidae::ReferencesHelper, Apidae::SelectionsHelper, and Apidae::ApplicationController.
-
-Being able to do this is deprecated. Autoloading during initialization is going
-to be an error condition in future versions of Rails.
-
-Reloading does not reboot the application, and therefore code executed during
-initialization does not run again. So, if you reload Apidae::ApidaeHelper, for example,
-the expected changes won't be reflected in that stale Module object.
-
-`config.autoloader` is set to `classic`. These autoloaded constants would have been unloaded if `config.autoloader` had been set to `:zeitwerk`.
-
-In order to autoload safely at boot time, please wrap your code in a reloader
-callback this way:
-
-    Rails.application.reloader.to_prepare do
-      # Autoload classes and modules needed at boot time here.
-    end
-
-That block runs when the application boots, and every time there is a reload.
-For historical reasons, it may run twice, so it has to be idempotent.
-
-Check the "Autoloading and Reloading Constants" guide to learn more about how
-Rails autoloads and reloads.
- (called from <top (required)> at /Users/jbvilain/workspace/code/apidae-engine-rails/test/dummy/config/environment.rb:5)
-DEPRECATION WARNING: Initialization autoloaded the constants Apidae::ApidaeHelper, Apidae::ApplicationHelper, Apidae::ApiHelper, Apidae::DashboardHelper, Apidae::ExtendableHelper, Apidae::ImportHelper, Apidae::ObjectsHelper, Apidae::ReferencesHelper, Apidae::SelectionsHelper, and Apidae::ApplicationController.
-
-Being able to do this is deprecated. Autoloading during initialization is going
-to be an error condition in future versions of Rails.
-
-Reloading does not reboot the application, and therefore code executed during
-initialization does not run again. So, if you reload Apidae::ApidaeHelper, for example,
-the expected changes won't be reflected in that stale Module object.
-
-`config.autoloader` is set to `classic`. These autoloaded constants would have been unloaded if `config.autoloader` had been set to `:zeitwerk`.
-
-In order to autoload safely at boot time, please wrap your code in a reloader
-callback this way:
-
-    Rails.application.reloader.to_prepare do
-      # Autoload classes and modules needed at boot time here.
-    end
-
-That block runs when the application boots, and every time there is a reload.
-For historical reasons, it may run twice, so it has to be idempotent.
-
-Check the "Autoloading and Reloading Constants" guide to learn more about how
-Rails autoloads and reloads.
- (called from <top (required)> at /Users/jbvilain/workspace/code/apidae-engine-rails/test/dummy/config/environment.rb:5)
-DEPRECATION WARNING: Initialization autoloaded the constants Apidae::ApidaeHelper, Apidae::ApplicationHelper, Apidae::ApiHelper, Apidae::DashboardHelper, Apidae::ExtendableHelper, Apidae::ImportHelper, Apidae::ObjectsHelper, Apidae::ReferencesHelper, Apidae::SelectionsHelper, and Apidae::ApplicationController.
-
-Being able to do this is deprecated. Autoloading during initialization is going
-to be an error condition in future versions of Rails.
-
-Reloading does not reboot the application, and therefore code executed during
-initialization does not run again. So, if you reload Apidae::ApidaeHelper, for example,
-the expected changes won't be reflected in that stale Module object.
-
-`config.autoloader` is set to `classic`. These autoloaded constants would have been unloaded if `config.autoloader` had been set to `:zeitwerk`.
-
-In order to autoload safely at boot time, please wrap your code in a reloader
-callback this way:
-
-    Rails.application.reloader.to_prepare do
-      # Autoload classes and modules needed at boot time here.
-    end
-
-That block runs when the application boots, and every time there is a reload.
-For historical reasons, it may run twice, so it has to be idempotent.
-
-Check the "Autoloading and Reloading Constants" guide to learn more about how
-Rails autoloads and reloads.
- (called from <top (required)> at /Users/jbvilain/workspace/code/apidae-engine-rails/test/dummy/config/environment.rb:5)
-DEPRECATION WARNING: Initialization autoloaded the constants Apidae::ApidaeHelper, Apidae::ApplicationHelper, Apidae::ApiHelper, Apidae::DashboardHelper, Apidae::ExtendableHelper, Apidae::ImportHelper, Apidae::ObjectsHelper, Apidae::ReferencesHelper, Apidae::SelectionsHelper, and Apidae::ApplicationController.
-
-Being able to do this is deprecated. Autoloading during initialization is going
-to be an error condition in future versions of Rails.
-
-Reloading does not reboot the application, and therefore code executed during
-initialization does not run again. So, if you reload Apidae::ApidaeHelper, for example,
-the expected changes won't be reflected in that stale Module object.
-
-`config.autoloader` is set to `classic`. These autoloaded constants would have been unloaded if `config.autoloader` had been set to `:zeitwerk`.
-
-In order to autoload safely at boot time, please wrap your code in a reloader
-callback this way:
-
-    Rails.application.reloader.to_prepare do
-      # Autoload classes and modules needed at boot time here.
-    end
-
-That block runs when the application boots, and every time there is a reload.
-For historical reasons, it may run twice, so it has to be idempotent.
-
-Check the "Autoloading and Reloading Constants" guide to learn more about how
-Rails autoloads and reloads.
- (called from <top (required)> at /Users/jbvilain/workspace/code/apidae-engine-rails/test/dummy/config/environment.rb:5)
-DEPRECATION WARNING: Initialization autoloaded the constants Apidae::ApidaeHelper, Apidae::ApplicationHelper, Apidae::ApiHelper, Apidae::DashboardHelper, Apidae::ExtendableHelper, Apidae::ImportHelper, Apidae::ObjectsHelper, Apidae::ReferencesHelper, Apidae::SelectionsHelper, and Apidae::ApplicationController.
-
-Being able to do this is deprecated. Autoloading during initialization is going
-to be an error condition in future versions of Rails.
-
-Reloading does not reboot the application, and therefore code executed during
-initialization does not run again. So, if you reload Apidae::ApidaeHelper, for example,
-the expected changes won't be reflected in that stale Module object.
-
-`config.autoloader` is set to `classic`. These autoloaded constants would have been unloaded if `config.autoloader` had been set to `:zeitwerk`.
-
-In order to autoload safely at boot time, please wrap your code in a reloader
-callback this way:
-
-    Rails.application.reloader.to_prepare do
-      # Autoload classes and modules needed at boot time here.
-    end
-
-That block runs when the application boots, and every time there is a reload.
-For historical reasons, it may run twice, so it has to be idempotent.
-
-Check the "Autoloading and Reloading Constants" guide to learn more about how
-Rails autoloads and reloads.
- (called from <top (required)> at /Users/jbvilain/workspace/code/apidae-engine-rails/test/dummy/config/environment.rb:5)
-DEPRECATION WARNING: Initialization autoloaded the constants Apidae::ApidaeHelper, Apidae::ApplicationHelper, Apidae::ApiHelper, Apidae::DashboardHelper, Apidae::ExtendableHelper, Apidae::ImportHelper, Apidae::ObjectsHelper, Apidae::ReferencesHelper, Apidae::SelectionsHelper, and Apidae::ApplicationController.
-
-Being able to do this is deprecated. Autoloading during initialization is going
-to be an error condition in future versions of Rails.
-
-Reloading does not reboot the application, and therefore code executed during
-initialization does not run again. So, if you reload Apidae::ApidaeHelper, for example,
-the expected changes won't be reflected in that stale Module object.
-
-`config.autoloader` is set to `classic`. These autoloaded constants would have been unloaded if `config.autoloader` had been set to `:zeitwerk`.
-
-In order to autoload safely at boot time, please wrap your code in a reloader
-callback this way:
-
-    Rails.application.reloader.to_prepare do
-      # Autoload classes and modules needed at boot time here.
-    end
-
-That block runs when the application boots, and every time there is a reload.
-For historical reasons, it may run twice, so it has to be idempotent.
-
 Check the "Autoloading and Reloading Constants" guide to learn more about how
 Rails autoloads and reloads.
  (called from <top (required)> at /Users/jbvilain/workspace/code/apidae-engine-rails/test/dummy/config/environment.rb:5)
+  Apidae::Obj Load (0.8ms)  SELECT "apidae_objs".* FROM "apidae_objs" WHERE "apidae_objs"."root_obj_id" IS NULL ORDER BY "apidae_objs"."id" ASC LIMIT $1  [["LIMIT", 1]]
+  TRANSACTION (1.0ms)  BEGIN
+  Apidae::Obj Create (8.3ms)  INSERT INTO "apidae_objs" ("apidae_type", "created_at", "updated_at", "description_data") VALUES ($1, $2, $3, $4) RETURNING "id"  [["apidae_type", "test"], ["created_at", "2023-02-16 21:12:52.351303"], ["updated_at", "2023-02-16 21:12:52.351303"], ["description_data", "{\"short_desc\":{\"\":\"test desc\"}}"]]
+  TRANSACTION (0.7ms)  COMMIT
+  TRANSACTION (0.2ms)  BEGIN
+  Apidae::Obj Update (1.3ms)  UPDATE "apidae_objs" SET "updated_at" = $1, "description_data" = $2 WHERE "apidae_objs"."id" = $3  [["updated_at", "2023-02-16 21:16:00.968796"], ["description_data", "{\"short_desc\":{\"\":\"test desc\",\"fr\":\"updated desc\"}}"], ["id", 1]]
+  TRANSACTION (0.7ms)  COMMIT
+  TRANSACTION (0.2ms)  BEGIN
+  Apidae::Obj Create (0.9ms)  INSERT INTO "apidae_objs" ("apidae_type", "created_at", "updated_at", "description_data") VALUES ($1, $2, $3, $4) RETURNING "id"  [["apidae_type", "HOTELLERIE"], ["created_at", "2023-02-16 21:17:36.422310"], ["updated_at", "2023-02-16 21:17:36.422310"], ["description_data", "{\"short_desc\":{\"fr\":\"short desc fr\"}}"]]
+  TRANSACTION (1.4ms)  COMMIT
 DEPRECATION WARNING: Initialization autoloaded the constants Apidae::ApidaeHelper, Apidae::ApplicationHelper, Apidae::ApiHelper, Apidae::DashboardHelper, Apidae::ExtendableHelper, Apidae::ImportHelper, Apidae::ObjectsHelper, Apidae::ReferencesHelper, Apidae::SelectionsHelper, and Apidae::ApplicationController.
 
 Being able to do this is deprecated. Autoloading during initialization is going