bigamy 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/bigamy.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bigamy}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Angilly"]
@@ -30,7 +30,8 @@ Gem::Specification.new do |s|
      "test/test_helper.rb",
      "test/unit/test_ar_side.rb",
      "test/unit/test_helper.rb",
-     "test/unit/test_mongo_side.rb"
+     "test/unit/test_mongo_side.rb",
+     "test/unit/test_proxy.rb"
   ]
   s.homepage = %q{http://github.com/ryana/bigamy}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -42,7 +43,8 @@ Gem::Specification.new do |s|
      "test/test_helper.rb",
      "test/unit/test_ar_side.rb",
      "test/unit/test_helper.rb",
-     "test/unit/test_mongo_side.rb"
+     "test/unit/test_mongo_side.rb",
+     "test/unit/test_proxy.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/bigamy/proxy.rb

@@ -1,14 +1,12 @@
 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
 
@@ -18,7 +16,7 @@ module Bigamy
     end
 
     def foreign_key
-      options[:foreign_key] || :"#{name.to_s.singularize}_id"
+      raise
     end
 
     def create_accessors
@@ -51,8 +49,9 @@ module Bigamy
     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('/', '_')

data/test/test_helper.rb

@@ -22,6 +22,8 @@ end
 class User < ActiveRecord::Base
 end
 
+Other = User
+
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'bigamy'

data/test/unit/test_mongo_side.rb

@@ -37,12 +37,36 @@ class TestMongoSide < Test::Unit::TestCase
       assert User.included_modules.include?(Bigamy::ActiveRecord::InstanceMethods)
     end
 
+    should "use class option" do
+      Doc.has_one_ar :user, :class => Other
+      assert_equal Other, Doc.bigamy_associations[:user].target_klass
+    end
+
+    should "use foreign_key option" do
+      Doc.has_one_ar :user, :foreign_key => :random_thing
+      assert_equal :random_thing, Doc.bigamy_associations[:user].foreign_key
+    end
+
+    should "user primary_key option" do
+      Doc.has_one_ar :user, :primary_key => :random_thing
+      assert_equal :random_thing, Doc.bigamy_associations[:user].primary_key
+    end
+
     context "that has_one_ar :user" do
       setup do
         Doc.has_one_ar :user
         @user = User.create!
       end
 
+      should "have correct target and root classes" do
+        assert_equal Doc, Doc.bigamy_associations[:user].root_klass
+        assert_equal User, Doc.bigamy_associations[:user].target_klass
+      end
+      
+      should "have correct foreign_key" do
+        assert_equal :doc_id, Doc.bigamy_associations[:user].foreign_key
+      end
+
       should "create accessors" do
         assert Doc.new.respond_to?(:user)
         assert Doc.new.respond_to?(:user=)
@@ -79,6 +103,15 @@ class TestMongoSide < Test::Unit::TestCase
         Doc.has_many_ar :users
       end
 
+      should "have correct target and root classes" do
+        assert_equal Doc, Doc.bigamy_associations[:users].root_klass
+        assert_equal User, Doc.bigamy_associations[:users].target_klass
+      end
+      
+      should "have correct foreign_key" do
+        assert_equal :doc_id, Doc.bigamy_associations[:users].foreign_key
+      end
+
       should "create accessors" do
         assert Doc.new.respond_to?(:users)
         assert Doc.new.respond_to?(:users=)
@@ -125,6 +158,14 @@ class TestMongoSide < Test::Unit::TestCase
         Doc.belongs_to_ar :user
       end
 
+      should "have correct target and root classes" do
+        assert_equal Doc, Doc.bigamy_associations[:user].root_klass
+        assert_equal User, Doc.bigamy_associations[:user].target_klass
+      end
+      
+      should "have correct foreign_key" do
+        assert_equal :user_id, Doc.bigamy_associations[:user].foreign_key
+      end
       should "create accessors" do
         assert Doc.new.respond_to?(:user)
         assert Doc.new.respond_to?(:user=)

data/test/unit/test_proxy.rb

@@ -0,0 +1,101 @@
+require File.join(File.dirname(__FILE__), 'test_helper')
+
+module A
+  class B
+  end
+end
+
+class C
+end
+
+class DumbBelongsToProxy < Bigamy::BelongsTo
+  def add_getter
+  end
+
+  def add_setter
+  end
+end
+
+class DumbHasProxy < Bigamy::HasOne
+  def add_getter
+  end
+
+  def add_setter
+  end
+end
+
+class TestProxy < Test::Unit::TestCase
+
+  context "A referenced association proxy" do
+    setup do
+      @proxy = DumbHasProxy.new(C, :user, {})
+    end
+
+    should "have proper foreign_key" do
+      assert_equal :c_id, @proxy.foreign_key
+    end
+  end
+
+  context "An referenced association proxy with a namespaced model parent" do
+    setup do
+      @proxy = DumbHasProxy.new(A::B, :user, {})
+    end
+
+    should "have proper foreign_key" do
+      assert_equal :a_b_id, @proxy.foreign_key
+    end
+  end
+
+  context "An referenced association proxy with a namespaced model parent and a custom foreign_key" do
+    setup do
+      @proxy = DumbHasProxy.new(A::B, :user, {:foreign_key => :drats})
+    end
+
+    should "have proper foreign_key" do
+      assert_equal :drats, @proxy.foreign_key
+    end
+  end
+
+  context "An referenced association proxy with a namespaced target" do
+    setup do
+      @proxy = DumbHasProxy.new(A::B, :user, {})
+    end
+
+    should "have proper foreign_key" do
+      assert_equal :a_b_id, @proxy.foreign_key
+    end
+
+  end
+
+  context "An association proxy" do
+    setup do
+      @proxy = DumbBelongsToProxy.new(C, :user, {})
+    end
+
+    should "have proper foreign_key" do
+      assert_equal :user_id, @proxy.foreign_key
+    end
+  end
+
+  context "An association proxy with a namespaced model parent" do
+    setup do
+      @proxy = DumbBelongsToProxy.new(A::B, :user, {})
+    end
+
+    should "have proper foreign_key" do
+      assert_equal :user_id, @proxy.foreign_key
+    end
+  end
+
+  context "An association proxy with a namespaced target" do
+    setup do
+      @proxy = DumbBelongsToProxy.new(C, :user, {:class => A::B})
+    end
+
+    should "have proper foreign_key" do
+      assert_equal :user_id, @proxy.foreign_key
+    end
+
+  end
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Ryan Angilly
@@ -125,6 +125,7 @@ files:
 - test/unit/test_ar_side.rb
 - test/unit/test_helper.rb
 - test/unit/test_mongo_side.rb
+- test/unit/test_proxy.rb
 has_rdoc: true
 homepage: http://github.com/ryana/bigamy
 licenses: []
@@ -161,3 +162,4 @@ test_files:
 - test/unit/test_ar_side.rb
 - test/unit/test_helper.rb
 - test/unit/test_mongo_side.rb
+- test/unit/test_proxy.rb