apidae 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50f3213a4c2753e079a8a564b9cbff4199370119
-  data.tar.gz: 323d35e564e7863142fd8384877ec9d1e3c74b6c
+  metadata.gz: 6c720ab33eaef78cb4204c9a762bb8a99cc9b789
+  data.tar.gz: ba76e69c7b40c4b4e6236567879c74983d18744d
 SHA512:
-  metadata.gz: ff0caea0932ed8948d58ceee7641565e37e8767db7ec6ff47e65366a8f0b8b4decde0dc4929fe34dfad39a9d96b05bece8b3387740e16e6fde8c7ce9d4f18919
-  data.tar.gz: 0340df6cfbc78fcd72fc3fb6a373e59a9aec13fefffb4fabe52fc4daeace61afaa787e03e5c93640cf118257ceafc25e3b446e506fe8f2d1fb2d43f273359100
+  metadata.gz: 4885ebfb95a966eb54cdee590498a24c5e6bced783d61d12edd5c13f53c8792421bc46dc1b3000f5a2fd89573fe0ef73ba213b575f285fc074fd36de40b4cef9
+  data.tar.gz: 0fa597db6dd22bc8a78e79ce64079828d23f7c8d89c82a303e6641800c907a748bf608ac1b6d9eb76c74e2d2419e838b14db211ba454ba1e36d7adf5fbce087a

data/app/controllers/apidae/import_controller.rb

@@ -46,7 +46,7 @@ module Apidae
                 http.request(req)
               end
               e.update(status: Export::COMPLETE)
-              if Rails.application.config.apidae_import_callback
+              if Rails.application.config.respond_to?(:apidae_import_callback)
                 Rails.application.config.apidae_import_callback.call(e)
               end
             rescue Exception => ex

data/app/controllers/apidae/objects_controller.rb

@@ -19,38 +19,39 @@ module Apidae
     end
 
     def new
-      @object = Obj.new
+      @obj = Obj.new
     end
 
     def edit
     end
 
     def create
-      @object = Obj.new(object_params)
-
-      if @object.save
-        redirect_to @object, notice: 'Object was successfully created.'
+      @obj = Obj.new(object_params)
+      selection = params[:selection_apidae_id].blank? ? Selection.last : Selection.find_by_apidae_id(params[:selection_apidae_id])
+      if @obj.save && selection.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
       end
     end
 
     def update
-      if @object.update(object_params)
-        redirect_to @object, notice: 'Object was successfully updated.'
+      if @obj.update(object_params)
+        redirect_to @obj, notice: 'Object was successfully updated.'
       else
         render :edit
       end
     end
 
     def destroy
-      @object.destroy
+      @obj.destroy
       redirect_to objects_url, notice: 'Object was successfully destroyed.'
     end
 
     def refresh
       referrer = session.delete(:referrer)
-      if @object && @object.selections.first.refresh_obj(@object.apidae_id)
+      if @obj && @obj.selections.first.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."
@@ -59,7 +60,7 @@ module Apidae
 
     private
       def set_object
-        @object = Obj.find(params[:id])
+        @obj = Obj.find(params[:id])
       end
 
       def object_params

data/app/models/apidae/obj.rb

@@ -1,7 +1,7 @@
 module Apidae
   class Obj < ActiveRecord::Base
 
-    belongs_to :town, class_name: 'Apidae::Town', foreign_key: :town_insee_code, primary_key: :insee_code
+    belongs_to :town, class_name: 'Apidae::Town', foreign_key: :town_insee_code, primary_key: :insee_code, optional: true
     has_many :apidae_selection_objects, class_name: 'Apidae::SelectionObject', foreign_key: :apidae_object_id
     has_many :selections, class_name: 'Apidae::Selection', source: :apidae_selection, through: :apidae_selection_objects
 

data/app/models/apidae/selection.rb

@@ -95,7 +95,7 @@ module Apidae
         obj = Obj.find_by_apidae_id(apidae_obj_id)
         if obj
           refreshed = Obj.update_object(obj, obj_data)
-          if refreshed && Rails.application.config.apidae_obj_refresh_callback
+          if refreshed && Rails.application.config.respond_to?(:apidae_obj_refresh_callback)
             Rails.application.config.apidae_obj_refresh_callback.call(apidae_obj_id)
           end
           refreshed

data/app/views/apidae/objects/edit.html.erb

@@ -2,5 +2,5 @@
 
 <%= render 'form' %>
 
-<%= link_to 'Show', @object %> |
+<%= link_to 'Show', @obj %> |
 <%= link_to 'Back', objects_path %>

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

@@ -1,6 +1,7 @@
 <%= render layout: "/layouts/#{Rails.application.config.apidae_layout}" do |styles| %>
     <div id="apidae_header" class="<%= styles[:header] %>">
-      <%= link_to 'Retour', @selection ? selections_path : root_path, class: styles[:back] %>
+      <%= link_to 'Importer un objet', apidae.new_object_path, class: styles[:objects] %>
+      <%= link_to 'Retour', @selection ? apidae.selections_path : root_path, class: styles[:back] %>
       <h1 class="<%= styles[:h1] %>">Apidae - <%= @selection ? "Sélection \"#{@selection.label}\"" : "Tous les objets touristiques" %></h1>
     </div>
     <div id="apidae_dashboard" class="<%= styles[:wrapper] %>">
@@ -22,7 +23,7 @@
                 <td><%= object.apidae_id %></td>
                 <td><%= object.apidae_type %></td>
                 <td><%= object.updated_at.strftime('Le %d/%m/%Y à %H:%M') if object.updated_at %></td>
-                <td><%= link_to 'Rafraîchir', refresh_object_path(object), method: :post,
+                <td><%= link_to 'Rafraîchir', apidae.refresh_object_path(object), method: :post,
                                 data: {confirm: 'Voulez-vous vraiment rafraîchir cet objet ? Les données existantes seront écrasées.'} %></td>
               </tr>
           <% end %>

data/app/views/apidae/objects/new.html.erb

@@ -1,5 +1,33 @@
-<h1>New Object</h1>
+<%= render layout: "/layouts/#{Rails.application.config.apidae_layout}" do |styles| %>
+  <div id="apidae_header" class="<%= styles[:header] %>">
+    <%= link_to 'Retour', :back, class: styles[:back] %>
+    <h1 class="<%= styles[:h1] %>">Apidae - Importer un objet</h1>
+  </div>
+  <div id="apidae_new_object" class="<%= styles[:wrapper] %>">
+    <div id="apidae_form" class="<%= styles[:body] %>">
+      <%= form_for(@obj, class: styles[:form]) do |f| %>
+        <% if @obj.errors.any? %>
+          <div id="apidae_form_errors">
+            <ul>
+              <% @obj.errors.full_messages.each do |message| %>
+                <li><%= message %></li>
+              <% end %>
+            </ul>
+          </div>
+        <% end %>
 
-<%= render 'form' %>
-
-<%= link_to 'Back', objects_path %>
+        <div class="<%= styles[:form_field] %>">
+          <div><%= f.label :apidae_id %></div>
+          <div><%= f.text_field :apidae_id %></div>
+        </div>
+        <div class="<%= styles[:form_field] %>">
+          <div><%= label_tag :selection_apidae_id %></div>
+          <div><%= text_field_tag :selection_apidae_id %></div>
+        </div>
+        <div class="<%= styles[:form_actions] %>">
+          <%= f.submit 'Valider' %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+<% end %>

data/config/routes.rb

@@ -1,6 +1,6 @@
 Apidae::Engine.routes.draw do
 
-  resources :objects, only: [:index, :show], path: 'objets' do
+  resources :objects, only: [:index, :show, :new, :create], path: 'objets' do
     post 'refresh', on: :member
   end
 

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "0.7.6"
+  VERSION = "0.7.7"
 end

metadata

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