apidae 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b11e939316f83f92542ad8f9dd1d61d6a759b221
-  data.tar.gz: b37d8f51dccc89e83c7f29e7ccb880025482646a
+  metadata.gz: 0aba2cd1de094aeef3e30a618807daf0373c30e2
+  data.tar.gz: fe93f13f69bfc494f8217c803c4bf0c32f609c73
 SHA512:
-  metadata.gz: b6c8fd210ade09f620c897676c89dec75bde2cb94379a6acd69511aeaad495fc080eaad1d14fc0096834e79a7156870a495dde4600f245716b893af8b1458d20
-  data.tar.gz: 3798b7eab1196ab9f2ff594a4d27d6930732894446d7c8fef0793be046f4a0b9bd5f3255a104528a1ff13a0fe1a2772b1843e1deb96dc8ad90bf2fe832d679a7
+  metadata.gz: 362a44da5272c50d931b7511f67c1ce6e001b83e2e3fec284ffcb1641301304eabceb9c1a9e7629665ee6bc5cd47fd6e637057bce37b547e4a4f79b60a833202
+  data.tar.gz: 4c182bf514518cb48efe9f0262088486764c6c747d29d93c9e02b9a1c092557ec88d842ab56e7079d4929b549e16dadd9241dfd725628d4ebb9d821a256a8480

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

@@ -245,7 +245,7 @@ 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,
@@ -346,10 +346,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/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)
@@ -89,7 +93,7 @@ module Apidae
     end
 
     def add_or_refresh_obj(apidae_obj_id)
-      if apidae_project
+      if valid_api?
         res = api_object(apidae_obj_id)
         if res[:results] && res[:results].length == 1
           obj_data = res[:results].first.deep_symbolize_keys
@@ -99,7 +103,7 @@ module Apidae
     end
 
     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/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

metadata

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