apidae 1.3.16 → 1.3.18
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/models/apidae/apidae_data_parser.rb +10 -4
- data/app/models/apidae/obj.rb +3 -3
- data/app/models/apidae/selection.rb +1 -1
- data/lib/apidae/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 404091c3c4aeea7ead657d6f94d1c87729df31a856e1e2c84926e8e9dbe19367
|
4
|
+
data.tar.gz: de47d5b8f2526a44586b55207d3dd466b867590a3ab78874b78d5179a37fdf6c
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 7dff3c671ee521d5fc73dd9d9a0061bf8d3815f6df24d121e677574d2406d2582533533b46b22505da22d4d639e206d228b66fdfbcfc6cc21bad8a956922c90a
|
7
|
+
data.tar.gz: bad3ccfea997dcc9e2674b9bb0fc882581ef66391c0a11e8fbc3eed79ab599b1fedd2620e70330998d886694c54b9e2575a80497aab11cd8e976b0c676513f00
|
@@ -101,10 +101,15 @@ module Apidae
|
|
101
101
|
{title: node_value(data_hash, :nom, *locales)}
|
102
102
|
end
|
103
103
|
|
104
|
-
def self.parse_owner_data(data_hash)
|
104
|
+
def self.parse_owner_data(data_hash, polls_data)
|
105
|
+
owner_data = {}
|
105
106
|
unless data_hash.blank?
|
106
|
-
{owner_name: data_hash[:nom], owner_id: data_hash[:id]}
|
107
|
+
owner_data.merge!({owner_name: data_hash[:nom], owner_id: data_hash[:id]})
|
107
108
|
end
|
109
|
+
unless polls_data.blank?
|
110
|
+
owner_data.merge!({polls: polls_data[:enquetes] || []})
|
111
|
+
end
|
112
|
+
owner_data
|
108
113
|
end
|
109
114
|
|
110
115
|
def self.parse_desc_data(data_hash, private_data, *locales)
|
@@ -233,7 +238,7 @@ module Apidae
|
|
233
238
|
end
|
234
239
|
|
235
240
|
# Note : use internal format for openings storage (ideally Apihours one, to merge data from both sources)
|
236
|
-
def self.parse_openings(openings_hash, *locales)
|
241
|
+
def self.parse_openings(openings_hash, opening_days, *locales)
|
237
242
|
if openings_hash && openings_hash[:periodeEnClair]
|
238
243
|
{
|
239
244
|
openings_desc: node_value(openings_hash, :periodeEnClair, *locales),
|
@@ -241,7 +246,8 @@ module Apidae
|
|
241
246
|
openings: build_openings(openings_hash, *locales),
|
242
247
|
all_year_long: openings_hash[:ouvertTouteLAnnee] == 'OUVERT_TOUTE_L_ANNEE' ? 'true' : 'false',
|
243
248
|
time_periods: lists_ids(openings_hash[:indicationsPeriode]),
|
244
|
-
openings_extra: lists_ids(openings_hash[:ouverturesComplementaires])
|
249
|
+
openings_extra: lists_ids(openings_hash[:ouverturesComplementaires]),
|
250
|
+
opening_days: opening_days
|
245
251
|
}
|
246
252
|
end
|
247
253
|
end
|
data/app/models/apidae/obj.rb
CHANGED
@@ -21,7 +21,7 @@ module Apidae
|
|
21
21
|
store_accessor :contact_data, :telephone, :email, :website, :google, :facebook, :twitter, :yelp, :trip_advisor, :fax,
|
22
22
|
:mobile_website, :shorty_url, :contacts
|
23
23
|
store_accessor :location_data, :address, :place, :latitude, :longitude, :access, :territories, :environments, :altitude, :map_reference
|
24
|
-
store_accessor :openings_data, :openings_desc, :openings_desc_mode, :openings, :time_periods, :openings_extra
|
24
|
+
store_accessor :openings_data, :openings_desc, :openings_desc_mode, :openings, :time_periods, :openings_extra, :opening_days
|
25
25
|
store_accessor :rates_data, :rates_desc, :rates_desc_mode, :rates, :payment_methods, :includes, :excludes, :rates_extra, :tax_included
|
26
26
|
store_accessor :service_data, :services, :equipments, :comfort, :activities, :challenged, :languages
|
27
27
|
store_accessor :booking_data, :booking_desc, :booking_entities, :visits_allowed, :visits_desc, :visits_duration, :visits_services
|
@@ -175,7 +175,7 @@ module Apidae
|
|
175
175
|
def self.populate_fields(apidae_obj, object_data, locales)
|
176
176
|
type_fields = TYPES_DATA[object_data[:type]]
|
177
177
|
apidae_obj.last_update = DateTime.parse(object_data[:gestion][:dateModification]) unless object_data[:gestion].blank?
|
178
|
-
apidae_obj.owner_data = ApidaeDataParser.parse_owner_data(object_data[:gestion][:membreProprietaire]) unless object_data[:gestion].blank?
|
178
|
+
apidae_obj.owner_data = ApidaeDataParser.parse_owner_data(object_data[:gestion][:membreProprietaire], object_data[:enquete]) unless (object_data[:gestion].blank? && object_data[:enquete].blank?)
|
179
179
|
apidae_obj.apidae_type = object_data[:type]
|
180
180
|
apidae_obj.apidae_subtype = ApidaeDataParser.node_id(object_data[type_fields[:node]], type_fields[:subtype])
|
181
181
|
apidae_obj.title_data = ApidaeDataParser.parse_title(object_data, *locales)
|
@@ -184,7 +184,7 @@ module Apidae
|
|
184
184
|
apidae_obj.location_data = ApidaeDataParser.parse_location_data(object_data[:localisation], object_data[type_fields[:node]],
|
185
185
|
object_data[:territoires])
|
186
186
|
apidae_obj.town = ApidaeDataParser.parse_town(object_data[:localisation])
|
187
|
-
apidae_obj.openings_data = ApidaeDataParser.parse_openings(object_data[:ouverture], *locales)
|
187
|
+
apidae_obj.openings_data = ApidaeDataParser.parse_openings(object_data[:ouverture], object_data[:datesOuverture], *locales)
|
188
188
|
apidae_obj.rates_data = ApidaeDataParser.parse_rates(object_data[:descriptionTarif], *locales)
|
189
189
|
apidae_obj.booking_data = ApidaeDataParser.parse_booking(object_data[:reservation], object_data[:visites], *locales)
|
190
190
|
apidae_obj.type_data = ApidaeDataParser.parse_type_data(apidae_obj, object_data[type_fields[:node]], object_data[:prestations],
|
@@ -220,7 +220,7 @@ module Apidae
|
|
220
220
|
def get_response(args)
|
221
221
|
response = ''
|
222
222
|
query = JSON.generate args.except(:url)
|
223
|
-
logger.
|
223
|
+
logger.debug "Apidae API query : #{args[:url]}?query=#{query}"
|
224
224
|
open("#{args[:url]}?query=#{CGI.escape query}") { |f|
|
225
225
|
f.each_line {|line| response += line if line}
|
226
226
|
}
|
data/lib/apidae/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: apidae
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.3.
|
4
|
+
version: 1.3.18
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Jean-Baptiste Vilain
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-
|
11
|
+
date: 2022-10-16 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|