apidae 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fe1287369b7529aaf7d00240f5b8bd0c8c4e384
-  data.tar.gz: 86c492805ce1a12a864e8491708ac029506608a3
+  metadata.gz: f40e5ca95d358cc2e60b9f551ddd92f12a99fd13
+  data.tar.gz: 71294f4f216d6031357eefb74fa16471eff7aaf1
 SHA512:
-  metadata.gz: b311d3795cd80311cc707abda6538dceb1b17bb58586264cd78d85a9776c9b7ceec75a128b178a404b8f3e23029fd56cbf55eec7aa48804c9399429f124d368c
-  data.tar.gz: 4967af4e9d2548a079573e415a4452ef43e2312260a0998e2852693ef7baa4703cc26f30f29901a047df425f3b504f3c30c6da1f21f6dee411277244648bd9c4
+  metadata.gz: 07d9fffb31e67f35ffbe412baeb5e0d5e82d8eb20b161a40aef15000da34b1cdf4267c10813e12cbc1dd2cb5cc358731397cab5e0e122556c68fbef2b00c4bc6
+  data.tar.gz: 63044d89c16f89e0c14150f90c894d769e1489a771a169c1885853632effd2398569625f7fb8fb40788757239b8c6acb5a43642c812da9a55979d98812f5a8e3

data/app/controllers/apidae/projects_controller.rb

@@ -14,13 +14,18 @@ module Apidae
     end
 
     def create
-      @project = Project.new(project_params)
-      if @project.save
-        referrer = session.delete(:referrer)
-        redirect_to (referrer + "?apidae_project_id=#{@project.id}"), notice: 'Le projet a bien été créé'
+      if Project.find_by_apidae_id(project_params[:apidae_id])
+        @project = Project.find_by_apidae_id(project_params[:apidae_id])
+        update_project
       else
-        flash.now[:alert] = "Une erreur s'est produite lors la création du projet"
-        render :new
+        @project = Project.new(project_params)
+        if @project.save
+          referrer = session.delete(:referrer)
+          redirect_to (referrer + "?apidae_project_id=#{@project.id}"), notice: 'Le projet a bien été créé'
+        else
+          flash.now[:alert] = "Une erreur s'est produite lors la création du projet"
+          render :new
+        end
       end
     end
 
@@ -29,13 +34,7 @@ module Apidae
     end
 
     def update
-      if @project.update(project_params)
-        referrer = session.delete(:referrer)
-        redirect_to (referrer + "?apidae_project_id=#{@project.id}"), notice: 'Le projet a bien été mis à jour'
-      else
-        flash.now[:alert] = "Une erreur s'est produite lors la mise à jour du projet"
-        render :edit
-      end
+      update_project
     end
 
     def destroy
@@ -49,6 +48,16 @@ module Apidae
       @project = Project.find(params[:id])
     end
 
+    def update_project
+      if @project.update(project_params)
+        referrer = session.delete(:referrer)
+        redirect_to (referrer + "?apidae_project_id=#{@project.id}"), notice: 'Le projet a bien été mis à jour'
+      else
+        flash.now[:alert] = "Une erreur s'est produite lors la mise à jour du projet"
+        render :edit
+      end
+    end
+
     def project_params
       params.require(:project).permit(:name, :api_key, :apidae_id, locales: [], versions: [])
     end

data/app/models/apidae/obj.rb

@@ -372,7 +372,7 @@ module Apidae
     end
 
     def main_picture
-      pictures.blank? ? "/#{Rails.application.config.apidae_pictures_path}/default/logo.png" : pictures[0]["url"]
+      pictures.blank? ? "/#{Rails.application.config.apidae_pictures_path}/default/logo.png" : pictures[0]["url"].gsub('http', 'https')
     end
 
     def self.build_rate(rate_period)

data/app/models/apidae/overridden_fields.rb

@@ -2,8 +2,7 @@ module Apidae
   module OverriddenFields
 
     # Note : add non-localized fields that can be overridden in aspects (openings, rates etc...)
-    [:title, :short_desc, :long_desc, :theme_desc, :private_desc, :pictures, :attachments, :openings_desc, :rates_desc,
-     :includes, :excludes, :extra, :booking_desc].each do |f|
+    LOCALIZED_FIELDS.each do |f|
       define_method f do
         if @obj_version == DEFAULT_VERSION
           val = (super() || {})[@locale]

data/app/models/apidae/selection.rb

@@ -32,7 +32,7 @@ module Apidae
         if obj
           SelectionObject.create(apidae_selection_id: apidae_sel.id, apidae_object_id: obj.id)
         else
-          logger.error "Object #{o} referenced in selection #{apidae_sel.apidae_id} and project #{apidae_proj_id} is unknown"
+          logger.error "Object #{o} referenced in selection #{apidae_sel.apidae_id} and project #{apidae_sel.apidae_project.apidae_id} is unknown"
         end
       end
 

data/app/views/apidae/projects/index.html.erb

@@ -12,6 +12,7 @@
           <th>Nom</th>
           <th>Identifiant</th>
           <th>Locales</th>
+          <th>Versions</th>
           <th>Mise à jour</th>
           <th></th>
         </tr>
@@ -22,13 +23,14 @@
             <td><%= proj.name %></td>
             <td><%= proj.apidae_id %></td>
             <td><%= proj.locales.join(', ') %></td>
+            <td><%= proj.versions.join(', ') %></td>
             <td><%= proj.updated_at.strftime('Le %d/%m/%Y à %H:%M') if proj.updated_at %></td>
             <td><%= link_to 'Modifier', edit_project_path(proj) %></td>
           </tr>
         <% end %>
         <% if @projects.empty? %>
           <tr>
-            <td colspan="4">Aucun projet pour le moment.</td>
+            <td colspan="6">Aucun projet pour le moment.</td>
           </tr>
         <% end %>
         </tbody>

data/config/initializers/constants.rb

@@ -22,4 +22,7 @@ module Apidae
   DEFAULT_VERSION = STANDARD_VERSION
   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]
 end

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-06 00:00:00.000000000 Z
+date: 2019-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails