data_migrate 8.2.0 → 9.1.1

data/lib/data_migrate.rb

@@ -1,22 +1,20 @@
 # frozen_string_literal: true
 
-require File.join(File.dirname(__FILE__), "data_migrate", "data_migrator_five")
+require File.join(File.dirname(__FILE__), "data_migrate", "data_migrator")
 require File.join(File.dirname(__FILE__), "data_migrate", "data_schema_migration")
 require File.join(File.dirname(__FILE__), "data_migrate", "data_schema")
 require File.join(File.dirname(__FILE__), "data_migrate", "database_tasks")
 require File.join(File.dirname(__FILE__), "data_migrate", "schema_dumper")
-require File.join(File.dirname(__FILE__), "data_migrate", "status_service_five")
+require File.join(File.dirname(__FILE__), "data_migrate", "status_service")
 require File.join(File.dirname(__FILE__), "data_migrate", "migration_context")
 require File.join(File.dirname(__FILE__), "data_migrate", "railtie")
 require File.join(File.dirname(__FILE__), "data_migrate", "tasks/data_migrate_tasks")
 require File.join(File.dirname(__FILE__), "data_migrate", "legacy_migrator")
 require File.join(File.dirname(__FILE__), "data_migrate", "config")
-
-if Rails::VERSION::MAJOR == 5
-  require File.join(File.dirname(__FILE__), "data_migrate", "schema_migration_five")
-else
-  require File.join(File.dirname(__FILE__), "data_migrate", "schema_migration_six")
-end
+require File.join(File.dirname(__FILE__), "data_migrate", "schema_migration")
 
 module DataMigrate
+  def self.root
+    File.dirname(__FILE__)
+  end
 end

data/lib/generators/data_migrate.rb

@@ -1,9 +1,22 @@
 require 'rails/generators/named_base'
+
 module DataMigrate
   module Generators
     class DataMigrationGenerator < Rails::Generators::NamedBase #:nodoc:
-      def self.source_root
-         @_data_migrate_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), generator_name, 'templates'))
+      class << self
+        def source_root
+          build_data_migrate_source_root
+        end
+
+        private
+
+        def build_data_migrate_source_root
+          if DataMigrate.config.data_template_path == DataMigrate::Config::DEFAULT_DATA_TEMPLATE_PATH
+            File.expand_path(File.join(File.dirname(__FILE__), generator_name, 'templates'))
+          else
+            File.expand_path(File.dirname(DataMigrate.config.data_template_path))
+          end
+        end
       end
     end
   end

data/lib/generators/data_migration/data_migration_generator.rb

@@ -14,7 +14,7 @@ module DataMigrate
 
       def create_data_migration
         set_local_assigns!
-        migration_template "data_migration.rb", data_migrations_file_path
+        migration_template template_path, data_migrations_file_path
       end
 
       protected
@@ -26,6 +26,10 @@ module DataMigrate
         end
       end
 
+      def template_path
+        DataMigrate.config.data_template_path
+      end
+
       def migration_base_class_name
         "ActiveRecord::Migration[#{ActiveRecord::Migration.current_version}]"
       end

data/spec/data_migrate/config_spec.rb

@@ -1,27 +1,69 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe DataMigrate::Config do
-
   it "sets default data_migrations_path path", :no_override do
     expect(DataMigrate.config.data_migrations_path).to eq "db/data/"
   end
 
+  it "sets default data_template_path path", :no_override do
+    expect(DataMigrate.config.data_template_path).to eq DataMigrate::Config::DEFAULT_DATA_TEMPLATE_PATH
+  end
+
   describe "data migration path configured" do
+    subject { DataMigrate.config.data_migrations_path }
+    let(:data_migrations_path) { "db/awesome/" }
+
+    before do
+      @original_data_migrations_path = DataMigrate.config.data_migrations_path
+
+      DataMigrate.configure do |config|
+        config.data_migrations_path = data_migrations_path
+      end
+    end
+
+    after do
+      DataMigrate.configure do |config|
+        config.data_migrations_path = @original_data_migrations_path
+      end
+    end
+
+    it "equals the custom data migration path" do
+      is_expected.to eq(data_migrations_path)
+    end
+  end
+
+  describe "data template path configured" do
+    subject { DataMigrate.config.data_template_path }
+    let(:data_template_path) { File.join(DataMigrate.root, "generators", "data_migration", "templates", "data_migration.rb") }
+
     before do
-      @before = DataMigrate.config.data_migrations_path
+      @original_data_migrations_path = DataMigrate.config.data_template_path
+
       DataMigrate.configure do |config|
-        config.data_migrations_path = "db/awesome/"
+        config.data_template_path = data_template_path
       end
     end
 
     after do
       DataMigrate.configure do |config|
-        config.data_migrations_path = @before
+        config.data_template_path = @original_data_migrations_path
       end
     end
 
-    it do
-      expect(DataMigrate.config.data_migrations_path).to eq "db/awesome/"
+    it "equals the custom data template path" do
+      is_expected.to eq data_template_path
+    end
+
+    context "when path does not exist" do
+      subject { DataMigrate.config.data_template_path = invalid_path }
+
+      let(:invalid_path) { "lib/awesome/templates/data_migration.rb" }
+
+      it "checks that file exists on setting config var" do
+        expect { subject }.to raise_error { ArgumentError.new("File not found: '#{data_template_path}'") }
+      end
     end
   end
 end

data/spec/data_migrate/data_migrator_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe DataMigrate::DataMigrator do
@@ -10,25 +12,18 @@ describe DataMigrate::DataMigrator do
   end
 
   before do
-    allow(DataMigrate::DataMigrator).to receive(:db_config) { db_config }
     ActiveRecord::Base.establish_connection(db_config)
+    ::ActiveRecord::SchemaMigration.create_table
+    DataMigrate::DataSchemaMigration.create_table
   end
 
-  describe :load_migrated do
-    before do
-      allow(subject).to receive(:db_config) { db_config }.at_least(:once)
-      ActiveRecord::Base.establish_connection(db_config)
-      ::ActiveRecord::SchemaMigration.create_table
-      DataMigrate::DataSchemaMigration.create_table
-    end
-
-    after do
-      ActiveRecord::Migration.drop_table("data_migrations")
-      ActiveRecord::Migration.drop_table("schema_migrations")
-    end
+  after do
+    ActiveRecord::Migration.drop_table("data_migrations") rescue nil
+    ActiveRecord::Migration.drop_table("schema_migrations") rescue nil
+  end
 
-    it do
-      subject.assure_data_schema_table
+  describe ".load_migrated" do
+    it "loads migrated versions" do
       DataMigrate::DataSchemaMigration.create(version: 20090000000000)
       ::ActiveRecord::SchemaMigration.create(version: 20100000000000)
       DataMigrate::DataSchemaMigration.create(version: 20110000000000)
@@ -40,19 +35,10 @@ describe DataMigrate::DataMigrator do
     end
   end
 
-  describe :assure_data_schema_table do
-    before do
-      allow(subject).to receive(:db_config) { db_config }.at_least(:once)
-      ActiveRecord::Base.establish_connection(db_config)
-    end
-
-    after do
-      ActiveRecord::Migration.drop_table("data_migrations")
-    end
-
-    it do
+  describe :create_data_schema_table do
+    it "creates the data_migrations table" do
       ActiveRecord::Migration.drop_table("data_migrations") rescue nil
-      subject.assure_data_schema_table
+      subject.create_data_schema_table
       expect(
         ActiveRecord::Base.connection.table_exists?("data_migrations")
       ).to eq true
@@ -60,13 +46,6 @@ describe DataMigrate::DataMigrator do
   end
 
   describe "#migrations_status" do
