adjustable_schema 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e36fef6757e9e0803ad940f90a425ea0b25870c0720b0d338ed14970a35e339
-  data.tar.gz: a50db598919a729c33f607f107b1f78145d3fe262e00d0b7899dacb473ebc194
+  metadata.gz: 3b1390e4f564f54d0e8a840fae882bf7a494b51323846ab06e05a786c332fc37
+  data.tar.gz: 5458b1a98b4b3a3dea0c3a8e2cd66e42003683cbbd4af95c939af8fe1810ce34
 SHA512:
-  metadata.gz: 631771aa7ea4295ba2d886ab24a1e102b1ab50b9d3631ff467a3f46fd6f48a5bcd1f4ff2af62523510cc4c5d361852ef71dd183ca5846d20cf3a939ba25864f8
-  data.tar.gz: 57cd60293cb11377429fb2f808115301bb84f3a9c71372c7e0e5040bc8441e3ca62b244906d96785f1a34845c9542a1617107d7887dd01b9481b2b658ecae1d5
+  metadata.gz: dee15ab2468fca2b6bf3739df1b65508dd80ae87830833d27895e05a21c59392e3856ffbd78742cc0c067bfd1db66b364a880f0bf5401a3a3cc5cac2879ec59e
+  data.tar.gz: 984449dfcba1f1797830b5153439d2873187b0fe32aaefe23cb21bab76b49f49906f70dc562eacb92653a531eb828c262449bf41a71b4507782de25ac38214d0

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [0.9.0] — 2025-03-10
+
+### Changed
+
+- Requires Rails 8 and Ruby 3.4+.
+- Protected `AdjustableSchema::Relationship::Role` from being deleted when used.
+
+### Added
+
+- `Relationship#sourced` and `Relationship#targeted` scopes to filter relationships by presence of _source_ and _target_ records respectively.
+
+### Fixed
+
+- `Relationship#applied` scope used to return relationships with at least one record attached, instead of ones with both records present.
+
+
 ## [0.8.0] — 2024-11-08
 
 ### Changed

data/Rakefile

@@ -1,8 +1,10 @@
-require "bundler/setup"
+# frozen_string_literal: true
 
-APP_RAKEFILE = File.expand_path("test/dummy/Rakefile", __dir__)
-load "rails/tasks/engine.rake"
+require 'bundler/setup'
 
-load "rails/tasks/statistics.rake"
+APP_RAKEFILE = File.expand_path('test/dummy/Rakefile', __dir__)
+load 'rails/tasks/engine.rake'
 
-require "bundler/gem_tasks"
+load 'rails/tasks/statistics.rake'
+
+require 'bundler/gem_tasks'

data/app/models/adjustable_schema/application_record.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module AdjustableSchema
-  class ApplicationRecord < ::ActiveRecord::Base
-    self.abstract_class = true
-  end
+	class ApplicationRecord < ::ActiveRecord::Base # :nodoc:
+		self.abstract_class = true
+	end
 end

data/app/models/adjustable_schema/relationship/role.rb

@@ -1,9 +1,16 @@
+# frozen_string_literal: true
+
 module AdjustableSchema
 	class Relationship
+		# = Relationship roles
+		#
+		# `AdjustableSchema::Relationship::Role` serves to distinguish
+		# between several associations of the same pair of models.
 		class Role < ApplicationRecord
 			include Organizer::Identifiable.by :name, symbolized: true
 
-			has_many :relationships
+			has_many :relationships,
+					dependent: :restrict_with_exception
 
 			validates :name, presence: true, uniqueness: true
 

data/app/models/adjustable_schema/relationship.rb

@@ -1,4 +1,29 @@
+# frozen_string_literal: true
+
 module AdjustableSchema
+	# = Relationships
+	#
+	# `Relationship` is a core class of Adjustable Schema representing both
+	# associations of model classes and connections of individual records.
+	#
+	# No constraints are supported yet, so only many-to-many associations
+	# are available for now.
+	#
+	# == Model associations
+	#
+	# To represent an association, a `Relationship` record should have both
+	# `source_type` and `target_type` columns set, with both ID columns set
+	# to `NULL`.
+	#
+	# == Record relationships
+	#
+	# To connect individual records, both `source` and `target` polymorphic
+	# associations shoud be set.
+	#
+	# == Roles
+	#
+	# Many associations with different semantics between the same models
+	# can be set using roles (see `Relationship::Role`).
 	class Relationship < ApplicationRecord
 		belongs_to :source, polymorphic: true, optional: true
 		belongs_to :target, polymorphic: true, optional: true
@@ -8,7 +33,7 @@ module AdjustableSchema
 			includes :role
 		end
 
-		Config.shortcuts.each &-> ((association, method)) do
+		Config.shortcuts.each &-> ((association, method)) do # rubocop:disable Style
 			scope method, -> object {
 				case object
 				when ::ActiveRecord::Base, nil
@@ -29,8 +54,7 @@ module AdjustableSchema
 
 			scope "#{method}_abstract", -> object = nil {
 				if object
-					send(__method__).
-							send method, object
+					send(__method__).send method, object
 				else
 					where "#{association}_id" => nil
 				end
@@ -39,20 +63,14 @@ module AdjustableSchema
 
 		scope :abstract, -> {
 			Config.shortcuts.values
-					.map { send _1, :abstract }
+					.map { send it, :abstract }
 					.reduce &:merge
 		}
 
-		scope :general, -> {
-			where target: nil
-		}
-
-		scope :applied, -> {
-			where.not(
-					source: nil,
-					target: nil,
-			)
-		}
+		scope :general,  -> { where     target: nil }
+		scope :sourced,  -> { where.not source: nil }
+		scope :targeted, -> { where.not target: nil }
+		scope :applied,  -> { sourced.targeted }
 
 		scope :named, -> *names {
 			case names
@@ -74,15 +92,15 @@ module AdjustableSchema
 			def [] **scopes
 				scopes
 						.map do
-							self
+							self # rubocop:disable Style
 									.send(Config.shortcuts[:source], _1)
 									.send(Config.shortcuts[:target], _2)
 						end
 						.reduce &:or
 			end
 
-			def seed! *models, roles: [], **_models
-				return seed!({ **Hash[*models], **_models }, roles:) if _models.any? # support keyword arguments syntax
+			def seed! *models, roles: [], **mapping # rubocop:disable Metrics
+				return seed!({ **Hash[*models], **mapping }, roles:) if mapping.any? # support keyword arguments syntax
 
 				case models
 				in [
@@ -91,7 +109,7 @@ module AdjustableSchema
 				]
 					roles
 							.map { |name| Role.find_or_create_by! name: }
-							.then { _1.presence or [ nil ] } # no roles => nameless relationship
+							.then { it.presence or [ nil ] } # no roles => nameless relationship
 							.map { |role| create! source_type:, target_type:, role: }
 				in [ Hash => models ]
 					for sources, targets in models do
@@ -122,7 +140,7 @@ module AdjustableSchema
 		# https://api.rubyonrails.org/classes/ActiveRecord/Associations/ClassMethods.html#module-ActiveRecord::Associations::ClassMethods-label-Polymorphic+Associations
 		reflections
 				.values
-				.select { _1.options[:polymorphic] }
+				.select { it.options[:polymorphic] }
 				.each do |reflection|
 					define_method "#{reflection.name}_type=" do |type|
 						super type && type.to_s.classify.constantize.base_class.to_s

data/app/models/concerns/adjustable_schema/active_record/associations.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module AdjustableSchema
-	module ActiveRecord
+	module ActiveRecord # :nodoc:
 		concern :Associations do
 			class_methods do
 				private

data/app/models/concerns/adjustable_schema/active_record/relationships.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 require 'memery'
 
 module AdjustableSchema
-	module ActiveRecord
+	module ActiveRecord # :nodoc:
 		concern :Relationships do
 			class_methods do
 				include Memery
 
 				memoize def relationships
-					Config.association_directions.to_h do
-						[ _1, Relationship.abstract.send(Config.shortcuts.opposite[_1], self) ]
+					Config.association_directions.index_with do
+						Relationship.abstract.send Config.shortcuts.opposite[it], self
 					end
 				end
 
@@ -44,20 +46,20 @@ module AdjustableSchema
 							.preload(Config.association_directions)
 							.map do |relationship|
 								Config.association_directions
-										.map { relationship.send _1 } # both objects
+										.map { relationship.send it } # both objects
 										.without(self) # the related one
 										.first or self # may be recursive
 							end
 							.uniq
 				end
 
-				def relationships **options
-					if (direction, scope = Config.find_direction **options) # filter by direction & related objects
+				def relationships(...)
+					if (direction, scope = Config.find_direction(...)) # filter by direction & related objects
 						relationships_to(direction)
 								.send Config.shortcuts[direction], scope
 					else # all in both directions
 						Config.association_directions
-								.map { relationships_to _1 }
+								.map { relationships_to it }
 								.reduce(&:or)
 					end
 				end

data/config/initializers/associations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ActiveSupport.on_load :model_class do
 	next if     self == AdjustableSchema::Relationship
 	next unless AdjustableSchema.available?

data/config/initializers/model_names.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # HACK: non-public Rails API used
 ActiveModel::Name.class_eval do
 	def unnamespaced = @unnamespaced || name

data/db/migrate/01_create_adjustable_schema_relationship_tables.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateAdjustableSchemaRelationshipTables < ActiveRecord::Migration[7.1]
 	def change
 		# Use Active Record's configured type for primary and foreign keys
@@ -22,7 +24,7 @@ class CreateAdjustableSchemaRelationshipTables < ActiveRecord::Migration[7.1]
 					target_id target_type
 					role_id
 			].tap { |columns|
-				columns.reject! { _1.ends_with? '_type' } if foreign_key_type == :uuid # OPTIMIZATION: IDs are unique
+				columns.reject! { it.ends_with? '_type' } if foreign_key_type == :uuid # OPTIMIZATION: IDs are unique
 
 				# NULLS are DISTINCT by default.
 				# One can use `ADD CONSTRAINT … UNIQUE NULLS NOT DISTINCT (…)` instead

data/lib/adjustable_schema/active_record/association/hierarchy.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module AdjustableSchema
+	module ActiveRecord
+		module Association::Hierarchy # :nodoc:
+			private
+
+			def scopes
+				name = roleless_name # save the context
+
+				{
+						**super,
+
+						name_for_any( target_name) => -> { where.associated name },
+						name_for_none(target_name) => -> { where.missing    name },
+				}
+			end
+
+			def flags
+				name = roleless_name # save the context
+
+				{
+						**super,
+
+						name_for_any( target_name) => -> { send(name).any?  },
+						name_for_none(target_name) => -> { send(name).none? },
+						intermediate:                 -> { send(name).one?  },
+						branching:                    -> { send(name).many? },
+				}
+			end
+		end
+	end
+end

data/lib/adjustable_schema/active_record/association/naming.rb

@@ -1,16 +1,17 @@
+# frozen_string_literal: true
+
 require 'memery'
 
 module AdjustableSchema
 	module ActiveRecord
-		class Association
+		class Association # :nodoc:
 			concerning :Naming do
 				include Memery
 
-				module Inflections
+				module Inflections # :nodoc:
 					refine String do
 						def passivize
-							self
-									.presence
+							presence
 									&.sub(/((:?[aeiou]+[^aeiou]+){2,})(?:or|ant|ion|e?ment)$/, '\1ed')
 									&.sub(/((:?[aeiou]+[^aeiou]+){1,})(?:ing)$/,               '\1ed')
 									&.sub(/(?:e*|ed|er)$/,                                     '\1ed')
@@ -21,6 +22,27 @@ module AdjustableSchema
 
 				using Inflections
 
+				module Recursive # :nodoc:
+					include Memery
+
+					memoize def name_with_role = {
+							source: role.name,
+							target: "#{role.name.passivize}_#{target_name}",
+					}[direction]
+
+					def name_without_role
+						Config.association_directions
+								.self[direction]
+								.to_s
+					end
+				end
+
+				def initialize(...)
+					super
+
+					extend Recursive if recursive?
+				end
+
 				memoize def name name = object_name
 					name
 							.to_s
@@ -48,29 +70,12 @@ module AdjustableSchema
 
 				private
 
-				memoize def name_with_role
-					if recursive?
-						{
-								source: role.name,
-								target: "#{role.name.passivize}_#{target_name}",
-						}[direction]
-					else
-						"#{{
-								source: role.name,
-								target: role.name.passivize,
-						}[direction]}_#{target_name}"
-					end
-				end
+				memoize def name_with_role = "#{{
+						source: role.name,
+						target: role.name.passivize,
+				}[direction]}_#{target_name}"
 
-				def name_without_role
-					if recursive?
-						Config.association_directions
-								.self[direction]
-								.to_s
-					else
-						target_name
-					end
-				end
+				def name_without_role = target_name
 
 				def roleless_name = name(target_name)
 

data/lib/adjustable_schema/active_record/association/roleless.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module AdjustableSchema
+	module ActiveRecord
+		module Association::Roleless # :nodoc:
+			def define
+				super
+
+				has_many roleless_name, -> { roleless }, **options if
+						child?
+			end
+
+			private
+
+			def define_methods
+				super
+
+				name = self.name # save the context
+
+				owner.redefine_method "#{name}_with_roles" do |*roles|
+					send(name)
+							.merge Relationship.named *roles
+				end
+			end
+		end
+	end
+end

data/lib/adjustable_schema/active_record/association/scopes.rb

@@ -1,39 +1,40 @@
+# frozen_string_literal: true
+
 module AdjustableSchema
 	module ActiveRecord
 		module Association::Scopes
-			concern :Recursive do
-				require_relative '../query_methods'
-
-				included do
-					::ActiveRecord::QueryMethods.prepend QueryMethods # HACK: to bring `with.recursive` in
-				end
+			module Recursive # :nodoc:
+				# rubocop:disable Layout
 
 				def recursive
-					all._exec_scope do
-						all
-								.select(
-										select_values = self.select_values.presence || arel_table[Arel.star],
-										Arel.sql('1').as('distance'),
-								)
-								.with.recursive(recursive_table.name => unscoped
-										.select(
-												select_values,
-												(recursive_table[:distance] + 1).as('distance'),
-										)
-										.joins(inverse_association_name)
-										.arel
-										.join(recursive_table)
-												.on(recursive_table[primary_key].eq inverse_table[primary_key])
-								)
-								.unscope(:select, :joins, :where)
-								.from(recursive_table.alias table_name)
-								.distinct
-										.unscope(:order) # for SELECT DISTINCT, ORDER BY expressions must appear in select list
-					end
+					with_recursive(recursive_table.name => [ recursion_base, recursive_step ])
+							.unscope(:select, :joins, :where)
+							.from(recursive_table.alias table_name)
+							.distinct
+									.unscope(:order) # for SELECT DISTINCT, ORDER BY expressions must appear in select list
 				end
 
 				private
 
+				def recursion_base
+					unscope(:order, :group, :having)
+							.select(recursive_select_values,
+									Arel.sql('1').as('distance'),
+							)
+				end
+
+				def recursive_step
+					unscoped
+							.select(recursive_select_values,
+									(recursive_table[:distance] + 1).as('distance'),
+							)
+							.joins(inverse_association_name)
+							.joins(<<~SQL.squish)
+								JOIN #{recursive_table.name}
+									ON #{recursive_table.name}.#{primary_key} = #{inverse_table.name}.#{primary_key}
+							SQL
+				end
+
 				def association_name = @association.reflection.name
 
 				def inverse_association_name
@@ -46,6 +47,8 @@ module AdjustableSchema
 
 				def recursive_table = Arel::Table.new [ :recursive, association_name, klass.table_name ] * '_'
 				def   inverse_table = Arel::Table.new [     inverse_association_name, klass.table_name ] * '_' # HACK: depends on ActiveRecord internals
+
+				def recursive_select_values = select_values.presence || arel_table[Arel.star]
 			end
 		end
 	end

data/lib/adjustable_schema/active_record/association.rb

@@ -1,35 +1,40 @@
+# frozen_string_literal: true
+
+require 'memery'
+
 module AdjustableSchema
 	module ActiveRecord
-		class Association < Struct.new(:owner, :direction, :target, :role)
+		# rubocop:disable Style/StructInheritance
+		class Association < Struct.new( # :nodoc:
+				:owner,
+				:direction,
+				:target,
+				:role,
+		)
 			require_relative 'association/naming'
 			require_relative 'association/scopes'
+			require_relative 'association/roleless'
+			require_relative 'association/hierarchy'
+
+			include Memery
+
+			def initialize(...)
+				super
+
+				extend Roleless  if roleless?
+				extend Hierarchy if hierarchy?
+			end
 
 			def define
-				name.tap do |association_name|
-					association = self # save context
-
-					has_many association_name, **(options = {
-							through:     define_relationships,
-							source:      direction,
-							source_type: target.base_class.name,
-							class_name:  target.name
-					}) do
-						include Scopes
-						include Scopes::Recursive if association.recursive?
-					end
-
-					define_scopes
-					define_methods
-
-					unless role
-						# HACK: using `try` to overcome a Rails bug
-						# (see https://github.com/rails/rails/issues/40109)
-						has_many roleless_name, -> { try :roleless }, **options if
-								child?
-
-						define_role_methods
-					end
+				association = self # save the context
+
+				has_many name, **options do
+					include Scopes
+					include Scopes::Recursive if association.recursive?
 				end
+
+				define_scopes
+				define_methods
 			end
 
 			def recursive? = target == owner
@@ -52,56 +57,48 @@ module AdjustableSchema
 			end
 
 			def define_scopes
-				name          = relationships_name
-				roleless_name = self.roleless_name
-
-				{
-						name_for_any  => -> { where.associated name },
-						name_for_none => -> { where.missing    name },
-
-						**({
-								name_for_any( target_name) => -> { where.associated roleless_name },
-								name_for_none(target_name) => -> { where.missing    roleless_name },
-						} if hierarchy?),
-				}
+				scopes
 						.reject { owner.singleton_class.method_defined? _1 }
 						.each   { owner.scope _1, _2 }
 			end
 
 			def define_methods
-				name          = self.name
-				roleless_name = self.roleless_name
-
-				{
-						name_for_any  => -> { send(name).any?  },
-						name_for_none => -> { send(name).none? },
-
-						**(hierarchy? ? {
-								name_for_any( target_name) => -> { send(roleless_name).any?  },
-								name_for_none(target_name) => -> { send(roleless_name).none? },
-								intermediate:                 -> { send(roleless_name).one?  },
-								branching:                    -> { send(roleless_name).many? },
-						} : {}),
-				}
-						.transform_keys {"#{_1}?" }
+				flags
+						.transform_keys { :"#{it}?" }
 						.reject { owner.method_defined? _1 }
 						.each   { owner.define_method _1, &_2 }
 			end
 
-			def define_role_methods
-				name = self.name
-
-				owner.redefine_method "#{name}_with_roles" do |*roles|
-					send(name)
-							.merge Relationship.named *roles
-				end
-			end
-
 			def has_many(association_name, ...)
 				return if owner.reflect_on_association association_name
 
 				owner.has_many(association_name, ...)
 			end
+
+			def scopes
+				name = relationships_name # save the context
+
+				{
+						name_for_any  => -> { where.associated name },
+						name_for_none => -> { where.missing    name },
+				}
+			end
+
+			def flags
+				name = self.name # save the context
+
+				{
+						name_for_any  => -> { send(name).any?  },
+						name_for_none => -> { send(name).none? },
+				}
+			end
+
+			memoize def options = {
+					through:     define_relationships,
+					source:      direction,
+					source_type: target.base_class.name,
+					class_name:  target.name,
+			}
 		end
 	end
 end

data/lib/adjustable_schema/active_record.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module AdjustableSchema
-	module ActiveRecord
+	module ActiveRecord # :nodoc:
 		autoload :Association, 'adjustable_schema/active_record/association'
 
 		ActiveSupport.on_load :active_record do

data/lib/adjustable_schema/authors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Gem::Author ||= Struct.new(
 		:name,
 		:email,
@@ -11,5 +13,5 @@ module AdjustableSchema
 					email:      'Alexander.Senko@gmail.com',
 					github_url: 'https://github.com/Alexander-Senko',
 			),
-	]
+	].freeze
 end

data/lib/adjustable_schema/config.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'memery'
 
 module AdjustableSchema
-	module Config
+	module Config # :nodoc:
 		include Memery
 
-		module Naming
+		module Naming # :nodoc:
 			include Memery
 
 			memoize def shortcuts
@@ -13,7 +15,7 @@ module AdjustableSchema
 						if to
 							values.grep_v(to).sole
 						else
-							transform_values { opposite to: _1 }
+							transform_values { opposite to: it }
 						end
 					end
 				end
@@ -23,7 +25,7 @@ module AdjustableSchema
 
 			def recursive
 				config.values.to_h do
-					[ _1[:self].to_s.pluralize.to_sym, _1[:recursive].to_sym ]
+					[ it[:self].to_s.pluralize.to_sym, it[:recursive].to_sym ]
 				end
 			end
 
@@ -35,7 +37,7 @@ module AdjustableSchema
 
 			def config section = nil
 				if section
-					config.transform_values { _1[section].to_sym }
+					config.transform_values { it[section].to_sym }
 				else
 					Config.association_names # TODO: DRY
 				end
@@ -64,14 +66,11 @@ module AdjustableSchema
 			module_function method
 		end
 
-		private
-		module_function
-
 		def association_names = Engine.config.names[:associations]
 
 		def normalize **options
 			shortcuts
-					.tap { options.assert_valid_keys _1.keys, _1.values }
+					.tap { options.assert_valid_keys it.keys, it.values }
 					.select { _2.in? options }
 					.each { options[_1] = options.delete _2 }
 

data/lib/adjustable_schema/engine.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'organizer'
 
 module AdjustableSchema
-	class Engine < ::Rails::Engine
+	class Engine < ::Rails::Engine # :nodoc:
 		isolate_namespace AdjustableSchema
 
 		config.names = {

data/lib/adjustable_schema/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AdjustableSchema
-	VERSION = '0.8.0'
+	VERSION = '0.9.0'
 end

data/lib/adjustable_schema.rb

@@ -1,10 +1,12 @@
-require "adjustable_schema/version"
-require "adjustable_schema/engine"
+# frozen_string_literal: true
+
+require 'adjustable_schema/version'
+require 'adjustable_schema/engine'
 require 'adjustable_schema/active_record'
 
 require 'rails_model_load_hook' # should be loaded
 
-module AdjustableSchema
+module AdjustableSchema # :nodoc:
 	autoload :Config, 'adjustable_schema/config'
 
 	module_function

data/lib/tasks/adjustable_schema_tasks.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # desc "Explaining what the task does"
 # task :adjustable_schema do
 #   # Task goes here

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: adjustable_schema
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Alexander Senko
 bindir: bin
 cert_chain: []
-date: 2024-11-08 00:00:00.000000000 Z
+date: 2025-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: rails_model_load_hook
   requirement: !ruby/object:Gem::Requirement
@@ -77,28 +77,21 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- app/assets/config/adjustable_schema_manifest.js
-- app/assets/stylesheets/adjustable_schema/application.css
-- app/controllers/adjustable_schema/application_controller.rb
-- app/helpers/adjustable_schema/application_helper.rb
-- app/jobs/adjustable_schema/application_job.rb
-- app/mailers/adjustable_schema/application_mailer.rb
 - app/models/adjustable_schema/application_record.rb
 - app/models/adjustable_schema/relationship.rb
 - app/models/adjustable_schema/relationship/role.rb
 - app/models/concerns/adjustable_schema/active_record/associations.rb
 - app/models/concerns/adjustable_schema/active_record/relationships.rb
-- app/views/layouts/adjustable_schema/application.html.erb
 - config/initializers/associations.rb
 - config/initializers/model_names.rb
-- config/routes.rb
 - db/migrate/01_create_adjustable_schema_relationship_tables.rb
 - lib/adjustable_schema.rb
 - lib/adjustable_schema/active_record.rb
 - lib/adjustable_schema/active_record/association.rb
+- lib/adjustable_schema/active_record/association/hierarchy.rb
 - lib/adjustable_schema/active_record/association/naming.rb
+- lib/adjustable_schema/active_record/association/roleless.rb
 - lib/adjustable_schema/active_record/association/scopes.rb
-- lib/adjustable_schema/active_record/query_methods.rb
 - lib/adjustable_schema/authors.rb
 - lib/adjustable_schema/config.rb
 - lib/adjustable_schema/engine.rb
@@ -110,7 +103,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/Alexander-Senko/adjustable_schema
   source_code_uri: https://github.com/Alexander-Senko/adjustable_schema
-  changelog_uri: https://github.com/Alexander-Senko/adjustable_schema/blob/v0.8.0/CHANGELOG.md
+  changelog_uri: https://github.com/Alexander-Senko/adjustable_schema/blob/v0.9.0/CHANGELOG.md
 rdoc_options: []
 require_paths:
 - lib
@@ -118,14 +111,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.0.dev
+rubygems_version: 3.6.5
 specification_version: 4
 summary: Adjustable data schemas for Rails
 test_files: []

data/app/assets/config/adjustable_schema_manifest.js

@@ -1 +0,0 @@
-//= link_directory ../stylesheets/adjustable_schema .css

data/app/assets/stylesheets/adjustable_schema/application.css

@@ -1,15 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
- * files in this directory. Styles in this file should be added after the last require_* statement.
- * It is generally better to create a new file per style scope.
- *
- *= require_tree .
- *= require_self
- */

data/app/controllers/adjustable_schema/application_controller.rb

@@ -1,4 +0,0 @@
-module AdjustableSchema
-  class ApplicationController < ActionController::Base
-  end
-end

data/app/helpers/adjustable_schema/application_helper.rb

@@ -1,4 +0,0 @@
-module AdjustableSchema
-  module ApplicationHelper
-  end
-end

data/app/jobs/adjustable_schema/application_job.rb

@@ -1,4 +0,0 @@
-module AdjustableSchema
-  class ApplicationJob < ActiveJob::Base
-  end
-end

data/app/mailers/adjustable_schema/application_mailer.rb

@@ -1,6 +0,0 @@
-module AdjustableSchema
-  class ApplicationMailer < ActionMailer::Base
-    default from: "from@example.com"
-    layout "mailer"
-  end
-end

data/app/views/layouts/adjustable_schema/application.html.erb

@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Adjustable schema</title>
-  <%= csrf_meta_tags %>
-  <%= csp_meta_tag %>
-
-  <%= stylesheet_link_tag    "adjustable_schema/application", media: "all" %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>

data/config/routes.rb

@@ -1,2 +0,0 @@
-AdjustableSchema::Engine.routes.draw do
-end

data/lib/adjustable_schema/active_record/query_methods.rb

@@ -1,103 +0,0 @@
-module AdjustableSchema
-	module ActiveRecord
-		module QueryMethods
-			class WithChain
-				def initialize scope
-					@scope = scope
-				end
-
-				# Returns a new relation expressing WITH RECURSIVE statement.
-				#
-				# #recursive accepts conditions as a hash. See QueryMethods#with for
-				# more details on each format.
-				#
-				#    User.with.recursive(
-				#      descendants: User.joins('INNER JOIN descendants ON users.parent_id = descendants.id')
-				#    )
-				#    # WITH RECURSIVE descendants AS (
-				#    #   SELECT * FROM users
-				#    #   UNION
-				#    #   SELECT * FROM users INNER JOIN descendants ON users.parent_id = descendants.id
-				#    # ) SELECT * FROM descendants
-				#
-				# WARNING! Due to how Arel works,
-				#  * `recursive` can't be chained with any prior non-recursive calls to `with` and
-				#  * all subsequent non-recursive calls to `with` will be treated as recursive ones.
-				def recursive *args
-					args.map! do
-						next _1 unless _1.is_a? Hash
-
-						_1
-								.map(&method(:with_recursive_union))
-								.to_h
-					end
-
-					case @scope.with_values
-					in []
-						@scope = @scope.with :recursive, *args
-					in [ :recursive, * ]
-						@scope = @scope.with *args
-					else
-						raise ArgumentError, "can't chain `WITH RECURSIVE` with non-recursive one"
-					end
-
-					@scope
-				end
-
-				private
-
-				def with_recursive_union name, scope
-					scope = scope.arel if scope.respond_to? :arel
-
-					[
-							name,
-							@scope
-									.unscope(:order, :group, :having)
-									.arel
-									.union(scope)
-					]
-				end
-			end
-
-			def with *args
-				if args.empty?
-					WithChain.new spawn
-				else
-					super
-				end
-			end
-
-			private
-
-			# OVERWRITE: allow a Symbol to be passes as the first argument
-			def build_with(arel)
-				return if with_values.empty?
-
-				with_statements = with_values.map.with_index do |with_value, i|
-					next with_value if with_value.is_a? Symbol and i == 0
-
-					raise ArgumentError, "Unsupported argument type: #{with_value} #{with_value.class}" unless with_value.is_a?(Hash)
-
-					build_with_value_from_hash(with_value)
-				end
-
-				arel.with(*with_statements)
-			end
-
-			# OVERWRITE: allow Arel Nodes
-			def build_with_value_from_hash(hash)
-				hash.map do |name, value|
-					expression =
-							case value
-							when Arel::Nodes::SqlLiteral then Arel::Nodes::Grouping.new(value)
-							when ::ActiveRecord::Relation then value.arel
-							when Arel::SelectManager, Arel::Nodes::Node then value
-							else
-								raise ArgumentError, "Unsupported argument type: `#{value}` #{value.class}"
-							end
-					Arel::Nodes::TableAlias.new(expression, name)
-				end
-			end
-		end
-	end
-end