apidae 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff6394e1f32776f2d275a0b448ceb968c493967b
-  data.tar.gz: 679a63b9dc98ea90c3a5491c59ab86ccf144c6e2
+  metadata.gz: 0b543869ff93b3f28bb112221a75f6453b893ea8
+  data.tar.gz: 59ad8e04d58263ae44fb6bc4ff97428592064e14
 SHA512:
-  metadata.gz: 3ee076bdd66bdf41487cd6be15d7ac4239724e004ff1304835f8c362f6b4f681d94681d289b3cb227f6dcae20ec02c7990338f9f4260d9a429a97bfc00e148ed
-  data.tar.gz: c2a9f335d0ec0bdcd58f639024431d1d78388c7c21140da2ab523bf72c520bc83d243f28ce26ef216bbc61e1e566893a4964a065bc31e27ee268695b9996aaa5
+  metadata.gz: 016145c8d3d73a03844b8c64cbf71df5b68a6c47becff87bdfff8e55d40bda4ed957f6c46192455a64ab8c10f58c42cc97436c04bacd44cf31915263919acd12
+  data.tar.gz: ebd5ae7ba7fa1b4447d61582d492e5e85d6c0ecbc3c5a52b5a0305ed09c0e075b95e3aeca68939e5b70c593baf1bc3dea4397107ba9ab5ba38ee0d8a5ec69675

data/app/models/apidae/obj.rb

@@ -7,6 +7,7 @@ module Apidae
 
     attr_accessor :locale
     attr_accessor :obj_version
+    attr_accessor :obj_versions
 
     store_accessor :title_data, :title
     store_accessor :owner_data, :owner_name, :owner_id
@@ -100,6 +101,7 @@ module Apidae
     after_initialize do
       @locale = DEFAULT_LOCALE
       @obj_version = DEFAULT_VERSION
+      @obj_versions = {}
     end
 
     def root_obj
@@ -111,11 +113,15 @@ module Apidae
     end
 
     def in_version(v)
-      @cached_versions ||= {}
-      if @cached_versions[v].nil?
-        @cached_versions[v] = versions.where(version: v).first
+      if v == DEFAULT_VERSION && root_obj_id.nil?
+        @obj_version = DEFAULT_VERSION
+        self
+      else
+        if @obj_versions[v].nil?
+          @obj_versions[v] = versions.where(version: v).first
+        end
+        @obj_versions[v]
       end
-      @cached_versions[v]
     end
 
     def in_locale(l)
@@ -164,6 +170,7 @@ module Apidae
       apidae_obj
     end
 
+    # Note : overrides existing fields (not a merge)
     def self.populate_fields(apidae_obj, object_data, locales)
       type_fields = TYPES_DATA[object_data[:type]]
       apidae_obj.last_update = DateTime.parse(object_data[:gestion][:dateModification]) unless object_data[:gestion].blank?

data/app/models/apidae/selection.rb

@@ -92,6 +92,7 @@ module Apidae
       query_api(query_args, true, false)
     end
 
+    # Note : WARNING - updated obj will only contain the provided fields
     def add_or_refresh_obj(apidae_obj_id, fields = ["@all"])
       if valid_api?
         res = api_object(apidae_obj_id, fields)
@@ -102,6 +103,7 @@ module Apidae
       end
     end
 
+    # Note : WARNING - updated objs will only contain the provided fields
     def add_or_refresh_objs(fields = ["@all"])
       if valid_api?
         res = api_objects({fields: fields})

data/config/initializers/constants.rb

@@ -24,8 +24,11 @@ module Apidae
   ALL_VERSIONS = [STANDARD_VERSION, WINTER_VERSION, SUMMER_VERSION, CHALLENGED_VERSION, BUSINESS_VERSION,
                   GROUPS_VERSION, ACTIVITIES_VERSION]
 
-  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,
+  LOCALIZED_FIELDS = [:title, :short_desc, :long_desc, :theme_desc, :pictures, :attachments,
+                      :openings_desc, :rates_desc, :includes, :excludes, :extra, :booking_desc]
+  ALL_FIELDS = LOCALIZED_FIELDS + [:theme_desc, :private_desc, :capacity, :telephone, :email, :website,
+                                   :google, :facebook, :twitter, :yelp, :trip_advisor, :fax, :mobile_website, :shorty_url,
+                                   :openings, :rates, :services, :payment_methods, :categories, :themes, :labels, :chains,
+                                   :classification, :challenged, :environments, :languages, :products, :animals,
                                    :equipments, :comfort, :activities, :promo, :internal, :linked]
 end

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "1.2.5"
+  VERSION = "1.2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-23 00:00:00.000000000 Z
+date: 2020-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails