foreign_key_validation 1.1.0 → 1.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDU3ZTY0MGMyNmIzYTJiOWFjMjZjMzE5NjllMWM1MjAyNmI5MTcwOA==
+    YjZkZDY5NzBlNGQ2ZTQ0MThkMjc5OWY4MGU3ZDVjZDVkMTg5NjdiNQ==
   data.tar.gz: !binary |-
-    OTRhOTc5NzlmZDBjODAxNmE4Mzk4NjM1ZDQ2NDJhMjkyMTFhZWY4YQ==
+    NmU5Y2NmNGQ3M2YyNjFlOWI4YmI3M2JlZTZhYTM3NDA0MWU0NzFmYg==
 SHA512:
   metadata.gz: !binary |-
-    ODdiYzEzM2FhNTE1ZGVjZmMzYWY2ZmMxMGFmZDM2NTIxZjlmYjcxMGY1Njdk
-    NmZmN2Q3ZmY1YTkzN2NlYjZiNzhhNjhmNDUwNTAxOTkyYjMwMzRlYjg1NWU3
-    ZTc2ZWE1ZTAxZDYzMzQ1MmRkNmVmYmZkOGViOGZjNTRiNGNhYTY=
+    YmY4NTllNGJhZTc0ODhlNmE0YjM3ZmYyNWU0OTZhMDQzOGYwMzVjZDkwYzIy
+    Y2VhOWNiZGE4MDczNTU4OGRlYWZmNmY0ODQ0YTU1ZmU5Mjg4MDZjNDY4NGNk
+    ZDM4NjgxYzM4NDQwODk1NzlmYWZkNzRkYmQ5NDczMzYzNGU4Y2Y=
   data.tar.gz: !binary |-
-    NTczZTBjNGFjNTgyYThkNThlZTQwZDUzNTZlZTQ3ZTk2MGIzMDY1ODRhMTg1
-    OWE2MDRhMGUxYzA5Yzg2NTEwYmEzMDk2NDUzOTU3MjhjNjNiMmFlY2NiOTc0
-    OTUxNTMwMmQzZDNhZTEyNjk3MWRhN2JhMmVlODE4NzczZGI2MDk=
+    Y2QwMTRkNzg4ZWE5MjVmOTc3N2I4NTM1YTk5OTg2Zjk4N2VkODE0OTJlYWYx
+    ODUxOTdjMDBhZWNmMzcwNmJiZGExOTI0MTExY2I0NGZmYTU1MzBiNDkwZmE4
+    MWE0MTM1YmJhYmFlODMzM2FlNzZiZGEwYTM4MmRmOGVhNDNhN2E=

data/README.md

@@ -37,11 +37,12 @@ This would only check `model.project.admin_user_id` to match `model.admin_user_i
 
 ## Configuration
 
-You can customize the behaviour of the gem by calling the `configure` method on the module with a block (e.g. initializer).
+You can customize the default behaviour of the gem by calling the `configure` method on the module with a block (e.g. initializer).
 
     ForeignKeyValidation.configure do |config|
       config.error_message      = proc { |key, name, object| "My custom msg!" }
-      config.inject_subclasses  = true
+      config.inject_subclasses  = false     # default: true
+      config.validate_against   = :admin    # default: :user
     end
 
 ## Note

data/lib/foreign_key_validation/collector.rb

@@ -3,8 +3,6 @@ module ForeignKeyValidation
   class Collector
     attr_accessor :options
 
-    DEFAULT_VALIDATE_AGAINST = :user
-
     def initialize(opt={})
       self.options = opt
     end
@@ -21,7 +19,7 @@ module ForeignKeyValidation
     end
 
     def validate_against
-      @validate_against ||= (options[:on] || DEFAULT_VALIDATE_AGAINST).to_s
+      @validate_against ||= (options[:on] || ForeignKeyValidation.configuration.validate_against).to_s
     end
 
     def validate_with

data/lib/foreign_key_validation/version.rb

@@ -1,3 +1,3 @@
 module ForeignKeyValidation
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/lib/foreign_key_validation.rb

@@ -10,8 +10,9 @@ module ForeignKeyValidation
 
   DEFAULT_CONFIG = {
     inject_subclasses: true,
-    error_message: proc { |validate_against_key, reflection_name, object|
-      "#{validate_against_key} of #{reflection_name} does not match #{object.class.name.tableize} #{validate_against_key}."
+    validate_against: :user,
+    error_message: proc { |key, reflection_name, object|
+      "#{key} of #{reflection_name} does not match #{object.class.name.tableize} #{key}."
     }
   }
 

data/spec/config_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe ForeignKeyValidation do
+
+  describe ".configuration" do
+
+    subject { ForeignKeyValidation }
+
+    it "initializes configuration as open struct" do
+      expect(subject.configuration).to be_instance_of OpenStruct
+    end
+
+    it "defaults to true for injecting subclasses" do
+      expect(subject.configuration.inject_subclasses).to eq true
+    end
+
+    it "defaults to proc for error messages" do
+      expect(subject.configuration.error_message).to be_a Proc
+      expect(subject.configuration.error_message.call).to match /does not match/
+    end
+
+    it "defaults to :user for validate against key" do
+      expect(subject.configuration.validate_against).to eq :user
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreign_key_validation
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Marcus Geißler
@@ -168,6 +168,7 @@ files:
 - lib/foreign_key_validation/validator.rb
 - lib/foreign_key_validation/version.rb
 - spec/collector/base_spec.rb
+- spec/config_spec.rb
 - spec/model_extension/validation_with_config_block_spec.rb
 - spec/model_extension/validation_with_custom_attrs_spec.rb
 - spec/model_extension/validation_with_exceptions_spec.rb
@@ -205,6 +206,7 @@ specification_version: 4
 summary: Protect the foreign keys in your Rails models.
 test_files:
 - spec/collector/base_spec.rb
+- spec/config_spec.rb
 - spec/model_extension/validation_with_config_block_spec.rb
 - spec/model_extension/validation_with_custom_attrs_spec.rb
 - spec/model_extension/validation_with_exceptions_spec.rb