apidae 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e25a6430bdd39784b105556de0aa19e44ade0a88
-  data.tar.gz: f58818fd7eda17b51846270440e03b5ba5c174a1
+  metadata.gz: 2f547cf4610e683c3aaea19fcd199a9eb22938ef
+  data.tar.gz: 4aa87029f4a8c5781c8545682bf574c722842cc4
 SHA512:
-  metadata.gz: cf1539b6f2f4e1e6e7b3f679192bf2eabbb7bd16c0dc1783c380d988989d755a2b63e5979073ac55f1523572884a09bc3add495d6788346d2253f627a6f037d7
-  data.tar.gz: 5fa24cb1d6966a4f40b5a76f455fd6c9480b46d42f1087d56f6c64f89570181f9822b1cad300cf481c76156ee44bfe9e9274157aa032c3798104c26fe416be78
+  metadata.gz: a6c3da77b3d4f508cfce7635cd18e9370f2e1af3c45e44a2f0184194e285b47cadb4cd6c0cb9282975abd1534eb8faf7d0760c7125df2dfe050a93560210a4f5
+  data.tar.gz: e84e25d392c3b1cca5edc9b5395abc3f964b34f6f13b840f48dee6d86640127bf78219baeace49ea3bad00ccb2f72c5066ec65cdbaea5424ff22aee72e5f7c16

data/app/controllers/apidae/api_controller.rb

@@ -6,8 +6,8 @@ module Apidae
     def selection
       @objects = []
       unless params[:selection_id].blank?
-        objects_ids = Apidae::Selection.find(params[:selection_id]).api_results[:results]
-        @objects = Apidae::Object.where(id: objects_ids)
+        objects_ids = Selection.find(params[:selection_id]).api_results[:results]
+        @objects = Obj.where(id: objects_ids)
       end
     end
 
@@ -17,8 +17,8 @@ module Apidae
     def agenda
       @objects = []
       unless params[:selection_id].blank?
-        objects_ids = Apidae::Selection.find(params[:selection_id]).api_agenda(params[:from], params[:to])[:results]
-        @objects = Apidae::Object.where(id: objects_ids)
+        objects_ids = Selection.find(params[:selection_id]).api_agenda(params[:from], params[:to])[:results]
+        @objects = Obj.where(id: objects_ids)
       end
     end
   end

data/app/controllers/apidae/application_controller.rb

@@ -1,5 +1,6 @@
 module Apidae
   class ApplicationController < ActionController::Base
     protect_from_forgery with: :exception
+    before_action Rails.application.config.apidae_auth
   end
 end

data/app/controllers/apidae/dashboard_controller.rb

@@ -3,9 +3,10 @@ require_dependency "apidae/application_controller"
 module Apidae
   class DashboardController < ApplicationController
     def index
-      @objects = Apidae::Object.count
-      @selections = Apidae::Selection.count
-      @last_imports = Apidae::FileImport.order(id: :desc).take(5)
+      @objects = Obj.count
+      @selections = Selection.count
+      @references = Reference.count
+      @last_imports = FileImport.order(id: :desc).take(5)
     end
   end
 end

data/app/controllers/apidae/references_controller.rb

@@ -0,0 +1,9 @@
+require_dependency "apidae/application_controller"
+
+module Apidae
+  class ReferencesController < ApplicationController
+    def index
+      @references = Reference.all
+    end
+  end
+end

data/app/controllers/apidae/selections_controller.rb

@@ -4,25 +4,20 @@ module Apidae
   class SelectionsController < ApplicationController
     before_action :set_selection, only: [:show, :edit, :update, :destroy]
 
-    # GET /selections
     def index
       @selections = Selection.all
     end
 
-    # GET /selections/1
     def show
     end
 
-    # GET /selections/new
     def new
       @selection = Selection.new
     end
 
-    # GET /selections/1/edit
     def edit
     end
 
-    # POST /selections
     def create
       @selection = Selection.new(selection_params)
 
@@ -33,7 +28,6 @@ module Apidae
       end
     end
 
-    # PATCH/PUT /selections/1
     def update
       if @selection.update(selection_params)
         redirect_to @selection, notice: 'Selection was successfully updated.'
@@ -42,19 +36,16 @@ module Apidae
       end
     end
 
-    # DELETE /selections/1
     def destroy
       @selection.destroy
       redirect_to selections_url, notice: 'Selection was successfully destroyed.'
     end
 
     private
-      # Use callbacks to share common setup or constraints between actions.
       def set_selection
         @selection = Selection.find(params[:id])
       end
 
-      # Only allow a trusted parameter "white list" through.
       def selection_params
         params.require(:selection).permit(:label, :reference, :apidae_id)
       end

data/app/helpers/apidae/references_helper.rb

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

data/app/models/apidae/file_import.rb

@@ -64,12 +64,12 @@ 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 = Apidae::Object.find_by_apidae_id(object_data[:id])
+        existing = Obj.find_by_apidae_id(object_data[:id])
         if existing
-          Apidae::Object.update_object(existing, object_data)
+          Obj.update_object(existing, object_data)
           result[:updated] += 1
         else
-          Apidae::Object.add_object(object_data)
+          Obj.add_object(object_data)
           result[:created] += 1
         end
       end
@@ -85,7 +85,7 @@ module Apidae
     def self.delete_objects(deleted_json, result)
       deleted_ids = JSON.parse(deleted_json)
       deleted_ids.each do |id|
-        obj = Apidae::Object.find_by_apidae_id(id)
+        obj = Obj.find_by_apidae_id(id)
         if obj
           obj.destroy!
           result[:deleted] += 1
@@ -104,7 +104,7 @@ module Apidae
             objects_json = File.read(json_file)
             objects_hashes = JSON.parse(objects_json, symbolize_names: true)
             objects_hashes.each do |object_data|
-              obj = Apidae::Object.find_by_apidae_id(object_data[:id])
+              obj = Obj.find_by_apidae_id(object_data[:id])
               if obj
                 yield(obj, object_data)
                 obj.save!
@@ -140,13 +140,13 @@ module Apidae
 
     def self.add_or_update_selections(selections_json, result)
       selections_hashes = JSON.parse(selections_json, symbolize_names: true)
-      deleted_ids = Apidae::Selection.all.collect {|sel| sel.apidae_id}.uniq - selections_hashes.collect {|sel| sel[:id]}
-      Apidae::Selection.where(apidae_id: deleted_ids).delete_all
+      deleted_ids = Selection.all.collect {|sel| sel.apidae_id}.uniq - selections_hashes.collect {|sel| sel[:id]}
+      Selection.where(apidae_id: deleted_ids).delete_all
       selections_hashes.each do |selection_data|
         logger.info "Updating selection #{selection_data[:id]}"
-        Apidae::Selection.add_or_update(selection_data)
+        Selection.add_or_update(selection_data)
       end
-      result[:selections] = Apidae::Selection.all
+      result[:selections] = Selection.all
                                 .collect {|sel| {apidae_id: sel.apidae_id, reference: sel.reference, objects: sel.objects.count}}
     end
   end

data/app/models/apidae/{object.rb → obj.rb}

@@ -1,5 +1,5 @@
 module Apidae
-  class Object < ActiveRecord::Base
+  class Obj < ActiveRecord::Base
 
     belongs_to :town, class_name: 'Apidae::Town', foreign_key: :town_insee_code, primary_key: :insee_code
     # has_many :attached_files, class_name: 'Apidae::AttachedFile'
@@ -16,7 +16,7 @@ module Apidae
     store_accessor :location_data, :address, :place, :latitude, :longitude, :access
     store_accessor :openings_data, :openings_desc, :openings, :time_periods
     store_accessor :rates_data, :rates_desc, :rates, :payment_methods
-    store_accessor :service_data, :services, :equipments, :comfort, :activities
+    store_accessor :service_data, :services, :equipments, :comfort, :activities, :challenged, :languages
     store_accessor :tags_data, :promo, :internal
 
     ACT = 'ACTIVITE'
@@ -60,7 +60,7 @@ module Apidae
     WEBSITE = 205
 
     def self.add_object(object_data)
-      apidae_obj = Apidae::Object.new(apidae_id: object_data[:id])
+      apidae_obj = Obj.new(apidae_id: object_data[:id])
       update_object(apidae_obj, object_data)
     end
 
