adjustable_schema 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a26450a562fbcde4b87abd3a84e85f577d3c1a7c9f8ecfdf22b79728875f1e6
-  data.tar.gz: b2cda5f212ae129a97b92a80440f8e053af2c44d5c54676e2358da3230cb987a
+  metadata.gz: 7e36fef6757e9e0803ad940f90a425ea0b25870c0720b0d338ed14970a35e339
+  data.tar.gz: a50db598919a729c33f607f107b1f78145d3fe262e00d0b7899dacb473ebc194
 SHA512:
-  metadata.gz: 1bf5d1bcef25e17cdbfc7de6d1f4f0278571169e9416d96fa4542ae654ea236184b39fa162938870d085a5afc496beac98e8a6a48ad311e69a277a97eb2f01d8
-  data.tar.gz: '099e2973293293635d6a1a1cda5a3105363e5c42dedc14cc30f07fc967870b6586da29dd4443e2ab37ee7b93059e063e538a8f3c39bc98308354342f5398a3bb'
+  metadata.gz: 631771aa7ea4295ba2d886ab24a1e102b1ab50b9d3631ff467a3f46fd6f48a5bcd1f4ff2af62523510cc4c5d361852ef71dd183ca5846d20cf3a939ba25864f8
+  data.tar.gz: 57cd60293cb11377429fb2f808115301bb84f3a9c71372c7e0e5040bc8441e3ca62b244906d96785f1a34845c9542a1617107d7887dd01b9481b2b658ecae1d5

data/CHANGELOG.md

@@ -0,0 +1,108 @@
+## [0.8.0] — 2024-11-08
+
+### Changed
+
+- Renamed checks for related records:
+	`<associat>ful` form is now used instead of a passive one (`<associat>ed`) to check for related records’ presence.
+	- `.<associat>ful` — scope records having associated ones.
+	- `#<associat>ful?` — are there any records associated?
+- Naming: improved passive forms for words ending with `or`/`ant`/`ion`/`ment`/`ing`.
+
+### Added
+
+- Checks for related records’ presence on roleless recursive associations:
+	- `.<associat>ful` —
+		records having associated ones;
+	- `.<association>less` —
+		records not having associated ones;
+	- `#<associat>ful?` —
+		if there are records associated;
+	- `#<association>less?` —
+		if there are no records associated;
+	- `#intermediate?` —
+		whether is only one child record associated (_Is the node just a link between two other nodes like?_);
+	- `#branching?` —
+		whether are several child records associated.
+
+### Fixed
+
+- Naming: passive form for `author`.
+
+
+## [0.7.2] — 2024-04-02
+
+### Fixed
+
+- `roleless` scope used to generate wrong queries.
+
+
+## [0.7.1] — 2024-03-31
+
+### Fixed
+
+- DB constraints:
+	- `roles.name` is `NOT NULL`,
+	- `UNIQUE` constraints should treat `NULLS` as `NOT DISTINCT`.
+- Roleless recursive associations used to fail on `joins`.
+
+
+## [0.7.0] — 2024-02-25
+
+### Changed
+
+- Naming: improved passive forms a bit.
+- Configuration: renamed `self_related` to `self`.
+
+### Added
+
+- Checks for related records’ presence:
+	- `.<associat>ed` —
+		records having associated ones;
+	- `.<association>less` —
+		records not having associated ones;
+	- `#<associat>ed?` —
+		if there are records associated;
+	- `#<association>less?` —
+		if there are no records associated.
+- Documentation: self-targeted relationships in README.
+
+### Fixed
+
+- Documentation: examples in the README.
+
+
+## [0.6.0] — 2024-02-20
+
+### Changed
+
+- Destroy orphaned relationships of an object on destroy.
+- Symbolize configurable names used for associations, methods, etc.
+- Raise `ArgumentError` for unknown names passed to the API.
+
+### Added
+
+- `Relationship[]` to filter relationships by related objects/classes.
+- `Role[]` accepts `Hash`-like parameters to filter roles by relationships.
+- Methods for related records:
+	- `related?` to check for related objects,
+	- `related` to fetch them,
+	- and the basic `relationships`.
+- Recursive methods for related records:
+	- flat `ancestors` & `descendants` with distance,
+	- based on `recursive` association scope.
+- `roleless` scope for related records without a role.
+- A dedicated association for roleless children.
+
+### Fixed
+
+- Faulty scopes in role-based relationship associations.
+- Naming for namespaced models, e.g., in Rails Engines.
+
+
+## [0.5.0] — 2023-12-29
+
+Refactored from [Rails Dynamic Associations](
+	https://github.com/Alexander-Senko/rails_dynamic_associations
+).
+
+Some experimental features are missing and can be found in the `api` branch.

data/README.md

@@ -75,7 +75,7 @@ It includes `User` by default.
 
 ##### Self-referencing models
 
-You may want to set up self-targeted relationships:
+You may want to set up recursive relationships:
 
 ``` ruby
 AdjustableSchema::Relationship.seed! Person, roles: %w[friend]
@@ -100,7 +100,7 @@ AdjustableSchema::Engine.configure do
 end
 ```
 
-Thus, for the self-referenced `Event`s, you'll get:
+Thus, for hierarchical `Event`s, you'll get:
 
 ``` ruby
 event.causes

data/app/models/adjustable_schema/relationship.rb

@@ -5,8 +5,7 @@ module AdjustableSchema
 		belongs_to :role,                      optional: true
 
 		default_scope do
-			references(:role)
-					.includes :role
+			includes :role
 		end
 
 		Config.shortcuts.each &-> ((association, method)) do
@@ -16,7 +15,7 @@ module AdjustableSchema
 					where association => object
 				when Class
 					where "#{association}_type" => object.ancestors
-							.select { _1 <= object.base_class }
+							.grep(..object.base_class)
 							.map(&:name)
 				when ::ActiveRecord::Relation
 					send(method, object.klass)
@@ -101,7 +100,7 @@ module AdjustableSchema
 						end
 					end
 				in [ Class => source ]
-					seed! source, source, roles: # self-related
+					seed! source, source, roles: # recursive
 				end
 			end
 		end

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

@@ -46,7 +46,7 @@ module AdjustableSchema
 								Config.association_directions
 										.map { relationship.send _1 } # both objects
 										.without(self) # the related one
-										.first or self # may be self-related
+										.first or self # may be recursive
 							end
 							.uniq
 				end

data/db/migrate/01_create_adjustable_schema_relationship_tables.rb

@@ -28,7 +28,7 @@ class CreateAdjustableSchemaRelationshipTables < ActiveRecord::Migration[7.1]
 				# One can use `ADD CONSTRAINT … UNIQUE NULLS NOT DISTINCT (…)` instead
 				t.index columns,
 						unique: true, where: 'role_id IS NOT NULL', name: :index_adjustable_schema_relationships_uniqueness_with_role
-				t.index columns.excluding(:role_id),
+				t.index columns.without(:role_id),
 						unique: true, where: 'role_id IS     NULL', name: :index_adjustable_schema_relationships_uniqueness_without_role
 			}
 		end

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

@@ -10,21 +10,32 @@ module AdjustableSchema
 					refine String do
 						def passivize
 							self
-									.sub(/(author)$/, '\\2ed')
-									.sub(/(e*|ed|ing|[eo]r|ant|(t)ion)$/, '\\2ed')
+									.presence
+									&.sub(/((:?[aeiou]+[^aeiou]+){2,})(?:or|ant|ion|e?ment)$/, '\1ed')
+									&.sub(/((:?[aeiou]+[^aeiou]+){1,})(?:ing)$/,               '\1ed')
+									&.sub(/(?:e*|ed|er)$/,                                     '\1ed')
+									.to_s
 						end
 					end
 				end
 
 				using Inflections
 
-				memoize def name
-					(role ? name_with_role : name_without_role)
+				memoize def name name = object_name
+					name
 							.to_s
 							.tableize
 							.to_sym
 				end
 
+				def object_name
+					if role
+						name_with_role
+					else
+						name_without_role
+					end
+				end
+
 				memoize def target_name
 					target.model_name.unnamespaced
 							.split('::')
@@ -51,17 +62,20 @@ module AdjustableSchema
 					end
 				end
 
-				memoize def name_without_role
+				def name_without_role
 					if recursive?
 						Config.association_directions
 								.self[direction]
+								.to_s
 					else
 						target_name
 					end
 				end
 
-				def name_for_any  = :"#{name.to_s.singularize.passivize}"
-				def name_for_none = :"#{name.to_s.singularize}less"
+				def roleless_name = name(target_name)
+
+				def name_for_any (name = object_name) = :"#{name}ful"
+				def name_for_none(name = object_name) = :"#{name}less"
 			end
 		end
 	end

data/lib/adjustable_schema/active_record/association.rb

@@ -24,8 +24,8 @@ module AdjustableSchema
 					unless role
 						# HACK: using `try` to overcome a Rails bug
 						# (see https://github.com/rails/rails/issues/40109)
-						has_many target_name.tableize.to_sym, -> { try :roleless }, **options if
-								recursive?
+						has_many roleless_name, -> { try :roleless }, **options if
+								child?
 
 						define_role_methods
 					end
@@ -33,6 +33,12 @@ module AdjustableSchema
 			end
 
 			def recursive? = target == owner
+			def roleless?  = !role
+			def source?    = direction == :source
+			def target?    = direction == :target
+			def child?     = (recursive? and source?)
+			def parent?    = (recursive? and target?)
+			def hierarchy? = (child? and roleless?)
 
 			private
 
@@ -46,22 +52,36 @@ module AdjustableSchema
 			end
 
 			def define_scopes
-				name = relationships_name
+				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?),
 				}
 						.reject { owner.singleton_class.method_defined? _1 }
 						.each   { owner.scope _1, _2 }
 			end
 
 			def define_methods
-				name = self.name
+				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}?" }
 						.reject { owner.method_defined? _1 }

data/lib/adjustable_schema/config.rb

@@ -11,7 +11,7 @@ module AdjustableSchema
 				config(:shortcut).tap do |shortcuts|
 					def shortcuts.opposite to: nil
 						if to
-							values.reject { _1 == to }.sole
+							values.grep_v(to).sole
 						else
 							transform_values { opposite to: _1 }
 						end
@@ -28,7 +28,7 @@ module AdjustableSchema
 			end
 
 			def opposite to:
-				reject { _1 == to }.sole
+				grep_v(to).sole
 			end
 
 			private

data/lib/adjustable_schema/engine.rb

@@ -18,8 +18,5 @@ module AdjustableSchema
 						},
 				},
 		}
-
-		config.active_record
-				.automatically_invert_plural_associations = true
 	end
 end

data/lib/adjustable_schema/version.rb

@@ -1,3 +1,3 @@
 module AdjustableSchema
-	VERSION = '0.7.1'
+	VERSION = '0.8.0'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: adjustable_schema
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Alexander Senko
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-31 00:00:00.000000000 Z
+date: 2024-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -111,8 +110,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.7.1/CHANGELOG.md
-post_install_message:
+  changelog_uri: https://github.com/Alexander-Senko/adjustable_schema/blob/v0.8.0/CHANGELOG.md
 rdoc_options: []
 require_paths:
 - lib
@@ -127,8 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
-signing_key:
+rubygems_version: 3.6.0.dev
 specification_version: 4
 summary: Adjustable data schemas for Rails
 test_files: []