declare_schema 1.4.0.colin.2 → 1.4.0.colin.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33160a248adef9ac404a1efa4f6446fedabc2ddc49b02f0434ff3e1a91bfa8b2
-  data.tar.gz: ff9b214dfb3d31904927c906f244312571967de575ffcdadd4f100558bc3ffe4
+  metadata.gz: b48f50b03282da270199e8bb46e4e7a2d69068a8753203364835db206692a94a
+  data.tar.gz: b72de21ed3123f0b4e9527d5e5ee805742b2c21628adeabd4213925858062914
 SHA512:
-  metadata.gz: aae64d3b2dff696f0ac532831df033fd0433e41eca6018c74eb07088ea2d0384e30bdae0c6648087ed15e367094558ec040b05f2869d7d28009f3396c343147a
-  data.tar.gz: 776c0b887fcbb9566b9b3347e8359c5ddd7b40020816ce18494ad6897eee5bc9b0e827167ae9ba759b3dcec4cd3244ea62c9a79e1f351e266a319339ca2534d7
+  metadata.gz: 24edb7af1a43c955d5bc3664d755ea30d225bf1bce15e98765693ee7de2da87b4d66c42b0c6f6818b5a81b9485536da4ccd824319b91744eee6837c7317d80ca
+  data.tar.gz: 996169b7db3b3a8426968e8924181a0c588b7035d00a563fb78708eb8e47e2384f20b5838a2bc491ccbef3f45c6e3f462c3e0095261477841cfe666b320acfd2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    declare_schema (1.4.0.colin.2)
+    declare_schema (1.4.0.colin.4)
       rails (>= 5.0)
 
 GEM

data/lib/declare_schema/model/habtm_model_shim.rb

@@ -52,23 +52,23 @@ module DeclareSchema
       end
 
       def index_definitions_with_primary_key
-        [
+        @index_definitions_with_primary_key ||= Set.new([
           IndexDefinition.new(self, foreign_keys, unique: true, name: Model::IndexDefinition::PRIMARY_KEY_NAME), # creates a primary composite key on both foreign keys
           IndexDefinition.new(self, foreign_keys.last) # not unique by itself; combines with primary key to be unique
-        ]
+        ])
       end
 
       alias_method :index_definitions, :index_definitions_with_primary_key
 
       def ignore_indexes
-        []
+        @ignore_indexes ||= Set.new
       end
 
       def constraint_specs
-        [
+        @constraint_specs ||= Set.new([
           ForeignKeyDefinition.new(self, foreign_keys.first, parent_table: foreign_key_classes.first.table_name, constraint_name: "#{join_table}_FK1", dependent: :delete),
           ForeignKeyDefinition.new(self, foreign_keys.last, parent_table: foreign_key_classes.last.table_name, constraint_name: "#{join_table}_FK2", dependent: :delete)
-        ]
+        ])
       end
     end
   end

data/lib/declare_schema/model.rb

@@ -16,7 +16,6 @@ module DeclareSchema
           # attr_types holds the type class for any attribute reader (i.e. getter
           # method) that returns rich-types
           inheriting_cattr_reader attr_types: HashWithIndifferentAccess.new
-          inheriting_cattr_reader attr_order: []
 
           # field_specs holds FieldSpec objects for every declared
           # field. Note that attribute readers are created (by ActiveRecord)
@@ -26,9 +25,9 @@ module DeclareSchema
           inheriting_cattr_reader field_specs: HashWithIndifferentAccess.new
 
           # index_definitions holds IndexDefinition objects for all the declared indexes.
-          inheriting_cattr_reader index_definitions: []
-          inheriting_cattr_reader ignore_indexes: []
-          inheriting_cattr_reader constraint_specs: []
+          inheriting_cattr_reader index_definitions: Set.new
+          inheriting_cattr_reader ignore_indexes: Set.new
+          inheriting_cattr_reader constraint_specs: Set.new
 
           # table_options holds optional configuration for the create_table statement
           # supported options include :charset and :collation
@@ -50,11 +49,7 @@ module DeclareSchema
 
     module ClassMethods
       def index(fields, **options)
-        # make index idempotent
-        index = ::DeclareSchema::Model::IndexDefinition.new(self, fields, **options)
-        unless index_definitions.any? { |index_spec| index_spec.equivalent?(index) }
-          index_definitions << index
-        end
+        index_definitions << ::DeclareSchema::Model::IndexDefinition.new(self, fields, **options)
       end
 
       def primary_key_index(*fields)
@@ -85,7 +80,6 @@ module DeclareSchema
         _add_validations_for_field(name, type, args, options)
         _add_index_for_field(name, args, options)
         field_specs[name] = ::DeclareSchema::Model::FieldSpec.new(self, name, type, position: field_specs.size, **options)
-        attr_order << name unless attr_order.include?(name)
       end
 
       def index_definitions_with_primary_key
@@ -122,19 +116,20 @@ module DeclareSchema
           index_options = {}
           case index_value
           when String
-            Kernel.warn("belongs_to index: 'name' is deprecated; use index: { name: 'name' } instead (in #{self.class.name})")
+            Kernel.warn("belongs_to index: 'name' is deprecated; use index: { name: 'name' } instead (in #{name})")
             index_options[:name] = index_value
-          # when false -- impossible since we checked that above
           when true
+          when false
+            raise ArgumentError, "belongs_to index: false contradicts others options #{options.inspect} (in #{name})"
           when nil
           when Hash
             index_options = index_value
           else
-            raise ArgumentError, "belongs_to index: must be true or false or a Hash; got #{index_value.inspect}"
+            raise ArgumentError, "belongs_to index: must be true or false or a Hash; got #{index_value.inspect} (in #{name})"
           end
 
           if options.has_key?(:unique)
-            Kernel.warn("belongs_to unique: true|false is deprecated; use index: { unique: true|false } instead (in #{self.class.name})")
+            Kernel.warn("belongs_to unique: true|false is deprecated; use index: { unique: true|false } instead (in #{name})")
             index_options[:unique] = options.delete(:unique)
           end
 

data/lib/declare_schema/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DeclareSchema
-  VERSION = "1.4.0.colin.2"
+  VERSION = "1.4.0.colin.4"
 end

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

@@ -141,8 +141,8 @@ RSpec.describe DeclareSchema::Model::HabtmModelShim do
     end
 
     describe 'ignore_indexes' do
-      it 'returns empty array' do
-        expect(subject.ignore_indexes).to eq([])
+      it 'returns empty Set' do
+        expect(subject.ignore_indexes).to eq(Set.new)
       end
     end
 
@@ -156,10 +156,11 @@ RSpec.describe DeclareSchema::Model::HabtmModelShim do
         expect(result.first.parent_table_name).to be(Parent1.table_name)
         expect(result.first.on_delete_cascade).to be_truthy
 
-        expect(result.last).to be_a(::DeclareSchema::Model::ForeignKeyDefinition)
-        expect(result.last.foreign_key).to eq(foreign_keys.last)
-        expect(result.last.parent_table_name).to be(Parent2.table_name)
-        expect(result.last.on_delete_cascade).to be_truthy
+        sample = result.to_a.last
+        expect(sample).to be_a(::DeclareSchema::Model::ForeignKeyDefinition)
+        expect(sample.foreign_key).to eq(foreign_keys.last)
+        expect(sample.parent_table_name).to be(Parent2.table_name)
+        expect(sample.on_delete_cascade).to be_truthy
       end
     end
   end

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

@@ -112,15 +112,16 @@ RSpec.describe DeclareSchema::Model::IndexDefinition do
         it do
           expect(model_class.index_definitions.size).to eq(1)
 
-          expect(model_class.index_definitions[0].name).to eq('index_index_definition_test_models_on_name')
-          expect(model_class.index_definitions[0].fields).to eq(['name'])
-          expect(model_class.index_definitions[0].unique).to eq(false)
+          sample = model_class.index_definitions.to_a.first
+          expect(sample.name).to eq('index_index_definition_test_models_on_name')
+          expect(sample.fields).to eq(['name'])
+          expect(sample.unique).to eq(false)
         end
       end
 
       describe 'has index_definitions_with_primary_key' do
         it do
-          expect(model_class.index_definitions_with_primary_key).to be_kind_of(Array)
+          expect(model_class.index_definitions_with_primary_key).to be_kind_of(Set)
           result = model_class.index_definitions_with_primary_key.sort_by(&:name)
           expect(result.size).to eq(2)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: declare_schema
 version: !ruby/object:Gem::Version
-  version: 1.4.0.colin.2
+  version: 1.4.0.colin.4
 platform: ruby
 authors:
 - Invoca Development adapted from hobo_fields by Tom Locke