apidae 0.3.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97cacc692289fdb612cad0f9adbf6fcf78f620bb
-  data.tar.gz: 9e97ba3558c0b225816f27714c10462313f4d586
+  metadata.gz: 60148050e39da7ee11f5ad3b5763f8974359e97c
+  data.tar.gz: 676823e12e5f3672229f13c2b5f6fff6ec83ddf6
 SHA512:
-  metadata.gz: 34afc260f113771be502374a0b23a68fe32298ceedf39f5ca5ea62c00f0a67e43119ed921d4708823bb153fa361a1545cf9064c9c2ad9e2e83ee81886663ead3
-  data.tar.gz: b79659180c93fceb6e803f5c3b1e0ad059902c01a1c050e8b36d3c35d7873000a0a8ad44fbac2bbe35ea16a5da553131976b7f1103b93817084275451fd7f331
+  metadata.gz: cd2224c5903a85ea614d39f360c27d02fb1d71fd40de52bd62101f84feb8d62c898736da212abf136287b7290685edf025fd4c2e358670953107b1376a15e5ad
+  data.tar.gz: 503d4a38cbcf23e52a101ead6eedcbb901566143e75bb04cf1e9f3b93c999871b686bfc924bcce5266e67e7f84116858a20dbd939ca8ac68a5a8e983b97acc98

data/app/models/apidae/object.rb

@@ -6,13 +6,15 @@ module Apidae
     has_many :apidae_selection_objects, class_name: 'Apidae::SelectionObject', foreign_key: :apidae_object_id
     has_many :selections, class_name: 'Apidae::Selection', source: :apidae_selection, through: :apidae_selection_objects
 
+    store_accessor :description_data, :short_desc, :long_desc, :theme_desc
     store_accessor :pictures_data, :pictures
     store_accessor :attachments_data, :attachments
-    store_accessor :type_data, :categories, :themes, :capacity, :classification, :labels, :chains, :area, :track
+    store_accessor :type_data, :categories, :themes, :capacity, :classification, :labels, :chains, :area, :track,
+                   :products, :audience, :animals, :extra, :duration
     store_accessor :entity_data, :entity_id, :entity_name
     store_accessor :contact, :telephone, :email, :website
-    store_accessor :address, :address_fields, :place
-    store_accessor :openings_data, :openings_desc, :openings
+    store_accessor :location_data, :address, :place, :latitude, :longitude, :access
+    store_accessor :openings_data, :openings_desc, :openings, :time_periods
     store_accessor :rates_data, :rates_desc, :rates, :payment_methods
     store_accessor :service_data, :services, :equipments, :comfort, :activities
     store_accessor :tags_data, :promo, :internal
@@ -67,13 +69,10 @@ module Apidae
       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)
-      apidae_obj.short_desc = node_value(object_data[:presentation], :descriptifCourt)
-      apidae_obj.long_desc = node_value(object_data[:presentation], :descriptifDetaille)
+      apidae_obj.description_data = parse_desc_data(object_data[:presentation])
       apidae_obj.contact = contact(object_data[:informations])
-      apidae_obj.address = address(object_data[:localisation][:adresse], object_data[type_fields[:node]])
+      apidae_obj.location_data = parse_location_data(object_data[:localisation], object_data[type_fields[:node]])
       apidae_obj.town = town(object_data[:localisation][:adresse])
-      apidae_obj.latitude = latitude(object_data[:localisation])
-      apidae_obj.longitude = longitude(object_data[:localisation])
       apidae_obj.openings_data = parse_openings(object_data[:ouverture])
       apidae_obj.rates_data = parse_rates(object_data[:descriptionTarif])
       apidae_obj.reservation = parse_reservation(object_data[:reservation])
@@ -87,6 +86,16 @@ module Apidae
       apidae_obj.save!
     end
 
+    def self.parse_desc_data(data_hash)
+      unless data_hash.blank?
+        {
+            short_desc: node_value(data_hash, :descriptifCourt),
+            long_desc: node_value(data_hash, :descriptifDetaille),
+            theme_desc: data_hash[:descriptifsThematises].blank? ? [] : Hash[data_hash[:descriptifsThematises].map {|th| [node_id(th, :theme), node_value(th, :description)]}]
+        }
+      end
+    end
+
     def self.pictures_urls(pictures_array)
       pics_data = []
       unless pictures_array.blank?
@@ -135,37 +144,37 @@ module Apidae
       contact_details
     end
 
-    def self.address(address_hash, type_data_hash)
-      computed_address = []
-      unless address_hash.blank?
-        computed_address << address_hash[:adresse1] unless address_hash[:adresse1].blank?
-        computed_address << address_hash[:adresse2] unless address_hash[:adresse2].blank?
-        computed_address << address_hash[:adresse3] unless address_hash[:adresse3].blank?
-      end
-      {address_fields: computed_address, place: type_data_hash[:nomLieu]}
-    end
-
-    def self.town(address_hash = {})
-      (!address_hash.blank? && address_hash[:commune]) ? Town.find_by_apidae_id(address_hash[:commune][:id]) : nil
-    end
-
-    def self.latitude(location_hash)
+    def self.parse_location_data(location_hash, type_data_hash)
       unless location_hash.blank?
+        address_hash = location_hash[:adresse]
+        computed_address = []
+        unless address_hash.blank?
+          computed_address << address_hash[:adresse1] unless address_hash[:adresse1].blank?
+          computed_address << address_hash[:adresse2] unless address_hash[:adresse2].blank?
+          computed_address << address_hash[:adresse3] unless address_hash[:adresse3].blank?
+        end
+        loc_data = {address: computed_address, place: type_data_hash[:nomLieu]}
         geoloc_details = location_hash[:geolocalisation]
-        (geoloc_details && geoloc_details[:valide] && geoloc_details[:geoJson]) ? geoloc_details[:geoJson][:coordinates][1] : nil
+        if geoloc_details && geoloc_details[:valide] && geoloc_details[:geoJson]
+          loc_data[:latitude] = geoloc_details[:geoJson][:coordinates][1]
+          loc_data[:longitude] = geoloc_details[:geoJson][:coordinates][0]
+        end
+        loc_data[:access] = node_value(geoloc_details, :complement) if geoloc_details
+        loc_data
       end
     end
 
-    def self.longitude(location_hash = {})
-      unless location_hash.blank?
-        geoloc_details = location_hash[:geolocalisation]
-        (geoloc_details && geoloc_details[:valide] && geoloc_details[:geoJson]) ? geoloc_details[:geoJson][:coordinates][0] : nil
-      end
+    def self.town(address_hash = {})
+      (!address_hash.blank? && address_hash[:commune]) ? Town.find_by_apidae_id(address_hash[:commune][:id]) : nil
     end
 
     def self.parse_openings(openings_hash)
       if openings_hash && openings_hash[:periodeEnClair]
-        {openings_desc: openings_hash[:periodeEnClair][:libelleFr], openings: openings_hash[:periodesOuvertures]}
+        {
+            openings_desc: openings_hash[:periodeEnClair][:libelleFr],
+            openings: openings_hash[:periodesOuvertures],
+            time_periods: lists_ids(openings_hash[:indicationsPeriode])
+        }
       end
     end
 
@@ -181,8 +190,9 @@ module Apidae
     def self.parse_type_data(apidae_obj, data_hash, prestations_hash)
       if data_hash
         apidae_obj.apidae_subtype = lists_ids(data_hash[:typesManifestation]).first if apidae_obj.apidae_type == FEM
+        apidae_obj.apidae_subtype = node_id(data_hash, :rubrique) if apidae_obj.apidae_type == EQU
         {
-            categories: lists_ids(data_hash[:categories]),
+            categories: lists_ids(data_hash[:categories], data_hash[:typesDetailles]),
             themes: lists_ids(data_hash[:themes]),
             capacity: data_hash[:capacite],
             classification: nodes_ids(data_hash[:classement], data_hash[:classementPrefectoral], data_hash[:classification]) +
@@ -190,7 +200,12 @@ module Apidae
             labels: lists_ids(data_hash[:labels], prestations_hash[:labelsTourismeHandicap]),
             chains: lists_ids(data_hash[:chaines]) + nodes_ids(data_hash[:chaineEtLabel]),
             area: apidae_obj.apidae_type == DOS ? data_hash.except(:classification) : nil,
-            track: apidae_obj.apidae_type == EQU ? data_hash[:itineraire] : nil
+            track: apidae_obj.apidae_type == EQU ? data_hash[:itineraire] : nil,
+            products: lists_ids(data_hash[:typesProduit]),
+            audience: lists_ids(prestations_hash[:typesClientele]),
+            animals: prestations_hash[:animauxAcceptes] == 'ACCEPTES',
+            extra: node_value(prestations_hash, :complementAccueil),
+            duration: data_hash[:dureeSeance]
         }
       end
     end

data/db/migrate/20180417164604_add_location_data_to_apidae_objects.rb

@@ -0,0 +1,5 @@
+class AddLocationDataToApidaeObjects < ActiveRecord::Migration[5.1]
+  def change
+    add_column :apidae_objects, :location_data, :jsonb
+  end
+end

data/db/migrate/20180417165744_remove_address_from_apidae_objects.rb

@@ -0,0 +1,5 @@
+class RemoveAddressFromApidaeObjects < ActiveRecord::Migration[5.1]
+  def change
+    remove_column :apidae_objects, :address
+  end
+end

data/db/migrate/20180417171344_remove_lat_lng_from_apidae_objects.rb

@@ -0,0 +1,6 @@
+class RemoveLatLngFromApidaeObjects < ActiveRecord::Migration[5.1]
+  def change
+    remove_column :apidae_objects, :latitude
+    remove_column :apidae_objects, :longitude
+  end
+end

data/db/migrate/20180418141248_add_description_data_to_apidae_objects.rb

@@ -0,0 +1,5 @@
+class AddDescriptionDataToApidaeObjects < ActiveRecord::Migration[5.1]
+  def change
+    add_column :apidae_objects, :description_data, :jsonb
+  end
+end

data/db/migrate/20180418141305_remove_desc_columns_from_apidae_objects.rb

@@ -0,0 +1,6 @@
+class RemoveDescColumnsFromApidaeObjects < ActiveRecord::Migration[5.1]
+  def change
+    remove_column :apidae_objects, :short_desc
+    remove_column :apidae_objects, :long_desc
+  end
+end

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "0.3.6"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-10 00:00:00.000000000 Z
+date: 2018-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -137,6 +137,11 @@ files:
 - db/migrate/20180314093512_add_tags_data_to_apidae_objects.rb
 - db/migrate/20180314132631_add_meta_data_to_apidae_objects.rb
 - db/migrate/20180319143954_remove_apidae_id_unicity.rb
+- db/migrate/20180417164604_add_location_data_to_apidae_objects.rb
+- db/migrate/20180417165744_remove_address_from_apidae_objects.rb
+- db/migrate/20180417171344_remove_lat_lng_from_apidae_objects.rb
+- db/migrate/20180418141248_add_description_data_to_apidae_objects.rb
+- db/migrate/20180418141305_remove_desc_columns_from_apidae_objects.rb
 - lib/apidae.rb
 - lib/apidae/engine.rb
 - lib/apidae/version.rb