apidae 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31c663f50b9b41f31819067a7e8af82f44fa4622
-  data.tar.gz: 21c1c4dae6cc1d75e30241a86c06c3625b2e5be7
+  metadata.gz: 79f70b5fe26642a9edae0f542465d6914084c18c
+  data.tar.gz: 34d359453c6c3da2b2bfd73e5734c7a35a837dce
 SHA512:
-  metadata.gz: 18bddeee3022a6520979e46a338e51d010570a98898fc25a4bf9c9ee57edc1666a312e13a82167e753e5da1288659aa86a76acca501f95ed3797138173fa88dd
-  data.tar.gz: 24a3be222e24cbdae2f91212a550c37f716bc72032c753955212cd98fa0be3932aee7203bbfb05eb184e97f113d444beb781182554a468776a6332397c716072
+  metadata.gz: 344e11193415d6c193d22f75b3a49f72f54867f71e3e5867c2200382fac19668168839f2d9e1f45b05cd55792a48af33411565ecd45b9f718741bdc36bacf608
+  data.tar.gz: 8eaae4b4be226524437caf86b2f560cc28581f1e9e07c6705411ed8f8b123868f4bf3df17542e77f27019f22a0d42944bca38753e7d62af6104353e40bf199fa

data/app/controllers/apidae/objects_controller.rb

@@ -3,13 +3,14 @@ require_dependency "apidae/application_controller"
 module Apidae
   class ObjectsController < ApplicationController
     before_action :set_object, only: [:show, :edit, :update, :destroy]
+    skip_before_action Rails.application.config.apidae_auth, only: [:index, :show]
 
     def index
       if params[:selection_id]
         @selection = Selection.find(params[:selection_id])
-        @objects = @selection.objects.select(:apidae_id, :title, :apidae_type, :updated_at)
+        @objects = @selection.objects.select(:id, :apidae_id, :title, :apidae_type, :updated_at)
       else
-        @objects = Obj.all.select(:apidae_id, :title, :apidae_type, :updated_at)
+        @objects = Obj.all.select(:id, :apidae_id, :title, :apidae_type, :updated_at)
       end
     end
 

data/app/helpers/apidae/references_helper.rb

@@ -1,4 +1,4 @@
 module Apidae
-  module Apidae::ReferencesHelper
+  module ReferencesHelper
   end
 end

data/app/models/apidae/file_import.rb

@@ -64,13 +64,20 @@ module Apidae
     def self.add_or_update_objects(objects_json, result)
       objects_hashes = JSON.parse(objects_json, symbolize_names: true)
       objects_hashes.each do |object_data|
-        existing = Obj.find_by_apidae_id(object_data[:id])
-        if existing
-          Obj.update_object(existing, object_data)
-          result[:updated] += 1
-        else
-          Obj.add_object(object_data)
-          result[:created] += 1
+        begin
+          existing = Obj.find_by_apidae_id(object_data[:id])
+          if existing
+            Obj.update_object(existing, object_data)
+            result[:updated] += 1
+          else
+            Obj.add_object(object_data)
+            result[:created] += 1
+          end
+        rescue Exception => e
+          puts "Failed to import object #{object_data[:id]}"
+          puts e.message
+          puts e.backtrace[0..5].join("\n")
+          raise e
         end
       end
     end

data/app/models/apidae/obj.rb

@@ -187,8 +187,9 @@ module Apidae
       end
     end
 
-    def self.parse_type_data(apidae_obj, data_hash, prestations_hash)
+    def self.parse_type_data(apidae_obj, data_hash, presta_hash)
       if data_hash
+        prestations_hash = presta_hash || {}
         apidae_obj.apidae_subtype = lists_ids(data_hash[:typesManifestation]).first if apidae_obj.apidae_type == FEM
         apidae_obj.apidae_subtype = node_id(data_hash, :rubrique) if apidae_obj.apidae_type == EQU
         {

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

@@ -1,6 +1,6 @@
 <%= render layout: "/layouts/#{Rails.application.config.apidae_layout}" do |styles| %>
     <div id="apidae_header" class="<%= styles[:header] %>">
-      <%= link_to 'Retour', :back, class: styles[:back] %>
+      <%= link_to 'Retour', @selection ? 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] %>">

data/app/views/apidae/objects/index.json.jbuilder

@@ -0,0 +1,6 @@
+json.results do
+  json.array!(@objects) do |obj|
+    json.id obj.id
+    json.title obj.title
+  end
+end

data/app/views/apidae/objects/show.json.jbuilder

@@ -0,0 +1 @@
+json.extract! @object, :title

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

@@ -1,6 +1,6 @@
 <%= render layout: "/layouts/#{Rails.application.config.apidae_layout}" do |styles| %>
   <div id="apidae_header" class="<%= styles[:header] %>">
-    <%= link_to 'Retour', :back, class: styles[:back] %>
+    <%= link_to 'Retour', root_path, class: styles[:back] %>
     <h1 class="<%= styles[:h1] %>">Apidae - Eléments de référence</h1>
   </div>
   <div id="apidae_dashboard" class="<%= styles[:wrapper] %>">

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

@@ -1,6 +1,6 @@
 <%= render layout: "/layouts/#{Rails.application.config.apidae_layout}" do |styles| %>
     <div id="apidae_header" class="<%= styles[:header] %>">
-      <%= link_to 'Retour', :back, class: styles[:back] %>
+      <%= link_to 'Retour', root_path, class: styles[:back] %>
       <h1 class="<%= styles[:h1] %>">Apidae - Sélections</h1>
     </div>
     <div id="apidae_dashboard" class="<%= styles[:wrapper] %>">

data/config/routes.rb

@@ -1,8 +1,8 @@
 Apidae::Engine.routes.draw do
 
-  resources :objects, only: [:index], path: 'objets'
+  resources :objects, only: [:index, :show], path: 'objets'
   resources :selections, only: [:index] do
-    resources :objects, only: [:index]
+    resources :objects, only: [:index], path: 'objets'
   end
   resources :references, only: [:index]
 

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-28 00:00:00.000000000 Z
+date: 2018-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: jbuilder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: To be completed
 email:
 - jbvilain@gmail.com
@@ -92,8 +106,10 @@ files:
 - app/views/apidae/objects/_form.html.erb
 - app/views/apidae/objects/edit.html.erb
 - app/views/apidae/objects/index.html.erb
+- app/views/apidae/objects/index.json.jbuilder
 - app/views/apidae/objects/new.html.erb
 - app/views/apidae/objects/show.html.erb
+- app/views/apidae/objects/show.json.jbuilder
 - app/views/apidae/references/index.html.erb
 - app/views/apidae/selections/_form.html.erb
 - app/views/apidae/selections/edit.html.erb