apidae 0.9.12 → 0.9.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0bf9ec2b27f43e1947e8bd43c328edb47f11080
-  data.tar.gz: d94cf5f9fd7da3c2d0e6a3243e286c18e47007a5
+  metadata.gz: 1e54fe57152a5714413aba23797610efd3a4a3e4
+  data.tar.gz: 565684a2efce72558b5a5d9454bf81d6e5d5320c
 SHA512:
-  metadata.gz: f358589f655e82f90442f29759ed046655a257d08f41a912637f0796b2627ddcc4e4bbda627d207bc9eaad4258a07694971524e70ea406e94dc6763aabebd3a7
-  data.tar.gz: c55567bd15c57cd906c5d9d08191ebd54ded314ee384eb10de6c242b13d5c8e911d0a096926bb9cfc7cbcab515bc4e32cc5e1857360ff9d0377bc07ddeb80c67
+  metadata.gz: 266e62aceee6c4871a2ee7d628f8126c4bf01eef8f653339b66c38660e58f1a0fd578999d6259927571c2ddf14d45a813dcb4cacad3bbd6701c02872a86fe6b7
+  data.tar.gz: 705ad1fc2670bf15e83478103434b5a22748791de48978bbb5792eb157c56c5f72467132ab61e0a08b32f51953c92806a6868d59274f341b47c5cad04a3787d1

data/app/models/apidae/obj.rb

@@ -18,8 +18,8 @@ module Apidae
     store_accessor :entity_data, :entity_id, :entity_name, :service_provider_id
     store_accessor :contact, :telephone, :email, :website
     store_accessor :location_data, :address, :place, :latitude, :longitude, :access, :territories, :environments
-    store_accessor :openings_data, :openings_desc, :openings, :time_periods
-    store_accessor :rates_data, :rates_desc, :rates, :payment_methods, :includes, :excludes
+    store_accessor :openings_data, :openings_desc, :openings_desc_mode, :openings, :time_periods
+    store_accessor :rates_data, :rates_desc, :rates_desc_mode, :rates, :payment_methods, :includes, :excludes
     store_accessor :service_data, :services, :equipments, :comfort, :activities, :challenged, :languages
     store_accessor :booking_data, :booking_desc, :booking_entities
     store_accessor :tags_data, :promo, :internal, :linked
@@ -64,6 +64,9 @@ module Apidae
     EMAIL = 204
     WEBSITE = 205
 
+    MODE_AUTO = 'auto'
+    MODE_MANUAL = 'manual'
+
     after_initialize do
       @locale = DEFAULT_LOCALE
       @obj_version = DEFAULT_VERSION
@@ -275,6 +278,7 @@ module Apidae
       if openings_hash && openings_hash[:periodeEnClair]
         {
             openings_desc: node_value(openings_hash, :periodeEnClair, *locales),
+            openings_desc_mode: openings_hash[:periodeEnClairGenerationMode] == 'AUTOMATIQUE' ? MODE_AUTO : MODE_MANUAL,
             openings: openings_hash[:periodesOuvertures],
             time_periods: lists_ids(openings_hash[:indicationsPeriode])
         }
@@ -288,6 +292,7 @@ module Apidae
         methods = rates_hash[:modesPaiement].blank? ? [] : rates_hash[:modesPaiement].map {|p| p[:id]}
         {
             rates_desc: desc, rates: values, payment_methods: methods,
+            rates_desc_mode: rates_hash[:tarifsEnClairGenerationMode] == 'AUTOMATIQUE' ? MODE_AUTO : MODE_MANUAL,
             includes: node_value(rates_hash, :leTarifComprend, *locales),
             excludes: node_value(rates_hash, :leTarifNeComprendPas, *locales)
         }
@@ -390,7 +395,7 @@ module Apidae
 
     def self.node_value(node, key, *locales)
       l = locales.blank? ? [DEFAULT_LOCALE] : locales
-      locales_map = Hash[l.map {|loc| ["libelle#{loc.camelize.gsub('-', '')}".to_sym, loc]}]
+      locales_map = Hash[l.map {|loc| [localized_key(loc), loc]}]
       if node && node[key]
         node[key].slice(*locales_map.keys).transform_keys {|k| locales_map[k]}
       else
@@ -398,9 +403,9 @@ module Apidae
       end
     end
 
-    def self.localized_value(node, key, locale)
+    def self.localized_value(node, key, loc)
       if node && node[key]
-        node[key]["libelle#{locale.camelize.gsub('-', '')}".to_sym]
+        node[key][localized_key(loc)]
       else
         ''
       end
@@ -417,5 +422,9 @@ module Apidae
     def self.nodes_ids(*nodes)
       nodes.blank? ? [] : nodes.select {|n| !n.blank?}.map {|n| n[:id]}
     end
+
+    def self.localized_key(loc = locale)
+      "libelle#{loc.camelize.gsub('-', '')}".to_sym
+    end
   end
 end

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "0.9.12"
+  VERSION = "0.9.13"
 end

metadata

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