foreign_model 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/foreign_model.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{foreign_model}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Nicholaides"]
-  s.date = %q{2010-04-13}
+  s.date = %q{2010-07-29}
   s.description = %q{Works for ActiveRecord and Mongoid}
   s.email = %q{mike@ablegray.com}
   s.extra_rdoc_files = [

data/lib/foreign_model.rb

@@ -12,9 +12,9 @@ module ForeignModel
   
   module ClassMethods
     def belongs_to_foreign_model(name, options={})
-      options[:class_name] ||= ForeignModel.camelize(name.to_s)
+      options[:class_name] ||= ForeignModel.camelize(name)
       
-      ForeignModel::SCOPE_PROCS[self][name.to_s] = begin
+      ForeignModel::SCOPE_PROCS[self][name] = begin
         if options[:scope]
           options[:scope]
         elsif options[:polymorphic]
@@ -27,43 +27,47 @@ module ForeignModel
           proc{ eval(options[:class_name]) }
         end
       end
-        
-      class_eval %`
-        def parent_proc_for_#{name}
-          @parent_proc_for_#{name} ||= begin
-            ForeignModel::SCOPE_PROCS[self.class]["#{name}"].call(self)
-          end
-        end
-        
-        def #{name}
-          @#{name} ||= parent_proc_for_#{name}.find(#{name}_id) if parent_proc_for_#{name} && #{name}_id && #{name}_id != ""
+      
+      define_method :_foreign_models do
+        @_foreign_models ||= {}
+      end
+      
+      define_method :_parent_procs do
+        @_parent_procs ||= {}
+      end
+       
+      define_method :parent_proc_for do |foreign_model_name|
+        _parent_procs[foreign_model_name] ||= ForeignModel::SCOPE_PROCS[self.class][foreign_model_name].call(self)
+      end
+      
+      define_method name do
+        if parent_proc_for(name) && send("#{name}_id") && send("#{name}_id") != ""
+          _foreign_models[name] ||= parent_proc_for(name).find(send("#{name}_id"))
         end
-
-        def #{name}=(foreign_model)
-          @#{name} = foreign_model
-          if foreign_model
-            send('#{name}_id=', foreign_model.id)
-            send('#{name}_type=', foreign_model.class.name) if respond_to? '#{name}_type='
-          end
+      end
+      
+      define_method "#{name}=" do |foreign_model|
+        _foreign_models[name] = foreign_model
+        if foreign_model
+          send("#{name}_id=",   foreign_model.id)
+          send("#{name}_type=", foreign_model.class.name) if respond_to? "#{name}_type="
         end
-
-        def #{name}_id=(foreign_model_id)
-          if #{name}_id != foreign_model_id
-            write_raw_attribute("#{name}_id", foreign_model_id)
-            @#{name} = nil
-          end
+      end
+      
+      define_method "#{name}_id=" do |foreign_model_id|
+        if send("#{name}_id") != foreign_model_id
+          write_raw_attribute("#{name}_id", foreign_model_id)
+          _foreign_models[name] = nil
         end
-      `
+      end
       
       if options[:polymorphic]
-        class_eval %`  
-          def #{name}_type=(foreign_model_type)
-            if #{name}_type != foreign_model_type
-              write_raw_attribute("#{name}_type", foreign_model_type)
-              @#{name} = nil
-            end
+        define_method "#{name}_type=" do |foreign_model_type|
+          if send("#{name}_type") != foreign_model_type
+            write_raw_attribute("#{name}_type", foreign_model_type)
+            _foreign_models[name] = nil
           end
-        `
+        end
       end
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Mike Nicholaides
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-13 00:00:00 +00:00
+date: 2010-07-29 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency