apidae 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e5d13058f65857b20c5eb5ebcb31933047d458d
-  data.tar.gz: 57c158bf11ea28f28c25094e2e2b732289cd1b47
+  metadata.gz: 765dd17ae6901f726e634a675934148a79715022
+  data.tar.gz: bab182d1cc1367ed70b10dfda1bb1d3a08f0d47c
 SHA512:
-  metadata.gz: '039e3d10fa484d795ad731c1a178b567f7c793b2a339ea835370f0a3c59318734ecb5bc9cd818073da9d4c16cdaf03d9d833f83c507d8589f39fe41d56c32657'
-  data.tar.gz: 188194787706a94cf7b04854bdd92266095ee95607b24a764ad2ccadda0fec50f076bb9d0631b7bb3454c02c80c74334bb5f313832d10ac012b86ec4ad3c3e23
+  metadata.gz: a019141cef8e85dc8806cd73c31dfbc02e5f95758c9be26825a7c8b647a4cb99ff2fd41af12723f8c867e9b52095d583ee195011dd5d8d2cf2de2c6d1775f5d1
+  data.tar.gz: 6695e5409d28e870ee3096db3737e88f3db3cc701ec5362860b8eab60c65ba45678ff20e6dbc780a9dc6db1c478a2c58baaf24d2a3eb1c6eff088738c52dde77

data/app/models/apidae/obj.rb

@@ -25,30 +25,38 @@ module Apidae
     store_accessor :tags_data, :promo, :internal, :linked
     store_accessor :version_data, :versioned_fields
 
-    LOCALIZED_FIELDS.each do |f|
-      alias_method :"#{f}_hash", :"#{f}"
-      alias_method :"#{f}_hash=", :"#{f}="
-
-      define_method "#{f}=" do |val|
-        ref_obj = (@obj_version == DEFAULT_VERSION || @obj_version.nil?) ? self : in_version(@obj_version)
-        field_hash = ref_obj.send(:"#{f}_hash") || {}
-        ref_obj.send(:"#{f}_hash=", field_hash.merge(@locale => val))
+    ALL_FIELDS.each do |f|
+      alias_method :"get_#{f}", :"#{f}"
+      alias_method :"set_#{f}", :"#{f}="
+
+      if LOCALIZED_FIELDS.include?(f)
+        define_method "#{f}=" do |val|
+          ref_obj = (@obj_version == DEFAULT_VERSION || @obj_version.nil?) ? self : in_version(@obj_version)
+          current_val = ref_obj.send(:"get_#{f}") || {}
+          ref_obj.send(:"set_#{f}", current_val.merge(@locale => val))
+        end
+      else
+        define_method "#{f}=" do |val|
+          ref_obj = (@obj_version == DEFAULT_VERSION || @obj_version.nil?) ? self : in_version(@obj_version)
+          ref_obj.send(:"set_#{f}", val)
+        end
       end
 
       define_method f do
-        field_hash = self.send(:"#{f}_hash") || {}
+        default_value = LOCALIZED_FIELDS.include?(f) ? {} : nil
+        field_val = self.send(:"get_#{f}") || default_value
         unless @obj_version == DEFAULT_VERSION
           versioned_obj = in_version(@obj_version)
           if versioned_obj
-            versioned_hash = versioned_obj.send(:"#{f}_hash") || {}
+            versioned_value = versioned_obj.send(:"get_#{f}") || default_value
             if versioned_obj.versioned_fields.include?(f.to_s)
-              field_hash = versioned_hash
-            else
-              field_hash.deep_merge!(versioned_hash)
+              field_val = versioned_value
+            elsif field_val.respond_to?('deep_merge!')
+              field_val.deep_merge!(versioned_value)
             end
           end
         end
-        field_hash[@locale] || field_hash[DEFAULT_LOCALE]
+        LOCALIZED_FIELDS.include?(f) ? (field_val[@locale] || field_val[DEFAULT_LOCALE]) : field_val
       end
     end
 

data/config/initializers/constants.rb

@@ -26,4 +26,6 @@ module Apidae
 
   LOCALIZED_FIELDS = [:title, :short_desc, :long_desc, :pictures, :attachments, :openings_desc, :rates_desc,
                       :includes, :excludes, :extra, :booking_desc]
+  ALL_FIELDS = LOCALIZED_FIELDS + [:theme_desc, :private_desc, :capacity, :telephone, :email, :website, :services,
+                                   :equipments, :comfort, :activities, :promo, :internal, :linked]
 end

data/db/migrate/20190127210921_migrate_localized_apidae_obj_fields.rb

@@ -1,5 +1,6 @@
 class MigrateLocalizedApidaeObjFields < ActiveRecord::Migration[5.2]
   def change
+    # Todo
     Apidae::Obj.all.each do |o|
       o.short_desc_hash = {'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_hash = {'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))

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end

data/test/data/equ_groups.json

@@ -550,7 +550,7 @@
         "ordre" : 170
       }
     } ],
-    "tailleGroupeMax" : 72
+    "tailleGroupeMax" : 64
   },
   "ouverture" : {
     "periodeEnClair" : {
@@ -1242,7 +1242,7 @@
   },
   "aspects" : [ {
     "aspect" : "GROUPES",
-    "champsAspect" : [ "illustrations", "descriptionTarif.indicationTarif", "descriptionTarif.periodes", "descriptionTarif.tarifsEnClairAutomatique", "ouverture.periodeEnClair", "descriptionTarif.conditions.gratuitPourLesMoinsDe", "descriptionTarif.complement", "multimedias", "presentation.descriptifDetaille", "informations.moyensCommunication", "descriptionTarif.tarifsEnClair", "prestations.tailleGroupeMax", "ouverture.periodeEnClairAutomatique", "presentation.descriptifCourt", "reservation.complement", "ouverture.periodesOuvertures" ],
+    "champsAspect" : [ "illustrations", "descriptionTarif.indicationTarif", "descriptionTarif.periodes", "descriptionTarif.tarifsEnClairAutomatique", "ouverture.periodeEnClair", "descriptionTarif.conditions.gratuitPourLesMoinsDe", "descriptionTarif.complement", "multimedias", "presentation.descriptifDetaille", "informations.moyensCommunication", "descriptionTarif.tarifsEnClair", "prestations.tailleGroupeMax", "prestations.equipements", "ouverture.periodeEnClairAutomatique", "presentation.descriptifCourt", "reservation.complement", "ouverture.periodesOuvertures" ],
     "informations" : {
       "moyensCommunication" : [ {
         "identifiant" : 72276483,
@@ -1288,8 +1288,20 @@
       }
     },
     "prestations" : {
-      "tailleGroupeMax" : 72
-    },
+      "tailleGroupeMax" : 72,
+      "equipements" : [ {
+        "elementReferenceType" : "PrestationEquipement",
+        "id" : 613,
+        "libelleFr" : "Aire de pique-nique",
+        "ordre" : 30,
+        "familleCritere" : {
+          "elementReferenceType" : "FamilleCritere",
+          "id" : 122,
+          "libelleFr" : "Equipements de loisirs",
+          "ordre" : 51
+        }
+      }
+    ] },
     "ouverture" : {
       "periodeEnClair" : {
         "libelleFr" : "Du 01/05 au 31/10.\nÀ partir de 10h30, uniquement sur réservation.\n\nSous réserve de conditions météo favorables."