apidae 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bd8c7a992f4c7d76fd4255d90c737506c0b9b4d
-  data.tar.gz: ef8dccc6e6af2d9aef146bb03164ec89f4394db0
+  metadata.gz: d0a3a4373bd30afc262811bcf084f5c6d047b064
+  data.tar.gz: 18bd22b43a8ac17470a989cc7c9d5fc05e8fc0f1
 SHA512:
-  metadata.gz: 3dc86f15ac98ebcf52b5cd3f2218ee5ec88460908db06b80226660932f7bf4539c1ade07fbb833bad11bfa10d1aa9254adc3115171fba1e7387d9da66c8dd99e
-  data.tar.gz: d9fb909de8cabe9d2175b86d38e178006a089399f438a22ef477a11247ba7d8904e6540fb7a9063b4350d52abf3ca8c514b7e67aae57c24913281cf8fad42a13
+  metadata.gz: 6b84b9f9ecf1c2dbbf66ec0d4b31ed9faac0556094b9c1fd53c66a9a4810b663cd4e5295ba1e21210024a7f2069ed342c87738e8eb5f1afd1613cf093d4e2488
+  data.tar.gz: acbbbb5cb56bfac471ed1a36cb7bc171bdc3260ef592aa8a2cd457aeb1183e3b1e04130d834f9beabd2ceb0ba48736ca91cec8c71cb6d8783e7a0f23590f21f9

data/app/controllers/apidae/import_controller.rb

@@ -33,20 +33,27 @@ module Apidae
     def run
       success = true
       Export.pending.each do |e|
-        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)
+        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
             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/models/apidae/application_record.rb

@@ -0,0 +1,5 @@
+module Apidae
+  class ApplicationRecord < ActiveRecord::Base
+    self.abstract_class = true
+  end
+end

data/app/models/apidae/object.rb

@@ -1,16 +1,17 @@
 module Apidae
   class Object < 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'
-    has_and_belongs_to_many :selections, :class_name => 'Apidae::Selection'
-
-    store :pictures_data, accessors: [:pictures], coder: JSON
-    store :type_data, accessors: [:categories, :themes], coder: JSON
-    store :entity_data, accessors: [:entity_id, :entity_name]
-    store :contact, accessors: [:telephone, :email, :website], coder: JSON
-    store :address, accessors: [:address_fields], coder: JSON
-    store :openings, accessors: [:description, :opening_periods], coder: JSON
+    belongs_to :town, class_name: 'Apidae::Town', foreign_key: :town_insee_code, primary_key: :insee_code
+    has_many :attached_files, class_name: 'Apidae::AttachedFile'
+    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
+
+    store_accessor :pictures_data, :pictures
+    store_accessor :type_data, :categories, :themes, :capacite, :classement
+    store_accessor :entity_data, :entity_id, :entity_name
+    store_accessor :contact, :telephone, :email, :website
+    store_accessor :address, :address_fields
+    store_accessor :openings, :description, :opening_periods
 
     ACT = 'ACTIVITE'
     COS = 'COMMERCE_ET_SERVICE'
@@ -60,7 +61,7 @@ module Apidae
     def self.update_object(apidae_obj, object_data)
       type_fields = TYPES_DATA[object_data[:type]]
       apidae_obj.apidae_type = object_data[:type]
-      apidae_obj.apidae_subtype = node_value(object_data[type_fields[:node]], object_data[type_fields[:subtype]])
+      apidae_obj.apidae_subtype = node_id(object_data[type_fields[:node]], type_fields[:subtype])
       apidae_obj.title = node_value(object_data, :nom)
       apidae_obj.short_desc = node_value(object_data[:presentation], :descriptifCourt)
       apidae_obj.long_desc = node_value(object_data[:presentation], :descriptifDetaille)
@@ -75,6 +76,7 @@ module Apidae
       apidae_obj.type_data = object_data[type_fields[:node]]
       apidae_obj.pictures_data = pictures_urls(object_data[:illustrations])
       apidae_obj.entity_data = entity_fields(object_data[:informations])
+      apidae_obj.service_data = object_data[:prestations]
       apidae_obj.save!
     end
 
@@ -112,24 +114,30 @@ module Apidae
 
     def self.address(address_hash)
       computed_address = []
-      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?
+      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
       {address_fields: computed_address}
     end
 
-    def self.town(address_hash)
-      address_hash[:commune] ? Town.find_by_apidae_id(address_hash[:commune][:id]) : nil
+    def self.town(address_hash = {})
+      (!address_hash.blank? && address_hash[:commune]) ? Town.find_by_apidae_id(address_hash[:commune][:id]) : nil
     end
 
     def self.latitude(location_hash)
-      geoloc_details = location_hash[:geolocalisation]
-      (geoloc_details && geoloc_details[:valide] && geoloc_details[:geoJson]) ? geoloc_details[:geoJson][:coordinates][1] : nil
+      unless location_hash.blank?
+        geoloc_details = location_hash[:geolocalisation]
+        (geoloc_details && geoloc_details[:valide] && geoloc_details[:geoJson]) ? geoloc_details[:geoJson][:coordinates][1] : nil
+      end
     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
+    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
     end
 
     def self.openings(openings_hash)
@@ -185,5 +193,13 @@ module Apidae
         ''
       end
     end
+
+    def self.node_id(node, key)
+      if node && node[key]
+        node[key][:id]
+      else
+        ''
+      end
+    end
   end
 end

data/app/models/apidae/selection.rb

@@ -1,6 +1,7 @@
 module Apidae
   class Selection < ActiveRecord::Base
-    has_and_belongs_to_many :objects, :class_name => 'Apidae::Object'
+    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
 
     MAX_COUNT = 100
     MAX_LOOPS = 10
@@ -14,19 +15,21 @@ module Apidae
       apidae_sel.label = selection_data[:nom]
       apidae_sel.save!
 
+      # Note : should be done with basic collection assignment, but can't make it work...
       current_objs = apidae_sel.objects.collect {|obj| obj.apidae_id}
       imported_objs = selection_data[:objetsTouristiques].blank? ? [] : selection_data[:objetsTouristiques].collect {|obj| obj[:id]}
+
       added = imported_objs - current_objs
       removed = current_objs - imported_objs
 
       added.each do |o|
-        apidae_object = Apidae::Object.find_by_apidae_id(o)
-        apidae_sel.objects << apidae_object if apidae_object
+        obj = Apidae::Object.find_by_apidae_id(o)
+        Apidae::SelectionObject.create(apidae_selection_id: apidae_sel.id, apidae_object_id: obj.id)
       end
 
       removed.each do |o|
-        apidae_object = Apidae::Object.find_by_apidae_id(o)
-        apidae_sel.objects.delete(apidae_object) if apidae_object
+        obj = Apidae::Object.find_by_apidae_id(o)
+        Apidae::SelectionObject.destroy(apidae_selection_id: apidae_sel.id, apidae_object_id: obj.id)
       end
     end
 
@@ -65,6 +68,14 @@ module Apidae
       agenda_entries
     end
 
+    def results(where_clause, offset, size)
+      objects.includes(:town).limit(size).offset(offset).where(where_clause)
+    end
+
+    def total(where_clause)
+      objects.where(where_clause).count
+    end
+
     private
 
     def get_response(config)

data/app/models/apidae/selection_object.rb

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

data/db/migrate/20170512212941_create_apidae_selections.rb

@@ -1,4 +1,4 @@
-class CreateApidaeSelections < ActiveRecord::Migration
+class CreateApidaeSelections < ActiveRecord::Migration[4.2]
   def change
     create_table :apidae_selections do |t|
       t.string :label

data/db/migrate/20170512214641_create_apidae_objects.rb

@@ -1,4 +1,4 @@
-class CreateApidaeObjects < ActiveRecord::Migration
+class CreateApidaeObjects < ActiveRecord::Migration[4.2]
   def change
     create_table :apidae_objects do |t|
       t.string :address

data/db/migrate/20170512221525_create_apidae_objects_apidae_selections.rb

@@ -1,4 +1,4 @@
-class CreateApidaeObjectsApidaeSelections < ActiveRecord::Migration
+class CreateApidaeObjectsApidaeSelections < ActiveRecord::Migration[4.2]
   def change
     create_table :apidae_objects_apidae_selections do |t|
       t.integer :object_id

data/db/migrate/20170513114002_create_apidae_towns.rb

@@ -1,4 +1,4 @@
-class CreateApidaeTowns < ActiveRecord::Migration
+class CreateApidaeTowns < ActiveRecord::Migration[4.2]
   def change
     create_table :apidae_towns do |t|
       t.string :country

data/db/migrate/20170513114409_add_town_insee_code_to_objects.rb

@@ -1,4 +1,4 @@
-class AddTownInseeCodeToObjects < ActiveRecord::Migration
+class AddTownInseeCodeToObjects < ActiveRecord::Migration[4.2]
   def change
     add_column :apidae_objects, :town_insee_code, :string
   end

data/db/migrate/20170513115401_add_pictures_data_to_objects.rb

@@ -1,4 +1,4 @@
-class AddPicturesDataToObjects < ActiveRecord::Migration
+class AddPicturesDataToObjects < ActiveRecord::Migration[4.2]
   def change
     add_column :apidae_objects, :pictures_data, :text
   end

data/db/migrate/20170513121215_create_apidae_attached_files.rb

@@ -1,4 +1,4 @@
-class CreateApidaeAttachedFiles < ActiveRecord::Migration
+class CreateApidaeAttachedFiles < ActiveRecord::Migration[4.2]
   def change
     create_table :apidae_attached_files do |t|
       t.string :name

data/db/migrate/20170513205932_rename_objects_selections_table.rb

@@ -1,4 +1,4 @@
-class RenameObjectsSelectionsTable < ActiveRecord::Migration
+class RenameObjectsSelectionsTable < ActiveRecord::Migration[4.2]
   def change
     rename_table :apidae_objects_apidae_selections, :apidae_objects_selections
   end

data/db/migrate/20170720161134_add_entity_data_to_objects.rb

@@ -1,4 +1,4 @@
-class AddEntityDataToObjects < ActiveRecord::Migration
+class AddEntityDataToObjects < ActiveRecord::Migration[4.2]
   def change
     add_column :apidae_objects, :entity_data, :text
   end

data/db/migrate/20170730102424_create_apidae_file_imports.rb

@@ -1,4 +1,4 @@
-class CreateApidaeFileImports < ActiveRecord::Migration
+class CreateApidaeFileImports < ActiveRecord::Migration[4.2]
   def change
     create_table :apidae_file_imports do |t|
       t.string :status

data/db/migrate/20171025075304_create_apidae_exports.rb

@@ -1,4 +1,4 @@
-class CreateApidaeExports < ActiveRecord::Migration
+class CreateApidaeExports < ActiveRecord::Migration[4.2]
   def change
     create_table :apidae_exports do |t|
       t.string :status

data/db/migrate/20180217222410_create_apidae_selection_objects.rb

@@ -0,0 +1,10 @@
+class CreateApidaeSelectionObjects < ActiveRecord::Migration[5.1]
+  def change
+    create_table :apidae_selection_objects do |t|
+      t.integer :apidae_selection_id
+      t.integer :apidae_object_id
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20180218172704_change_text_columns_to_json.rb

@@ -0,0 +1,10 @@
+class ChangeTextColumnsToJson < ActiveRecord::Migration[5.1]
+  def change
+    change_column :apidae_objects, :pictures_data, :jsonb, using: 'pictures_data::text::jsonb'
+    change_column :apidae_objects, :type_data, :jsonb, using: 'type_data::text::jsonb'
+    change_column :apidae_objects, :entity_data, :jsonb, using: 'entity_data::text::jsonb'
+    change_column :apidae_objects, :contact, :jsonb, using: 'contact::text::jsonb'
+    change_column :apidae_objects, :address, :jsonb, using: 'address::text::jsonb'
+    change_column :apidae_objects, :openings, :jsonb, using: 'openings::text::jsonb'
+  end
+end

data/db/migrate/20180218231319_add_service_data_to_apidae_objects.rb

@@ -0,0 +1,5 @@
+class AddServiceDataToApidaeObjects < ActiveRecord::Migration[5.1]
+  def change
+    add_column :apidae_objects, :service_data, :jsonb
+  end
+end

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/test/dummy/config/application.rb

@@ -18,9 +18,6 @@ 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
-
-    # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true
   end
 end
 

data/test/dummy/db/schema.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -11,91 +10,98 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20171025075304) do
+ActiveRecord::Schema.define(version: 20180218231319) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
-  create_table "apidae_attached_files", 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"
+  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
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
-  create_table "apidae_exports", force: :cascade do |t|
-    t.string   "status"
-    t.string   "remote_status"
-    t.boolean  "oneshot"
-    t.boolean  "reset"
-    t.string   "file_url"
-    t.string   "confirm_url"
-    t.integer  "project_id"
-    t.datetime "created_at",    null: false
-    t.datetime "updated_at",    null: false
+  create_table "apidae_exports", id: :serial, force: :cascade do |t|
+    t.string "status"
+    t.string "remote_status"
+    t.boolean "oneshot"
+    t.boolean "reset"
+    t.string "file_url"
+    t.string "confirm_url"
+    t.integer "project_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
-  create_table "apidae_file_imports", force: :cascade do |t|
-    t.string   "status"
-    t.string   "remote_file"
-    t.integer  "created"
-    t.integer  "updated"
-    t.integer  "deleted"
-    t.datetime "created_at",  null: false
-    t.datetime "updated_at",  null: false
+  create_table "apidae_file_imports", id: :serial, force: :cascade do |t|
+    t.string "status"
+    t.string "remote_file"
+    t.integer "created"
+    t.integer "updated"
+    t.integer "deleted"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
-  create_table "apidae_objects", force: :cascade do |t|
-    t.string   "address"
-    t.integer  "apidae_id"
-    t.string   "apidae_type"
-    t.string   "apidae_subtype"
-    t.string   "title"
-    t.text     "short_desc"
-    t.text     "contact"
-    t.text     "long_desc"
-    t.text     "type_data"
-    t.float    "latitude"
-    t.float    "longitude"
-    t.text     "openings"
-    t.text     "rates"
-    t.text     "reservation"
-    t.datetime "created_at",      null: false
-    t.datetime "updated_at",      null: false
-    t.string   "town_insee_code"
-    t.text     "pictures_data"
-    t.text     "entity_data"
+  create_table "apidae_objects", id: :serial, force: :cascade do |t|
+    t.jsonb "address"
+    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"
+    t.text "rates"
+    t.text "reservation"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.string "town_insee_code"
+    t.jsonb "pictures_data"
+    t.jsonb "entity_data"
+    t.jsonb "service_data"
   end
 
-  create_table "apidae_objects_selections", force: :cascade do |t|
+  create_table "apidae_objects_selections", id: :serial, force: :cascade do |t|
     t.integer "object_id"
     t.integer "selection_id"
   end
 
-  create_table "apidae_selections", force: :cascade do |t|
-    t.string   "label"
-    t.string   "reference"
-    t.integer  "apidae_id"
+  create_table "apidae_selection_objects", force: :cascade do |t|
+    t.integer "apidae_selection_id"
+    t.integer "apidae_object_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
 
-  create_table "apidae_towns", force: :cascade do |t|
-    t.string   "country"
-    t.integer  "apidae_id"
-    t.string   "insee_code"
-    t.string   "name"
-    t.string   "postal_code"
-    t.datetime "created_at",  null: false
-    t.datetime "updated_at",  null: false
+  create_table "apidae_selections", id: :serial, force: :cascade do |t|
+    t.string "label"
+    t.string "reference"
+    t.integer "apidae_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
-  add_index "apidae_towns", ["insee_code"], name: "index_apidae_towns_on_insee_code", unique: true, using: :btree
+  create_table "apidae_towns", id: :serial, force: :cascade do |t|
+    t.string "country"
+    t.integer "apidae_id"
+    t.string "insee_code"
+    t.string "name"
+    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
+  end
 
 end

data/test/dummy/log/development.log

@@ -188,3 +188,98 @@ WHERE c.contype = 'f'
 ORDER BY c.conname
 
 DEPRECATION WARNING: Defining a route where `to` is a controller without an action is deprecated. Please change `to: 'dashboard/index'` to `controller: 'dashboard/index'`. (called from block in <top (required)> at /Users/jbvilain/workspace/code/apidae-engine-rails/config/routes.rb:9)
+   (45.2ms)  CREATE TABLE "ar_internal_metadata" ("key" character varying NOT NULL PRIMARY KEY, "value" character varying, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL)
+   (2.4ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+   (5.3ms)  SELECT pg_try_advisory_lock(6140174353533887940)
+   (0.3ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+Migrating to AddPicturesDataToObjects (20170513115401)
+   (0.2ms)  SELECT pg_advisory_unlock(6140174353533887940)
+   (0.4ms)  SELECT pg_try_advisory_lock(6140174353533887940)
+   (1.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+Migrating to CreateApidaeAttachedFiles (20170513121215)
+   (11.7ms)  BEGIN
+   (24.3ms)  CREATE TABLE "apidae_attached_files" ("id" serial NOT NULL PRIMARY KEY, "name" character varying, "credits" character varying, "description" text, "apidae_object_id" integer, "picture_file_name" character varying, "picture_content_type" character varying, "picture_file_size" integer, "picture_updated_at" timestamp, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL)
+  SQL (0.4ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20170513121215"]]
+   (0.6ms)  COMMIT
+Migrating to RenameObjectsSelectionsTable (20170513205932)
+   (6.0ms)  BEGIN
+   (18.8ms)  ALTER TABLE "apidae_objects_apidae_selections" RENAME TO "apidae_objects_selections"
+   (0.4ms)  ALTER TABLE "public"."apidae_objects_apidae_selections_id_seq" RENAME TO "apidae_objects_selections_id_seq"
+   (0.3ms)  ALTER INDEX "apidae_objects_apidae_selections_pkey" RENAME TO "apidae_objects_selections_pkey"
+  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20170513205932"]]
+   (0.4ms)  COMMIT
+Migrating to AddEntityDataToObjects (20170720161134)
+   (0.2ms)  BEGIN
+   (10.3ms)  ALTER TABLE "apidae_objects" ADD "entity_data" text
+  SQL (0.4ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20170720161134"]]
+   (6.3ms)  COMMIT
+Migrating to CreateApidaeFileImports (20170730102424)
+   (0.2ms)  BEGIN
+   (21.6ms)  CREATE TABLE "apidae_file_imports" ("id" serial NOT NULL PRIMARY KEY, "status" character varying, "remote_file" character varying, "created" integer, "updated" integer, "deleted" integer, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL)
+  SQL (0.4ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20170730102424"]]
+   (0.6ms)  COMMIT
+Migrating to CreateApidaeExports (20171025075304)
+   (6.2ms)  BEGIN
+   (15.7ms)  CREATE TABLE "apidae_exports" ("id" serial NOT NULL PRIMARY KEY, "status" character varying, "remote_status" character varying, "oneshot" boolean, "reset" boolean, "file_url" character varying, "confirm_url" character varying, "project_id" integer, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL)
+  SQL (0.4ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20171025075304"]]
+   (0.5ms)  COMMIT
+Migrating to CreateApidaeSelectionObjects (20180217222410)
+   (6.3ms)  BEGIN
+   (8.9ms)  CREATE TABLE "apidae_selection_objects" ("id" bigserial primary key, "apidae_selection_id" integer, "apidae_object_id" integer, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL)
+  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20180217222410"]]
+   (6.0ms)  COMMIT
+Migrating to AddIndexToApidaeTowns (20180218094339)
+   (0.4ms)  BEGIN
+   (0.2ms)  ROLLBACK
+   (0.3ms)  SELECT pg_advisory_unlock(6140174353533887940)
+   (0.2ms)  SELECT pg_try_advisory_lock(6140174353533887940)
+   (0.9ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+Migrating to ChangeTextColumnsToJson (20180218172704)
+   (0.1ms)  BEGIN
+   (0.8ms)  ALTER TABLE "apidae_objects" ALTER COLUMN "pictures_data" TYPE jsonb USING CAST(value AS JSON)
+   (0.1ms)  ROLLBACK
+   (0.2ms)  SELECT pg_advisory_unlock(6140174353533887940)
+   (0.2ms)  SELECT pg_try_advisory_lock(6140174353533887940)
+   (0.5ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+Migrating to ChangeTextColumnsToJson (20180218172704)
+   (0.2ms)  BEGIN
+   (0.7ms)  ALTER TABLE "apidae_objects" ALTER COLUMN "pictures_data" TYPE jsonb USING CAST(pictures_data AS JSON)
+   (0.1ms)  ROLLBACK
+   (0.2ms)  SELECT pg_advisory_unlock(6140174353533887940)
+   (0.1ms)  SELECT pg_try_advisory_lock(6140174353533887940)
+   (0.8ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+Migrating to ChangeTextColumnsToJson (20180218172704)
+   (0.2ms)  BEGIN
+   (0.8ms)  ALTER TABLE "apidae_objects" ALTER COLUMN "pictures_data" TYPE jsonb USING pictures_data::JSON
+   (0.1ms)  ROLLBACK
+   (0.2ms)  SELECT pg_advisory_unlock(6140174353533887940)
+   (0.2ms)  SELECT pg_try_advisory_lock(6140174353533887940)
+   (0.5ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+Migrating to ChangeTextColumnsToJson (20180218172704)
+   (0.2ms)  BEGIN
+   (8.5ms)  ALTER TABLE "apidae_objects" ALTER COLUMN "pictures_data" TYPE jsonb USING pictures_data::text::jsonb
+   (2.4ms)  ALTER TABLE "apidae_objects" ALTER COLUMN "type_data" TYPE jsonb USING type_data::text::jsonb
+   (4.0ms)  ALTER TABLE "apidae_objects" ALTER COLUMN "entity_data" TYPE jsonb USING entity_data::text::jsonb
+   (2.8ms)  ALTER TABLE "apidae_objects" ALTER COLUMN "contact" TYPE jsonb USING contact::text::jsonb
+   (2.9ms)  ALTER TABLE "apidae_objects" ALTER COLUMN "address" TYPE jsonb USING address::text::jsonb
+   (3.1ms)  ALTER TABLE "apidae_objects" ALTER COLUMN "openings" TYPE jsonb USING openings::text::jsonb
+  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20180218172704"]]
+   (3.6ms)  COMMIT
+  ActiveRecord::InternalMetadata Load (0.7ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = $1 LIMIT $2  [["key", "environment"], ["LIMIT", 1]]
+   (0.2ms)  BEGIN
+  SQL (0.4ms)  INSERT INTO "ar_internal_metadata" ("key", "value", "created_at", "updated_at") VALUES ($1, $2, $3, $4) RETURNING "key"  [["key", "environment"], ["value", "development"], ["created_at", "2018-02-18 17:35:13.592426"], ["updated_at", "2018-02-18 17:35:13.592426"]]
+   (0.3ms)  COMMIT
+   (0.2ms)  SELECT pg_advisory_unlock(6140174353533887940)
+   (0.3ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+   (0.3ms)  SELECT pg_try_advisory_lock(6140174353533887940)
+   (1.0ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+Migrating to AddServiceDataToApidaeObjects (20180218231319)
+   (0.2ms)  BEGIN
+   (0.9ms)  ALTER TABLE "apidae_objects" ADD "service_data" jsonb
+  SQL (0.4ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20180218231319"]]
+   (5.5ms)  COMMIT
+  ActiveRecord::InternalMetadata Load (7.7ms)  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.3ms)  SELECT pg_advisory_unlock(6140174353533887940)
+   (0.3ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC

data/test/fixtures/apidae/selection_objects.yml

@@ -0,0 +1,9 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  selection_id: 1
+  object_id: 1
+
+two:
+  selection_id: 1
+  object_id: 1

data/test/models/apidae/selection_object_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+module Apidae
+  class SelectionObjectTest < ActiveSupport::TestCase
+    # test "the truth" do
+    #   assert true
+    # end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-10 00:00:00.000000000 Z
+date: 2018-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -89,11 +89,13 @@ files:
 - app/helpers/apidae/import_helper.rb
 - app/helpers/apidae/objects_helper.rb
 - app/helpers/apidae/selections_helper.rb
+- app/models/apidae/application_record.rb
 - app/models/apidae/attached_file.rb
 - app/models/apidae/export.rb
 - app/models/apidae/file_import.rb
 - app/models/apidae/object.rb
 - app/models/apidae/selection.rb
+- app/models/apidae/selection_object.rb
 - app/models/apidae/town.rb
 - app/views/apidae/dashboard/index.html.erb
 - app/views/apidae/import/callback.html.erb
@@ -120,6 +122,9 @@ files:
 - db/migrate/20170720161134_add_entity_data_to_objects.rb
 - db/migrate/20170730102424_create_apidae_file_imports.rb
 - db/migrate/20171025075304_create_apidae_exports.rb
+- db/migrate/20180217222410_create_apidae_selection_objects.rb
+- db/migrate/20180218172704_change_text_columns_to_json.rb
+- db/migrate/20180218231319_add_service_data_to_apidae_objects.rb
 - lib/apidae.rb
 - lib/apidae/engine.rb
 - lib/apidae/version.rb
@@ -176,6 +181,7 @@ files:
 - test/fixtures/apidae/attached_files.yml
 - test/fixtures/apidae/exports.yml
 - test/fixtures/apidae/objects.yml
+- test/fixtures/apidae/selection_objects.yml
 - test/fixtures/apidae/selections.yml
 - test/fixtures/apidae/towns.yml
 - test/integration/navigation_test.rb
@@ -183,6 +189,7 @@ files:
 - test/models/apidae/export_test.rb
 - test/models/apidae/file_import_test.rb
 - test/models/apidae/object_test.rb
+- test/models/apidae/selection_object_test.rb
 - test/models/apidae/selection_test.rb
 - test/models/apidae/town_test.rb
 - test/test_helper.rb
@@ -206,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Ruby on Rails engine for projects that involve Apidae data
@@ -251,11 +258,13 @@ test_files:
 - test/dummy/README.rdoc
 - test/integration/navigation_test.rb
 - test/models/apidae/object_test.rb
+- test/models/apidae/selection_object_test.rb
 - test/models/apidae/selection_test.rb
 - test/models/apidae/file_import_test.rb
 - test/models/apidae/export_test.rb
 - test/models/apidae/attached_file_test.rb
 - test/models/apidae/town_test.rb
+- test/fixtures/apidae/selection_objects.yml
 - test/fixtures/apidae/towns.yml
 - test/fixtures/apidae/objects.yml
 - test/fixtures/apidae/selections.yml