-    before do
-      allow(subject).to receive(:db_config) { db_config }.at_least(:once)
-      ActiveRecord::Base.establish_connection(db_config)
-      ::ActiveRecord::SchemaMigration.create_table
-      DataMigrate::DataSchemaMigration.create_table
-    end
-
     it "returns all migrations statuses" do
       status = subject.migrations_status
       expect(status.length).to eq 2

data/spec/data_migrate/data_spec.rb

@@ -4,12 +4,6 @@ require "spec_helper"
 
 describe DataMigrate::Data do
   let(:subject) { DataMigrate::Data }
-  let(:db_config) do
-    {
-      adapter: "sqlite3",
-      database: "spec/db/test.db"
-    }
-  end
   let(:fixture_file_timestamps) do
     %w[20091231235959 20101231235959 20111231235959]
   end
@@ -28,11 +22,6 @@ describe DataMigrate::Data do
   end
 
   describe :define do
-    before do
-      allow(DataMigrate::DataMigrator).
-        to receive(:db_config) { db_config }
-    end
-
     after do
       ActiveRecord::Migration.drop_table("data_migrations")
     end

data/spec/data_migrate/database_tasks_spec.rb

@@ -4,13 +4,7 @@ require "spec_helper"
 
 describe DataMigrate::DatabaseTasks do
   let(:subject) { DataMigrate::DatabaseTasks }
-  let(:migration_path) {
-    if Rails::VERSION::MAJOR == 5
-      "spec/db/migrate/5.2"
-    else
-      "spec/db/migrate/6.0"
-    end
-  }
+  let(:migration_path) { "spec/db/migrate" }
   let(:data_migrations_path) {
     DataMigrate.config.data_migrations_path
   }
@@ -33,9 +27,8 @@ describe DataMigrate::DatabaseTasks do
     allow(DataMigrate::Tasks::DataMigrateTasks).to receive(:migrations_paths) {
       data_migrations_path
     }
-    allow(DataMigrate::DataMigrator).to receive(:db_config) { db_config }
     ActiveRecord::Base.establish_connection(db_config)
-    if Rails.version >= '6.1'
+    if Gem::Dependency.new("railties", ">= 6.1").match?("railties", Gem.loaded_specs["railties"].version)
       hash_config = ActiveRecord::DatabaseConfigurations::HashConfig.new('test', 'test', db_config)
       config_obj = ActiveRecord::DatabaseConfigurations.new([hash_config])
       allow(ActiveRecord::Base).to receive(:configurations).and_return(config_obj)
@@ -44,19 +37,10 @@ describe DataMigrate::DatabaseTasks do
     end
   end
 
-  describe :schema_file do
-    it "returns the correct data schema file path" do
-      expect(subject.schema_file(nil)).to eq "db/data_schema.rb"
-    end
-  end
-
   context "migrations" do
     after do
-      begin
-        ActiveRecord::Migration.drop_table("data_migrations")
-      rescue ActiveRecord::StatementInvalid
-      end
-      ActiveRecord::Migration.drop_table("schema_migrations")
+      ActiveRecord::Migration.drop_table("data_migrations") rescue nil
+      ActiveRecord::Migration.drop_table("schema_migrations") rescue nil
     end
 
     before do
@@ -68,56 +52,23 @@ describe DataMigrate::DatabaseTasks do
       allow(DataMigrate::DatabaseTasks).to receive(:data_migrations_path) {
         data_migrations_path
       }.at_least(:once)
-      allow(DataMigrate::DatabaseTasks).to receive(:schema_migrations_path) {
-        migration_path
-      }.at_least(:once)
     end
 
     describe :past_migrations do
-      it do
+      it "returns past migration records" do
         subject.forward
-        m = subject.past_migrations
-        expect(m.count).to eq 1
-        expect(m.first[:version]).to eq 20091231235959
+        migrations = subject.past_migrations
+        expect(migrations.count).to eq 1
+        expect(migrations.first[:version]).to eq 20091231235959
       end
 
       it "shows nothing without any migrations" do
-        m = subject.past_migrations
-        expect(m.count).to eq 0
-      end
-    end
-
-    describe :load_schema_current do
-      before do
-        allow(DataMigrate::DataMigrator).to receive(:full_migrations_path).and_return(migration_path)
-      end
-
-      it "loads the current schema file" do
-        if Rails::VERSION::MAJOR < 6
-          skip("Not implemented for Rails lower than 6")
-        end
-        allow(subject).to receive(:schema_location).and_return("spec/db/data/schema/")
-
-        subject.load_schema_current
-        versions = DataMigrate::DataSchemaMigration.normalized_versions
-        expect(versions.count).to eq(2)
-      end
-
-      it "loads schema file that has not been update with latest data migrations" do
-        if Rails::VERSION::MAJOR < 6
-          skip("Not implemented for Rails lower than 6")
-        end
-
-        allow(subject).to receive(:schema_location).and_return("spec/db/data/partial_schema/")
-
-        subject.load_schema_current
-        versions = DataMigrate::DataSchemaMigration.normalized_versions
-        expect(versions.count).to eq(1)
+        migrations = subject.past_migrations
+        expect(migrations.count).to eq 0
       end
     end
 
     describe :forward do
-
       it "run forward default amount of times" do
         subject.forward
         versions = DataMigrate::DataSchemaMigration.normalized_versions

data/spec/data_migrate/legacy_migrator_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe DataMigrate::LegacyMigrator do
@@ -5,30 +7,17 @@ describe DataMigrate::LegacyMigrator do
     DataMigrate::MigrationContext.new("spec/db/data")
   }
 
-  after do
-    begin
-      ActiveRecord::Migration.drop_table("data_migrations")
-      ActiveRecord::Migration.drop_table("schema_migrations")
-    rescue StandardError
-      nil
-    end
-  end
-
   before do
-    ActiveRecord::Base.establish_connection(db_config)
     ActiveRecord::SchemaMigration.create_table
     DataMigrate::DataSchemaMigration.create_table
   end
 
-  let(:db_config) do
-    {
-      adapter: "sqlite3",
-      database: "spec/db/test.db"
-    }
+  after do
+    ActiveRecord::Migration.drop_table("data_migrations") rescue nil
+    ActiveRecord::Migration.drop_table("schema_migrations") rescue nil
   end
 
   it "migrate legacy migrations to be in correct table" do
-    DataMigrate::DataSchemaMigration.create_table
     # simulate creation of legacy data migration when
     # it was recorded in schema table
     ActiveRecord::SchemaMigration.create(version: "20091231235959")
@@ -36,7 +25,7 @@ describe DataMigrate::LegacyMigrator do
     # create one migration in correct place
     DataMigrate::DataSchemaMigration.create(version: "20171231235959")
 
-    migrated = DataMigrate::DataMigrator .new(:up, []).load_migrated
+    migrated = DataMigrate::DataMigrator.new(:up, []).load_migrated
     expect(migrated.count).to eq 1
 
     DataMigrate::LegacyMigrator.new("spec/db/data").migrate
@@ -46,5 +35,4 @@ describe DataMigrate::LegacyMigrator do
     migrated = DataMigrate::DataMigrator .new(:up, []).load_migrated
     expect(migrated.count).to eq 2
   end
-
 end

data/spec/data_migrate/migration.rb

@@ -1,19 +1,17 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
-if Rails::VERSION::MAJOR >= 5
-  subject = DataMigrate::MigrationFive
-else
-  subject = DataMigrate::Migration
-end
+require 'spec_helper'
 
-describe subject do
-  it "uses correct table name" do
-    expect(subject.table_name).to eq("data_migrations")
+describe DataMigrate::Migration do
+  describe ".table_name" do
+    it "returns correct table name" do
+      expect(subject.table_name).to eq("data_migrations")
+    end
   end
 
-  it "uses correct index name" do
-    expect(subject).to receive(:table_name_prefix) { "" }
-    expect(subject).to receive(:table_name_suffix) { "" }
-    expect(subject.primary_key).to eq("version")
+  describe ".index_name" do
+    it "returns correct primary key name" do
+      expect(subject.primary_key).to eq("version")
+    end
   end
 end

data/spec/data_migrate/migration_context_spec.rb

@@ -1,48 +1,22 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe DataMigrate::DataMigrator do
-  let(:context) {
-    if (Rails::VERSION::MAJOR == 5)
-      DataMigrate::MigrationContext.new("spec/db/data")
-    else
-      DataMigrate::MigrationContext.new("spec/db/data-6.0")
-    end
-  }
-  let(:schema_context) {
-    if (Rails::VERSION::MAJOR == 5)
-      ActiveRecord::MigrationContext.new("spec/db/migrate/5.2")
-    else
-      ActiveRecord::MigrationContext.new("spec/db/migrate/6.0", ActiveRecord::Base.connection.schema_migration)
-    end
-  }
+  let(:context) { DataMigrate::MigrationContext.new("spec/db/data") }
+  let(:schema_context) { ActiveRecord::MigrationContext.new("spec/db/migrate", ActiveRecord::Base.connection.schema_migration) }
 
-  after do
-    begin
-      ActiveRecord::Migration.drop_table("data_migrations")
-      ActiveRecord::Migration.drop_table("schema_migrations")
-    rescue StandardError
-      nil
-    end
+  before do
+    ActiveRecord::SchemaMigration.create_table
+    DataMigrate::DataSchemaMigration.create_table
   end
 
-  let(:db_config) do
-    {
-      adapter: "sqlite3",
-      database: "spec/db/test.db"
-    }
+  after do
+    ActiveRecord::Migration.drop_table("data_migrations") rescue nil
+    ActiveRecord::Migration.drop_table("schema_migrations") rescue nil
   end
 
-  describe :migrate do
-    before do
-      ActiveRecord::Base.establish_connection(db_config)
-      ActiveRecord::SchemaMigration.create_table
-    end
-
-    after do
-      ActiveRecord::Migration.drop_table("data_migrations")
-      ActiveRecord::Migration.drop_table("schema_migrations")
-    end
-
+  describe "migrate" do
     it "migrates existing file" do
       context.migrate(nil)
       context.migrations_status

data/spec/data_migrate/schema_dumper_spec.rb

@@ -4,35 +4,22 @@ require "spec_helper"
 
 describe DataMigrate::SchemaDumper do
   let(:subject) { DataMigrate::SchemaDumper }
-  let(:db_config) do
-    {
-      adapter: "sqlite3",
-      database: "spec/db/test.db"
-    }
-  end
   let(:fixture_file_timestamps) do
     %w[20091231235959 20101231235959 20111231235959]
   end
 
-  describe :dump do
-    before do
-      allow(DataMigrate::DataMigrator).
-        to receive(:db_config) { db_config }.at_least(:once)
-      ActiveRecord::Base.establish_connection(db_config)
-
-      ActiveRecord::SchemaMigration.create_table
-      DataMigrate::DataMigrator.assure_data_schema_table
-
-      ActiveRecord::Base.connection.execute <<-SQL
-        INSERT INTO #{DataMigrate::DataSchemaMigration.table_name}
-        VALUES #{fixture_file_timestamps.map { |t| "(#{t})" }.join(', ')}
-      SQL
-    end
+  before do
+    ActiveRecord::SchemaMigration.create_table
+    DataMigrate::DataSchemaMigration.create_table
+    DataMigrate::DataSchemaMigration.create(fixture_file_timestamps.map { |t| { version: t } })
+  end
 
-    after do
-      ActiveRecord::Migration.drop_table("data_migrations")
-    end
+  after do
+    ActiveRecord::Migration.drop_table("data_migrations") rescue nil
+    ActiveRecord::Migration.drop_table("schema_migrations") rescue nil
+  end
 
+  describe ".dump" do
     it "writes the define method with the version key to the stream" do
       stream = StringIO.new
       DataMigrate::SchemaDumper.dump(ActiveRecord::Base.connection, stream)