bigamy 0.2.0 → 0.2.1

data/README

@@ -2,22 +2,18 @@
 Enable seamless Ruby-ness between ActiveRecord objects & MongoMapper documents
 
 class User < ActiveRecord::Base
-  Bigamy.setup self
-
   has_one_mm :doc
   has_many_mm :photos
 end
 
 class Doc
   include MongoMapper::Document
-  Bigamy.setup self
 
   belongs_to_ar :user
 end
 
 class Photo
   include MongoMapper::Document
-  Bigamy.setup self
 
   belongs_to_ar :user
 end
@@ -56,10 +52,7 @@ All class methods take :foreign_key, :class, and :primary_key options as a hash
 
 
 == Setup
-Bigamy.setup can take any number of classes as arguments, and can be in an initializer like:
-
-Bigamy.setup User, Doc
-
+Bigamy installs itself into MongoMapper and ActiveRecord automatically.
 
 = License
 Bigmay is released under the MIT license.

data/VERSION

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

data/bigamy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bigamy}
-  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 = ["Ryan Angilly"]
-  s.date = %q{2010-06-30}
+  s.date = %q{2010-07-06}
   s.description = %q{}
   s.email = %q{ryan@angilly.com}
   s.extra_rdoc_files = [

data/lib/bigamy.rb

@@ -125,6 +125,10 @@ module Bigamy
       def import_id_val i
         BSON::ObjectID.from_string(i)
       end
+
+      def reset_current_relationships f_key, f_id
+        collection.update({f_key => f_id}, {f_key => nil}, :multi => true, :upsert => false)
+      end
     end
   end
 

data/lib/bigamy/proxy.rb

@@ -74,7 +74,7 @@ module Bigamy
     def add_getter 
       me.class_eval <<-EOF
         def #{name}
-          self.id.nil? ? nil : #{target_klass}.first(:conditions => {:#{foreign_key} => export_id_val(self.id)})
+          self.#{primary_key}.nil? ? nil : #{target_klass}.first(:conditions => {:#{foreign_key} => export_id_val(self.#{primary_key})})
         end
       EOF
     end
@@ -82,11 +82,20 @@ module Bigamy
     def add_setter
       me.class_eval <<-EOF
         def #{name}= v
-          raise NewRecordAssignment.new('Child must be saved') if v.new_record?
-          raise NewRecordAssignment.new('Parent must be saved') if self.new_record?
-          raise TypeError unless v.is_a? #{klass}
-
-          v.#{foreign_key} = export_id_val(self.id)
+          if v.nil?
+            new_id = nil
+          else
+            raise NewRecordAssignment.new('Child must be saved') if v.new_record?
+            raise NewRecordAssignment.new('Parent must be saved') if self.new_record?
+            raise TypeError unless v.is_a? #{klass}
+            new_id = export_id_val(self.#{primary_key})
+          end
+
+          if #{name}
+            #{name}.update_attributes :#{foreign_key} => nil
+          end
+
+          v.#{foreign_key} = new_id
           v.save!
         end
       EOF
@@ -101,7 +110,7 @@ module Bigamy
     def add_getter 
       me.class_eval <<-EOF
         def #{name}
-          self.id.nil? ? nil : #{target_klass}.all(:conditions => {:#{foreign_key} => export_id_val(self.id)})
+          self.#{primary_key}.nil? ? nil : #{target_klass}.all(:conditions => {:#{foreign_key} => export_id_val(self.#{primary_key})})
         end
       EOF
     end
@@ -109,10 +118,18 @@ module Bigamy
     def add_setter
       me.class_eval <<-EOF
         def #{name}= val
-          raise NewRecordAssignment.new('All children must be saved') if val.select(&:new_record?).present?
-          raise NewRecordAssignment.new('Parent must be saved') if self.new_record?
-
-          val.each {|v| v.send "#{foreign_key}=", export_id_val(self.id); v.save! }
+          val ||= []
+          if val == []
+            new_id = nil
+          else
+            raise NewRecordAssignment.new('All children must be saved') if val.select(&:new_record?).present?
+            raise NewRecordAssignment.new('Parent must be saved') if self.new_record?
+            new_id = export_id_val(self.#{primary_key})
+          end
+          
+          #{name}.each {|x| x.update_attributes :#{foreign_key} => nil }
+
+          val.each {|v| v.send "#{foreign_key}=", new_id; v.save! }
         end
       EOF
     end
@@ -130,7 +147,7 @@ module Bigamy
     def add_getter
       code = <<-EOF
         def #{name}
-          self.id.blank? ? nil : #{klass}.first(:conditions => {:#{primary_key} => export_id_val(self.id)})
+          self.#{primary_key}.blank? ? nil : #{klass}.first(:conditions => {:#{primary_key} => export_id_val(self.#{primary_key})})
         end
       EOF
 
@@ -140,10 +157,15 @@ module Bigamy
     def add_setter
       code = <<-EOF
         def #{name}= val
+          if val.nil?
+            set_value(:#{foreign_key}, nil)
+            return
+          end
+          
           raise NewRecordAssignment if val.new_record?
           raise TypeError.new("Should get #{klass}") unless val.is_a? #{klass}
 
-          set_value :#{foreign_key}, val.id
+          set_value :#{foreign_key}, val.#{primary_key}
         end
       EOF
 

data/test/unit/test_ar_side.rb

@@ -101,6 +101,16 @@ class TestArSide < Test::Unit::TestCase
             @user.docs = [@u1, @u2]
           end
 
+          should "clear on nil assignment" do
+            @user.docs = nil
+            assert_equal [], Doc.find_by_user_id(@user.id)
+          end
+
+          should "clear on nil assignment" do
+            @user.docs = nil
+            assert_equal [], Doc.find_all_by_user_id(@user.id)
+          end
+
           should "assign user_id on docs" do
             assert Doc.find(@u1.id, @u2.id).all? {|x| x.user_id == @user.id}
           end
@@ -135,18 +145,28 @@ class TestArSide < Test::Unit::TestCase
           end
         end
 
-        context "with a saved doc" do
-          setup { @doc.save! }
-
-          should "save user" do
+        context "with a saved doc and user" do
+          setup do
+            @doc.save!
             @user.doc = @doc
             @user.save!
+          end
 
+          should "save user" do
             assert !@user.doc_id.nil?
             assert_equal @user.doc_id, @doc.id
             assert_equal 1, Doc.count
             assert_equal 1, User.count
           end
+
+          should "clear relationship on nil assignment" do
+            @user.doc = nil
+            @user.save!
+
+            u = User.find(@user.id)
+            assert_equal nil, u.doc_id
+          end
+
         end
       end
     end

data/test/unit/test_proxy.rb

@@ -8,94 +8,99 @@ end
 class C
 end
 
-class DumbBelongsToProxy < Bigamy::BelongsTo
-  def add_getter
-  end
-
-  def add_setter
-  end
-end
+class TestProxy < Test::Unit::TestCase
 
-class DumbHasProxy < Bigamy::HasOne
-  def add_getter
-  end
 
-  def add_setter
+  def self.should_have_options name, options
+    should "have correct options for #{name}" do
+      assert_equal options[:primary_key], @proxy.primary_key
+      assert_equal options[:foreign_key], @proxy.foreign_key
+      assert_equal options[:target_klass], @proxy.target_klass
+      assert_equal options[:root_klass], @proxy.root_klass
+    end
   end
-end
 
-class TestProxy < Test::Unit::TestCase
 
   context "A referenced association proxy" do
     setup do
-      @proxy = DumbHasProxy.new(C, :user, {})
+      @proxy = Bigamy::HasOne.new(C, :user, {})
     end
 
-    should "have proper foreign_key" do
-      assert_equal :c_id, @proxy.foreign_key
-    end
+    should_have_options 'standard', :primary_key => :id,
+                                    :foreign_key => :c_id,
+                                    :target_klass => User,
+                                    :root_klass => C
   end
 
   context "An referenced association proxy with a namespaced model parent" do
     setup do
-      @proxy = DumbHasProxy.new(A::B, :user, {})
+      @proxy = Bigamy::HasOne.new(A::B, :user, {})
     end
 
-    should "have proper foreign_key" do
-      assert_equal :a_b_id, @proxy.foreign_key
-    end
+    should_have_options 'standard', :primary_key => :id,
+                                    :foreign_key => :a_b_id,
+                                    :target_klass => User,
+                                    :root_klass => A::B
+ 
+
   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
+      @proxy = Bigamy::HasOne.new(A::B, :user, {:foreign_key => :drats})
     end
+    should_have_options 'standard', :primary_key => :id,
+                                    :foreign_key => :drats,
+                                    :target_klass => User,
+                                    :root_klass => A::B
+ 
   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
+      @proxy = Bigamy::HasOne.new(C, :user, {:class => A::B})
     end
-
+  
+    should_have_options 'standard', :primary_key => :id,
+                                    :foreign_key => :c_id,
+                                    :target_klass => A::B,
+                                    :root_klass => C
   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
+      @proxy = Bigamy::BelongsTo.new(C, :user, {})
     end
+  
+    should_have_options 'standard', :primary_key => :id,
+                                    :foreign_key => :user_id,
+                                    :target_klass => User,
+                                    :root_klass => C
+ 
   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
+      @proxy = Bigamy::BelongsTo.new(A::B, :user, {})
     end
+  
+    should_have_options 'standard', :primary_key => :id,
+                                    :foreign_key => :user_id,
+                                    :target_klass => User,
+                                    :root_klass => A::B
+ 
   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
+      @proxy = Bigamy::BelongsTo.new(C, :user, {:class => A::B})
     end
 
+    should_have_options 'standard', :primary_key => :id,
+                                    :foreign_key => :user_id,
+                                    :target_klass => A::B,
+                                    :root_klass => C
+ 
   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: 
 - Ryan Angilly
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-30 00:00:00 -04:00
+date: 2010-07-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency