active_model_validates_intersection_of 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76242e3e9b01b1b5d32baf79a3e562c640b9a070
-  data.tar.gz: e284f822c443f3670ee1e4a41ab0a50d69a743ea
+  metadata.gz: 2d9a880302c1fb042f2b7cfd0d45d13886d5c6a6
+  data.tar.gz: 8bebd7296a28944ff88fe31bbae47f42d5df6f49
 SHA512:
-  metadata.gz: 4e91fef8acba499072b1dc4822fd655a8675e69685b0fff02d7979acd022878a815365a23d92e938f8cbadffcb201dd769e5cdade3d5d80238c42f4b3f0dec7a
-  data.tar.gz: 844fcb44851f526de9e6fc0d9789ec81035b7c5ab1a6036790a0ce73ae4ef1a13a0ac82e3ab79e5ef2721f50076cb2240ef0dfe0067596972c6e9d1997fe12e5
+  metadata.gz: d508965100a884ba3ba35eadeda759d7e53f2d8fe360d467ec663836a297158917b76537ea9bfb09ebb159da219dc68c801f6684ad35a7bd89388540be486258
+  data.tar.gz: 4899760345566f7f3c71cd2012d0c8cda4603ad8086ae29eb551f33863b70fd35dbb7f15b6a8f1b0d2cdead25317d9998c5b30ae5664a84132cde1ac6fa3daec

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 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

@@ -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/lib/active_model_validates_intersection_of/validator.rb

@@ -1,12 +1,36 @@
 module ActiveModelValidatesIntersectionOf
   class Validator < ActiveModel::EachValidator
-    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)
+    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
 
-      if (value - delimiter).any?
+    def validate_each(record, attribute, value)
+      raise ArgumentError, "value must be an array" unless value.is_a?(Array)
+      
+      if (value - members(record)).any?
         record.errors.add(attribute, :inclusion, options.except(:in, :within).merge!(value: value))
       end
     end
+
+    private 
+
+    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 = "1.2.0".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
 
@@ -61,5 +62,88 @@ RSpec.describe IntersectionValidator do
         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
 

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

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: 1.2.0
 platform: ruby
 authors:
 - Rafael Biriba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-06 00:00:00.000000000 Z
+date: 2017-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel