addywaddy-couch_surfer 0.0.4 → 0.0.5

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+0.0.5 (2009-02-06)
+------------------
+ - BUGFIX: `belongs_to` now takes `:class_name` (see Employer class in Association spec)
+
 0.0.4 (2009-02-04)
 ------------------
  - `has_many :through`

data/lib/couch_surfer.rb

@@ -2,7 +2,7 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module CouchSurfer
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
   autoload :Model,        'couch_surfer/model'
   autoload :Validations,        'couch_surfer/validations'
   autoload :Associations,        'couch_surfer/associations'

data/lib/couch_surfer/associations.rb

@@ -35,7 +35,7 @@ module CouchSurfer
         if options[:through]
           define_method_for_children(options[:through], options)
           define_method children do
-            name = options[:class_name] || children.to_s.singular
+            name = (options[:class_name] || children).to_s.singular
             class_name =  ::Extlib::Inflection.camelize(name)
             klass = ::Extlib::Inflection.constantize(class_name)
             through_items = self.send("#{options[:through]}")
@@ -51,12 +51,13 @@ module CouchSurfer
       def belongs_to *args
         options = extract_options!(args)
         parent = args.first
+        parent_name = (options[:class_name] || parent).to_s
         define_method parent do
-          name = ::Extlib::Inflection.camelize(parent.to_s)
-          klass = ::Extlib::Inflection.constantize(name)
-          parent_id = self["#{parent.to_s}_id"]
+          class_name = ::Extlib::Inflection.camelize(parent_name)
+          klass = ::Extlib::Inflection.constantize(class_name)
+          parent_id = self["#{parent_name}_id"]
           if parent_id
-            klass.send(:get, self["#{parent.to_s}_id"])
+            klass.send(:get, self["#{parent_name}_id"])
           end
         end
 

data/spec/lib/associations_spec.rb

@@ -50,7 +50,7 @@ class Employee
   
   key_accessor :email, :account_id, :role
   
-  belongs_to :account
+  belongs_to :employer, :class_name => :account
   has_many :shirts, :inline => true
   has_many :projects, :through => :memberships
   
@@ -82,8 +82,11 @@ describe CouchSurfer::Associations do
   
   describe "belongs_to" do
     it "should return it's parent" do
-      @employee = @account.employees.first
-      @employee.account.should == @account
+      @project.account.should == @account
+    end
+    
+    it "should take the class_name into consideration" do
+      @employee.employer.should == @account
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: addywaddy-couch_surfer
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Adam Groves