apidae 1.2.8 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60d30181c595dde4d2f63e3389cfab37de03ba14
-  data.tar.gz: c4f2dc5189846f3068537fa832735bdedee85cc1
+  metadata.gz: 11f5031e46f8bfa23ce228c242e023c4ebe10e0e
+  data.tar.gz: '0083f65ff4cfbd3f53c5a13126ca940c4be696ae'
 SHA512:
-  metadata.gz: 259771713e098dcfee2c5e20f1c42ec5209dc976a38177b43cb7580eb5a4bec5b6d6e3cdbc790a8ef1f1c37e4af2b55d3d1cc40401ad6da95f8cea60d9e05b20
-  data.tar.gz: 95a7109af9633d25cba07aaf58268905c51bcb9dc72387e0a13ab1b0a60868fa1e2cf32bfb1a1c38e00cf84b97a60ef8ad3582f4330c4aadce427cc877178a62
+  metadata.gz: 0a6544dae89ca3cee7525b37433fc6941b5ae76d720f2adce045d3357fd65efca3150885b0cb9da8234a5324218448e57545897865a77896e1bdfe7a462ab31b
+  data.tar.gz: 9c51ebdb6c1d9d671499fd60f086a8c43feb94a9c77d06108aa030b73d5bce00ad4fd5b58e0f5467d21a509bcc1594c2c59f6d19e4be2f61a78d76fc04037b3b

data/app/controllers/apidae/import_controller.rb

@@ -37,7 +37,7 @@ module Apidae
     def run
       success = true
       Export.pending.each do |e|
-        success &&= import_data(e)
+        success &&= e.import_data
       end
       success ? head(:ok) : head(:internal_server_error)
     end
@@ -48,7 +48,7 @@ module Apidae
 
     def create
       @export = Export.new(export_params)
-      if @export.save && import_data(@export)
+      if @export.save && @export.import_data
         redirect_to apidae.root_url, notice: 'Le fichier a bien été importé.'
       else
         flash.now[:alert] = "Une erreur s'est produite lors de l'import du fichier."
@@ -61,43 +61,5 @@ module Apidae
     def export_params
       params.require(:export).permit(:project_id, :file_url, :status)
     end
-
-    def import_data(e)
-      success = true
-      begin
-        open(e.file_url) do |f|
-          begin
-            FileImport.import(f, e.project_id)
-            unless e.confirm_url.blank?
-              uri = URI(e.confirm_url)
-              req = Net::HTTP::Post.new(uri)
-              Net::HTTP.start(uri.hostname, uri.port) do |http|
-                http.request(req)
-              end
-            end
-            e.update(status: Export::COMPLETE)
-            if Rails.application.config.respond_to?(:apidae_import_callback)
-              Rails.application.config.apidae_import_callback.call(e)
-            end
-          rescue Exception => ex
-            logger.error("Failed to import export file : #{e.file_url}")
-            logger.error("Error is : #{ex} \n#{ex.backtrace.join("\n") unless ex.backtrace.blank?}")
-            success = false
-            e.update(status: Export::CANCELLED)
-          end
-        end
-      rescue OpenURI::HTTPError => err
-        logger.error("Failed to download export file : #{e.file_url}")
-        logger.error("Error is : #{err}")
-        success = false
-        e.update(status: Export::CANCELLED)
-      rescue Exception => e
-        logger.error "Failed to import file : #{e.file_url}"
-        logger.error("Error is : #{err}")
-        success = false
-        e.update(status: Export::CANCELLED)
-      end
-      success
-    end
   end
 end

data/app/helpers/apidae/application_helper.rb

@@ -1,6 +1,6 @@
 module Apidae
   module ApplicationHelper
-    include Apidae::ApidaeHelper
+    include ApidaeHelper
 
     def apidae_user
       send(Rails.application.config.apidae_user) if Rails.application.config.respond_to?(:apidae_user)

data/app/models/apidae/apidae_data_parser.rb

@@ -236,7 +236,6 @@ 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])
         }
@@ -336,15 +335,10 @@ module Apidae
       end
     end
 
-    def self.parse_entity_fields(information_hash, type_data_hash, sp_hash)
-      entity_hash = {}
+    def self.parse_entity_fields(information_hash, type_data_hash)
       if information_hash && information_hash[:structureGestion]
-        entity_hash.merge!({entity_id: information_hash[:structureGestion][:id], service_provider_id: node_id(type_data_hash, :prestataireActivites)})
+        {entity_id: information_hash[:structureGestion][:id], service_provider_id: node_id(type_data_hash, :prestataireActivites)}
       end
-      if sp_hash && sp_hash[:prestataireActivites]
-        entity_hash[:is_service_provider] = true
-      end
-      entity_hash
     end
 
     def self.node_id(node, key)

data/app/models/apidae/export.rb

@@ -1,3 +1,6 @@
+require 'uri'
+require 'net/http'
+
 module Apidae
   class Export < ActiveRecord::Base
 
@@ -20,5 +23,43 @@ module Apidae
     def self.pending
       where(remote_status: 'SUCCESS', status: PENDING).order(:id)
     end
+
+    def import_data
+      success = true
+      begin
+        open(file_url) do |f|
+          begin
+            FileImport.import(f, project_id)
+            unless confirm_url.blank?
+              uri = URI(confirm_url)
+              req = Net::HTTP::Post.new(uri)
+              Net::HTTP.start(uri.hostname, uri.port) do |http|
+                http.request(req)
+              end
+            end
+            update(status: Export::COMPLETE)
+            if Rails.application.config.respond_to?(:apidae_import_callback)
+              Rails.application.config.apidae_import_callback.call(self)
+            end
+          rescue Exception => ex
+            logger.error("Failed to import export file : #{file_url}")
+            logger.error("Error is : #{ex} \n#{ex.backtrace.join("\n") unless ex.backtrace.blank?}")
+            success = false
+            update(status: Export::CANCELLED)
+          end
+        end
+      rescue OpenURI::HTTPError => err
+        logger.error("Failed to download export file : #{file_url}")
+        logger.error("Error is : #{err}")
+        success = false
+        update(status: Export::CANCELLED)
+      rescue Exception => e
+        logger.error "Failed to import file : #{e.file_url}"
+        logger.error("Error is : #{err}")
+        success = false
+        e.update(status: Export::CANCELLED)
+      end
+      success
+    end
   end
 end

data/app/models/apidae/obj.rb

@@ -7,7 +7,6 @@ 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
@@ -16,7 +15,7 @@ module Apidae
     store_accessor :attachments_data, :attachments
     store_accessor :type_data, :categories, :themes, :capacity, :classification, :labels, :chains, :area, :track,
                    :products, :audience, :animals, :animals_desc, :extra, :duration, :certifications, :business
-    store_accessor :entity_data, :entity_id, :entity_name, :service_provider_id, :is_service_provider
+    store_accessor :entity_data, :entity_id, :entity_name, :service_provider_id
     store_accessor :contact_data, :telephone, :email, :website, :google, :facebook, :twitter, :yelp, :trip_advisor, :fax,
                    :mobile_website, :shorty_url, :contacts
     store_accessor :location_data, :address, :place, :latitude, :longitude, :access, :territories, :environments
@@ -101,7 +100,6 @@ module Apidae
     after_initialize do
       @locale = DEFAULT_LOCALE
       @obj_version = DEFAULT_VERSION
-      @obj_versions = {}
     end
 
     def root_obj
@@ -113,15 +111,11 @@ module Apidae
     end
 
     def in_version(v)
-      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]
+      @cached_versions ||= {}
+      if @cached_versions[v].nil?
+        @cached_versions[v] = versions.where(version: v).first
       end
+      @cached_versions[v]
     end
 
     def in_locale(l)
@@ -170,7 +164,6 @@ 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?
@@ -190,7 +183,7 @@ module Apidae
                                              object_data[:tourismeAffaires], *locales)
       apidae_obj.pictures_data = ApidaeDataParser.parse_pictures_data(object_data[:illustrations], *locales)
       apidae_obj.attachments_data = ApidaeDataParser.parse_attachments_data(object_data[:multimedias], *locales)
-      apidae_obj.entity_data = ApidaeDataParser.parse_entity_fields(object_data[:informations], object_data[type_fields[:node]], object_data[:informationsPrestataireActivites])
+      apidae_obj.entity_data = ApidaeDataParser.parse_entity_fields(object_data[:informations], object_data[type_fields[:node]])
       apidae_obj.service_data = ApidaeDataParser.parse_service_data(object_data[:prestations], object_data[type_fields[:node]])
       apidae_obj.tags_data = ApidaeDataParser.parse_tags_data(object_data[:presentation], object_data[:criteresInternes], object_data[:liens])
       apidae_obj.meta_data = object_data[:metadonnees]

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

@@ -92,7 +92,6 @@ 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)
@@ -103,7 +102,6 @@ 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

@@ -8,10 +8,9 @@ module Apidae
   LOCALE_ZH = 'zh'
   LOCALE_ES = 'es'
   LOCALE_PT_BR = 'pt-BR'
-  LOCALE_JP = 'jp'
 
   DEFAULT_LOCALE = LOCALE_FR
-  ALL_LOCALES = [LOCALE_FR, LOCALE_EN, LOCALE_IT, LOCALE_DE, LOCALE_NL, LOCALE_RU, LOCALE_ZH, LOCALE_ES, LOCALE_PT_BR, LOCALE_JP]
+  ALL_LOCALES = [LOCALE_FR, LOCALE_EN, LOCALE_IT, LOCALE_DE, LOCALE_NL, LOCALE_RU, LOCALE_ZH, LOCALE_ES, LOCALE_PT_BR]
 
   STANDARD_VERSION = 'STANDARD'
   WINTER_VERSION = 'HIVER'
@@ -25,11 +24,8 @@ 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,
-                                   :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,
+  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,
                                    :equipments, :comfort, :activities, :promo, :internal, :linked]
 end

data/config/locales/apidae.fr.yml

@@ -41,7 +41,6 @@ fr:
       ru: Russe
       zh: Chinois
       'pt-BR': Brésilien
-      jp: Japonais
     versions:
       STANDARD: Standard
       HIVER: Hiver

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "1.2.8"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.3.0
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-02 00:00:00.000000000 Z
+date: 2020-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -31,6 +31,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,20 +41,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement