validates_belongs_to 0.0.3 → 0.0.4

data/README.md

@@ -1,6 +1,6 @@
 # validates_belongs_to [![Build Status](https://secure.travis-ci.org/Arjeno/validates_belongs_to.png?branch=master)](http://travis-ci.org/Arjeno/validates_belongs_to)
 
-This is a simple validator which validates an association belongs to the same owner.
+Validate your associations to ensure they belong to the same owner. Also works for `has_and_belongs_to_many` associations.
 
 ## Usage
 
@@ -19,7 +19,7 @@ class Car < ActiveRecord::Base
 end
 ```
 
-## Example code
+## Example code: belongs_to
 
 ```ruby
 class User < ActiveRecord::Base
@@ -44,8 +44,37 @@ warehouse = user.warehouses.create
 user_2 = User.create
 warehouse_2 = user_2.warehouses.create
 
-car = warehouse.cars.create # Works fine
+Car.create :warehouse => warehouse # Works fine
+Car.create :warehouse => warehouse_2 # Validation failed: Warehouse does not belong to user
+```
+
+## Example code: has_and_belongs_to_many
+
+
+```ruby
+class User < ActiveRecord::Base
+  has_many :warehouses
+  has_many :cars
+end
+
+class Warehouse < ActiveRecord::Base
+  has_many :cars
+  belongs_to :user
+  has_and_belongs_to_many :cars
+end
+
+class Car < ActiveRecord::Base
+  belongs_to :user
+  has_and_belongs_to_many :warehouses
+  validates :warehouses, :belongs_to => :user
+end
+
+user = User.create
+warehouse = user.warehouses.create
+
+user_2 = User.create
+warehouse_2 = user_2.warehouses.create
 
-car.warehouse = warehouse_2
-car.save! # Validation failed: Warehouse does not belong to user
+Car.create :warehouses => [warehouse] # Works fine
+Car.create :warehouses => [warehouse_2] # Warehouses do not belong to user
 ```

data/lib/validates_belongs_to/locale/en.yml

@@ -1,4 +1,5 @@
 en:
   errors:
     messages:
-      belongs_to: "does not belong to %{value}"
+      belongs_to: "does not belong to %{value}"
+      belongs_to_habtm: "do not belong to %{value}"

data/lib/validates_belongs_to/version.rb

@@ -1,3 +1,3 @@
 module ValidatesBelongsTo
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/validates_belongs_to.rb

@@ -16,16 +16,33 @@ module ValidatesBelongsTo
   class BelongsToValidator < ActiveModel::EachValidator
 
     def validate_each(record, attribute, owner)
-      record_value  = get_id_by_association(record, options[:with])
-      owner_value   = get_id_by_association(owner, options[:with])
+      association       = record.class.reflect_on_association(attribute)
+      association_type  = association.macro
+      method            = "validate_by_#{association_type}"
 
-      unless record_value == owner_value || owner_value.nil?
-        record.errors.add(attribute, :belongs_to, options.merge(:value => options[:with]))
-      end
+      send(method, record, attribute, owner) if respond_to?(method)
     end
 
     protected
 
+      def validate_by_belongs_to(record, attribute, owner)
+        record_value  = get_id_by_association(record, options[:with])
+        owner_value   = get_id_by_association(owner, options[:with])
+
+        unless record_value == owner_value || owner_value.nil?
+          record.errors.add(attribute, :belongs_to, options.merge(:value => options[:with]))
+        end
+      end
+
+      def validate_by_has_and_belongs_to_many(record, attribute, owner)
+        record_value  = get_id_by_association(record, options[:with])
+        owner_values  = owner.map { |o| get_id_by_association(o, options[:with]) }.compact.uniq
+
+        unless owner_values == [record_value] || owner_values.empty?
+          record.errors.add(attribute, :belongs_to_habtm, options.merge(:value => options[:with]))
+        end
+      end
+
       def get_id_by_association(record, association_name)
         return nil if record.nil?
 

data/spec/support/models.rb

@@ -5,6 +5,7 @@ end
 
 class Warehouse < ActiveRecord::Base
   has_many :cars
+  has_and_belongs_to_many :shared_cars
   belongs_to :user
 end
 
@@ -12,4 +13,10 @@ class Car < ActiveRecord::Base
   belongs_to :user
   belongs_to :warehouse
   validates :warehouse, :belongs_to => :user
+end
+
+class SharedCar < ActiveRecord::Base
+  belongs_to :user
+  has_and_belongs_to_many :warehouses
+  validates :warehouses, :belongs_to => :user
 end

data/spec/support/schema.rb

@@ -15,4 +15,15 @@ ActiveRecord::Schema.define do
     t.belongs_to :warehouse
     t.timestamps
   end
+
+  create_table :shared_cars, :force => true do |t|
+    t.belongs_to :user
+    t.timestamps
+  end
+
+  create_table :warehouses_shared_cars, :id => false, :force => true do |t|
+    t.belongs_to :shared_car
+    t.belongs_to :warehouse
+    t.timestamps
+  end
 end

data/spec/validates_belong_to_spec.rb

@@ -10,22 +10,49 @@ describe ValidatesBelongsTo do
     let(:warehouse)   { Warehouse.create({ :user => user }) }
     let(:warehouse_2) { Warehouse.create({ :user => user_2 }) }
 
-    subject { Car.new({ :user => user }) }
+    context 'with belongs_to' do
 
-    it { should allow_value(warehouse).for(:warehouse) }
-    it { should_not allow_value(warehouse_2).for(:warehouse).with_message('does not belong to user') }
+      subject { Car.new({ :user => user }) }
 
-    describe 'when association owner is set to nil' do
+      it { should allow_value(warehouse).for(:warehouse) }
+      it { should_not allow_value(warehouse_2).for(:warehouse).with_message('does not belong to user') }
 
-      it { should allow_value(Warehouse.create).for(:warehouse) }
+      describe 'when association owner is set to nil' do
+
+        it { should allow_value(Warehouse.create).for(:warehouse) }
+
+      end
+
+      describe 'when record owner is set to nil' do
+
+        subject { Car.new }
+
+        it { should_not allow_value(warehouse).for(:warehouse) }
+
+      end
 
     end
 
-    describe 'when record owner is set to nil' do
+    context 'with has_and_belongs_to_many' do
+
+      subject { SharedCar.new({ :user => user }) }
+
+      it { should allow_value([warehouse]).for(:warehouses) }
+      it { should_not allow_value([warehouse_2]).for(:warehouses).with_message('do not belong to user') }
+
+      describe 'when association owner is set to nil' do
+
+        it { should allow_value([Warehouse.create]).for(:warehouses) }
+
+      end
+
+      describe 'when record owner is set to nil' do
+
+        subject { SharedCar.new }
 
-      subject { Car.new }
+        it { should_not allow_value([warehouse]).for(:warehouses) }
 
-      it { should_not allow_value(warehouse).for(:warehouse) }
+      end
 
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validates_belongs_to
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-04 00:00:00.000000000 Z
+date: 2013-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 934803748451263386
+      hash: -3583830976604260693
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 934803748451263386
+      hash: -3583830976604260693
 requirements: []
 rubyforge_project: validates_belongs_to
 rubygems_version: 1.8.24