declare_schema 0.14.3 → 1.0.0

data/spec/lib/declare_schema/model/column_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe DeclareSchema::Model::Column do
   describe 'class methods' do
     describe '.native_type?' do
       let(:native_types) { [:string, :text, :integer, :float, :decimal, :datetime, :time, :date, :binary, :boolean, :json] }
-    
+
 
       it 'is falsey for :primary_key' do
         expect(described_class.native_type?(:primary_key)).to be_falsey
@@ -91,33 +91,6 @@ RSpec.describe DeclareSchema::Model::Column do
                           sql_type_metadata: {}) }
     subject { described_class.new(model, current_table_name, column) }
 
-    context 'Using fields' do
-      before do
-        class ColumnTestModel < ActiveRecord::Base
-          fields do
-            title :string, limit: 127, null: false
-            count :integer, null: false
-          end
-        end
-      end
-
-      describe '#type' do
-        it 'returns type' do
-          expect(subject.type).to eq(type)
-        end
-      end
-
-      describe '#schema_attributes' do
-        it 'returns a hash with relevant key/values' do
-          if defined?(Mysql2)
-            expect(subject.schema_attributes).to eq(type: :integer, null: false, limit: 4)
-          else
-            expect(subject.schema_attributes).to eq(type: :integer, null: false)
-          end
-        end
-      end
-    end
-
     context 'Using declare_schema' do
       before do
         class ColumnTestModel < ActiveRecord::Base

data/spec/lib/declare_schema/model/foreign_key_definition_spec.rb

@@ -5,99 +5,6 @@ require_relative '../../../../lib/declare_schema/model/foreign_key_definition'
 RSpec.describe DeclareSchema::Model::ForeignKeyDefinition do
   let(:model_class) { Network }
 
-  context 'Using fields' do
-    before do
-      load File.expand_path('../prepare_testapp.rb', __dir__)
-
-      class Network < ActiveRecord::Base
-        fields do
-          name :string, limit: 127, index: true
-
-          timestamps
-        end
-      end
-    end
-
-    describe 'instance methods' do
-      let(:connection) { instance_double(ActiveRecord::Base.connection.class) }
-      let(:model) { instance_double('Model', table_name: 'models', connection: connection) }
-      let(:foreign_key) { :network_id }
-      let(:options) { {} }
-      subject { described_class.new(model, foreign_key, options)}
-
-      before do
-        allow(model.connection).to receive(:index_name).with(any_args) { 'index_on_network_id' }
-      end
-
-      describe '#initialize' do
-        it 'normalizes symbols to strings' do
-          expect(subject.foreign_key).to eq('network_id')
-          expect(subject.parent_table_name).to eq('networks')
-        end
-
-        context 'when most options passed' do
-          let(:options) { { parent_table: :networks, foreign_key: :the_network_id } }
-
-          it 'normalizes symbols to strings' do
-            expect(subject.foreign_key).to eq('network_id')
-            expect(subject.foreign_key_name).to eq('the_network_id')
-            expect(subject.parent_table_name).to eq('networks')
-            expect(subject.foreign_key).to eq('network_id')
-            expect(subject.constraint_name).to eq('index_on_network_id')
-            expect(subject.on_delete_cascade).to be_falsey
-          end
-        end
-
-        context 'when all options passed' do
-          let(:foreign_key) { nil }
-          let(:options) { { parent_table: :networks, foreign_key: :the_network_id, constraint_name: :constraint_1, dependent: :delete } }
-
-          it 'normalizes symbols to strings' do
-            expect(subject.foreign_key).to be_nil
-            expect(subject.foreign_key_name).to eq('the_network_id')
-            expect(subject.parent_table_name).to eq('networks')
-            expect(subject.constraint_name).to eq('constraint_1')
-            expect(subject.on_delete_cascade).to be_truthy
-          end
-        end
-
-        context 'when constraint name passed as empty string' do
-          let(:options) { { constraint_name: "" } }
-          it 'defaults to rails constraint name' do
-            expect(subject.constraint_name).to eq("index_on_network_id")
-          end
-        end
-
-        context 'when no constraint name passed' do
-          it 'defaults to rails constraint name' do
-            expect(subject.constraint_name).to eq("index_on_network_id")
-          end
-        end
-      end
-    end
-
-    describe 'class << self' do
-      let(:connection) { instance_double(ActiveRecord::Base.connection.class) }
-      let(:model) { instance_double('Model', table_name: 'models', connection: connection) }
-      let(:old_table_name) { 'networks' }
-      before do
-        allow(connection).to receive(:quote_table_name).with('networks') { 'networks' }
-        allow(connection).to receive(:select_rows) { [['CONSTRAINT `constraint` FOREIGN KEY (`network_id`) REFERENCES `networks` (`id`)']] }
-        allow(connection).to receive(:index_name).with('models', column: 'network_id') { }
-      end
-
-      describe '.for_model' do
-        subject { described_class.for_model(model, old_table_name) }
-
-        it 'returns new object' do
-          expect(subject.size).to eq(1), subject.inspect
-          expect(subject.first).to be_kind_of(described_class)
-          expect(subject.first.foreign_key).to eq('network_id')
-        end
-      end
-    end
-  end
-
   context 'Using declare_schema' do
     before do
       load File.expand_path('../prepare_testapp.rb', __dir__)
@@ -116,7 +23,7 @@ RSpec.describe DeclareSchema::Model::ForeignKeyDefinition do
       let(:model) { instance_double('Model', table_name: 'models', connection: connection) }
       let(:foreign_key) { :network_id }
       let(:options) { {} }
-      subject { described_class.new(model, foreign_key, options)}
+      subject { described_class.new(model, foreign_key, **options)}
 
       before do
         allow(model.connection).to receive(:index_name).with(any_args) { 'index_on_network_id' }

data/spec/lib/declare_schema/model/index_definition_spec.rb

@@ -12,115 +12,6 @@ require_relative '../../../../lib/declare_schema/model/index_definition'
 RSpec.describe DeclareSchema::Model::IndexDefinition do
   let(:model_class) { IndexDefinitionTestModel }
 
-  context 'Using fields' do
-    before do
-      load File.expand_path('../prepare_testapp.rb', __dir__)
-
-      class IndexDefinitionTestModel < ActiveRecord::Base
-        fields do
-          name :string, limit: 127, index: true
-
-          timestamps
-        end
-      end
-
-      class IndexDefinitionCompoundIndexModel < ActiveRecord::Base
-        fields do
-          fk1_id :integer
-          fk2_id :integer
-
-          timestamps
-        end
-      end
-    end
-
-    describe 'instance methods' do
-      let(:model) { model_class.new }
-      subject { declared_class.new(model_class) }
-
-      it 'has index_definitions' do
-        expect(model_class.index_definitions).to be_kind_of(Array)
-        expect(model_class.index_definitions.map(&:name)).to eq(['on_name'])
-        expect([:name, :fields, :unique].map { |attr| model_class.index_definitions[0].send(attr)}).to eq(
-          ['on_name', ['name'], false]
-        )
-      end
-
-      it 'has index_definitions_with_primary_key' do
-        expect(model_class.index_definitions_with_primary_key).to be_kind_of(Array)
-        result = model_class.index_definitions_with_primary_key.sort_by(&:name)
-        expect(result.map(&:name)).to eq(['PRIMARY', 'on_name'])
-        expect([:name, :fields, :unique].map { |attr| result[0].send(attr)}).to eq(
-          ['PRIMARY', ['id'], true]
-        )
-        expect([:name, :fields, :unique].map { |attr| result[1].send(attr)}).to eq(
-          ['on_name', ['name'], false]
-        )
-      end
-    end
-
-    describe 'class methods' do
-      describe 'index_name' do
-        it 'works with a single column' do
-          expect(described_class.index_name('parent_id')).to eq('on_parent_id')
-        end
-
-        it 'works with many columns' do
-          expect(described_class.index_name(['a', 'b', 'c'])).to eq('on_a_and_b_and_c')
-        end
-      end
-
-      context 'with a migrated database' do
-        before do
-          ActiveRecord::Base.connection.execute <<~EOS
-              CREATE TABLE index_definition_test_models (
-                id INTEGER NOT NULL PRIMARY KEY,
-                name #{if defined?(SQLite3) then 'TEXT' else 'VARCHAR(255)' end} NOT NULL
-              )
-          EOS
-          ActiveRecord::Base.connection.execute <<~EOS
-            CREATE UNIQUE INDEX index_definition_test_models_on_name ON index_definition_test_models(name)
-          EOS
-          ActiveRecord::Base.connection.execute <<~EOS
-              CREATE TABLE index_definition_compound_index_models (
-                fk1_id INTEGER NOT NULL,
-                fk2_id INTEGER NOT NULL,
-                PRIMARY KEY (fk1_id, fk2_id)
-              )
-          EOS
-          ActiveRecord::Base.connection.schema_cache.clear!
-        end
-
-        describe 'for_model' do
-          subject { described_class.for_model(model_class) }
-
-          context 'with single-column PK' do
-            it 'returns the indexes for the model' do
-              expect(subject.size).to eq(2), subject.inspect
-              expect([:name, :columns, :unique].map { |attr| subject[0].send(attr) }).to eq(
-                ['index_definition_test_models_on_name', ['name'], true]
-              )
-              expect([:name, :columns, :unique].map { |attr| subject[1].send(attr) }).to eq(
-                ['PRIMARY', ['id'], true]
-              )
-            end
-          end
-
-          context 'with compound-column PK' do
-            let(:model_class) { IndexDefinitionCompoundIndexModel }
-
-            it 'returns the indexes for the model' do
-              expect(subject.size).to eq(1), subject.inspect
-              expect([:name, :columns, :unique].map { |attr| subject[0].send(attr) }).to eq(
-                ['PRIMARY', ['fk1_id', 'fk2_id'], true]
-              )
-            end
-          end
-        end
-      end
-    end
-  end
-
   context 'Using declare_schema' do
     before do
       load File.expand_path('../prepare_testapp.rb', __dir__)

data/spec/lib/declare_schema/model/table_options_definition_spec.rb

@@ -10,69 +10,6 @@ require_relative '../../../../lib/declare_schema/model/table_options_definition'
 RSpec.describe DeclareSchema::Model::TableOptionsDefinition do
   let(:model_class) { TableOptionsDefinitionTestModel }
 
-  context 'Using fields' do
-    before do
-      load File.expand_path('../prepare_testapp.rb', __dir__)
-
-      class TableOptionsDefinitionTestModel < ActiveRecord::Base
-        fields do
-          name :string, limit: 127, index: true
-        end
-      end
-    end
-
-    context 'instance methods' do
-    let(:table_options) { { charset: "utf8", collation: "utf8_general"} }
-    let(:model) { described_class.new('table_options_definition_test_models', table_options) }
-
-    describe '#to_key' do
-      subject { model.to_key }
-      it { should eq(['table_options_definition_test_models', '{:charset=>"utf8", :collation=>"utf8_general"}']) }
-    end
-
-    describe '#settings' do
-      subject { model.settings }
-      it { should eq("CHARACTER SET utf8 COLLATE utf8_general") }
-    end
-
-    describe '#hash' do
-      subject { model.hash }
-      it { should eq(['table_options_definition_test_models', '{:charset=>"utf8", :collation=>"utf8_general"}'].hash) }
-    end
-
-    describe '#to_s' do
-      subject { model.to_s }
-      it { should eq("CHARACTER SET utf8 COLLATE utf8_general") }
-    end
-
-    describe '#alter_table_statement' do
-      subject { model.alter_table_statement }
-      it { should match(/execute "ALTER TABLE .*table_options_definition_test_models.* CHARACTER SET utf8 COLLATE utf8_general"/) }
-    end
-  end
-
-    context 'class << self' do
-    describe '#for_model' do
-      context 'when database migrated' do
-        let(:options) do
-          if defined?(Mysql2)
-            { charset: "utf8mb4", collation: "utf8mb4_bin" }
-          else
-            { }
-          end
-        end
-        subject { described_class.for_model(model_class) }
-
-        before do
-          generate_migrations '-n', '-m'
-        end
-
-        it { should eq(described_class.new(model_class.table_name, options)) }
-      end
-    end
-    end
-  end
-
   context 'Using declare_schema' do
     before do
       load File.expand_path('../prepare_testapp.rb', __dir__)
@@ -86,7 +23,7 @@ RSpec.describe DeclareSchema::Model::TableOptionsDefinition do
 
     context 'instance methods' do
       let(:table_options) { { charset: "utf8", collation: "utf8_general"} }
-      let(:model) { described_class.new('table_options_definition_test_models', table_options) }
+      let(:model) { described_class.new('table_options_definition_test_models', **table_options) }
 
       describe '#to_key' do
         subject { model.to_key }
@@ -130,7 +67,7 @@ RSpec.describe DeclareSchema::Model::TableOptionsDefinition do
             generate_migrations '-n', '-m'
           end
 
-          it { should eq(described_class.new(model_class.table_name, options)) }
+          it { should eq(described_class.new(model_class.table_name, **options)) }
         end
       end
     end

data/spec/spec_helper.rb

@@ -31,7 +31,7 @@ RSpec.configure do |config|
   end
 
   def migrate(renames = {})
-    up, down = Generators::DeclareSchema::Migration::Migrator.run(renames)
+    up, down = Generators::DeclareSchema::Migration::Migrator.run(**renames)
     ActiveRecord::Migration.class_eval(up)
     ActiveRecord::Base.send(:descendants).each { |model| model.reset_column_information }
     [up, down]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: declare_schema
 version: !ruby/object:Gem::Version
-  version: 0.14.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Invoca Development adapted from hobo_fields by Tom Locke
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-02 00:00:00.000000000 Z
+date: 2022-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -126,7 +126,7 @@ homepage: https://github.com/Invoca/declare_schema
 licenses: []
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -141,8 +141,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Database schema declaration and migration generator for Rails
 test_files: []