apidae 0.9.22 → 0.9.23

data/test/models/apidae/file_import_test.rb

@@ -6,6 +6,8 @@ module Apidae
       Obj.delete_all
       Project.delete_all
       Selection.delete_all
+      Town.delete_all
+      Reference.delete_all
       @result = {created: 0, updated: 0, deleted: 0, selections: []}
     end
 
@@ -86,6 +88,28 @@ module Apidae
       assert_equal 0, Obj.count
       assert_equal({created: 0, updated: 0, deleted: 1, selections: []}, @result)
     end
+    
+    test "nil versioned attachments field overrides standard one" do
+      objects_json = File.read('test/data/cos_winter.json')
+      FileImport.add_or_update_objects(objects_json, @result, [], [WINTER_VERSION])
+      assert_equal 1, Obj.count
+      assert_equal 2, Obj.unscoped.count
+      root_obj = Obj.find_by_apidae_id(4838849)
+      assert_equal 2, root_obj.attachments.length
+      root_obj.obj_version = WINTER_VERSION
+      assert_nil root_obj.attachments
+    end
+
+    test "blank versioned desc field overrides standard one" do
+      objects_json = File.read('test/data/equ_groups.json')
+      FileImport.add_or_update_objects(objects_json, @result, [], [GROUPS_VERSION])
+      assert_equal 1, Obj.count
+      assert_equal 2, Obj.unscoped.count
+      root_obj = Obj.find_by_apidae_id(185789)
+      assert_equal "Cette ligne de 4km", root_obj.long_desc
+      root_obj.obj_version = GROUPS_VERSION
+      assert_nil root_obj.long_desc
+    end
 
     test "new selection insertion" do
       Obj.create(apidae_id: 504, title: 'Société des contrebassistes aixois')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 0.9.22
+  version: 0.9.23
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-06 00:00:00.000000000 Z
+date: 2020-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -168,13 +168,14 @@ files:
 - db/migrate/20190127210921_migrate_localized_apidae_obj_fields.rb
 - db/migrate/20190127213602_migrate_localized_apidae_references.rb
 - db/migrate/20190304142446_migrate_desc_apidae_obj_fields.rb
-- db/migrate/20190328122424_add_description_to_apidae_towns.rb
 - db/migrate/20190418133435_add_index_on_apidae_obj.rb
 - db/migrate/20190517153215_add_description_to_apidae_towns.rb
 - db/migrate/20200111214145_add_last_update_to_apidae_ojbs.rb
 - db/migrate/20200111214631_add_owner_data_to_apidae_objs.rb
 - db/migrate/20200224130804_add_apidae_type_index_on_references.rb
 - db/migrate/20200224145802_add_town_insee_code_index_to_objs.rb
+- db/migrate/20200312150008_add_version_data_to_apidae_objs.rb
+- db/migrate/20200312150904_add_version_index_on_apidae_objs.rb
 - lib/apidae.rb
 - lib/apidae/engine.rb
 - lib/apidae/version.rb
@@ -189,6 +190,7 @@ files:
 - test/data/cos_winter.json
 - test/data/delete_selections.json
 - test/data/deletion.json
+- test/data/equ_groups.json
 - test/data/hot_fr_en.json
 - test/data/json_export.zip
 - test/data/selections.json
@@ -334,6 +336,7 @@ test_files:
 - test/controllers/apidae/dashboard_controller_test.rb
 - test/controllers/apidae/references_controller_test.rb
 - test/controllers/apidae/import_controller_test.rb
+- test/data/equ_groups.json
 - test/data/update_selections.json
 - test/data/json_export.zip
 - test/data/delete_selections.json

data/db/migrate/20190328122424_add_description_to_apidae_towns.rb

@@ -1,5 +0,0 @@
-class AddDescriptionToApidaeTowns < ActiveRecord::Migration[5.1]
-  def change
-    add_column :apidae_towns, :description, :string
-  end
-end