declare_schema 1.4.0.colin.4 → 1.4.0.colin.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b48f50b03282da270199e8bb46e4e7a2d69068a8753203364835db206692a94a
-  data.tar.gz: b72de21ed3123f0b4e9527d5e5ee805742b2c21628adeabd4213925858062914
+  metadata.gz: 1bdf7e72cc4b08040aaaa9036e520edf7c2be76a0a2466fc08215c8d222ec966
+  data.tar.gz: 63a8e595acec695a3a88ead0daeb46e871353645747ec2c03e6175d7d7c35161
 SHA512:
-  metadata.gz: 24edb7af1a43c955d5bc3664d755ea30d225bf1bce15e98765693ee7de2da87b4d66c42b0c6f6818b5a81b9485536da4ccd824319b91744eee6837c7317d80ca
-  data.tar.gz: 996169b7db3b3a8426968e8924181a0c588b7035d00a563fb78708eb8e47e2384f20b5838a2bc491ccbef3f45c6e3f462c3e0095261477841cfe666b320acfd2
+  metadata.gz: eca71720644bbf4783dc90bab55604b154f2feb6ab5e05c72822675c9dc2993368041074f2f3a719188298577820e460ec44815a3b7a3ee19b46f00f5448e19d
+  data.tar.gz: 35851323ffd8cd93b0f634d03f3164a83087cee588a45da74f4499e5ebd1d48dcea50fb21dfe42eb2ed807ce3cf307a40de79b4f5a8fbb99c0017268d20932d6

data/Gemfile.lock

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

data/lib/declare_schema/model/foreign_key_definition.rb

@@ -7,7 +7,7 @@ module DeclareSchema
     class ForeignKeyDefinition
       include Comparable
 
-      attr_reader :constraint_name, :model, :foreign_key, :foreign_key_name, :parent_table_name, :child_table_name, :options, :on_delete_cascade
+      attr_reader :constraint_name, :model, :foreign_key, :foreign_key_name, :child_table_name, :options, :on_delete_cascade
 
 
       def initialize(model, foreign_key, **options)
@@ -19,6 +19,17 @@ module DeclareSchema
         @parent_table_name = options[:parent_table]&.to_s
         @foreign_key_name = options[:foreign_key]&.to_s || @foreign_key
 
+        @parent_class_name =
+          case class_name = options[:class_name]
+          when String, Symbol
+            class_name.to_s
+          when Class
+            @parent_class = class_name
+            @parent_class.name
+          when nil
+            @foreign_key.sub(/_id\z/, '').camelize
+          end
+
         @constraint_name = options[:constraint_name]&.to_s.presence ||
                              model.connection.index_name(model.table_name, column: @foreign_key_name)
         @on_delete_cascade = options[:dependent] == :delete
@@ -44,21 +55,13 @@ module DeclareSchema
       end
 
       # returns the parent class as a Class object
-      # or nil if no :class_name option given
+      # lazy loaded so that we don't require the parent class until we need it
       def parent_class
-        if (class_name = options[:class_name])
-          if class_name.is_a?(Class)
-            class_name
-          else
-            class_name.to_s.constantize
-          end
-        end
+        @parent_class ||= @parent_class_name.constantize
       end
 
       def parent_table_name
-        @parent_table_name ||=
-          parent_class&.try(:table_name) ||
-            foreign_key.sub(/_id\z/, '').camelize.constantize.table_name
+        @parent_table_name ||= parent_class.table_name
       end
 
       def <=>(rhs)
@@ -67,14 +70,14 @@ module DeclareSchema
 
       alias eql? ==
 
+      def hash
+        key.hash
+      end
+
       private
 
       def key
-        @key ||= [@child_table_name, parent_table_name, @foreign_key_name, @on_delete_cascade].map(&:to_s)
-      end
-
-      def hash
-        key.hash
+        @key ||= [@child_table_name, @parent_class_name, @foreign_key_name, @on_delete_cascade].map(&:to_s)
       end
     end
   end

data/lib/declare_schema/model.rb

@@ -16,6 +16,7 @@ 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)
@@ -64,7 +65,7 @@ module DeclareSchema
       end
 
       # tell the migration generator to ignore the named index. Useful for existing indexes, or for indexes
-      # that can't be automatically generated (for example: a prefix index in MySQL)
+      # that can't be automatically generated.
       def ignore_index(index_name)
         ignore_indexes << index_name.to_s
       end
@@ -80,6 +81,7 @@ 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

data/lib/declare_schema/version.rb

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

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

@@ -60,6 +60,24 @@ RSpec.describe DeclareSchema::Model::ForeignKeyDefinition do
           end
         end
 
+        describe `#<=>` do
+          context 'when class name not passed' do
+            let(:options) { { foreign_key: :the_network_id, constraint_name: :constraint_1, dependent: :delete } }
+
+            it 'compares equal without requring the parent class' do
+              expect(subject <=> subject).to eq(0)
+            end
+          end
+
+          context 'when class name passed' do
+            let(:options) { { foreign_key: :the_network_id, class_name: 'TheNetwork', constraint_name: :constraint_1 } }
+
+            it 'compares equal without requring the parent class' do
+              expect(subject <=> subject).to eq(0)
+            end
+          end
+        end
+
         context 'when constraint name passed as empty string' do
           let(:options) { { constraint_name: "" } }
           it 'defaults to rails constraint name' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: declare_schema
 version: !ruby/object:Gem::Version
-  version: 1.4.0.colin.4
+  version: 1.4.0.colin.6
 platform: ruby
 authors:
 - Invoca Development adapted from hobo_fields by Tom Locke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-13 00:00:00.000000000 Z
+date: 2024-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails