active_model_validates_intersection_of 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6b8262630e0adf42ea5e3e1695ac77c6155b0f1
-  data.tar.gz: a272709e84de27dd6d85981f28621d19586d7b7f
+  metadata.gz: 76242e3e9b01b1b5d32baf79a3e562c640b9a070
+  data.tar.gz: e284f822c443f3670ee1e4a41ab0a50d69a743ea
 SHA512:
-  metadata.gz: ba9de8512b66fd75d3a90f9cb75823cf050a7dbd7e51b68e41ca3f30e79b15493e17f209111dcd7638b0aa94b77cc372b34235a05d3dea62af18843c81efc07d
-  data.tar.gz: 354b6a7bbafd6c3d48afbbf943d049a4afd1038a6a82d3c9a382a0580f90365df48311e66af09487c6cef7a82dedb3914b5cff726a21f538e45b2d5f5d8c8c34
+  metadata.gz: 4e91fef8acba499072b1dc4822fd655a8675e69685b0fff02d7979acd022878a815365a23d92e938f8cbadffcb201dd769e5cdade3d5d80238c42f4b3f0dec7a
+  data.tar.gz: 844fcb44851f526de9e6fc0d9789ec81035b7c5ab1a6036790a0ce73ae4ef1a13a0ac82e3ab79e5ef2721f50076cb2240ef0dfe0067596972c6e9d1997fe12e5

data/CHANGELOG.md

@@ -1,7 +1,11 @@
+## v1.1.0 (2017-06-06)
+
+  - Implement `validates :list, intersection: { in: ANOTHER_LIST }` see the README for more information
+
 ## v1.0.0 (2017-06-06)
 
-  - Releasing 1.0 version
-  - Adding `:within` parameter support as an alias for `:in`
+  - Release 1.0 version
+  - Add `:within` parameter support as an alias for `:in`
 
 ## v0.1.0 (2017-06-01)
 

data/README.md

@@ -32,7 +32,7 @@ user.valid? #false
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'active_model_validates_intersection_of'
+gem "active_model_validates_intersection_of"
 ```
 
 And then execute:
@@ -45,35 +45,39 @@ Or install it yourself as:
 
 If your framework doesn't auto require gems, don't forget to do it after require of `active_model` gem.
 
-    require "active_model"
-    require "active_model_validates_intersection_of"
+```ruby
+require "active_model"
+require "active_model_validates_intersection_of"
+```
 
 ## Usage
 
+### Parameters
+
 * `:in` - Parameter is required
-* `:within` - A synonym(alias) for `:in`
-* `:message` - Specifies a custom error message (optional)
+* `:within` - *Optional:* A synonym(alias) for `:in`
+* `:message` - *Optional:* Specifies a custom error message
 
-```ruby
-class User < ActiveRecord::Base
-  DEFAULT_PERMISSION = ["read", "write", "share"]
-  validates_intersection_of :permission, in: DEFAULT_PERMISSION
-end
-```
+### Validation
+
+You can use the intersection validation in three differents ways: (Feel free to use what you liked more :))
 
 ```ruby
 class User < ActiveRecord::Base
   DEFAULT_PERMISSION = ["read", "write", "share"]
-  validates_intersection_of :permission, within: DEFAULT_PERMISSION, message: "invalid permission"
-end
-```
 
-You can also use the custom validation directly:
+  # Using the alias validates_intersection_of
+  validates_intersection_of :permission, in: DEFAULT_PERMISSION, message: "invalid permission"
+  validates_intersection_of :permission, within: DEFAULT_PERMISSION, message: "invalid permission"
 
-```ruby
-class User < ActiveRecord::Base
-  DEFAULT_PERMISSION = ["read", "write", "share"]
+  # Using the validator explicit:
   validates_with ActiveModelValidatesIntersectionOf::Validator, attributes: [:permission], in: DEFAULT_PERMISSION
+  validates_with ActiveModelValidatesIntersectionOf::Validator, attributes: [:permission], within: DEFAULT_PERMISSION
+
+  #Using the validator implicit:
+  validates :permission, intersection: { in: DEFAULT_PERMISSION, message: "invalid permission" }
+  validates :permission, intersection: { within: DEFAULT_PERMISSION, message: "invalid permission" }
+
 end
 ```
 

data/lib/active_model_validates_intersection_of.rb

@@ -1,3 +1,4 @@
 require "active_model_validates_intersection_of/version.rb"
 require "active_model_validates_intersection_of/validator.rb"
-require "validates_intersection_of_alias.rb"
+require "intersection_validator.rb"
+require "validates_intersection_of_alias.rb"

data/lib/active_model_validates_intersection_of/validator.rb

@@ -9,4 +9,4 @@ module ActiveModelValidatesIntersectionOf
       end
     end
   end
-end
+end

data/lib/active_model_validates_intersection_of/version.rb

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

data/lib/intersection_validator.rb

@@ -0,0 +1 @@
+IntersectionValidator = Class.new(ActiveModelValidatesIntersectionOf::Validator)

data/spec/lib/intersection_validator_spec.rb

@@ -0,0 +1,65 @@
+require "spec_helper"
+require_relative "../shared.rb"
+
+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"
+    end
+  end
+
+  context "validation" do
+    context "with :in option" do
+      class ListAliasValidator
+        VALID_ARRAY = ["a", "b", 1 , 2]
+        include ActiveModel::Validations
+        attr_accessor :list
+        validates :list, intersection: { in: VALID_ARRAY, message: "not valid" }
+      end
+
+      let(:valid_partial_array) { ListAliasValidator::VALID_ARRAY.sample(2) }
+      let(:invalid_partial_array) { valid_partial_array + ["invalid"] }
+      subject { ListAliasValidator.new }
+
+      describe "with a valid list" do
+        it_behaves_like "valid object"
+      end
+
+      describe "with an invalid list" do
+        it_behaves_like "invalid object"
+      end
+    end
+
+    context "with :within option" do
+      class WithinOptionListAliasValidator
+        VALID_ARRAY = ["a", "b", 1 , 2]
+        include ActiveModel::Validations
+        attr_accessor :list
+        validates :list, intersection: { within: VALID_ARRAY, message: "not valid" }
+      end
+
+      let(:valid_partial_array) { WithinOptionListAliasValidator::VALID_ARRAY.sample(2) }
+      let(:invalid_partial_array) { valid_partial_array + ["invalid"] }
+
+      subject { WithinOptionListAliasValidator.new }
+
+      context "validation with :in option" do
+        describe "with a valid list" do
+          it_behaves_like "valid object"
+        end
+
+        describe "with an invalid list" do
+          it_behaves_like "invalid object"
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_model_validates_intersection_of
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Rafael Biriba
@@ -99,7 +99,9 @@ files:
 - lib/active_model_validates_intersection_of.rb
 - lib/active_model_validates_intersection_of/validator.rb
 - lib/active_model_validates_intersection_of/version.rb
+- lib/intersection_validator.rb
 - lib/validates_intersection_of_alias.rb
+- spec/lib/intersection_validator_spec.rb
 - spec/lib/validates_intersection_of_alias_spec.rb
 - spec/lib/validator_spec.rb
 - spec/shared.rb
@@ -130,6 +132,7 @@ specification_version: 4
 summary: A custom validation for your Active Model that check if an array is included
   in another one
 test_files:
+- spec/lib/intersection_validator_spec.rb
 - spec/lib/validates_intersection_of_alias_spec.rb
 - spec/lib/validator_spec.rb
 - spec/shared.rb