From 0b45d400807f5d6c7ca2508b54bd3922795a9951 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Justin=20Malc=CC=8Cic=CC=81?= Date: Fri, 30 Oct 2020 16:11:31 +0000 Subject: [PATCH 1/3] Correct scope --- lib/spina/admin/conferences/migration/renaming.rb | 2 +- ...rb => 00000000000000_old_name.spina_conferences_engine.rb} | 0 ...00000000000000_new_name.spina_admin_conferences_engine.rb} | 0 ...rb => 00000000000000_old_name.spina_conferences_engine.rb} | 0 test/spina/admin/conferences/migration/renaming_test.rb | 4 ++-- 5 files changed, 3 insertions(+), 3 deletions(-) rename test/fixtures/files/migrations/fresh/{00000000000000_old_name.spina_conferences.rb => 00000000000000_old_name.spina_conferences_engine.rb} (100%) rename test/fixtures/files/migrations/stale/{00000000000000_new_name.spina_admin_conferences.rb => 00000000000000_new_name.spina_admin_conferences_engine.rb} (100%) rename test/fixtures/files/migrations/stale/{00000000000000_old_name.spina_conferences.rb => 00000000000000_old_name.spina_conferences_engine.rb} (100%) diff --git a/lib/spina/admin/conferences/migration/renaming.rb b/lib/spina/admin/conferences/migration/renaming.rb index f7fea0cf..4c9fff6b 100644 --- a/lib/spina/admin/conferences/migration/renaming.rb +++ b/lib/spina/admin/conferences/migration/renaming.rb @@ -65,7 +65,7 @@ def migrations_path end def engine_migration_glob(name) - "#{migrations_path}/**/*_#{name}.spina{_admin,}_conferences.rb" + "#{migrations_path}/**/*_#{name}.spina{_admin,}_conferences_engine.rb" end def detect_migration(name) diff --git a/test/fixtures/files/migrations/fresh/00000000000000_old_name.spina_conferences.rb b/test/fixtures/files/migrations/fresh/00000000000000_old_name.spina_conferences_engine.rb similarity index 100% rename from test/fixtures/files/migrations/fresh/00000000000000_old_name.spina_conferences.rb rename to test/fixtures/files/migrations/fresh/00000000000000_old_name.spina_conferences_engine.rb diff --git a/test/fixtures/files/migrations/stale/00000000000000_new_name.spina_admin_conferences.rb b/test/fixtures/files/migrations/stale/00000000000000_new_name.spina_admin_conferences_engine.rb similarity index 100% rename from test/fixtures/files/migrations/stale/00000000000000_new_name.spina_admin_conferences.rb rename to test/fixtures/files/migrations/stale/00000000000000_new_name.spina_admin_conferences_engine.rb diff --git a/test/fixtures/files/migrations/stale/00000000000000_old_name.spina_conferences.rb b/test/fixtures/files/migrations/stale/00000000000000_old_name.spina_conferences_engine.rb similarity index 100% rename from test/fixtures/files/migrations/stale/00000000000000_old_name.spina_conferences.rb rename to test/fixtures/files/migrations/stale/00000000000000_old_name.spina_conferences_engine.rb diff --git a/test/spina/admin/conferences/migration/renaming_test.rb b/test/spina/admin/conferences/migration/renaming_test.rb index 3064c12b..34e8e06a 100644 --- a/test/spina/admin/conferences/migration/renaming_test.rb +++ b/test/spina/admin/conferences/migration/renaming_test.rb @@ -41,8 +41,8 @@ class << self @dummy_class.include(Renaming) @dummy_class.stale_migrations = [ { - old: { name: 'old_name', file: '00000000000000_old_name.spina_conferences.rb' }, - new: { name: 'new_name', file: '00000000000000_new_name.spina_conferences.rb' } + old: { name: 'old_name', file: '00000000000000_old_name.spina_conferences_engine.rb' }, + new: { name: 'new_name', file: '00000000000000_new_name.spina_conferences_engine.rb' } } ] assert_raises Renaming::DuplicateMigrationsError do From 923903f5427bedc1515798e30db46a305bfc465e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Justin=20Malc=CC=8Cic=CC=81?= Date: Fri, 30 Oct 2020 16:15:58 +0000 Subject: [PATCH 2/3] Remove files not to be distrubuted over NPM --- package.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package.json b/package.json index 130c128c..2ecbabe5 100644 --- a/package.json +++ b/package.json @@ -2,10 +2,6 @@ "name": "spina-admin-conferences", "version": "1.0.0", "description": "Conference management plugin for Spina.", - "main": "app/assets/javascripts/spina/admin/conferences/application.es6", - "files": [ - "app/assets/javascripts/*.es6" - ], "repository": { "type": "git", "url": "jmalcic/spina-admin-conferences" From b3c1e2d3ac124591fbf7ec7147d132fff563ced4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Justin=20Malc=CC=8Cic=CC=81?= Date: Fri, 30 Oct 2020 16:16:25 +0000 Subject: [PATCH 3/3] Bump version --- Gemfile.lock | 2 +- lib/spina/admin/conferences/version.rb | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7bf929d9..a7f277ec 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - spina-admin-conferences (1.3.5) + spina-admin-conferences (1.3.6) babel-transpiler (~> 0.7) icalendar (~> 2.5) mobility (~> 0.8.10) diff --git a/lib/spina/admin/conferences/version.rb b/lib/spina/admin/conferences/version.rb index ee34031a..89df0587 100644 --- a/lib/spina/admin/conferences/version.rb +++ b/lib/spina/admin/conferences/version.rb @@ -4,7 +4,7 @@ module Spina module Admin module Conferences # Version number. - VERSION = '1.3.5' + VERSION = '1.3.6' end end end diff --git a/package.json b/package.json index 2ecbabe5..674c0dcd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "spina-admin-conferences", - "version": "1.0.0", + "version": "1.3.6", "description": "Conference management plugin for Spina.", "repository": { "type": "git",