fix Manifest

[pettanr/pettanr.git] / lib / manifest / model / association / has_one.rb

diff --git a/lib/manifest/model/association/has_one.rb b/lib/manifest/model/association/has_one.rb
index 9f1efb6..6f4e874 100644 (file)
--- a/lib/manifest/model/association/has_one.rb
+++ b/lib/manifest/model/association/has_one.rb
@@ -3,7 +3,7 @@ module Manifest
     module AssociationModule
       class HasOne
         attr :association, :has_one_name, :has_one_manifest, 
-          :model, :foreign_key
+          :model_name, :foreign_key
         def initialize association, has_one_name, has_one_manifest
           @association = association
           @has_one_name = has_one_name
@@ -13,12 +13,12 @@ module Manifest
         end
         
         def set_default
-          @has_one_manifest['model'] ||= @has_one_name
+          @has_one_manifest['model_name'] ||= @has_one_name
         end
         
         def init
-          @model = @has_one_manifest['model']
-          raise "undefined foreign_key for models > #{@association.model.model_name} > associations > has_one > #{@association.association_name}\n" unless @has_one_manifest['foreign_key']
+          @model_name = @has_one_manifest['model_name']
+          raise "undefined foreign_key for models > #{@association.model.model_name} > associations > has_one > #{@has_one_name}\n" unless @has_one_manifest['foreign_key']
           @foreign_key = @has_one_manifest['foreign_key']
         end