rails_dynamic_associations 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02f1e9739f27b665443124374994afc6729e4e8f
-  data.tar.gz: f5d07be362c9b98969dfe4b5b0109f6b429f2c0f
+  metadata.gz: 4dccbe5a752726f57eb97a9f03323efb4907fe0e
+  data.tar.gz: bba3e032f0bdc486b0bed4290b16a79b2ca14a5b
 SHA512:
-  metadata.gz: 5ee36ecaeee3642a97e3875c93c365e7323ac01ecc6fd7db0f2e67310eaf3a23aa61d9a0e351ee88b5c98f7de8d676f31fa456a1d992167dd8e37d4a9e9fd6ec
-  data.tar.gz: fc3ce8c1acbdebba32efd429e06eb5fc0b3390fc72163eb28905730f0a6293f5e0222fd67b2d89b8045a87aa138157f7b43b105bb070a7581efda2e0a0422802
+  metadata.gz: 68b1fb01b76e4b128978fcd829089c6a683332fc8b8aa6b1617db4e9bc32732d6636ac8d3e29f4460919f44f91bcb89086df736e179fe9428f00ff42be5ff3e5
+  data.tar.gz: 0c4802a3cf276dac52c6d91d394741830bf8925b800207d94feb1905e2ba40f2a41a12221a4427d5c86b20ef5c871a141f3ad9bb853844f729d954c8caa63812

data/app/models/relation.rb

@@ -5,32 +5,32 @@ class Relation < ActiveRecord::Base
 
 	delegate :name, to: :role, allow_nil: true
 
-	RailsDynamicAssociations.directions.each &-> (attribute, direction) do
-		scope "#{direction}_abstract", -> (object = nil) {
+	RailsDynamicAssociations.directions.each &-> (association, method) do
+		scope "#{method}_abstract", -> (object = nil) {
 			if object then
-				send direction, object
+				send method, object
 			else
 				all
 			end.
-				where "#{attribute}_id"   => nil
+				where "#{association}_id"   => nil
 		}
 
-		scope "#{direction}_general", -> {
-			send("#{direction}_abstract").
-				where "#{attribute}_type" => nil
+		scope "#{method}_general", -> {
+			send("#{method}_abstract").
+				where "#{association}_type" => nil
 		}
 
-		scope direction, -> (object) {
+		scope method, -> (object) {
 			case object
 			when nil then
 				all
 			when Symbol then
-				send "#{direction}_#{object}"
+				send "#{method}_#{object}"
 			when Class then
-				where "#{attribute}_type" => object.base_class
+				where "#{association}_type" => object.base_class
 			else
-				where "#{attribute}_type" => object.class.base_class,
-				      "#{attribute}_id"   => object.id
+				where "#{association}_type" => object.class.base_class,
+				      "#{association}_id"   => object.id
 			end
 		}
 	end

data/app/models/role.rb

@@ -13,11 +13,11 @@ class Role < ActiveRecord::Base
 	}
 
 	scope :in, -> (object) {
-		where relations: { id: object.source_relations } # TODO: simplify
+		where relations: { id: Relation.to(object) } # TODO: simplify
 	}
 
 	scope :for, -> (subject) {
-		where relations: { id: subject.target_relations } # TODO: simplify
+		where relations: { id: Relation.of(subject) } # TODO: simplify
 	}
 
 	def self.find_or_create_named *names

data/lib/rails_dynamic_associations/active_record/associations.rb

@@ -90,7 +90,7 @@ module RailsDynamicAssociations::ActiveRecord
 					end
 				else
 					if target == self then
-						RailsDynamicAssociations.self_referential_recursive[type].to_s
+						RailsDynamicAssociations.self_referential[type].to_s
 					else
 						target.name.split('::').reverse.join
 					end

data/lib/rails_dynamic_associations/version.rb

@@ -1,3 +1,3 @@
 module RailsDynamicAssociations
-	VERSION = '0.1.0'
+	VERSION = '0.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_dynamic_associations
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Alexander Senko