lib/bigamy/proxy.rb in bigamy-0.1.1 vs lib/bigamy/proxy.rb in bigamy-0.1.2

@@ -1,26 +1,24 @@
 module Bigamy
 
   class Proxy
-    attr_accessor :name, :me, :primary_key, :foreign_key, :klass, :methods_added,
-      :options
+    attr_accessor :name, :me, :primary_key, :methods_added, :options
 
     def initialize parent, name, options
       self.name = name
       self.me = parent
       self.primary_key = options.delete(:primary_key) || :id
-      self.klass = options.delete(:class) || target_klass
       self.methods_added = Set.new
       self.options = options
 
       serialize_foreign_key
       create_accessors
       serialize_foreign_key
     end
 
     def foreign_key
-      options[:foreign_key] || :"#{name.to_s.singularize}_id"
+      raise
     end
 
     def create_accessors
       methods_added << name
       methods_added << "#{name}="
@@ -49,11 +47,12 @@
       methods_added.each {|m| me.send(:undef_method, m) if me.respond_to?(m)}
       self.methods_added = Set.new
     end
 
     def target_klass
-      name.to_s.camelcase.singularize.constantize
+      options[:class] || name.to_s.camelcase.singularize.constantize
     end
+    alias klass target_klass
 
     def target_klass_name
       name.to_s.underscore.singularize.gsub('/', '_')
     end