declare_schema 0.10.1 → 0.12.0

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'rails'
-
 begin
   require 'mysql2'
 rescue LoadError
@@ -16,7 +14,7 @@ RSpec.describe DeclareSchema::Model::Column do
 
   describe 'class methods' do
     describe '.native_type?' do
-      if Rails::VERSION::MAJOR >= 5
+      if ActiveSupport::VERSION::MAJOR >= 5
         let(:native_types) { [:string, :text, :integer, :float, :decimal, :datetime, :time, :date, :binary, :boolean, :json] }
       else
         let(:native_types) { [:string, :text, :integer, :float, :decimal, :datetime, :time, :date, :binary, :boolean] }
@@ -65,9 +63,7 @@ RSpec.describe DeclareSchema::Model::Column do
     end
 
     describe '.deserialize_default_value' do
-      require 'rails'
-
-      if ::Rails::VERSION::MAJOR >= 5
+      if ::ActiveSupport::VERSION::MAJOR >= 5
         it 'deserializes :boolean' do
           expect(described_class.deserialize_default_value(nil, :boolean, 'true')).to eq(true)
           expect(described_class.deserialize_default_value(nil, :boolean, 'false')).to eq(false)

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

@@ -26,7 +26,7 @@ RSpec.describe DeclareSchema::Model::ForeignKeyDefinition do
       subject { described_class.new(model, foreign_key, options)}
 
       before do
-        allow(connection).to receive(:index_name).with('models', column: 'network_id') { 'on_network_id' }
+        allow(model.connection).to receive(:index_name).with(any_args) { 'index_on_network_id' }
       end
 
       describe '#initialize' do
@@ -36,7 +36,7 @@ RSpec.describe DeclareSchema::Model::ForeignKeyDefinition do
         end
 
         context 'when most options passed' do
-          let(:options) { { parent_table: :networks, foreign_key: :the_network_id, index_name: :index_on_network_id } }
+          let(:options) { { parent_table: :networks, foreign_key: :the_network_id } }
 
           it 'normalizes symbols to strings' do
             expect(subject.foreign_key).to eq('network_id')
@@ -50,8 +50,7 @@ RSpec.describe DeclareSchema::Model::ForeignKeyDefinition do
 
         context 'when all options passed' do
           let(:foreign_key) { nil }
-          let(:options) { { parent_table: :networks, foreign_key: :the_network_id, index_name: :index_on_network_id,
-                            constraint_name: :constraint_1, dependent: :delete } }
+          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
@@ -61,6 +60,19 @@ RSpec.describe DeclareSchema::Model::ForeignKeyDefinition do
             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
 
@@ -107,7 +119,7 @@ RSpec.describe DeclareSchema::Model::ForeignKeyDefinition do
       subject { described_class.new(model, foreign_key, options)}
 
       before do
-        allow(connection).to receive(:index_name).with('models', column: 'network_id') { 'on_network_id' }
+        allow(model.connection).to receive(:index_name).with(any_args) { 'index_on_network_id' }
       end
 
       describe '#initialize' do
@@ -117,7 +129,7 @@ RSpec.describe DeclareSchema::Model::ForeignKeyDefinition do
         end
 
         context 'when most options passed' do
-          let(:options) { { parent_table: :networks, foreign_key: :the_network_id, index_name: :index_on_network_id } }
+          let(:options) { { parent_table: :networks, foreign_key: :the_network_id } }
 
           it 'normalizes symbols to strings' do
             expect(subject.foreign_key).to eq('network_id')
@@ -131,8 +143,7 @@ RSpec.describe DeclareSchema::Model::ForeignKeyDefinition do
 
         context 'when all options passed' do
           let(:foreign_key) { nil }
-          let(:options) { { parent_table: :networks, foreign_key: :the_network_id, index_name: :index_on_network_id,
-                            constraint_name: :constraint_1, dependent: :delete } }
+          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
@@ -142,6 +153,19 @@ RSpec.describe DeclareSchema::Model::ForeignKeyDefinition do
             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
 

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'rails'
-
 begin
   require 'mysql2'
 rescue LoadError
@@ -57,7 +55,7 @@ RSpec.describe DeclareSchema::Model::HabtmModelShim do
 
     describe '#table_options' do
       it 'returns empty hash' do
-        expect(subject.table_options).to eq({})
+        expect(subject._table_options).to eq({})
       end
     end
 
@@ -88,13 +86,13 @@ RSpec.describe DeclareSchema::Model::HabtmModelShim do
 
     describe '#primary_key' do
       it 'returns false' do
-        expect(subject._defined_primary_key).to eq(false)
+        expect(subject._declared_primary_key).to eq(false)
       end
     end
 
-    describe '#_defined_primary_key' do
+    describe '#_declared_primary_key' do
       it 'returns false' do
-        expect(subject._defined_primary_key).to eq(false)
+        expect(subject._declared_primary_key).to eq(false)
       end
     end
 

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

@@ -75,7 +75,7 @@ RSpec.describe DeclareSchema::Model::IndexDefinition 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
+                name #{if defined?(SQLite3) then 'TEXT' else 'VARCHAR(255)' end} NOT NULL
               )
           EOS
           ActiveRecord::Base.connection.execute <<~EOS
@@ -110,7 +110,7 @@ RSpec.describe DeclareSchema::Model::IndexDefinition do
             let(:model_class) { IndexDefinitionCompoundIndexModel }
 
             it 'returns the indexes for the model' do
-              if Rails::VERSION::MAJOR < 5
+              if ActiveSupport::VERSION::MAJOR < 5
                 expect(model_class.connection).to receive(:primary_key).with('index_definition_compound_index_models').and_return(nil)
                 connection_stub = instance_double(ActiveRecord::Base.connection.class, "connection")
                 expect(connection_stub).to receive(:indexes).
@@ -184,7 +184,7 @@ RSpec.describe DeclareSchema::Model::IndexDefinition 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
+              name #{if defined?(SQLite3) then 'TEXT' else 'VARCHAR(255)' end} NOT NULL
             )
           EOS
           ActiveRecord::Base.connection.execute <<~EOS
@@ -219,7 +219,7 @@ RSpec.describe DeclareSchema::Model::IndexDefinition do
             let(:model_class) { IndexDefinitionCompoundIndexModel }
 
             it 'returns the indexes for the model' do
-              if Rails::VERSION::MAJOR < 5
+              if ActiveSupport::VERSION::MAJOR < 5
                 expect(model_class.connection).to receive(:primary_key).with('index_definition_compound_index_models').and_return(nil)
                 connection_stub = instance_double(ActiveRecord::Base.connection.class, "connection")
                 expect(connection_stub).to receive(:indexes).

data/spec/spec_helper.rb

@@ -27,7 +27,7 @@ RSpec.configure do |config|
   RSpec::Support::ObjectFormatter.default_instance.max_formatted_output_length = 2_000
 
   def active_record_base_class
-    if Rails::VERSION::MAJOR == 4
+    if ActiveSupport::VERSION::MAJOR == 4
       'ActiveRecord::Base'
     else
       'ApplicationRecord'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: declare_schema
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Invoca Development adapted from hobo_fields by Tom Locke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-18 00:00:00.000000000 Z
+date: 2021-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails