foreign_key_validation 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmUxYTU1NWRhZjEwYWQ1NDI2Mzk0MDFkMmZiZWViOTZmODc1NzA2MA==
+    Zjg4OGRlMzQzMTJhZmQyOWFhOGQzNTI2NDhhYTE0YThlZWM0Y2NjMg==
   data.tar.gz: !binary |-
-    MjQzNDJhZTc4MzcwZjBhNmJmZmZkODQ5NDU4YmE5OWY1MmU5ZGU0Yg==
+    NTRlZDQxNTUyMTdiZGRmYjQwNTlkMzkwOTUwMTMyMWNjZmUyYzBjZg==
 SHA512:
   metadata.gz: !binary |-
-    OWQ5NWQ5NzkyY2QxZjg3OTE0ZDFmYWZlNzlmYTc1MDJjZDc2ZjZmNTg3NmE1
-    NWE0Y2EzYWJiYWMyNjBiNjE1NWQ5MTkwOGFmYTQ1YWM5YjJmNjMyZTg3ZDFj
-    ZjM5OTQ2MTU5NGJiYzIxZDA4OWNhNmM3MWQ5NDkzODNjYzRmYWU=
+    NDAyZjI0YzcxYzQzOGVmMThkYzk5MmUyNDcyZmY4YjA3OWU2NTc1OTA2ODc2
+    ODVjOWEwZDhhYWVjYjk3MzAyNzZlNzI5NTBmZDNjYjQ2Zjk4MTBlZTRhZjgx
+    M2U2NzBjY2QzYzEyNmEyNzFhYTE1ZDA2ODAwNjYyMTQ0ZDFhNzY=
   data.tar.gz: !binary |-
-    YmQ2ODhmNTEyMjAwYTY4Zjg2MWJiOTMwNDYyNDQ0M2Y4NGZlODE1MDRiODZh
-    NmI2MTM3MmUxYWRlMzg4Y2JkYzQ3ZmI5ODQxNDc4ZWM1N2EyNzllMzBkYjUz
-    MDhiOTQwNmZkNDI4OWJlZmUxMDIzMTc0MGRlZWNiZDMxZjE3ZGU=
+    NWM2OWNhNDVkMDdmNDgxNTRmNzEzMTU1NzNjYTI3M2Y2ZjA3ZWYzYWViYjll
+    NjdmOGE2MjI2NTE3MjE3ZWZmZWZjYTI0ZDk5YTg2N2FlMmQzNDM4YWE0ZmU2
+    NGNlMGM1YTFlNzZjMDEyNjY2OWU1ZjNiY2I5ZTk4Y2NlM2YwNTM=

data/README.md

@@ -23,7 +23,7 @@ Or install it yourself as:
 
 ## Usage
 
-Call `validate_foreign_keys` in your model. By default it assumes that it should check all foreign keys against the `user_id` column. So any relation (except `user`) will be checked for a matching `user_id` if the column exists.
+Call `validate_foreign_keys` below the association definitions (`belongs_to`, ...) in your model. By default it assumes that it should check all foreign keys against the `user_id` column. So any relation (except `user`) will be checked for a matching `user_id` if the column exists.
 
 Change behaviour by calling `validate_foreign_keys` with arguments hash.
 

data/lib/foreign_key_validation/model_extension.rb

@@ -5,6 +5,8 @@ module ForeignKeyValidation
     included do
       private
       def validate_foreign_key(validate_against, relation)
+        return if send(relation).try("#{validate_against}_id").nil? or try("#{validate_against}_id").nil?
+
         if send(relation).send("#{validate_against}_id") != send("#{validate_against}_id")
           errors.add(validate_against, "#{validate_against} of #{relation} does not match #{self.class.table_name} #{validate_against}")
         end
@@ -14,10 +16,10 @@ module ForeignKeyValidation
     module ClassMethods
       def validate_foreign_keys(opt={})
         validate_against  = (opt[:on] || :user).to_s
-        reflections       = self.reflect_on_all_associations(:belongs_to).map(&:name).map(&:to_s)
+        reflections       = reflect_on_all_associations(:belongs_to).map(&:name).map(&:to_s)
         validate_with     = ((Array(opt[:with]).map(&:to_s) if opt[:with]) || reflections).reject {|n| n == validate_against}
 
-        raise ArgumentError, "No foreign key #{validate_against} on #{self.table_name} table!" unless reflections.include?(validate_against)
+        raise ArgumentError, "No foreign key #{validate_against} on #{table_name} table!" unless reflections.include?(validate_against)
         raise ArgumentError, "Unknown relation in #{validate_with}!" unless validate_with.all? {|k| reflections.include?(k) }
 
         define_method "validate_foreign_keys_on_#{validate_against}" do

data/lib/foreign_key_validation/version.rb

@@ -1,3 +1,3 @@
 module ForeignKeyValidation
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/models/model_spec.rb

@@ -2,10 +2,11 @@ require 'spec_helper'
 
 describe ForeignKeyValidation::ModelExtension do
 
+  # NOTE: it's important to not create the objects through relation (user.projects.create...)
+  #       it looks like active_record is caching the classes - but we need to test different class configs
+
   context "Without calling validation" do
 
-    # NOTE: it's important here to not create the object through relation (user.projects.create...)
-    #       it looks like active_record is caching the classes - but we need to test different class configs
     let(:user) { User.create }
     let(:project) { Project.create user: user }
     let(:idea) { Idea.create user: user, project: project }
@@ -55,8 +56,6 @@ describe ForeignKeyValidation::ModelExtension do
       Comment.send :validate_foreign_keys
     end
 
-    # NOTE: it's important here to not create the object through relation (user.projects.create...)
-    #       it looks like active_record is caching the classes - but we need to test different class configs
     let(:user) { User.create }
     let(:project) { Project.create user: user }
     let(:idea) { Idea.create user: user, project: project }
@@ -113,8 +112,6 @@ describe ForeignKeyValidation::ModelExtension do
       end
     end
 
-    # NOTE: it's important here to not create the object through relation (user.projects.create...)
-    #       it looks like active_record is caching the classes - but we need to test different class configs
     let(:user) { User.create }
     let(:project) { Project.create user: user }
     let(:idea) { Idea.create user: user, project: project }
@@ -158,8 +155,6 @@ describe ForeignKeyValidation::ModelExtension do
 
   context "With calling validation with wrong attributes hash" do
 
-    # NOTE: it's important here to not create the object through relation (user.projects.create...)
-    #       it looks like active_record is caching the classes - but we need to test different class configs
     let(:user) { User.create }
     let(:project) { Project.create user: user }
     let(:issue) { Issue.create user: user, project: project }
@@ -175,5 +170,46 @@ describe ForeignKeyValidation::ModelExtension do
 
   end
 
+  context "With calling validation and missing foreign key on self" do
+
+    before do
+      Issue.class_eval do
+        validate_foreign_keys
+      end
+    end
+
+    let(:user) { User.create }
+    let(:project) { Project.create user: user }
+    let(:issue) { Issue.create project: project }
+
+    it "does not allow to rewrite user id of issue" do
+      issue.user_id = 42
+      issue.save
+      expect(issue.errors.messages.values.flatten).to include("user of project does not match issues user")
+      expect(issue.reload.user_id).to_not eq(42)
+    end
+
+  end
+
+  context "With calling validation and missing foreign key on relation" do
+
+    before do
+      Issue.class_eval do
+        validate_foreign_keys
+      end
+    end
+
+    let(:user) { User.create }
+    let(:project) { Project.create }
+    let(:issue) { Issue.create project: project, user: user }
+
+    it "allow to rewrite user id of issue" do
+      issue.user_id = 42
+      issue.save
+      issue.reload
+      expect(issue.user_id).to eq(42)
+    end
+
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreign_key_validation
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Marcus Geißler