rails_dynamic_associations 0.1.1 → 0.2.0.real

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dccbe5a752726f57eb97a9f03323efb4907fe0e
-  data.tar.gz: bba3e032f0bdc486b0bed4290b16a79b2ca14a5b
+  metadata.gz: 43cb344fd8b7ef4cd4f603260a48ad84c2fd3010
+  data.tar.gz: 121001d4ff410084fe0e1306735a8f78bf40e931
 SHA512:
-  metadata.gz: 68b1fb01b76e4b128978fcd829089c6a683332fc8b8aa6b1617db4e9bc32732d6636ac8d3e29f4460919f44f91bcb89086df736e179fe9428f00ff42be5ff3e5
-  data.tar.gz: 0c4802a3cf276dac52c6d91d394741830bf8925b800207d94feb1905e2ba40f2a41a12221a4427d5c86b20ef5c871a141f3ad9bb853844f729d954c8caa63812
+  metadata.gz: ce004cfa30905fbfd731e1be5e084ccb10bbadf1018966d4a45f3cda25fd93258f1b330c70ffad9871ae3cb768b6a88358c8b0caa696fbd835adc786782c4270
+  data.tar.gz: 46953fe6aafe0cc8b6e7b3d15890d54f786f310f27ad4bf9b8d9aefac2947c0c6475406724d68a30ea57baa00ae3cae99b2ad7c6bb62e3616f6fcc1164b93e52

data/app/models/relation.rb

@@ -22,8 +22,6 @@ class Relation < ActiveRecord::Base
 
 		scope method, -> (object) {
 			case object
-			when nil then
-				all
 			when Symbol then
 				send "#{method}_#{object}"
 			when Class then
@@ -39,20 +37,6 @@ class Relation < ActiveRecord::Base
 		of_abstract.to_abstract
 	}
 
-	scope :applied, -> {
-		where.not source_id: nil,
-		          target_id: nil
-	}
-
-	scope :named, -> (*names) {
-		if names.present? then
-			where     roles: { name: names.flatten.map(&:to_s) }
-		else
-			where.not roles: { name: nil }
-		end.
-			includes :role
-	}
-
 	def self.seed source, target, roles = nil
 		(roles.present? ? by_roles(roles) : [ self ]).map do |scope|
 			scope.create source_type: source,
@@ -66,6 +50,12 @@ class Relation < ActiveRecord::Base
 	end
 
 
+	def name= role_name
+		self.role = role_name &&
+			Role.find_or_initialize_by(name: role_name)
+	end
+
+
 	# Using polymorphic associations in combination with single table inheritance (STI) is
 	# a little tricky. In order for the associations to work as expected, ensure that you
 	# store the base model for the STI models in the type column of the polymorphic

data/config/initializers/model_associations.rb

@@ -1,9 +1,7 @@
 ActiveSupport.on_load :model_class do
 	for type in RailsDynamicAssociations.directions.keys do
 		for relation in send("#{type}_relations").abstract.select(&:"#{type}_type") do
-			setup_relation type, relation.send("#{type}_type").constantize, relation.role do |association|
-				attr_accessible "#{association.to_s.singularize}_ids"
-			end
+			setup_relation type, relation.send("#{type}_type").constantize, relation.role
 		end
 	end if self != Relation and Relation.table_exists? # needed for DB migrations & schema initializing
 end

data/lib/rails_dynamic_associations/active_record/associations.rb

@@ -21,8 +21,8 @@ module RailsDynamicAssociations::ActiveRecord
 			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, conditions: role && { role_id: role.id },
-						         as: (RailsDynamicAssociations.directions.keys - [ type ]).first, class_name: 'Relation'
+						has_many association, role && -> { where role_id: role.id },
+						         as: (RailsDynamicAssociations.directions.keys - [type]).first, class_name: 'Relation'
 					end
 				end
 			end

data/lib/rails_dynamic_associations/active_record/relations.rb

@@ -4,11 +4,6 @@ module RailsDynamicAssociations::ActiveRecord
 	module Relations
 		extend ActiveSupport::Concern
 
-		included do
-			extend  ClassAndInstanceMethods
-			include ClassAndInstanceMethods
-		end
-
 		module ClassMethods
 			RailsDynamicAssociations.opposite_directions.each &-> (association, method) do
 				define_method "#{association}_relations" do
@@ -16,47 +11,5 @@ module RailsDynamicAssociations::ActiveRecord
 				end
 			end
 		end
-
-		module ClassAndInstanceMethods
-			# TODO: use keyword arguments
-			def find_relations args = {}
-				directions = RailsDynamicAssociations.directions
-
-				for association, method in directions do
-					args[association] = args.delete method
-				end
-
-				as = [ args[:as] ].flatten
-
-				if directions.keys.inject(nil) { |r, k| !r ^ !args[k] } then # direction specified
-					for association, method in directions do
-						next unless args[association]
-
-						return (as.present? ?
-							source_relations.named(as) :
-							source_relations
-						).send method, args[association]
-					end
-				else # both directions
-					directions.map do |association, method|
-						as.present? ?
-							send("#{association}_relations").named(as) :
-							send("#{association}_relations")
-					end.sum
-				end
-			end
-
-			def relative? args = {}
-				find_relations(args).
-					present?
-			end
-
-			def relatives args = {}
-				find_relations(args).
-					map { |r|
-						([ r.source, r.target ] - [ self ]).first
-					}.uniq
-			end
-		end
 	end
 end

data/lib/rails_dynamic_associations/active_record.rb

@@ -1,9 +1,7 @@
 require 'rails_dynamic_associations/active_record/associations'
 require 'rails_dynamic_associations/active_record/relations'
-require 'rails_dynamic_associations/active_record/roles'
 
 ActiveSupport.on_load :active_record do
 	include RailsDynamicAssociations::ActiveRecord::Associations
 	include RailsDynamicAssociations::ActiveRecord::Relations
-	include RailsDynamicAssociations::ActiveRecord::Roles
 end

data/lib/rails_dynamic_associations/version.rb

@@ -1,3 +1,3 @@
 module RailsDynamicAssociations
-	VERSION = '0.1.1'
+	VERSION = '0.2.0.real'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_dynamic_associations
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0.real
 platform: ruby
 authors:
 - Alexander Senko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rails_model_load_hook
   requirement: !ruby/object:Gem::Requirement
@@ -73,7 +73,6 @@ files:
 - lib/rails_dynamic_associations/active_record.rb
 - lib/rails_dynamic_associations/active_record/associations.rb
 - lib/rails_dynamic_associations/active_record/relations.rb
-- lib/rails_dynamic_associations/active_record/roles.rb
 - lib/rails_dynamic_associations/engine.rb
 - lib/rails_dynamic_associations/version.rb
 - lib/tasks/rails_dynamic_associations_tasks.rake
@@ -92,12 +91,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: DB-driven model associations for Rails.

data/lib/rails_dynamic_associations/active_record/roles.rb

@@ -1,24 +0,0 @@
-require 'active_support/concern'
-
-module RailsDynamicAssociations::ActiveRecord
-	module Roles
-		extend ActiveSupport::Concern
-
-		included do
-			extend  ClassAndInstanceMethods
-			include ClassAndInstanceMethods
-		end
-
-		module ClassAndInstanceMethods
-			def roles to: nil, &block
-				if block_given? then
-					source_relations.instance_eval &block
-				else
-					source_relations
-				end.
-					to(to).
-						map(&:name).uniq
-			end
-		end
-	end
-end