apidae 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b537e9e99b7f05f62b0c694b52382e7ca9c56c89
-  data.tar.gz: 7943e22b985c52739837a9db2c748b8891e634b1
+  metadata.gz: aecffb4dbac3b6d3b2c73f08d0ca3647c8d4c807
+  data.tar.gz: f55420c1dc448d89bd4819950c150f6e08d73624
 SHA512:
-  metadata.gz: c43827fbbacb7331fe032903e5ab2a5ac0f3e08e482811928d5a610d728c5734eaebd7c07bec35100c91fef71e688e56188ef68d422214336b0d924da8315f45
-  data.tar.gz: be1a882acd0d0714cf655a60bdd71ac329530ba6a125db12940beee9d746cc0d3dd7d62e120bef1909777df51f337fab7402ac7fe24c6da9a9f6e5106ee893c1
+  metadata.gz: 44ce804f3dd69a73d049c4c3b093cfee288eae63a348507bd76c14925bb3ec2fd14ad11dcb7faf46fb5b4760b4e6fecb3b999c9ebf2912cf846c6859e105ccac
+  data.tar.gz: 518f6e0bbfbe3b176a375da2133349955a550570f1e6aa3654554519f1fa7dbafe24b611b779671bff0bf7208d1bfbf525c945546376b7b57026a55f110d490f

data/app/controllers/apidae/import_controller.rb

@@ -91,6 +91,11 @@ module Apidae
         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

data/app/models/apidae/apidae_data_parser.rb

@@ -9,6 +9,9 @@ module Apidae
     TWITTER = 3755
     YELP = 4007
     TRIP_ADVISOR = 4000
+    FAX = 202
+    MOBILE_WEBSITE = 3769
+    SHORTY_URL = 4923
 
     CONTACTS_MAP = {
         'telephone' => PHONE,
@@ -18,7 +21,10 @@ module Apidae
         'google' => GOOGLE,
         'trip_advisor' => TRIP_ADVISOR,
         'twitter' => TWITTER,
-        'yelp' => YELP
+        'yelp' => YELP,
+        'fax' => FAX,
+        'mobile_website' => MOBILE_WEBSITE,
+        'shorty_url' => SHORTY_URL
     }
 
     MODE_AUTO = 'auto'
@@ -183,6 +189,15 @@ module Apidae
           when TRIP_ADVISOR
             contact_details[:trip_advisor] ||= {}
             contact_details[:trip_advisor][c[:identifiant]] = c[:coordonnees][:fr]
+          when FAX
+            contact_details[:fax] ||= {}
+            contact_details[:fax][c[:identifiant]] = c[:coordonnees][:fr]
+          when MOBILE_WEBSITE
+            contact_details[:mobile_website] ||= {}
+            contact_details[:mobile_website][c[:identifiant]] = c[:coordonnees][:fr]
+          when SHORTY_URL
+            contact_details[:shorty_url] ||= {}
+            contact_details[:shorty_url][c[:identifiant]] = c[:coordonnees][:fr]
           else
           end
         end

data/app/models/apidae/export.rb

@@ -7,6 +7,15 @@ module Apidae
 
     validates_presence_of :file_url, :project_id
 
+    before_save :normalize_url
+
+    def normalize_url
+      self.file_url = file_url.strip
+      unless file_url.include?('/')
+        self.file_url = "http://export.apidae-tourisme.com/exports/#{file_url}"
+      end
+    end
+
     # Note : handle reset case
     def self.pending
       where(remote_status: 'SUCCESS', status: PENDING).order(:id)

data/app/models/apidae/obj.rb

@@ -16,7 +16,8 @@ module Apidae
     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
-    store_accessor :contact_data, :telephone, :email, :website, :google, :facebook, :twitter, :yelp, :trip_advisor, :contacts
+    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
     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

data/app/views/apidae/import/_form.html.erb

@@ -9,9 +9,10 @@
     </div>
   <% end %>
   <p>
-    Pour que les données soient importées correctement,
-    vos projets doivent être configurés pour exporter les données au format <strong>JSON V2</strong>, en
-    <strong>groupant les objets exportés</strong>.
+    Pour que les données soient importées correctement, vos projets doivent être configurés pour exporter les données
+    au format <strong>JSON V2</strong>, en <strong>groupant les objets exportés</strong>. L'adresse du fichier d'export
+    est à récupérer dans :<br/>
+    <em>Page du projet Apidae > Onglet "Calcul des sélections et Exports " > Accéder à la ficher de l'export > Champ "Fichier d'export"</em>
   </p>
 
   <div class="<%= styles[:form_field] %>">

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Jean-Baptiste Vilain