apidae 0.9.14 → 0.9.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8cd680f167e5ed779ed8cbf212ed6bf920e2fca
-  data.tar.gz: f4a9a39f2d7b4639844de54a198aa97273ac640a
+  metadata.gz: 89bdda0e07dc726d4b70c073ae22f593ee2965a9
+  data.tar.gz: 7d2600b1a6d64a61c915e9bd7863dc2cd5a8d55a
 SHA512:
-  metadata.gz: b19dc62d6254687adfe209b0441736a590f73c80539bba1ccdb617f045e9c612caa5e89503aca1f711c63ba19c8b0415efa3c55bf82c5bc4ee05e9c382bc526e
-  data.tar.gz: cfb71e00838abb97a0d0f8ddd83cabcd17ad4bcc8fce6fa3fbd5da7fa80509cb0f5d74a4b71c5931a55e07303ab29af51f9fd84d10327d0e56c988d0164a7fb0
+  metadata.gz: 284aafe30129b821731551b6823a6063f316420ab11afa39af83f8340c36a8f424864ceac9862486e366268d2a6205ada486d1660f71dc6c3fc202d06c0198d9
+  data.tar.gz: c0b00e51b7f6498a307caafd0ee3e4da5d1f637b6fa11d2c3c44154b5d05db6bb427149ebbbaa86942298653f47cc9b558f1017508c082d849b5cc4ba23b129d

data/app/models/apidae/obj.rb

@@ -1,6 +1,5 @@
 module Apidae
   class Obj < ActiveRecord::Base
-    prepend OverriddenFields
 
     belongs_to :town, class_name: 'Apidae::Town', foreign_key: :town_insee_code, primary_key: :insee_code, optional: true
     has_many :apidae_selection_objects, class_name: 'Apidae::SelectionObject', foreign_key: :apidae_object_id
@@ -24,6 +23,23 @@ module Apidae
     store_accessor :booking_data, :booking_desc, :booking_entities
     store_accessor :tags_data, :promo, :internal, :linked
 
+    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 ? self : in_version(@obj_version)
+        field_hash = ref_obj.send(:"#{f}_hash")
+        ref_obj.send(:"#{f}_hash=", field_hash.merge(@locale => val))
+      end
+
+      define_method f do
+        ref_obj = @obj_version == DEFAULT_VERSION ? self : in_version(@obj_version)
+        field_hash = ref_obj.send(:"#{f}_hash") || {}
+        field_hash[@locale] || field_hash[DEFAULT_LOCALE]
+      end
+    end
+
     ACT = 'ACTIVITE'
     COS = 'COMMERCE_ET_SERVICE'
     DEG = 'DEGUSTATION'
@@ -131,7 +147,7 @@ module Apidae
       type_fields = TYPES_DATA[object_data[:type]]
       apidae_obj.apidae_type = object_data[:type]
       apidae_obj.apidae_subtype = node_id(object_data[type_fields[:node]], type_fields[:subtype])
-      apidae_obj.title = node_value(object_data, :nom, *locales)
+      apidae_obj.title_data = parse_title(object_data, *locales)
       apidae_obj.description_data = parse_desc_data(object_data[:presentation], object_data[:donneesPrivees], *locales)
       apidae_obj.contact = contact(object_data[:informations])
       apidae_obj.location_data = parse_location_data(object_data[:localisation], object_data[type_fields[:node]],
@@ -168,6 +184,10 @@ module Apidae
       data_hash.keep_if {|k, v| !v.blank?}
     end
 
+    def self.parse_title(data_hash, *locales)
+      {title: node_value(data_hash, :nom, *locales)}
+    end
+
     def self.parse_desc_data(data_hash, private_data, *locales)
       unless data_hash.blank?
         {

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "0.9.14"
+  VERSION = "0.9.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 0.9.14
+  version: 0.9.15
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-30 00:00:00.000000000 Z
+date: 2019-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -99,7 +99,6 @@ files:
 - app/models/apidae/export.rb
 - app/models/apidae/file_import.rb
 - app/models/apidae/obj.rb
-- app/models/apidae/overridden_fields.rb
 - app/models/apidae/project.rb
 - app/models/apidae/reference.rb
 - app/models/apidae/selection.rb

data/app/models/apidae/overridden_fields.rb

@@ -1,18 +0,0 @@
-module Apidae
-  module OverriddenFields
-
-    # Note : add non-localized fields that can be overridden in aspects (openings, rates etc...)
-    LOCALIZED_FIELDS.each do |f|
-      define_method f do
-        if @obj_version == DEFAULT_VERSION
-          val = (super() || {})[@locale]
-          val ||= (super() || {})[DEFAULT_LOCALE] if root_obj_id.nil?
-          val
-        else
-          v = in_version(@obj_version)
-          v ? (v.in_locale(@locale).send(f) || super()[@locale]) : super()[@locale]
-        end
-      end
-    end
-  end
-end