foreign_key_validation 1.1.1 → 1.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjZkZDY5NzBlNGQ2ZTQ0MThkMjc5OWY4MGU3ZDVjZDVkMTg5NjdiNQ==
+    YmM1OWE1NWI4NzQzZjM0MmFkNDg1NTIwOGYwMmRjM2YzYTAzZmQ4MQ==
   data.tar.gz: !binary |-
-    NmU5Y2NmNGQ3M2YyNjFlOWI4YmI3M2JlZTZhYTM3NDA0MWU0NzFmYg==
+    YWI5MTJmYWRmOWNiMjllNzY1NjA4NjFiZGU0ZTM3MmYzNDIwMGVjNw==
 SHA512:
   metadata.gz: !binary |-
-    YmY4NTllNGJhZTc0ODhlNmE0YjM3ZmYyNWU0OTZhMDQzOGYwMzVjZDkwYzIy
-    Y2VhOWNiZGE4MDczNTU4OGRlYWZmNmY0ODQ0YTU1ZmU5Mjg4MDZjNDY4NGNk
-    ZDM4NjgxYzM4NDQwODk1NzlmYWZkNzRkYmQ5NDczMzYzNGU4Y2Y=
+    MTVlOTJkNzlmZjE5OGUyZjY3ZTQ4ZWUxNTUxNjlhOWE4MjBmYWNhMjRlOWE0
+    NjI3NTYyZDMzNDcyOTdiZDk0NDc2YzBmZDBkMDdmNjQwOTBmZmYwMGI0NTJi
+    OTRhMzY0ZDRlMWQ2MTY4OWRjZjg2OTkwMjUzYjYxZDA0ZDZhNjE=
   data.tar.gz: !binary |-
-    Y2QwMTRkNzg4ZWE5MjVmOTc3N2I4NTM1YTk5OTg2Zjk4N2VkODE0OTJlYWYx
-    ODUxOTdjMDBhZWNmMzcwNmJiZGExOTI0MTExY2I0NGZmYTU1MzBiNDkwZmE4
-    MWE0MTM1YmJhYmFlODMzM2FlNzZiZGEwYTM4MmRmOGVhNDNhN2E=
+    MTZkYWYwZDU2OTg1ZjZiZjUyMTY3NWJiMGFlZWQyZWY1ODQwZGVmNTU2YmM0
+    ZGUwMzdhMjc0MDEyZDUwNDc5NWI1ZTVlNjBjOTJhMTcxOTZkMGQxMzg1N2Q4
+    YjNiMTE1YWM1YzIzZTk5ODBjNTA2ZDA3YWM3OThkMzYwZGRlNTk=

data/Appraisals

@@ -1,19 +1,23 @@
 appraise "3.2" do
-  gem "rails", "~> 3.2.0"
+  gem "activerecord", "~> 3.2.0"
+  gem "activesupport", "~> 3.2.0"
   gemspec
 end
 
 appraise "4.0" do
-  gem "rails", "~> 4.0.0"
+  gem "activerecord", "~> 4.0.0"
+  gem "activesupport", "~> 4.0.0"
   gemspec
 end
 
 appraise "4.1" do
-  gem "rails", "~> 4.1.0"
+  gem "activerecord", "~> 4.1.0"
+  gem "activesupport", "~> 4.1.0"
   gemspec
 end
 
 appraise "4.2" do
-  gem "rails", "~> 4.2.0.beta2"
+  gem "activerecord", "~> 4.2.0.beta4"
+  gem "activesupport", "~> 4.2.0.beta4"
   gemspec
 end

data/README.md

@@ -8,8 +8,9 @@
 Protect your models by specifying a collection of relations that should be tested for consistency with a predefined column (e.g. `user_id`).This is useful when the column `user_id` is used in multiple models. We can check if the `user_id` of *model A* matches `user_id` of *model B* before saving the records - if the IDs are different, an error will be attached to the errors hash of checked model.
 
 ## Requirements
+
     ruby >= 1.9.3
-    rails >= 3.2.0
+    active_record & active_support >= 3.2.0
 
 ## Installation
 
