diff --git a/lib/deja/node.rb b/lib/deja/node.rb index c4106af..6f55b25 100644 --- a/lib/deja/node.rb +++ b/lib/deja/node.rb @@ -8,19 +8,19 @@ class << self attr_reader :relationship_names def relationship(name, opts = {}) - raise StandardError, "'as' alias must be specified" unless opts.is_a? Hash and opts[:as] + raise StandardError, "'out' or 'in' aliases must be specified" unless opts.is_a? Hash and (opts[:out] or opts[:in]) @relationship_names ||= {} if opts[:reverse] then @relationship_names[name] = { - :out_singular => opts[:as].to_s.singularize, - :out_plural => opts[:as].to_s.pluralize, - :in_singular => opts[:reverse].to_s.singularize, - :in_plural => opts[:reverse].to_s.pluralize + :out_singular => opts[:out].to_s.singularize, + :out_plural => opts[:out].to_s.pluralize, + :in_singular => opts[:in].to_s.singularize, + :in_plural => opts[:in].to_s.pluralize } else @relationship_names[name] = { - :out_singular => opts[:as].to_s.singularize, - :out_plural => opts[:as].to_s.pluralize + :out_singular => opts[:out].to_s.singularize, + :out_plural => opts[:out].to_s.pluralize } end attr_writer name diff --git a/spec/factories.rb b/spec/factories.rb index a6fbe1c..594fe8d 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -5,7 +5,7 @@ class Company < Deja::Node attribute :permalink, String, :index => true attribute :type, String - relationship :invested_in, :as => :investment, :reverse => :investor + relationship :invested_in, :out => :investment, :in => :investor end class Person < Deja::Node @@ -13,9 +13,9 @@ class Person < Deja::Node attribute :permalink, String, :index => true attribute :type, String - relationship :invested_in, :as => :investment - relationship :friends_with, :as => :friends - relationship :has_hate, :as => :hates + relationship :invested_in, :out => :investment + relationship :friends_with, :out => :friends + relationship :has_hate, :out => :hates end