@@ -202,7 +202,7 @@ module Apidae
             chains: lists_ids(data_hash[:chaines]) + nodes_ids(data_hash[:chaineEtLabel]),
             area: apidae_obj.apidae_type == DOS ? data_hash.except(:classification) : nil,
             track: apidae_obj.apidae_type == EQU ? data_hash[:itineraire] : nil,
-            products: lists_ids(data_hash[:typesProduit], data_hash[:aopAocIgps]),
+            products: lists_ids(data_hash[:typesProduit], data_hash[:aopAocIgps], data_hash[:specialites]),
             audience: lists_ids(prestations_hash[:typesClientele]),
             animals: prestations_hash[:animauxAcceptes] == 'ACCEPTES',
             extra: node_value(prestations_hash, :complementAccueil),
@@ -218,7 +218,9 @@ module Apidae
             equipments: lists_ids(data_hash[:equipements]),
             comfort: lists_ids(data_hash[:conforts]),
             activities: lists_ids(data_hash[:activites], type_data_hash[:activites],
-                                  type_data_hash[:activitesSportives], type_data_hash[:activitesCulturelles])
+                                  type_data_hash[:activitesSportives], type_data_hash[:activitesCulturelles]),
+            challenged: lists_ids(data_hash[:tourismesAdaptes]),
+            languages: lists_ids(data_hash[:languesParlees])
         }
       end
     end

data/app/models/apidae/reference.rb

@@ -39,7 +39,7 @@ module Apidae
     end
 
     def detailed_label(language)
-      category ? "#{Apidae::Reference.find_by_apidae_id(category).label(language)} - #{label(language)}" : label(language)
+      category ? "#{Reference.find_by_apidae_id(category).label(language)} - #{label(language)}" : label(language)
     end
   end
 end

data/app/models/apidae/selection.rb

@@ -1,7 +1,7 @@
 module Apidae
   class Selection < ActiveRecord::Base
     has_many :apidae_selection_objects, class_name: 'Apidae::SelectionObject', foreign_key: :apidae_selection_id
-    has_many :objects, class_name: 'Apidae::Object', source: :apidae_object, through: :apidae_selection_objects
+    has_many :objects, class_name: 'Apidae::Obj', source: :apidae_object, through: :apidae_selection_objects
 
     AGENDA_ENDPOINT = 'agenda/detaille/list-identifiants'
     SELECTION_ENDPOINT = 'recherche/list-identifiants'
@@ -12,7 +12,7 @@ module Apidae
     before_validation :generate_reference, on: :create
 
     def self.add_or_update(selection_data)
-      apidae_sel = Apidae::Selection.where(apidae_id: selection_data[:id]).first_or_initialize
+      apidae_sel = Selection.where(apidae_id: selection_data[:id]).first_or_initialize
       apidae_sel.label = selection_data[:nom]
       apidae_sel.save!
 
@@ -24,12 +24,12 @@ module Apidae
       removed = current_objs - imported_objs
 
       added.each do |o|
-        obj = Apidae::Object.find_by_apidae_id(o)
-        Apidae::SelectionObject.create(apidae_selection_id: apidae_sel.id, apidae_object_id: obj.id)
+        obj = Obj.find_by_apidae_id(o)
+        SelectionObject.create(apidae_selection_id: apidae_sel.id, apidae_object_id: obj.id)
       end
 
-      removed_ids = Apidae::Object.where(apidae_id: removed).map {|o| o.id}
-      Apidae::SelectionObject.where(apidae_selection_id: apidae_sel.id, apidae_object_id: removed_ids).delete_all
+      removed_ids = Obj.where(apidae_id: removed).map {|o| o.id}
+      SelectionObject.where(apidae_selection_id: apidae_sel.id, apidae_object_id: removed_ids).delete_all
     end
 
     def results(where_clause, offset, size)
@@ -62,6 +62,10 @@ module Apidae
       res
     end
 
+    def as_text
+      "#{label} (#{apidae_id})"
+    end
+
     private
 
     def query_api(query_args, all_results = false)

data/app/models/apidae/selection_object.rb

@@ -1,6 +1,6 @@
 module Apidae
   class SelectionObject < ApplicationRecord
-    belongs_to :apidae_object, class_name: 'Apidae::Object', foreign_key: :apidae_object_id
+    belongs_to :apidae_object, class_name: 'Apidae::Obj', foreign_key: :apidae_object_id
     belongs_to :apidae_selection, class_name: 'Apidae::Selection', foreign_key: :apidae_selection_id
   end
 end

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

@@ -1,5 +1,8 @@
 <%= render layout: "/layouts/#{Rails.application.config.apidae_layout}" do |styles| %>
     <div id="apidae_header" class="<%= styles[:header] %>">
+      <%= 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] %>
+      <%= link_to (pluralize(@references, 'élément', 'éléments') + ' de référence'), apidae.references_path, class: styles[:references] %>
       <%= link_to 'Retour', :back, class: styles[:back] %>
       <h1 class="<%= styles[:h1] %>">Apidae</h1>
     </div>
@@ -28,16 +31,11 @@
           <% end %>
           <% if @last_imports.empty? %>
               <tr>
-                <td colspan="3">Aucun import pour le moment.</td>
+                <td colspan="5">Aucun import pour le moment.</td>
               </tr>
           <% end %>
           </tbody>
         </table>
       </div>
-      <div id="apidae_navigation_panel" class="<%= styles[:body] %>">
-        <h2 class="<%= styles[:h2] %>">Données issues d'Apidae</h2>
-        <%= 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/references/index.html.erb

@@ -0,0 +1,35 @@
+<%= 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 - Eléments de référence</h1>
+  </div>
+  <div id="apidae_dashboard" class="<%= styles[:wrapper] %>">
+    <div id="apidae_imports_panel" class="<%= styles[:body] %>">
+      <table id="apidae_references" class="<%= styles[:table] %>">
+        <thead class="<%= styles[:table_head] %>">
+        <tr>
+          <th>Titre</th>
+          <th>Identifiant</th>
+          <th>Type</th>
+          <th>Mise à jour</th>
+        </tr>
+        </thead>
+        <tbody class="<%= styles[:table_body] %>">
+        <% @references.each do |ref| %>
+          <tr>
+            <td><%= ref.label(:fr) %></td>
+            <td><%= ref.apidae_id %></td>
+            <td><%= ref.apidae_type %></td>
+            <td><%= ref.updated_at.strftime('Le %d/%m/%Y à %H:%M') if ref.updated_at %></td>
+          </tr>
+        <% end %>
+        <% if @references.empty? %>
+          <tr>
+            <td colspan="4">Aucune référence importée pour le moment.</td>
+          </tr>
+        <% end %>
+        </tbody>
+      </table>
+    </div>
+  </div>
+<% end %>

data/config/routes.rb

@@ -4,6 +4,7 @@ Apidae::Engine.routes.draw do
   resources :selections, only: [:index] do
     resources :objects, only: [:index]
   end
+  resources :references, only: [:index]
 
   match 'import/callback', via: :post, to: 'import#callback'
   match 'import/run', via: :post, to: 'import#run'

data/db/migrate/20180625050400_rename_objects_to_obj.rb

@@ -0,0 +1,5 @@
+class RenameObjectsToObj < ActiveRecord::Migration[5.1]
+  def change
+    rename_table :apidae_objects, :apidae_objs
+  end
+end

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "0.4.5"
+  VERSION = "0.5.0"
 end

data/test/controllers/apidae/references_controller_test.rb

@@ -0,0 +1,13 @@
+require 'test_helper'
+
+module Apidae
+  class ReferencesControllerTest < ActionDispatch::IntegrationTest
+    include Engine.routes.url_helpers
+
+    test "should get index" do
+      get apidae_references_index_url
+      assert_response :success
+    end
+
+  end
+end

data/test/dummy/config/application.rb

@@ -18,6 +18,7 @@ module Dummy
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
+    config.apidae_auth = :dummy_auth
   end
 end
 

data/test/dummy/config/initializers/apidae.rb

@@ -0,0 +1,18 @@
+class DummyUser
+  attr_accessor :id
+
+  def initialize(id)
+    @id = id
+  end
+end
+
+DEFAULT_USER = DummyUser.new(1)
+
+Apidae::ApplicationController.class_eval do
+  def dummy_auth
+  end
+
+  def dummy_user
+    DEFAULT_USER
+  end
+end

data/test/dummy/db/schema.rb

@@ -10,24 +10,11 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20180314093512) do
+ActiveRecord::Schema.define(version: 20180625050400) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
-  create_table "apidae_attached_files", id: :serial, force: :cascade do |t|
-    t.string "name"
-    t.string "credits"
-    t.text "description"
-    t.integer "apidae_object_id"
-    t.string "picture_file_name"
-    t.string "picture_content_type"
-    t.integer "picture_file_size"
-    t.datetime "picture_updated_at"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-  end
-
   create_table "apidae_exports", id: :serial, force: :cascade do |t|
     t.string "status"
     t.string "remote_status"
@@ -50,18 +37,18 @@ ActiveRecord::Schema.define(version: 20180314093512) do
     t.datetime "updated_at", null: false
   end
 
-  create_table "apidae_objects", id: :serial, force: :cascade do |t|
-    t.jsonb "address"
+  create_table "apidae_objects_selections", id: :serial, force: :cascade do |t|
+    t.integer "object_id"
+    t.integer "selection_id"
+  end
+
+  create_table "apidae_objs", id: :serial, force: :cascade do |t|
     t.integer "apidae_id"
     t.string "apidae_type"
     t.string "apidae_subtype"
     t.string "title"
-    t.text "short_desc"
     t.jsonb "contact"
-    t.text "long_desc"
     t.jsonb "type_data"
-    t.float "latitude"
-    t.float "longitude"
     t.jsonb "openings_data"
     t.text "reservation"
     t.datetime "created_at", null: false
@@ -73,11 +60,9 @@ ActiveRecord::Schema.define(version: 20180314093512) do
     t.jsonb "rates_data"
     t.jsonb "attachments_data"
     t.jsonb "tags_data"
-  end
-
-  create_table "apidae_objects_selections", id: :serial, force: :cascade do |t|
-    t.integer "object_id"
-    t.integer "selection_id"
+    t.jsonb "meta_data"
+    t.jsonb "location_data"
+    t.jsonb "description_data"
   end
 
   create_table "apidae_references", force: :cascade do |t|
@@ -86,7 +71,8 @@ ActiveRecord::Schema.define(version: 20180314093512) do
     t.jsonb "label_data"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["apidae_id"], name: "index_apidae_references_on_apidae_id", unique: true
+    t.jsonb "meta_data"
+    t.index ["apidae_id"], name: "index_apidae_references_on_apidae_id"
   end
 
   create_table "apidae_selection_objects", force: :cascade do |t|
@@ -112,7 +98,7 @@ ActiveRecord::Schema.define(version: 20180314093512) do
     t.string "postal_code"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["insee_code"], name: "index_apidae_towns_on_insee_code", unique: true
+    t.index ["insee_code"], name: "index_apidae_towns_on_insee_code"
   end
 
 end

data/test/dummy/log/development.log

@@ -344,3 +344,72 @@ Migrating to AddTagsDataToApidaeObjects (20180314093512)
    (0.1ms)  COMMIT
    (0.2ms)  SELECT pg_advisory_unlock(6140174353533887940)
    (0.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+DEPRECATION WARNING: Passing string to be evaluated in :if and :unless conditional options is deprecated and will be removed in Rails 5.2 without replacement. Pass a symbol for an instance method, or a lambda, proc or block, instead. (called from <class:ApplicationController> at /Users/jbvilain/workspace/code/apidae-engine-rails/app/controllers/apidae/application_controller.rb:4)
+   (6.6ms)  SELECT pg_try_advisory_lock(6140174353533887940)
+   (2.9ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+Migrating to AddMetaDataToApidaeObjects (20180314132631)
+   (0.1ms)  BEGIN
+   (31.7ms)  ALTER TABLE "apidae_objects" ADD "meta_data" jsonb
+  SQL (0.5ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20180314132631"]]
+   (1.2ms)  COMMIT
+Migrating to RemoveApidaeIdUnicity (20180319143954)
+   (0.2ms)  BEGIN
+   (5.5ms)  DROP INDEX  "index_apidae_references_on_apidae_id"
+   (4.5ms)  CREATE  INDEX  "index_apidae_references_on_apidae_id" ON "apidae_references"  ("apidae_id")
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20180319143954"]]
+   (2.0ms)  COMMIT
+Migrating to AddLocationDataToApidaeObjects (20180417164604)
+   (0.3ms)  BEGIN
+   (0.3ms)  ALTER TABLE "apidae_objects" ADD "location_data" jsonb
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20180417164604"]]
+   (6.0ms)  COMMIT
+Migrating to RemoveAddressFromApidaeObjects (20180417165744)
+   (0.2ms)  BEGIN
+   (12.4ms)  ALTER TABLE "apidae_objects" DROP "address"
+  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20180417165744"]]
+   (6.1ms)  COMMIT
+Migrating to RemoveLatLngFromApidaeObjects (20180417171344)
+   (0.2ms)  BEGIN
+   (0.4ms)  ALTER TABLE "apidae_objects" DROP "latitude"
+   (0.3ms)  ALTER TABLE "apidae_objects" DROP "longitude"
+  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20180417171344"]]
+   (6.3ms)  COMMIT
+Migrating to AddDescriptionDataToApidaeObjects (20180418141248)
+   (0.2ms)  BEGIN
+   (0.3ms)  ALTER TABLE "apidae_objects" ADD "description_data" jsonb
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20180418141248"]]
+   (6.2ms)  COMMIT
+Migrating to RemoveDescColumnsFromApidaeObjects (20180418141305)
+   (0.2ms)  BEGIN
+   (0.4ms)  ALTER TABLE "apidae_objects" DROP "short_desc"
+   (0.2ms)  ALTER TABLE "apidae_objects" DROP "long_desc"
+  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20180418141305"]]
+   (5.9ms)  COMMIT
+Migrating to AddMetaDataToApidaeReferences (20180424141656)
+   (0.2ms)  BEGIN
+   (0.3ms)  ALTER TABLE "apidae_references" ADD "meta_data" jsonb
+  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20180424141656"]]
+   (5.8ms)  COMMIT
+Migrating to RemoveInseeCodeUnicity (20180519170210)
+   (0.2ms)  BEGIN
+   (13.0ms)  DROP INDEX  "index_apidae_towns_on_insee_code"
+   (7.7ms)  CREATE  INDEX  "index_apidae_towns_on_insee_code" ON "apidae_towns"  ("insee_code")
+  SQL (0.4ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20180519170210"]]
+   (1.8ms)  COMMIT
+Migrating to DestroyAttachedFiles (20180521211735)
+   (0.2ms)  BEGIN
+   (29.0ms)  DROP TABLE "apidae_attached_files"
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20180521211735"]]
+   (2.0ms)  COMMIT
+Migrating to RenameObjectsToObj (20180625050400)
+   (0.1ms)  BEGIN
+   (6.5ms)  ALTER TABLE "apidae_objects" RENAME TO "apidae_objs"
+   (0.3ms)  ALTER TABLE "public"."apidae_objects_id_seq" RENAME TO "apidae_objs_id_seq"
+   (0.9ms)  ALTER INDEX "apidae_objects_pkey" RENAME TO "apidae_objs_pkey"
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20180625050400"]]
+   (0.6ms)  COMMIT
+  ActiveRecord::InternalMetadata Load (23.6ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = $1 LIMIT $2  [["key", "environment"], ["LIMIT", 1]]
+   (0.2ms)  BEGIN
+   (0.1ms)  COMMIT
+   (0.2ms)  SELECT pg_advisory_unlock(6140174353533887940)
+   (0.3ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC

data/test/models/apidae/file_import_test.rb

@@ -3,45 +3,45 @@ require 'test_helper'
 module Apidae
   class FileImportTest < ActiveSupport::TestCase
     setup do
-      Apidae::Object.delete_all
-      Apidae::Selection.delete_all
+      Obj.delete_all
+      Selection.delete_all
       @result = {created: 0, updated: 0, deleted: 0, selections: []}
     end
 
     test "new object insertion" do
       objects_json = File.read('test/data/structure.json')
       FileImport.add_or_update_objects(objects_json, @result)
-      assert_equal 1, Apidae::Object.count
-      new_obj = Apidae::Object.first
+      assert_equal 1, Obj.count
+      new_obj = Obj.first
       assert_equal 504, new_obj.apidae_id
       assert_equal({created: 1, updated: 0, deleted: 0, selections: []}, @result)
     end
 
     test "existing object update" do
-      Apidae::Object.create(apidae_id: 504, title: 'Société des contrebassistes aixois')
+      Obj.create(apidae_id: 504, title: 'Société des contrebassistes aixois')
       objects_json = File.read('test/data/structure.json')
       FileImport.add_or_update_objects(objects_json, @result)
-      assert_equal 1, Apidae::Object.count
-      updated_obj = Apidae::Object.first
+      assert_equal 1, Obj.count
+      updated_obj = Obj.first
       assert_equal 504, updated_obj.apidae_id
       assert_equal 'Société des accordéonistes aixois', updated_obj.title
       assert_equal({created: 0, updated: 1, deleted: 0, selections: []}, @result)
     end
 
     test "existing object deletion" do
-      Apidae::Object.create(apidae_id: 504, title: 'Société des contrebassistes aixois')
+      Obj.create(apidae_id: 504, title: 'Société des contrebassistes aixois')
       objects_json = File.read('test/data/deletion.json')
       FileImport.delete_objects(objects_json, @result)
-      assert_equal 0, Apidae::Object.count
+      assert_equal 0, Obj.count
       assert_equal({created: 0, updated: 0, deleted: 1, selections: []}, @result)
     end
 
     test "new selection insertion" do
-      Apidae::Object.create(apidae_id: 504, title: 'Société des contrebassistes aixois')
+      Obj.create(apidae_id: 504, title: 'Société des contrebassistes aixois')
       objects_json = File.read('test/data/selections.json')
       FileImport.add_or_update_selections(objects_json, @result)
-      assert_equal 1, Apidae::Selection.count
-      new_sel = Apidae::Selection.first
+      assert_equal 1, Selection.count
+      new_sel = Selection.first
       assert_equal 49063, new_sel.apidae_id
       assert_equal 'Sélection 1', new_sel.label
       assert_equal 'selection-1', new_sel.reference
@@ -50,14 +50,14 @@ module Apidae
     end
 
     test "existing selection update" do
-      obj = Apidae::Object.create(apidae_id: 503, title: 'Société des contrebassistes aixois')
-      Apidae::Object.create(apidae_id: 504, title: 'Société des contrebassistes aixois')
-      sel = Apidae::Selection.create(apidae_id: 49063, label: 'Sélection 2', reference: 'selection-2')
+      obj = Obj.create(apidae_id: 503, title: 'Société des contrebassistes aixois')
+      Obj.create(apidae_id: 504, title: 'Société des contrebassistes aixois')
+      sel = Selection.create(apidae_id: 49063, label: 'Sélection 2', reference: 'selection-2')
       sel.objects << obj
       assert_equal 1, sel.objects.count
       objects_json = File.read('test/data/update_selections.json')
       FileImport.add_or_update_selections(objects_json, @result)
-      assert_equal 1, Apidae::Selection.count
+      assert_equal 1, Selection.count
       assert_equal 49063, sel.apidae_id
       assert_equal 'Sélection 2', sel.label
       assert_equal 'selection-2', sel.reference
@@ -66,19 +66,19 @@ module Apidae
     end
 
     test "existing selection deletion" do
-      Apidae::Selection.create(apidae_id: 49063, label: 'Sélection 3', reference: 'selection-3')
+      Selection.create(apidae_id: 49063, label: 'Sélection 3', reference: 'selection-3')
       objects_json = File.read('test/data/delete_selections.json')
-      assert_equal 1, Apidae::Selection.count
+      assert_equal 1, Selection.count
       FileImport.add_or_update_selections(objects_json, @result)
-      assert_equal 0, Apidae::Selection.count
+      assert_equal 0, Selection.count
     end
 
     test "full import process" do
-      Apidae::Object.create(apidae_id: 123, title: 'Objet à supprimer')
-      Apidae::Object.create(apidae_id: 4826186, title: 'Objet à mettre à jour')
+      Obj.create(apidae_id: 123, title: 'Objet à supprimer')
+      Obj.create(apidae_id: 4826186, title: 'Objet à mettre à jour')
       result = FileImport.import('test/data/json_export.zip')
-      assert_equal 2, Apidae::Selection.all.count
-      assert_equal 5, Apidae::Object.all.count
+      assert_equal 2, Selection.all.count
+      assert_equal 5, Obj.all.count
       assert_equal({created: 4, updated: 1, deleted: 1, selections: [
           {apidae_id: 49063, reference: 'selection-1', objects: 2},
           {apidae_id: 49073, reference: 'selection-2', objects: 3}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-27 00:00:00.000000000 Z
+date: 2018-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.4
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.4
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 description: To be completed
 email:
 - jbvilain@gmail.com
@@ -70,17 +70,19 @@ files:
 - app/controllers/apidae/dashboard_controller.rb
 - app/controllers/apidae/import_controller.rb
 - app/controllers/apidae/objects_controller.rb
+- app/controllers/apidae/references_controller.rb
 - app/controllers/apidae/selections_controller.rb
 - app/helpers/apidae/api_helper.rb
 - app/helpers/apidae/application_helper.rb
 - app/helpers/apidae/dashboard_helper.rb
 - app/helpers/apidae/import_helper.rb
 - app/helpers/apidae/objects_helper.rb
+- app/helpers/apidae/references_helper.rb
 - app/helpers/apidae/selections_helper.rb
 - app/models/apidae/application_record.rb
 - app/models/apidae/export.rb
 - app/models/apidae/file_import.rb
-- app/models/apidae/object.rb
+- app/models/apidae/obj.rb
 - app/models/apidae/reference.rb
 - app/models/apidae/selection.rb
 - app/models/apidae/selection_object.rb
@@ -92,6 +94,7 @@ files:
 - app/views/apidae/objects/index.html.erb
 - app/views/apidae/objects/new.html.erb
 - app/views/apidae/objects/show.html.erb
+- app/views/apidae/references/index.html.erb
 - app/views/apidae/selections/_form.html.erb
 - app/views/apidae/selections/edit.html.erb
 - app/views/apidae/selections/index.html.erb
@@ -130,6 +133,7 @@ files:
 - db/migrate/20180424141656_add_meta_data_to_apidae_references.rb
 - db/migrate/20180519170210_remove_insee_code_unicity.rb
 - db/migrate/20180521211735_destroy_attached_files.rb
+- db/migrate/20180625050400_rename_objects_to_obj.rb
 - lib/apidae.rb
 - lib/apidae/engine.rb
 - lib/apidae/version.rb
@@ -139,6 +143,7 @@ files:
 - test/controllers/apidae/dashboard_controller_test.rb
 - test/controllers/apidae/import_controller_test.rb
 - test/controllers/apidae/objects_controller_test.rb
+- test/controllers/apidae/references_controller_test.rb
 - test/controllers/apidae/selections_controller_test.rb
 - test/data/delete_selections.json
 - test/data/deletion.json
@@ -165,6 +170,7 @@ files:
 - test/dummy/config/environments/development.rb
 - test/dummy/config/environments/production.rb
 - test/dummy/config/environments/test.rb
+- test/dummy/config/initializers/apidae.rb
 - test/dummy/config/initializers/assets.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/cookies_serializer.rb
@@ -251,6 +257,7 @@ test_files:
 - test/dummy/config/initializers/assets.rb
 - test/dummy/config/initializers/cookies_serializer.rb
 - test/dummy/config/initializers/to_time_preserves_timezone.rb
+- test/dummy/config/initializers/apidae.rb
 - test/dummy/config/initializers/inflections.rb
 - test/dummy/config.ru
 - test/dummy/Rakefile
@@ -282,6 +289,7 @@ test_files:
 - test/controllers/apidae/api_controller_test.rb
 - test/controllers/apidae/objects_controller_test.rb
 - test/controllers/apidae/dashboard_controller_test.rb
+- test/controllers/apidae/references_controller_test.rb
 - test/controllers/apidae/import_controller_test.rb
 - test/data/update_selections.json
 - test/data/json_export.zip