@@ -40,24 +41,19 @@ This would only check `model.project.admin_user_id` to match `model.admin_user_i
 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.error_message      = lambda { |key, name, object| "My custom msg!" }
       config.inject_subclasses  = false     # default: true
       config.validate_against   = :admin    # default: :user
     end
 
-## Note
-
-Only tested with ActiveRecord
-
 ## Tests
 
-Use these commands to run the testsuite against different versions of Rails
+Use these commands to run the testsuite against different versions of ActiveRecord
 
     bundle
     appraisal install
     appraisal rspec
 
-
 ## Contributing
 
 1. Fork it ( https://github.com/marcusg/foreign_key_validation/fork )

data/foreign_key_validation.gemspec

@@ -18,13 +18,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency "rails", ">= 3.2"
+  spec.add_runtime_dependency "activerecord", ">= 3.2"
+  spec.add_runtime_dependency "activesupport", ">= 3.2"
 
   spec.add_development_dependency 'appraisal', '~> 1.0'
   spec.add_development_dependency 'coveralls', '~> 0.7'
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake', '~> 10.1'
-  spec.add_development_dependency 'rspec-rails', '~> 3.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'database_cleaner', '~> 1.3'
   spec.add_development_dependency 'sqlite3', '~> 1.3'
   spec.add_development_dependency 'pry', '~> 0.10'

data/gemfiles/3.2.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 3.2.0"
+gem "activerecord", "~> 3.2.0"
+gem "activesupport", "~> 3.2.0"
 
 gemspec :path => "../"

data/gemfiles/4.0.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 4.0.0"
+gem "activerecord", "~> 4.0.0"
+gem "activesupport", "~> 4.0.0"
 
 gemspec :path => "../"

data/gemfiles/4.1.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 4.1.0"
+gem "activerecord", "~> 4.1.0"
+gem "activesupport", "~> 4.1.0"
 
 gemspec :path => "../"

data/gemfiles/4.2.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 4.2.0.beta2"
+gem "activerecord", "~> 4.2.0.beta4"
+gem "activesupport", "~> 4.2.0.beta4"
 
 gemspec :path => "../"

data/lib/foreign_key_validation.rb

@@ -11,21 +11,25 @@ module ForeignKeyValidation
   DEFAULT_CONFIG = {
     inject_subclasses: true,
     validate_against: :user,
-    error_message: proc { |key, reflection_name, object|
+    error_message: lambda { |key, reflection_name, object|
       "#{key} of #{reflection_name} does not match #{object.class.name.tableize} #{key}."
     }
   }
 
   class << self
-    attr_writer :configuration
 
-    def configure(&blk)
+    def configure
       yield configuration
     end
 
     def configuration
       @configuration ||= OpenStruct.new(DEFAULT_CONFIG)
     end
+
+    def reset_configuration
+      @configuration = nil
+    end
+
   end
 end
 

data/lib/foreign_key_validation/filter.rb

@@ -13,7 +13,7 @@ module ForeignKeyValidation
         return true
       end
       collector.klass.send :private, filter_name.to_sym
-      collector.klass.send :before_validation, filter_name
+      collector.klass.public_send :before_validation, filter_name
     end
 
     private

data/lib/foreign_key_validation/model_extension.rb

@@ -5,7 +5,7 @@ module ForeignKeyValidation
     module ClassMethods
 
       def validate_foreign_keys(opt={})
-        subclasses.map {|klass| klass.send(:validate_foreign_keys, opt)} if ForeignKeyValidation.configuration.inject_subclasses
+        descendants.map {|klass| klass.public_send(:validate_foreign_keys, opt)} if ForeignKeyValidation.configuration.inject_subclasses
 
         collector = Collector.new(opt.merge(klass: self))
         collector.check!

data/lib/foreign_key_validation/validator.rb

@@ -11,21 +11,22 @@ module ForeignKeyValidation
     end
 
     def validate
-      has_errors = false
+      to_enum(:invalid_reflection_names).map {|n| attach_error(n) }.any?
+    end
+
+    private
+
+    def invalid_reflection_names(&block)
       reflection_names.each do |reflection_name|
         next unless keys_present?(reflection_name)
         if keys_different?(reflection_name)
-          attach_error(reflection_name)
-          has_errors = true
+          yield reflection_name
         end
       end
-      has_errors
     end
 
-    private
-
     def key_on_relation(relation)
-      object.send(relation).try(validate_against_key)
+      object.public_send(relation).try(validate_against_key)
     end
 
     def key_on_object

data/lib/foreign_key_validation/version.rb

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

data/spec/collector/base_spec.rb

@@ -17,12 +17,14 @@ describe ForeignKeyValidation::Collector do
 
   describe "#check!" do
 
+    subject { ForeignKeyValidation::Collector }
+
     it "returns true for known class" do
-      expect(ForeignKeyValidation::Collector.new(klass: Issue).check!).to be true
+      expect(subject.new(klass: Issue).check!).to be true
     end
 
     it "raises error for class without relations" do
-      expect{ForeignKeyValidation::Collector.new(klass: Dummy).check!}.to raise_error(ForeignKeyValidation::Errors::NoReleationFoundError)
+      expect{subject.new(klass: Dummy).check!}.to raise_error(ForeignKeyValidation::Errors::NoReleationFoundError)
     end
 
   end

data/spec/config_spec.rb

@@ -4,8 +4,6 @@ describe ForeignKeyValidation do
 
   describe ".configuration" do
 
-    subject { ForeignKeyValidation }
-
     it "initializes configuration as open struct" do
       expect(subject.configuration).to be_instance_of OpenStruct
     end
@@ -16,13 +14,46 @@ describe ForeignKeyValidation do
 
     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/
+      expect(subject.configuration.error_message.call(nil,nil,nil)).to match /does not match/
     end
 
     it "defaults to :user for validate against key" do
       expect(subject.configuration.validate_against).to eq :user
     end
 
+    it "defaults to nil for unknown config options" do
+      expect(subject.configuration.foo_bar).to eq nil
+    end
+
+  end
+
+  describe ".configure" do
+
+    it "allow change of inject_subclasses config" do
+      subject.configure {|c| c.inject_subclasses = false}
+      expect(subject.configuration.inject_subclasses).to eq false
+    end
+
+    it "allow change of error_message config" do
+      subject.configure {|c| c.error_message = proc { "MY MSG" }}
+      expect(subject.configuration.error_message.call).to eq "MY MSG"
+    end
+
+    it "allow change of validate_against config" do
+      subject.configure {|c| c.validate_against = :my_user}
+      expect(subject.configuration.validate_against).to eq :my_user
+    end
+
+  end
+
+  describe ".reset_configuration" do
+
+    it "allow reset of config" do
+      subject.configure {|c| c.validate_against = :my_user}
+      subject.reset_configuration
+      expect(subject.configuration.validate_against).to eq :user
+    end
+
   end
 
 end

data/spec/spec_helper.rb

@@ -1,26 +1,25 @@
 require 'coveralls'
 Coveralls.wear!
 
-require "rails/all"
+require 'active_support'
+require 'active_record'
 require 'foreign_key_validation'
-require 'rspec/rails'
+require 'rspec'
 require 'database_cleaner'
 require 'pry'
 
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
-  config.infer_base_class_for_anonymous_controllers = true
 
   # reset and reload model classes for each run
   config.before(:each) do
-    ForeignKeyValidation.configuration = nil
+    ForeignKeyValidation.reset_configuration
     load "support/reset_models.rb"
     load "support/load_models.rb"
   end
 
   config.before(:suite) do
-    puts "Running specs against Rails #{Rails.version}" if defined?(Rails)
     DatabaseCleaner.strategy = :transaction
     DatabaseCleaner.clean_with(:truncation)
   end

data/spec/support/load_models.rb

@@ -1,5 +1,3 @@
-require "active_record"
-
 class User < ActiveRecord::Base
   has_many :projects
   has_many :ideas

metadata

@@ -1,17 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: foreign_key_validation
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Marcus Geißler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-10 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -81,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>