rails_dynamic_associations 0.2.1.real → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2e750c6c7f3dff5b63c11d91a5636cb7aeffc31b
-  data.tar.gz: c8f63f3d0831bbe148c3ebde7563f36548d078e5
+SHA256:
+  metadata.gz: 8b7b48b2770c9ae7b6273ddfa0c792f074424f2e0b90973ea5683c34cdf738b6
+  data.tar.gz: 759bb756a6b7d0ad50542bddf4310b1b55d4e6ea1fed072a72fc740b1bc17002
 SHA512:
-  metadata.gz: ed9168cf7e38072e7971ecf38a9550d5a0c30ad27cd2a998e943d8cc7c7211243c94bfd7b475a326e0c1466debe3352b8ed0832de66defb86d57a027adcecd22
-  data.tar.gz: 6fb4f259c4915c9fe4c6edb2223e8ebe8376315c937c31e3f2ffb7a95fcc8afd04ff79382c72efa923d75f5035a71377020c92dc20d642f9efd57bb967b8d135
+  metadata.gz: 8f213dcd1c0317e892b4a8f849bdab9be75d9033ecdb401a7147f8ff8cac2862a8a45c1de2732ff841a24e2187e871bf947584679d2b5e4194fe50529bc6a3b0
+  data.tar.gz: 69af7d101d87093b6f1a240a9b4b8890b34442c5dd7ca68285d317cdc072c00da77f2fce1297c4267d429f5a92781951061c0073f012832727fc10ce6979db0e

data/app/models/relation.rb

@@ -1,7 +1,7 @@
 class Relation < ActiveRecord::Base
-	belongs_to :source, polymorphic: true
-	belongs_to :target, polymorphic: true
-	belongs_to :role
+	belongs_to :source, polymorphic: true, optional: true
+	belongs_to :target, polymorphic: true, optional: true
+	belongs_to :role,                      optional: true
 
 	delegate :name, to: :role, allow_nil: true
 
@@ -9,7 +9,7 @@ class Relation < ActiveRecord::Base
 		references(:roles).includes :role
 	}
 
-	association_directions.shortcuts.each &-> (association, method) do
+	association_directions.shortcuts.each &-> ((association, method)) do
 		scope "#{method}_abstract", -> (object = nil) {
 			if object then
 				send("#{method}_abstract").
@@ -31,9 +31,9 @@ class Relation < ActiveRecord::Base
 			when Symbol then
 				send "#{method}_#{object}"
 			when Class then
-				where "#{association}_type" => object.base_class
+				where "#{association}_type" => object.base_class.name
 			else
-				where "#{association}_type" => object.class.base_class,
+				where "#{association}_type" => object.class.base_class.name,
 				      "#{association}_id"   => object.id
 			end
 		}

data/lib/rails_dynamic_associations/active_record/associations.rb

@@ -13,24 +13,27 @@ module RailsDynamicAssociations::ActiveRecord
 				define_association type, target
 				define_association type, target, role if role
 
-				for association, method in association_directions.recursive do
-					define_recursive_methods association, method if association.in? reflections and not method_defined? method
-				end
+				association_directions.recursive
+					.select { |association, method| reflect_on_association association }
+					.reject { |association, method| method_defined? method }
+					.each   { |association, method| define_recursive_methods association, method }
 			end
 
 			private
 
 			def define_relations_association type, target = self, role = nil
-				:"#{role ? association_name(type, target, role).to_s.singularize : type}_relations".tap do |association|
-					unless association.in? reflections then
-						has_many association, role && -> { where role_id: role.id },
-							as: association_directions.opposite(type), class_name: 'Relation'
-					end
+				relations_association_name(type, target, role).tap do |association|
+					next if reflect_on_association association
+
+					has_many association, role && -> { where role_id: role.id },
+						as: association_directions.opposite(type), class_name: 'Relation'
 				end
 			end
 
 			def define_association type, target = self, role = nil
-				unless (association = association_name(type, target, role)).in? reflections then
+				association_name(type, target, role).tap do |association|
+					next if reflect_on_association association
+
 					has_many association,
 						through:     define_relations_association(type, target, role),
 						source:      type,
@@ -77,6 +80,10 @@ module RailsDynamicAssociations::ActiveRecord
 				end
 			end
 
+			def relations_association_name type, target = self, role = nil
+				:"#{role ? association_name(type, target, role).to_s.singularize : type}_relations"
+			end
+
 			def association_name type, target = self, role = nil
 				if role then
 					association_name_with_role    type, target, role

data/lib/rails_dynamic_associations/active_record/relations.rb

@@ -10,7 +10,7 @@ module RailsDynamicAssociations::ActiveRecord
 		end
 
 		module ClassMethods
-			RailsDynamicAssociations::Config.association_directions.opposite_shortcuts.each &-> (association, method) do
+			RailsDynamicAssociations::Config.association_directions.opposite_shortcuts.each &-> ((association, method)) do
 				define_method "#{association}_relations" do
 					Relation.send method, self
 				end

data/lib/rails_dynamic_associations/version.rb

@@ -1,3 +1,3 @@
 module RailsDynamicAssociations
-	VERSION = '0.2.1.real'
+	VERSION = '0.3.1'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rails_dynamic_associations
 version: !ruby/object:Gem::Version
-  version: 0.2.1.real
+  version: 0.3.1
 platform: ruby
 authors:
 - Alexander Senko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-28 00:00:00.000000000 Z
+date: 2022-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 5.0.0.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 5.0.0.beta
 - !ruby/object:Gem::Dependency
   name: rails_model_load_hook
   requirement: !ruby/object:Gem::Requirement
@@ -93,12 +93,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.3.5
 signing_key: 
 specification_version: 4
 summary: DB-driven model associations for Rails.