Add some more ActiveModel magic to node and relationship model.

This will improve integration with rubyonrails tremendously. Also make sure that we load the model extensions for the subklass and not the one we inherit from.
namxam · Oct 26, 2011 · f81d1b2 · f81d1b2
1 parent a8ddbd8
commit f81d1b2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/architect4r/model/node.rb b/lib/architect4r/model/node.rb
@@ -3,6 +3,10 @@ module Architect4r
   module Model
 
     class Node
+
+      #
+      # architect4r extensions
+      #
       include Architect4r::Model::Connection
       include Architect4r::Model::Callbacks
       include Architect4r::Model::Persistency
@@ -11,6 +15,8 @@ class Node
 
       def self.inherited(subklass)
         super
+        subklass.send(:include, ActiveModel::Conversion)
+        subklass.extend ActiveModel::Naming
         subklass.send(:include, Architect4r::Model::Properties)
         subklass.send(:include, Architect4r::Model::Validations)
 

diff --git a/lib/architect4r/model/relationship.rb b/lib/architect4r/model/relationship.rb
@@ -3,7 +3,7 @@ module Model
     class Relationship
 
       #
-      # Extensions
+      # Architect4r extensions
       #
       include Architect4r::Model::Connection
       include Architect4r::Model::Callbacks
@@ -12,6 +12,8 @@ class Relationship
 
       def self.inherited(subklass)
         super
+        subklass.send(:include, ActiveModel::Conversion)
+        subklass.extend ActiveModel::Naming
         subklass.send(:include, Architect4r::Model::Properties)
         subklass.send(:include, Architect4r::Model::Validations)