apidae 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87cd9a41caead065a805e975fbe7fc5f4227cfdf
-  data.tar.gz: bf3ac2b75b2e4a2ee96d5a0a0298ce105460afc4
+  metadata.gz: 2df93504655edcacc1527f70788f1e2cea326cd2
+  data.tar.gz: 0683c0b435a9a0b474d1fca15e7a33a78b2a587a
 SHA512:
-  metadata.gz: 16697f8ea3872f0b10db80aa23df7f7e475945b56787b131d89875fdb31c4a340729376f35160fbc715af0f2da68a862c3336334a8e34fb699d3ea6fbea2f098
-  data.tar.gz: 89856a0a71ddf723f2a8dffd3631d9950d93523e406c63a1032bf1fdd761fb5f6310aab7440f863dbdd6ceb7b0f7803d7e8cdf00d0e24b457ef925b184f253c2
+  metadata.gz: 640e73f427753e7bc1963066180b2cc032056e0373f884a1c3db341268bbb1e01a7babcb7c396193a60dbb1cb750dff1621b27d00789d9d70ab46633009963d3
+  data.tar.gz: c2e0065d476896b77fcdd2b5fb5f3b7cdfee2e5a19a7831efd77ea575795d380500eb1a0c913506a4423c31c03c6a1637676ff585fdfd74b9a200d314c58e948

data/app/controllers/apidae/import_controller.rb

@@ -33,27 +33,20 @@ module Apidae
     def run
       success = true
       Export.pending.each do |e|
-        begin
-          open(e.file_url) do |f|
-            begin
-              FileImport.import(f)
-              uri = URI(e.confirm_url)
-              req = Net::HTTP::Post.new(uri)
-              Net::HTTP.start(uri.hostname, uri.port) do |http|
-                http.request(req)
-              end
-              e.update(status: Export::COMPLETE)
-            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
+        open(e.file_url) do |f|
+          begin
+            FileImport.import(f)
+            uri = URI(e.confirm_url)
+            req = Net::HTTP::Post.new(uri)
+            Net::HTTP.start(uri.hostname, uri.port) do |http|
+              http.request(req)
             end
+            e.update(status: Export::COMPLETE)
+          rescue Exception => ex
+            logger.error("Failed to retrieve export file : #{ex.file_url}")
+            logger.error("Error is : #{ex}")
+            success = false
           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)
         end
       end
       render nothing: true, status: (success ? :ok : :internal_server_error)

data/app/controllers/apidae/objects_controller.rb

@@ -6,7 +6,7 @@ module Apidae
 
     # GET /objects
     def index
-      @objects = Object.all
+      @objects = Object.all.select(:apidae_id, :title, :apidae_type, :updated_at)
     end
 
     # GET /objects/1

data/app/models/apidae/export.rb

@@ -3,7 +3,6 @@ module Apidae
 
     PENDING = 'pending'
     COMPLETE = 'complete'
-    CANCELLED = 'cancelled'
 
     # Note : handle reset case
     def self.pending

data/app/models/apidae/object.rb

@@ -112,30 +112,24 @@ module Apidae
 
     def self.address(address_hash)
       computed_address = []
-      unless address_hash.blank?
-        computed_address << address_hash[:adresse1] unless address_hash[:adresse1].blank?
-        computed_address << address_hash[:adresse2] unless address_hash[:adresse2].blank?
-        computed_address << address_hash[:adresse3] unless address_hash[:adresse3].blank?
-      end
+      computed_address << address_hash[:adresse1] unless address_hash[:adresse1].blank?
+      computed_address << address_hash[:adresse2] unless address_hash[:adresse2].blank?
+      computed_address << address_hash[:adresse3] unless address_hash[:adresse3].blank?
       {address_fields: computed_address}
     end
 
-    def self.town(address_hash = {})
-      (!address_hash.blank? && address_hash[:commune]) ? Town.find_by_apidae_id(address_hash[:commune][:id]) : nil
+    def self.town(address_hash)
+      address_hash[:commune] ? Town.find_by_apidae_id(address_hash[:commune][:id]) : nil
     end
 
     def self.latitude(location_hash)
-      unless location_hash.blank?
-        geoloc_details = location_hash[:geolocalisation]
-        (geoloc_details && geoloc_details[:valide] && geoloc_details[:geoJson]) ? geoloc_details[:geoJson][:coordinates][1] : nil
-      end
+      geoloc_details = location_hash[:geolocalisation]
+      (geoloc_details && geoloc_details[:valide] && geoloc_details[:geoJson]) ? geoloc_details[:geoJson][:coordinates][1] : nil
     end
 
-    def self.longitude(location_hash = {})
-      unless location_hash.blank?
-        geoloc_details = location_hash[:geolocalisation]
-        (geoloc_details && geoloc_details[:valide] && geoloc_details[:geoJson]) ? geoloc_details[:geoJson][:coordinates][0] : nil
-      end
+    def self.longitude(location_hash)
+      geoloc_details = location_hash[:geolocalisation]
+      (geoloc_details && geoloc_details[:valide] && geoloc_details[:geoJson]) ? geoloc_details[:geoJson][:coordinates][0] : nil
     end
 
     def self.openings(openings_hash)

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

@@ -1,20 +1,20 @@
 <%= 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</h1>
     </div>
     <div id="apidae_dashboard" class="<%= styles[:wrapper] %>">
       <div id="apidae_imports_panel" class="<%= styles[:body] %>">
         <h2 class="<%= styles[:h2] %>">Derniers imports</h2>
         <table id="apidae_imports" class="<%= styles[:table] %>">
-          <thead>
+          <thead class="<%= styles[:table_head] %>">
           <tr>
             <th>Date</th>
             <th>Fichier</th>
             <th>Statut</th>
           </tr>
           </thead>
-
-          <tbody>
+          <tbody class="<%= styles[:table_body] %>">
           <% @last_imports.each do |import| %>
               <tr>
                 <td><%= import.updated_at.strftime('Le %d/%m/%Y à %H:%M') if import.updated_at %></td>
@@ -32,8 +32,8 @@
       </div>
       <div id="apidae_navigation_panel" class="<%= styles[:body] %>">
         <h2 class="<%= styles[:h2] %>">Données issues d'Apidae</h2>
-        <h3 class="<%= styles[:h3] %>"><%= link_to pluralize(@selections, 'sélection'), apidae.selections_path %></h3>
-        <h3 class="<%= styles[:h3] %>"><%= link_to pluralize(@objects, 'objet touristique', 'objets touristiques'), apidae.objects_path %></h3>
+        <%= link_to pluralize(@selections, 'sélection', 'sélections'), apidae.selections_path, class: styles[:selections] %>
+        <%= link_to pluralize(@objects, 'objet touristique', 'objets touristiques'), apidae.objects_path, class: styles[:objects] %>
       </div>
     </div>
 <% end %>

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

@@ -1,11 +1,12 @@
 <%= 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 - Objets touristiques</h1>
     </div>
     <div id="apidae_dashboard" class="<%= styles[:wrapper] %>">
       <div id="apidae_imports_panel" class="<%= styles[:body] %>">
         <table id="apidae_objects" class="<%= styles[:table] %>">
-          <thead>
+          <thead class="<%= styles[:table_head] %>">
           <tr>
             <th>Titre</th>
             <th>Identifiant</th>
@@ -13,8 +14,7 @@
             <th>Mise à jour</th>
           </tr>
           </thead>
-
-          <tbody>
+          <tbody class="<%= styles[:table_body] %>">
           <% @objects.each do |object| %>
               <tr>
                 <td><%= object.title %></td>
@@ -23,6 +23,11 @@
                 <td><%= object.updated_at.strftime('Le %d/%m/%Y à %H:%M') if object.updated_at %></td>
               </tr>
           <% end %>
+          <% if @objects.empty? %>
+            <tr>
+              <td colspan="4">Aucun objet importé pour le moment.</td>
+            </tr>
+          <% end %>
           </tbody>
         </table>
       </div>

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

@@ -1,11 +1,12 @@
 <%= 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 - Sélections</h1>
     </div>
     <div id="apidae_dashboard" class="<%= styles[:wrapper] %>">
       <div id="apidae_imports_panel" class="<%= styles[:body] %>">
         <table id="apidae_selections" class="<%= styles[:table] %>">
-          <thead>
+          <thead class="<%= styles[:table_head] %>">
           <tr>
             <th>Label</th>
             <th>Reference</th>
@@ -13,8 +14,7 @@
             <th>Nombre d'objets</th>
           </tr>
           </thead>
-
-          <tbody>
+          <tbody class="<%= styles[:table_body] %>">
           <% @selections.each do |selection| %>
               <tr>
                 <td><%= selection.label %></td>
@@ -23,6 +23,11 @@
                 <td><%= selection.objects.count %></td>
               </tr>
           <% end %>
+          <% if @selections.empty? %>
+            <tr>
+              <td colspan="4">Aucune sélection importée pour le moment.</td>
+            </tr>
+          <% end %>
           </tbody>
         </table>
       </div>

data/lib/apidae/engine.rb

@@ -1,5 +1,5 @@
 module Apidae
-  class Engine < ::Rails::Engine
+  class Engine < Rails::Engine
     isolate_namespace Apidae
   end
 end

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-25 00:00:00.000000000 Z
+date: 2018-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.8
+        version: 5.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.8
+        version: 5.1.4
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement