apidae 1.2.1 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bd545f978b6e92863317ee32f69d390366929e7
-  data.tar.gz: 7708db489c0c2a976645e121b03c3da60224ffc6
+  metadata.gz: 0b543869ff93b3f28bb112221a75f6453b893ea8
+  data.tar.gz: 59ad8e04d58263ae44fb6bc4ff97428592064e14
 SHA512:
-  metadata.gz: 47c2dd654c858986dc9cb77bec0088a3dc3102496d3807baa0e4c25dfe9927a4e5f374da9d7995bf915f773e90e70ab0ba84939a0a250835d254e19c33341174
-  data.tar.gz: 40cfebeba007efd9434a490cfdd001d47d4168ac4282276863178e3906273f523fa643f19c3e9dde7bdc3f9234d3f6166866b858f04765d14ac91cb3ad03760e
+  metadata.gz: 016145c8d3d73a03844b8c64cbf71df5b68a6c47becff87bdfff8e55d40bda4ed957f6c46192455a64ab8c10f58c42cc97436c04bacd44cf31915263919acd12
+  data.tar.gz: ebd5ae7ba7fa1b4447d61582d492e5e85d6c0ecbc3c5a52b5a0305ed09c0e075b95e3aeca68939e5b70c593baf1bc3dea4397107ba9ab5ba38ee0d8a5ec69675

data/app/controllers/apidae/objects_controller.rb

@@ -34,17 +34,15 @@ module Apidae
     def create
       @obj = Obj.new(object_params)
       if Obj.find_by_apidae_id(@obj.apidae_id)
-        redirect_to objects_url, alert: "Cet objet est déjà importé."
-      else
-        selection = params[:selection_apidae_id].blank? ? Selection.last : Selection.find_by_apidae_id(params[:selection_apidae_id])
-        if @obj.save && selection.add_or_refresh_obj(@obj.apidae_id)
-          redirect_to objects_url, notice: "L'objet a bien été importé"
-        else
-          flash[:alert] = "Une erreur s'est produite lors de l'import de l'objet."
-          render :new
+        redirect_to objects_url, alert: "Cet objet est déjà importé." and return
+      elsif !params[:selection_apidae_id].blank?
+        selection = Selection.find_by_apidae_id(params[:selection_apidae_id])
+        if selection && selection.valid_api? && @obj.save && selection.add_or_refresh_obj(@obj.apidae_id)
+          redirect_to objects_url, notice: "L'objet a bien été importé" and return
         end
       end
-
+      flash[:alert] = "Une erreur s'est produite lors de l'import de l'objet."
+      render :new
     end
 
     def update
@@ -63,7 +61,8 @@ module Apidae
     def refresh
       referrer = (session.delete(:referrer) || objects_url)
       begin
-        if @obj && @obj.selections.first.add_or_refresh_obj(@obj.apidae_id)
+        sel = @obj.selections.find {|s| s.valid_api?}
+        if sel && sel.add_or_refresh_obj(@obj.apidae_id)
           redirect_to referrer, notice: "L'objet touristique a bien été mis à jour."
         else
           redirect_to referrer, alert: "Une erreur s'est produite lors de la mise à jour de l'objet."

data/app/models/apidae/apidae_data_parser.rb

@@ -236,6 +236,7 @@ module Apidae
             openings_desc: node_value(openings_hash, :periodeEnClair, *locales),
             openings_desc_mode: openings_hash[:periodeEnClairGenerationMode] == 'AUTOMATIQUE' ? MODE_AUTO : MODE_MANUAL,
             openings: build_openings(openings_hash, *locales),
+            all_year_long: openings_hash[:ouvertTouteLAnnee] == 'OUVERT_TOUTE_L_ANNEE' ? 'true' : 'false',
             time_periods: lists_ids(openings_hash[:indicationsPeriode]),
             openings_extra: lists_ids(openings_hash[:ouverturesComplementaires])
         }
@@ -245,13 +246,14 @@ module Apidae
     def self.parse_rates(rates_hash, *locales)
       if rates_hash
         desc = rates_hash[:gratuit] ? {DEFAULT_LOCALE => 'gratuit'} : node_value(rates_hash, :tarifsEnClair, *locales)
-        values = rates_hash[:periodes].blank? ? [] : rates_hash[:periodes].map {|p| build_rate(p)}
+        values = rates_hash[:periodes].blank? ? [] : rates_hash[:periodes].map {|p| build_rate(p, *locales)}
         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)
+            excludes: node_value(rates_hash, :leTarifNeComprendPas, *locales),
+            rates_extra: node_value(rates_hash, :complement, *locales)
         }
       end
     end
@@ -346,10 +348,10 @@ module Apidae
 
     private
 
-    def self.build_rate(rate_period)
+    def self.build_rate(rate_period, *locales)
       {
           id: rate_period[:identifiant], start_date: rate_period[:dateDebut], end_date: rate_period[:dateFin],
-          values: rate_period[:tarifs].blank? ? [] : rate_period[:tarifs].map {|t| {min: t[:minimum], max: t[:maximum], type: t[:type][:id], details: node_value(t, :precisionTarif)}}
+          values: rate_period[:tarifs].blank? ? [] : rate_period[:tarifs].map {|t| {min: t[:minimum], max: t[:maximum], type: t[:type][:id], details: node_value(t, :precisionTarif, *locales)}}
       }
     end
 

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
@@ -20,7 +21,7 @@ module Apidae
                    :mobile_website, :shorty_url, :contacts
     store_accessor :location_data, :address, :place, :latitude, :longitude, :access, :territories, :environments
     store_accessor :openings_data, :openings_desc, :openings_desc_mode, :openings, :time_periods, :openings_extra
-    store_accessor :rates_data, :rates_desc, :rates_desc_mode, :rates, :payment_methods, :includes, :excludes
+    store_accessor :rates_data, :rates_desc, :rates_desc_mode, :rates, :payment_methods, :includes, :excludes, :rates_extra
     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
@@ -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/reference.rb

@@ -10,7 +10,7 @@ module Apidae
     end
 
     def self.import(refs_json)
-    locales = Rails.application.config.respond_to?(:apidae_locales) ? Rails.application.config.apidae_locales : [DEFAULT_LOCALE]
+      locales = Rails.application.config.respond_to?(:apidae_locales) ? Rails.application.config.apidae_locales : [DEFAULT_LOCALE]
       locales_map = Hash[locales.map {|loc| ["libelle#{loc.camelize.gsub('-', '')}".to_sym, loc]}]
       refs_hashes = JSON.parse(refs_json, symbolize_names: true)
       if refs_hashes.length != where("apidae_type != ?", INTERNAL).count

data/app/models/apidae/selection.rb

@@ -50,6 +50,10 @@ module Apidae
       objects.where(where_clause).count
     end
 
+    def valid_api?
+      apidae_project && !apidae_project.api_key.blank? && !apidae_project.apidae_id.blank?
+    end
+
     def api_results(opts = {})
       key = cache_key(:results)
       res = $apidae_cache.read(key)
@@ -83,14 +87,15 @@ module Apidae
       res
     end
 
-    def api_object(apidae_obj_id)
-      query_args = build_args(OBJECTS_ENDPOINT, {obj_ids: [apidae_obj_id], fields: ["@all"]})
+    def api_object(apidae_obj_id, fields = ["@all"])
+      query_args = build_args(OBJECTS_ENDPOINT, {obj_ids: [apidae_obj_id], fields: fields})
       query_api(query_args, true, false)
     end
 
-    def add_or_refresh_obj(apidae_obj_id)
-      if apidae_project
-        res = api_object(apidae_obj_id)
+    # 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)
         if res[:results] && res[:results].length == 1
           obj_data = res[:results].first.deep_symbolize_keys
           add_or_refresh(obj_data)
@@ -98,8 +103,9 @@ module Apidae
       end
     end
 
+    # Note : WARNING - updated objs will only contain the provided fields
     def add_or_refresh_objs(fields = ["@all"])
-      if apidae_project
+      if valid_api?
         res = api_objects({fields: fields})
         if res[:results] && res[:results].length > 0
           res[:results].each do |result|

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.1"
+  VERSION = "1.2.6"
 end

data/test/dummy/log/development.log

@@ -63,3 +63,5 @@ Migrating to AddLocalesDataToApidaeProjects (20190123214635)
    (0.2ms)  COMMIT
    (0.2ms)  SELECT pg_advisory_unlock(6140174353533887940)
    (0.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+  Apidae::Obj Load (26.8ms)  SELECT apidae_id, COUNT(id) FROM "apidae_objs" WHERE "apidae_objs"."root_obj_id" IS NULL GROUP BY "apidae_objs"."apidae_id" HAVING (COUNT(id) > 1)
+  Apidae::Obj Load (2.4ms)  SELECT apidae_id, COUNT(id) FROM "apidae_objs" WHERE "apidae_objs"."root_obj_id" IS NULL GROUP BY "apidae_objs"."apidae_id" HAVING (COUNT(id) > 1)

metadata

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