foreign_key_validation 0.0.7 → 0.0.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjBhMDg4MzJhYjgzMjlkMDJkZDBiODI5ZGM1ZjE5MWQ2NmI1YzIxMw==
+    ZmIyZjgxODI4YjY3ZjBiMWE5YzAxMWY1OTU2MjBjMmM2NDY4ZTVlNA==
   data.tar.gz: !binary |-
-    ZTBiZTExNmE4NjM4MGRmM2QwYjI3MmExZDBlMmU3NjY4ZDlkYTIzMw==
+    NGE0M2NkZDBmZDM0ODU0NWVjNzA4NWQ3NWFiNWNiOTYxMDZkOGYxZg==
 SHA512:
   metadata.gz: !binary |-
-    ZDM4OGQ0ZDRhYjNhOTFhNzIzMTM4YzUxOWI1ZWJhZGNjYjNhNDgzNDEyMWVl
-    YzA1ODQwYzRjYjY5MGY2MTBlMTMxOGU5MDE2YjRlMjgyNmMyZWFkNGJlODJk
-    NjFiYjAyZjIyYTg5MWUzMDhmMWU5MjNlNGIzNjMxZGE5MDIxOWQ=
+    OTRiYzRkNzFhMTI3MzllZTdiOWMwZjIyOWM5NDcyYjMzNjg5Y2U5YTZjMTZi
+    MDk0NzZhYjM0ZjE0NDM3ZTA5OWMyNTIwNGU0YjRmM2EwZjZlNzEzZGJiNmY1
+    OTgxMTU1YzQ0NzU2YjlmZDQxOGQ2OGQ3MmE2ZGEyYTM0YzkwNTg=
   data.tar.gz: !binary |-
-    YTYzOTRlODQ1ZjgwYWFlNTIzYmRmNDRmNTVjMDJhMTViNzVmNTc3ZmNlYThl
-    NWE0Yjc3NDA4OTgyZWUxN2M3ZTJlZDQ1MTYwMmFjZDY2MzM5ZDllMjM3ZTNk
-    YzI1NWNmZTI4ZjI1NmNiMDMzOWU0Y2U1MjRjZWVlY2Q1MDMyYTA=
+    NmY1ZjI1MDVmMmVhM2U4Yjk3MTg0OTE5NTZjYzg5ZjhkNzg5NTIzYjIxNzFh
+    ZWI4M2JkY2E4YjM3MTVjMTI1Y2IzZjFjNDY3ODQxODlkMWNlZTEyYzIzYTcy
+    ZmYwYzhkNGQ4M2M2Y2YyODg3ZDNlZThjYzRjNDhiMTgxMzY2ODM=

data/foreign_key_validation.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "rails", "~> 4.0.0"
+  spec.add_development_dependency "rails", "~> 4.0"
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 10.1"
   spec.add_development_dependency "rspec-rails", "~> 3.0"

data/lib/foreign_key_validation/model_extension.rb

@@ -8,7 +8,7 @@ module ForeignKeyValidation
         return if send(reflection_name).try(validate_against_key).nil? or try(validate_against_key).nil?
 
         if send(reflection_name).send(validate_against_key) != send(validate_against_key)
-          errors.add(validate_against_key, "#{validate_against_key} of #{reflection_name} does not match #{self.class.name.tableize} #{validate_against_key}")
+          errors.add(validate_against_key, "#{validate_against_key} of #{reflection_name} does not match #{self.class.name.tableize} #{validate_against_key}.")
         end
       end
     end
@@ -18,12 +18,13 @@ module ForeignKeyValidation
         subclasses.map {|klass| klass.send(:validate_foreign_keys, opt) } if subclasses.any?
 
         validate_against      = (opt[:on] || :user).to_s
-        validate_against_key  = "#{validate_against}_id"
-        reflection_names      = reflect_on_all_associations(:belongs_to).map(&:name).map(&:to_s)
+        reflections           = reflect_on_all_associations(:belongs_to)
+        reflection_names      = reflections.map(&:name).map(&:to_s)
+        validate_against_key  = reflections.select {|r| r.name.to_s == validate_against}.first.try(:foreign_key)
         validate_with         = ((Array(opt[:with]).map(&:to_s) if opt[:with]) || reflection_names).reject {|n| n == validate_against}
 
-        raise ArgumentError, "Can't find any belongs_to relations for #{name} class. Put validation call below association definitions" if reflection_names.empty?
-        raise ArgumentError, "No foreign key #{validate_against_key} on #{table_name} table!" unless reflection_names.include?(validate_against)
+        raise ArgumentError, "Can't find any belongs_to relations for #{name} class. Put validation call below association definitions!" if reflection_names.empty?
+        raise ArgumentError, "No foreign key for relation #{validate_against} on #{table_name} table!" unless reflection_names.include?(validate_against)
         raise ArgumentError, "Unknown relation in #{validate_with}!" unless validate_with.all? {|k| reflection_names.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.7"
+  VERSION = "0.0.8"
 end

data/spec/models/model_spec.rb

@@ -84,21 +84,21 @@ describe ForeignKeyValidation::ModelExtension do
     it "does not allow to rewrite user id of idea" do
       idea.user_id = 42
       idea.save
-      expect(idea.errors.messages.values.flatten).to include("user_id of project does not match ideas user_id")
+      expect(idea.errors.messages.values.flatten).to include("user_id of project does not match ideas user_id.")
       expect(idea.reload.user_id).to_not eq(42)
     end
 
     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_id of project does not match issues user_id")
+      expect(issue.errors.messages.values.flatten).to include("user_id of project does not match issues user_id.")
       expect(issue.reload.user_id).to_not eq(42)
     end
 
     it "does not allow to rewrite user id of comment" do
       comment.user_id = 42
       comment.save
-      expect(comment.errors.messages.values.flatten).to include("user_id of issue does not match comments user_id")
+      expect(comment.errors.messages.values.flatten).to include("user_id of issue does not match comments user_id.")
       expect(comment.reload.user_id).to_not eq(42)
     end
 
@@ -112,7 +112,7 @@ describe ForeignKeyValidation::ModelExtension do
     it "does not allow to rewrite user id of developer" do
       developer.user_id = 42
       developer.save
-      expect(developer.errors.messages.values.flatten).to include("user_id of boss does not match developers user_id")
+      expect(developer.errors.messages.values.flatten).to include("user_id of boss does not match developers user_id.")
       expect(developer.reload.user_id).to_not eq(42)
     end
 
@@ -147,7 +147,7 @@ describe ForeignKeyValidation::ModelExtension do
     it "does not allow to rewrite user id of idea" do
       idea.user_id = 42
       idea.save
-      expect(idea.errors.messages.values.flatten).to include("user_id of project does not match ideas user_id")
+      expect(idea.errors.messages.values.flatten).to include("user_id of project does not match ideas user_id.")
       expect(idea.reload.user_id).to_not eq(42)
     end
 
@@ -177,7 +177,7 @@ describe ForeignKeyValidation::ModelExtension do
   context "with calling validation and wrong attributes hash" do
 
     it "raises error due to wrong :on key" do
-      expect{Idea.class_eval { validate_foreign_keys on: :not_existing }}.to raise_error("No foreign key not_existing_id on ideas table!")
+      expect{Idea.class_eval { validate_foreign_keys on: :not_existing }}.to raise_error("No foreign key for relation not_existing on ideas table!")
     end
 
     it "raises error due to wrong :with key" do
@@ -189,7 +189,7 @@ describe ForeignKeyValidation::ModelExtension do
   context "with calling validation and missing relations" do
 
     it "raises error due to wrong :on key" do
-      expect{Dummy.class_eval { validate_foreign_keys }}.to raise_error("Can't find any belongs_to relations for Dummy class. Put validation call below association definitions")
+      expect{Dummy.class_eval { validate_foreign_keys }}.to raise_error("Can't find any belongs_to relations for Dummy class. Put validation call below association definitions!")
     end
 
   end
@@ -210,7 +210,7 @@ describe ForeignKeyValidation::ModelExtension do
     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_id of project does not match issues user_id")
+      expect(issue.errors.messages.values.flatten).to include("user_id of project does not match issues user_id.")
       expect(issue.reload.user_id).to_not eq(42)
     end
 

data/spec/support/load_models.rb

@@ -46,5 +46,5 @@ class Manager < Member
 end
 
 class Developer < Member
-  belongs_to :boss, class_name: "Manager", foreign_key: :boss_id
+  belongs_to :boss, class_name: "Manager", foreign_key: :custom_boss_id
 end

data/spec/support/schema.rb

@@ -29,7 +29,7 @@ ActiveRecord::Schema.define do
 
   create_table "members", force: true do |t|
     t.integer   "user_id"
-    t.integer   "boss_id"
+    t.integer   "custom_boss_id"
     t.string    "type"
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreign_key_validation
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Marcus Geißler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement