validates_belongs_to 0.0.1 → 0.0.2

data/Gemfile

@@ -4,3 +4,8 @@ gem 'rake'
 
 # Specify your gem's dependencies in validates_belongs_to.gemspec
 gemspec
+
+group :development do
+  gem 'rspec'
+  gem 'shoulda-matchers'
+end

data/README.md

@@ -2,6 +2,23 @@
 
 This is a simple validator which validates an association belongs to the same owner.
 
+## Usage
+
+Add to your Gemfile:
+
+```ruby
+gem 'validates_belongs_to'
+```
+
+Add the validator to your model:
+
+```ruby
+class Car < ActiveRecord::Base
+  validates :warehouse, :belongs_to => :user
+  # or you can use validates_belongs_to :warehouse, :user
+end
+```
+
 ## Example code
 
 ```ruby

data/lib/validates_belongs_to/locale/en.yml

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

data/lib/validates_belongs_to/version.rb

@@ -1,3 +1,3 @@
 module ValidatesBelongsTo
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/validates_belongs_to.rb

@@ -16,8 +16,8 @@ module ValidatesBelongsTo
   class BelongsToValidator < ActiveModel::EachValidator
 
     def validate_each(record, attribute, owner)
-      record_value  = get_id_by_association(record)
-      owner_value   = get_id_by_association(owner)
+      record_value  = get_id_by_association(record, options[:with])
+      owner_value   = get_id_by_association(owner, options[:with])
 
       unless record_value == owner_value
         record.errors.add(attribute, :belongs_to, options.merge(:value => options[:with]))
@@ -26,13 +26,15 @@ module ValidatesBelongsTo
 
     protected
 
-      def get_id_by_association(record)
-        association = record.class.reflect_on_association(options[:with])
+      def get_id_by_association(record, association_name)
+        return nil if record.nil?
+
+        association = record.class.reflect_on_association(association_name)
 
         if association.try(:macro) == :belongs_to
           record.send(association.foreign_key)
         else
-          association_resource = record.send(options[:with])
+          association_resource = record.send(association_name)
           association_resource.try(association_resource.class.primary_key)
         end
       end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
+require 'active_record'
 require 'validates_belongs_to'
-
+require 'shoulda/matchers'
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3",
                                         :database => File.dirname(__FILE__) + "/validates_belongs_to.sqlite3")
 

data/spec/validates_belong_to_spec.rb

@@ -2,30 +2,18 @@ require 'spec_helper'
 
 describe ValidatesBelongsTo do
 
-  context "valid" do
-
-    let(:user)      { User.create }
-    let(:warehouse) { Warehouse.create({ :user => user }) }
-
-    subject { Car.create({ :user => user, :warehouse => warehouse })}
-
-    it { should be_valid }
-
-  end
-
-  context "invalid" do
+  context :validation do
 
     let(:user)        { User.create }
     let(:user_2)      { User.create }
-    let(:warehouse)   { Warehouse.create({ :user => user }) }
 
-    subject { Car.create({ :user => user_2, :warehouse => warehouse })}
+    let(:warehouse)   { Warehouse.create({ :user => user }) }
+    let(:warehouse_2) { Warehouse.create({ :user => user_2 }) }
 
-    it { should_not be_valid }
+    subject { Car.new({ :user => user }) }
 
-    it "should contain validation error" do
-      subject.errors[:warehouse].should include 'does not belong to user'
-    end
+    it { should allow_value(warehouse).for(:warehouse) }
+    it { should_not allow_value(warehouse_2).for(:warehouse).with_message('does not belong to user') }
 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validates_belongs_to
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-15 00:00:00.000000000Z
+date: 2013-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70281984882240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70281984882240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70281984881560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: '2.3'
   type: :development
   prerelease: false
-  version_requirements: *70281984881560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70281984881100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70281984881100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70281984879600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +69,12 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70281984879600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Validates wether an association belongs to the same owner
 email:
 - mail@arjen.me
@@ -87,15 +107,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2930070579441286280
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2930070579441286280
 requirements: []
 rubyforge_project: validates_belongs_to
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Validates wether an association belongs to the same owner