be_valid 0.1.2 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5f38ecbc3d88533c9f6eb879796b4b03cb76df5b21f6c4f8e0b7060dc763cea
-  data.tar.gz: 9917a523c4042fdf20f4cfb70dea14f1fe148671092706d54fa5b23c9a514e40
+  metadata.gz: 7edccd354585b1c23c1b623e936e48a442e63084ffdb50ec723c8e6c484d88dc
+  data.tar.gz: 8f1a9f325cf407a462749673476eedba4257df10d9a58520bfa686b31d9cadda
 SHA512:
-  metadata.gz: c4ca1edbdd427368c74d63f42ffbc9e13a09bd8ad774d6e169a75226fa58c9740d384aa956c8b0e9bac9ed92fd9c08730d1eb9f030fafe181aeb48fa0fa4aa12
-  data.tar.gz: 4bf6eaf4377ee7cb15d321ea21fa8d106fe9a3ba0fe735196f3ca75e8751dc9a72747b6ee7f7fca8f69204bd1f925597d5519ccf9de339ffcec5dd6dcfc3dc7a
+  metadata.gz: f870bf1181a47bef15e48054ca0276090a55a9340f93dccb538e6ea94a62e15949c1b47c0c688c3347fa8f51ea6c0cbccfba19c51c23480acdb440f2c15d53b7
+  data.tar.gz: 36de4519138b8e10897ac761b99c71fb3b7726808ff11e3ef2ad5bc94cff19852dea31b8d4dedf835b3c025598ed1a832b08941053ba7adf1ebf5a3587d899a1

data/.github/workflows/ruby.yml

@@ -0,0 +1,24 @@
+name: Ruby
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.6', '2.7', '3.0']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake

data/Gemfile.lock

@@ -1,43 +1,42 @@
 PATH
   remote: .
   specs:
-    be_valid (0.1.0)
+    be_valid (0.1.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.5)
-      activesupport (= 5.2.5)
-    activerecord (5.2.5)
-      activemodel (= 5.2.5)
-      activesupport (= 5.2.5)
-      arel (>= 9.0)
-    activesupport (5.2.5)
+    activemodel (6.1.3.2)
+      activesupport (= 6.1.3.2)
+    activerecord (6.1.3.2)
+      activemodel (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
+    activesupport (6.1.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (9.0.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     concurrent-ruby (1.1.8)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     minitest (5.14.4)
     rake (10.5.0)
     sqlite3 (1.4.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 5)
+  activerecord (~> 6)
   be_valid!
-  bundler (~> 1.17)
+  bundler (~> 2)
   minitest (~> 5.0)
   rake (~> 10.0)
   sqlite3 (~> 1.4)
 
 BUNDLED WITH
-   1.17.2
+   2.2.17

data/be_valid.gemspec

@@ -25,9 +25,9 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.3'
 
-  spec.add_development_dependency "bundler", "~> 1.17"
+  spec.add_development_dependency "bundler", "~> 2"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "activerecord", "~> 5"
+  spec.add_development_dependency "activerecord", "~> 6"
   spec.add_development_dependency "sqlite3", "~> 1.4"
 end

data/lib/be_valid.rb

@@ -4,6 +4,6 @@ begin
   require 'validators/date_validator'
   require 'validators/must_be_validator'
 rescue 
-  'unable to loan be_valid validator'
+  'unable to load be_valid validator'
   nil
 end

data/lib/be_valid/be_valid.rb

@@ -9,10 +9,10 @@ module BeValid
   end
 
   class Configuration
-    attr_accessor :notice_rules
+    attr_accessor :rules
 
     def initialize
-      @notice_rules= []
+      @rules = {}
     end
   end
 end

data/lib/be_valid/version.rb

@@ -1,3 +1,3 @@
 module BeValid
-  VERSION = "0.1.2"
+  VERSION = "0.1.7"
 end

data/lib/validators/date_validator.rb

@@ -14,15 +14,15 @@ class DateValidator < ActiveModel::EachValidator
 
       # display helpful date format validation message with original value
       message = options[:time] ?  ": #{original_value} is not a valid value. Value must be a date in YYYY-MM-DD or YYYY-MM-DD HH:MM:SS format." : ": #{original_value} is not a valid value. Value must be a date in YYYY-MM-DD."
-      @error_hash.add(attribute, (options[:message] || message))
+      @error_hash.add(attribute, (options[:message] || message), rule_name: options[:rule_name])
     else
       # handle validation options on valid date instances
       return unless value.respond_to?(:strftime)
       if(options[:after] && (after_message = validate_after_option(record, attribute, value, original_value)) != true)
-        @error_hash.add(attribute, (options[:after_message] || "#{after_message}."))
+        @error_hash.add(attribute, (options[:after_message] || "#{after_message}."), rule_name: options[:rule_name])
       end
       if(options[:before] && (before_message = validate_before_option(record, attribute, value, original_value)) != true)
-        @error_hash.add(attribute, (options[:before_message] || "#{before_message}."))
+        @error_hash.add(attribute, (options[:before_message] || "#{before_message}."), rule_name: options[:rule_name])
       end
     end
   end

data/lib/validators/must_be_validator.rb

@@ -11,14 +11,16 @@ module ActiveModel
         less_or_equal_to: :<=,
         not_equal_to: :!=,
         matching: :=~,
-        # one_of: :in?
       }.freeze
+      
+      REQD_OPTS = (MATCHERS.keys + [:blank, :present, :one_of, :not_any_of, :only_from, :before, :after])
 
       MESSAGE_PREFIX = "must be"
       ERRORS_METHOD = :errors
 
       def validate_each(record, attribute, value) 
-        raise "must_be_validator requires at least one comparison operator for attribute." unless options.slice(MATCHERS.keys + [:blank, :present])
+        raise "Requires at least one comparison operator for attribute." unless (options.keys & REQD_OPTS).length > 0
+        return if options[:rule_name] && BeValid.config.rules&.fetch(options[:rule_name], {})[:disabled]
 
         original_value = record.read_attribute_before_type_cast( attribute )
 
@@ -30,7 +32,7 @@ module ActiveModel
         return if options[:present] && value.present?
         message << " present" if options[:present]
 
-        return if options[:one_of] && options[:one_of].include?(value)
+        return if options[:one_of] && Array(options[:one_of]).flatten.include?(value)
         message = ": '#{value}' is not a valid value" if options[:one_of]
 
         return if options[:not_any_of] && !(options[:not_any_of].include?(value))
@@ -73,8 +75,14 @@ module ActiveModel
               return if !values.match?(record[field])
               condition_errors << "#{field} = #{record[field]}"
             when Array
-              return if !values.include?(record[field])
+              return if !values.flatten.include?(record[field])
               condition_errors << "#{field} = #{record[field]}"
+            when :blank
+              return unless record.send(field).blank?
+              condition_errors << "#{field} is #{values.to_s.gsub('?', '')}"
+            when :present
+              return unless record.send(field).present?
+              condition_errors << "#{field} is #{values.to_s.gsub('?', '')}"
             when Symbol
               return if !record.send(field)&.send(values)
               condition_errors << "#{field} is #{values.to_s.gsub('?', '')}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: be_valid
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.7
 platform: ruby
 authors:
 - John Stewart (johnsinco)
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-19 00:00:00.000000000 Z
+date: 2021-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -87,6 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - Gemfile
 - Gemfile.lock
@@ -120,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Custom Ruby on Rails Validation library supporting 'conditional' validation