active_model_validates_intersection_of 1.1.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 76242e3e9b01b1b5d32baf79a3e562c640b9a070
-  data.tar.gz: e284f822c443f3670ee1e4a41ab0a50d69a743ea
+SHA256:
+  metadata.gz: 380a36633d08fb17e45a86ad9d94c329620487717be29f4ee3cfd4573a2ba1de
+  data.tar.gz: 00f2ec575910e8f8c7b8ab563a07b07f8c60e11740ecf10253d45b3f22730ac1
 SHA512:
-  metadata.gz: 4e91fef8acba499072b1dc4822fd655a8675e69685b0fff02d7979acd022878a815365a23d92e938f8cbadffcb201dd769e5cdade3d5d80238c42f4b3f0dec7a
-  data.tar.gz: 844fcb44851f526de9e6fc0d9789ec81035b7c5ab1a6036790a0ce73ae4ef1a13a0ac82e3ab79e5ef2721f50076cb2240ef0dfe0067596972c6e9d1997fe12e5
+  metadata.gz: bf99fdd4024988e87e6b7fd079f17347750aa80ce75cd7d4c9f71857e373abf99958672adb2af49886beddb9221c3f947060cca21bbacddaec9f0488e3e2a7f8
+  data.tar.gz: be4f4ed87278de54137fa89661ede7a931160fc50996d7d7e36f90efaef2c6b31ff198929880ab36812e19893834eb67ab40eb923f1300465c09c6b661222f7c

data/.travis.yml

@@ -1,5 +1,16 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.4.1
-before_install: gem install bundler -v 1.15.0
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0
+  - 3.0.1
+before_install: gem install bundler -v 2.2.16
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
+script:
+  - bundle exec rspec
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## v3.0.1 (2021-08-24)
+
+- Fixing model validation when the value is nil (eg: list = `[nil]` model.valid? should be false). (From issue: #9)
+
+## v3.0.0 (2021-04-13)
+
+- Ruby 3 support.
+
+## v1.2.0 (2017-12-20)
+
+  - Support for proc and lambda
+
 ## v1.1.0 (2017-06-06)
 
   - Implement `validates :list, intersection: { in: ANOTHER_LIST }` see the README for more information

data/README.md

@@ -1,6 +1,6 @@
 # Active Model Validates Intersection Of
 
-![Gem Version](https://img.shields.io/gem/v/active_model_validates_intersection_of.svg?style=flat-square) [![Code Climate](https://img.shields.io/codeclimate/github/rafaelbiriba/active_model_validates_intersection_of.svg?style=flat-square)](https://codeclimate.com/github/rafaelbiriba/active_model_validates_intersection_of) [![Coverage Status](https://img.shields.io/coveralls/rafaelbiriba/active_model_validates_intersection_of/master.svg?style=flat-square)](https://coveralls.io/r/rafaelbiriba/active_model_validates_intersection_of?branch=master) [![Travis](https://img.shields.io/travis/rafaelbiriba/active_model_validates_intersection_of/master.svg?style=flat-square)](https://travis-ci.org/rafaelbiriba/active_model_validates_intersection_of)
+![Gem Version](https://img.shields.io/gem/v/active_model_validates_intersection_of.svg?style=flat-square) [![Maintainability](https://api.codeclimate.com/v1/badges/e95e09a4905d648a3600/maintainability)](https://codeclimate.com/github/rafaelbiriba/active_model_validates_intersection_of/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/e95e09a4905d648a3600/test_coverage)](https://codeclimate.com/github/rafaelbiriba/active_model_validates_intersection_of/test_coverage) [![Coverage Status](https://img.shields.io/coveralls/rafaelbiriba/active_model_validates_intersection_of/master.svg?style=flat-square)](https://coveralls.io/r/rafaelbiriba/active_model_validates_intersection_of?branch=master) [![Travis](https://img.shields.io/travis/rafaelbiriba/active_model_validates_intersection_of/master.svg?style=flat-square)](https://travis-ci.org/rafaelbiriba/active_model_validates_intersection_of)
 
 A custom validation for Active Model that check if an array is included in another one.
 
@@ -54,7 +54,7 @@ require "active_model_validates_intersection_of"
 
 ### Parameters
 
-* `:in` - Parameter is required
+* `:in` - Parameter is required. (Supports: Array, proc and lambda)
 * `:within` - *Optional:* A synonym(alias) for `:in`
 * `:message` - *Optional:* Specifies a custom error message
 
@@ -70,6 +70,10 @@ class User < ActiveRecord::Base
   validates_intersection_of :permission, in: DEFAULT_PERMISSION, message: "invalid permission"
   validates_intersection_of :permission, within: DEFAULT_PERMISSION, message: "invalid permission"
 
+  # proc and lambda support
+  validates_intersection_of :permission, in: proc { DEFAULT_PERMISSION }, message: "invalid permission"
+  validates_intersection_of :permission, in: lambda { |l| DEFAULT_PERMISSION }, message: "invalid permission"
+
   # Using the validator explicit:
   validates_with ActiveModelValidatesIntersectionOf::Validator, attributes: [:permission], in: DEFAULT_PERMISSION
   validates_with ActiveModelValidatesIntersectionOf::Validator, attributes: [:permission], within: DEFAULT_PERMISSION

data/active_model_validates_intersection_of.gemspec

@@ -18,9 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(spec)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activemodel", ">= 4.0.0"
-  spec.add_development_dependency "bundler", "~> 1.15"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_dependency "activemodel", ">= 5.0.0"
+  spec.add_development_dependency "bundler", "~> 2.1"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "simplecov"
 end

data/lib/active_model_validates_intersection_of/validator.rb

@@ -1,12 +1,36 @@
 module ActiveModelValidatesIntersectionOf
   class Validator < ActiveModel::EachValidator
+    ERROR_MESSAGE = "An object with the method #include? or a proc, lambda or symbol is required, " \
+                    "and must be supplied as the :in (or :within) option"
+
+    def check_validity!
+      unless delimiter.respond_to?(:include?) || delimiter.respond_to?(:call) || delimiter.respond_to?(:to_sym)
+        raise ArgumentError, ERROR_MESSAGE
+      end
+    end
+
     def validate_each(record, attribute, value)
-      delimiter = options[:in] || options[:within]
-      raise(ArgumentError, "An array must be supplied as the :in option of the configuration hash") unless delimiter.kind_of?(Array)
+      raise ArgumentError, "value must be an array" unless value.is_a?(Array)
+      
+      if (value - members(record)).size > 0
+        record.errors.add(attribute, :inclusion, **options.except(:in, :within).merge!(value: value))
+      end
+    end
+
+    private 
 
-      if (value - delimiter).any?
-        record.errors.add(attribute, :inclusion, options.except(:in, :within).merge!(value: value))
+    def members(record)
+      members = if delimiter.respond_to?(:call)
+        delimiter.call(record)
+      elsif delimiter.respond_to?(:to_sym)
+        record.send(delimiter)
+      else
+        delimiter
       end
     end
+
+    def delimiter
+      @delimiter ||= options[:in] || options[:within]
+    end
   end
-end
+end

data/lib/active_model_validates_intersection_of/version.rb

@@ -1,3 +1,3 @@
 module ActiveModelValidatesIntersectionOf
-  VERSION = "1.1.0".freeze
+  VERSION = "3.0.1".freeze
 end

data/spec/lib/intersection_validator_spec.rb

@@ -5,14 +5,15 @@ RSpec.describe IntersectionValidator do
   class BadSetupValidator
     include ActiveModel::Validations
     attr_accessor :list
-    validates :list, intersection: true
   end
 
-  let(:badsetup) { BadSetupValidator.new }
-
   context "setup" do
     describe "with neither :in nor :within configuration" do
-      it_behaves_like "invalid configuration"
+      it "raises argument error" do
+        expect {
+          BadSetupValidator.class_eval("validates :list, intersection: true")
+        }.to raise_error(ArgumentError)
+      end
     end
   end
 
@@ -36,6 +37,22 @@ RSpec.describe IntersectionValidator do
       describe "with an invalid list" do
         it_behaves_like "invalid object"
       end
+
+      context "when the model value is an array with nil value" do
+        class ListTest
+          VALID_ARRAY = ["z", "x", 5 , 6]
+          include ActiveModel::Validations
+          attr_accessor :list
+          validates_intersection_of :list, within: VALID_ARRAY, message: "not valid"
+        end
+  
+        subject { ListTest.new }
+  
+        it "should return as invalid" do
+          subject.list = [nil]
+          expect(subject.valid?).to eq(false)
+        end
+      end
     end
 
     context "with :within option" do
@@ -60,6 +77,105 @@ RSpec.describe IntersectionValidator do
           it_behaves_like "invalid object"
         end
       end
+
+      context "when the model value is an array with nil value" do
+        class ListTest
+          VALID_ARRAY = ["z", "x", 5 , 6]
+          include ActiveModel::Validations
+          attr_accessor :list
+          validates_intersection_of :list, within: VALID_ARRAY, message: "not valid"
+        end
+  
+        subject { ListTest.new }
+  
+        it "should return as invalid" do
+          subject.list = [nil]
+          expect(subject.valid?).to eq(false)
+        end
+      end
+    end
+
+    context "validate with lambda" do
+      class SomeList
+        VALID_ARRAY = ["z", "x", 5 , 6]
+        include ActiveModel::Validations
+        attr_accessor :list
+        validates_intersection_of :list, in: lambda {|a| VALID_ARRAY }, message: "not valid"
+      end
+
+      it "is valid" do
+        list = SomeList.new
+        list.list = ["z"]
+        expect(list.valid?).to eq true
+      end
+
+      it "is invalid" do
+        list = SomeList.new
+        list.list = ["G"]
+        expect(list.valid?).to eq false
+      end
+    end
+
+    context "validate with proc" do
+      class ProcList
+        VALID_ARRAY = ["z", "q", 5 , 3]
+        include ActiveModel::Validations
+        attr_accessor :list
+        validates_intersection_of :list, in: proc { VALID_ARRAY }, message: "not valid"
+      end
+
+      it "is valid" do
+        list = ProcList.new
+        list.list = ["q"]
+        expect(list.valid?).to eq true
+      end
+
+      it "is invalid" do
+        list = ProcList.new
+        list.list = [10]
+        expect(list.valid?).to eq false
+      end
+    end
+
+    context "validate with symbol" do
+      class SymList
+        VALID_ARRAY = ["z", "d", 5 , 6]
+        include ActiveModel::Validations
+        attr_accessor :list
+        validates_intersection_of :list, in: :valid_options, message: "not valid"
+
+        def valid_options
+          VALID_ARRAY
+        end
+      end
+
+      it "is valid" do
+        list = SymList.new
+        list.list = ["d"]
+        expect(list.valid?).to eq true
+      end
+
+      it "is invalid" do
+        list = SymList.new
+        list.list = [8]
+        expect(list.valid?).to eq false
+      end
+    end
+
+    context "validate with value as string" do
+      class SomeInvalidList
+        include ActiveModel::Validations
+        attr_accessor :list
+        validates_intersection_of :list, in: proc { ['test'] }, message: "not valid"
+      end
+
+      it "causes an exception" do
+        list = SomeInvalidList.new
+        list.list = "d"
+        expect {
+          list.valid?
+        }.to raise_error(ArgumentError, "value must be an array")
+      end
     end
   end
 end

data/spec/lib/validates_intersection_of_alias_spec.rb

@@ -5,14 +5,15 @@ RSpec.describe ActiveModel::Validations::HelperMethods do
   class BadSetup
     include ActiveModel::Validations
     attr_accessor :list
-    validates_intersection_of :list
   end
 
-  let(:badsetup) { BadSetup.new }
-
   context "setup" do
     describe "with neither :in nor :within configuration" do
-      it_behaves_like "invalid configuration"
+      it "raises argument error" do
+        expect {
+          BadSetup.class_eval("validates_intersection_of :list")
+        }.to raise_error(ArgumentError)
+      end
     end
   end
 
@@ -64,5 +65,21 @@ RSpec.describe ActiveModel::Validations::HelperMethods do
         end
       end
     end
+
+    context "when the model value is an array with nil value" do
+      class ListTest
+        VALID_ARRAY = ["z", "x", 5 , 6]
+        include ActiveModel::Validations
+        attr_accessor :list
+        validates_intersection_of :list, within: VALID_ARRAY, message: "not valid"
+      end
+
+      subject { ListTest.new }
+
+      it "should return as invalid" do
+        subject.list = [nil]
+        expect(subject.valid?).to eq(false)
+      end
+    end
   end
 end

data/spec/lib/validator_spec.rb

@@ -5,14 +5,15 @@ RSpec.describe ActiveModelValidatesIntersectionOf::Validator do
   class BadSetupValidator
     include ActiveModel::Validations
     attr_accessor :list
-    validates_with ActiveModelValidatesIntersectionOf::Validator, attributes: [:list]
   end
 
-  let(:badsetup) { BadSetupValidator.new }
-
   context "setup" do
     describe "with neither :in nor :within configuration" do
-      it_behaves_like "invalid configuration"
+      it "raises argument error" do
+        expect {
+        BadSetupValidator.class_eval("validates_with ActiveModelValidatesIntersectionOf::Validator, attributes: [:list]")     
+        }.to raise_error(ArgumentError)
+      end
     end
   end
 

data/spec/shared.rb

@@ -1,9 +1,3 @@
-RSpec.shared_examples "invalid configuration" do
-  it "should raise an error" do
-    expect { badsetup.valid? }.to raise_error(ArgumentError)
-  end
-end
-
 RSpec.shared_examples "valid object" do
   it "the subject should be valid" do
     subject.list = valid_partial_array

data/spec/spec_helper.rb

@@ -1,8 +1,12 @@
+require "simplecov"
+SimpleCov.start
+
+require "coveralls"
+Coveralls.wear!
+
 require "bundler/setup"
 require "active_model"
 require "active_model_validates_intersection_of"
-require "coveralls"
-Coveralls.wear!
 
 RSpec.configure do |config|
   # Enable flags like --only-failures and --next-failure

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_model_validates_intersection_of
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Rafael Biriba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-06 00:00:00.000000000 Z
+date: 2021-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A custom validation for your Active Model that check if an array is included
   in another one
 email:
@@ -125,8 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A custom validation for your Active Model that check if an array is included