diff --git a/Gemfile.lock b/Gemfile.lock index d6f3cca8c..a303120d7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -56,7 +56,7 @@ GEM arel (9.0.0) aws-eventstream (1.0.1) aws-partitions (1.131.0) - aws-sdk-core (3.44.2) + aws-sdk-core (3.45.0) aws-eventstream (~> 1.0) aws-partitions (~> 1.0) aws-sigv4 (~> 1.0) @@ -64,7 +64,7 @@ GEM aws-sdk-kms (1.13.0) aws-sdk-core (~> 3, >= 3.39.0) aws-sigv4 (~> 1.0) - aws-sdk-s3 (1.30.0) + aws-sdk-s3 (1.30.1) aws-sdk-core (~> 3, >= 3.39.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.0) diff --git a/config/initializers/_version.rb b/config/initializers/_version.rb index 3bf060700..b762937bb 100644 --- a/config/initializers/_version.rb +++ b/config/initializers/_version.rb @@ -1,5 +1,5 @@ module Lupo class Application - VERSION = "2.3.8" + VERSION = "2.3.9" end end \ No newline at end of file diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb index a6d3d0ab0..d48ce5526 100644 --- a/config/initializers/mime_types.rb +++ b/config/initializers/mime_types.rb @@ -69,6 +69,6 @@ end ActionController::Renderers.add :csv do |obj, options| - %w(doi url year registered state resourceTypeGeneral bibtexType title author publisher journal volume issue pages).to_csv + - Array.wrap(obj).map { |o| o.send("csv") }.join("\n") + %w(doi url registered state resourceTypeGeneral bibtexType title author publisher publicationYear).to_csv + + Array.wrap(obj).map { |o| o.send("csv") }.join("") end diff --git a/db/schema.rb b/db/schema.rb index adc480111..9547a7e8f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -33,7 +33,7 @@ t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true end - create_table "allocator", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT", force: :cascade do |t| + create_table "allocator", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t| t.string "contact_email", null: false t.string "contact_name", limit: 80, null: false t.datetime "created" @@ -62,7 +62,7 @@ t.index ["symbol"], name: "symbol", unique: true end - create_table "allocator_prefixes", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT", force: :cascade do |t| + create_table "allocator_prefixes", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t| t.bigint "allocator", null: false t.bigint "prefixes", null: false t.datetime "created_at" @@ -72,7 +72,7 @@ t.index ["prefixes"], name: "FKE7FBD674AF86A1C7" end - create_table "datacentre", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT", force: :cascade do |t| + create_table "datacentre", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t| t.text "comments", limit: 4294967295 t.string "contact_email", null: false t.string "contact_name", limit: 80, null: false @@ -100,7 +100,7 @@ t.index ["url"], name: "index_datacentre_on_url", length: 100 end - create_table "datacentre_prefixes", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT", force: :cascade do |t| + create_table "datacentre_prefixes", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t| t.bigint "datacentre", null: false t.bigint "prefixes", null: false t.datetime "created_at" @@ -112,7 +112,7 @@ t.index ["prefixes"], name: "FK13A1B3BAAF86A1C7" end - create_table "dataset", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT", force: :cascade do |t| + create_table "dataset", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t| t.datetime "created" t.string "doi", null: false t.binary "is_active", limit: 1, null: false @@ -154,8 +154,8 @@ t.string "schema_version", limit: 191 t.json "content_url" t.binary "xml", limit: 16777215 - t.string "agency", limit: 191, default: "DataCite" t.json "landing_page" + t.string "agency", limit: 191, default: "DataCite" t.index ["aasm_state"], name: "index_dataset_on_aasm_state" t.index ["created", "indexed", "updated"], name: "index_dataset_on_created_indexed_updated" t.index ["datacentre"], name: "FK5605B47847B5F5FF" @@ -167,7 +167,7 @@ t.index ["url"], name: "index_dataset_on_url", length: 100 end - create_table "media", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT", force: :cascade do |t| + create_table "media", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t| t.datetime "created" t.string "media_type", limit: 80 t.datetime "updated" @@ -178,7 +178,7 @@ t.index ["dataset"], name: "FK62F6FE44D3D6B1B" end - create_table "metadata", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT", force: :cascade do |t| + create_table "metadata", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t| t.datetime "created" t.integer "metadata_version" t.integer "version" @@ -190,7 +190,7 @@ t.index ["dataset"], name: "FKE52D7B2F4D3D6B1B" end - create_table "prefix", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT", force: :cascade do |t| + create_table "prefix", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t| t.datetime "created" t.string "prefix", limit: 80, null: false t.integer "version"