be_valid 0.1.5 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 321b08decb577f0a5e7ceded71bf6c05829cd877a28f2b377f606e2f56cf6e61
-  data.tar.gz: c68cb42238a0480b4c2768b159fe7dca5bb690004f43027df728bdeca71b0f23
+  metadata.gz: 4df30ef660224a292378d734a78f8e680410c43fd3ded2e5bb2a0e4951e9cafc
+  data.tar.gz: 7a4c30c3fff7ccb3b10d5cc43bf0b72d918ba2973a9a2c4363ca16ea41a699cb
 SHA512:
-  metadata.gz: f085944be0b2681549ef91f534d2fb3a888d95be819f5bbd2e7143ac8d03817322229d5bbd1f8b46705dfe11c447006049f10c60fd301b7b4a6fa76f64c62e1e
-  data.tar.gz: c9f38ad043a959f56386d785b747197e0e6936867532a315348b47227858615040e8a0c3c20c7dca654f8292c815257f868d0eea9fd829072330219169f18f0b
+  metadata.gz: a2ec3ac95e91daad7216d7a33f0d4683c796e73df92a798cbd6fc691ca554ab18efe78cfda98abe91670ac4564bb6bd09625a37229045e8e0573ef1c336a48e1
+  data.tar.gz: ed48033ae3870e982ece60f870e76d398ef9a4fc2d78f95b316891d92aef4491aff62c1714afdbe9852d2b038063a2953dd98bd9922fa59510de2b6bcf218233

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: ['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,43 @@
 PATH
   remote: .
   specs:
-    be_valid (0.1.4)
+    be_valid (0.1.9)
+      activemodel (~> 6.1)
 
 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.4.1)
+      activesupport (= 6.1.4.1)
+    activerecord (6.1.4.1)
+      activemodel (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (9.0.0)
-    concurrent-ruby (1.1.8)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    concurrent-ruby (1.1.9)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     minitest (5.14.4)
-    rake (10.5.0)
+    rake (13.0.6)
     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.5.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 5)
+  activerecord (~> 6)
   be_valid!
-  bundler (~> 1.17)
+  bundler (~> 2)
   minitest (~> 5.0)
-  rake (~> 10.0)
+  rake (~> 13.0)
   sqlite3 (~> 1.4)
 
 BUNDLED WITH
-   1.17.2
+   2.2.22

data/be_valid.gemspec

@@ -23,11 +23,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.3'
+  spec.required_ruby_version = '>= 3.0'
 
-  spec.add_development_dependency "bundler", "~> 1.17"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_dependency "activemodel", "~> 6.1"
+
+  spec.add_development_dependency "bundler", "~> 2"
+  spec.add_development_dependency "rake", "~> 13.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/version.rb

@@ -1,3 +1,3 @@
 module BeValid
-  VERSION = "0.1.5"
+  VERSION = "0.1.9"
 end

data/lib/be_valid.rb

@@ -1,9 +1,21 @@
-require 'be_valid/be_valid'
-
-begin
+module BeValid
   require 'validators/date_validator'
   require 'validators/must_be_validator'
-rescue 
-  'unable to load be_valid validator'
-  nil
+
+  def self.config
+    @@config ||= Configuration.new
+  end
+
+  def self.configure
+    self.config ||= Configuration.new
+    yield(config)
+  end
+
+  class Configuration
+    attr_accessor :rules
+
+    def initialize
+      @rules = {}
+    end
+  end
 end

data/lib/validators/date_validator.rb

@@ -1,3 +1,5 @@
+require 'active_model'
+
 class DateValidator < ActiveModel::EachValidator
 
   # https://stackoverflow.com/questions/28538080/rails-validate-dates-in-model-before-type-cast
@@ -6,14 +8,15 @@ class DateValidator < ActiveModel::EachValidator
 
     @error_hash = options[:error_level].present? ? record.send(options[:error_level]) : record.errors
 
-    original_value = record.read_attribute_before_type_cast( attribute )
+    original_value = value
+    original_value = record.read_attribute_before_type_cast( attribute ) rescue nil # only in rails
     # dont display date format error unless date could not be parsed
     if value.nil?
       # if blank date was given it's still not a format issue, still show message if desired
       return if original_value.blank? && options[:allow_blank]
 
       # 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."
+      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 format."
       @error_hash.add(attribute, (options[:message] || message))
     else
       # handle validation options on valid date instances
@@ -38,7 +41,7 @@ class DateValidator < ActiveModel::EachValidator
     elsif options[:after].respond_to?(:strftime)
       after_message << " Date cannot be before #{options[:after]}"
     elsif options[:after].is_a? Proc
-      after_message << " Date cannot be before #{options[:after].call(record)}"
+      after_message << " Date cannot be before #{date}"
     elsif record.respond_to?(options[:after])
       after_message << " Date cannot be before #{options[:after]}"
     end
@@ -56,7 +59,7 @@ class DateValidator < ActiveModel::EachValidator
       elsif options[:before].respond_to?(:strftime)
         before_message << " Date cannot be after #{options[:before]}"
       elsif options[:before].is_a? Proc
-        before_message << " Date cannot be after #{options[:before].call(record)}"
+        before_message << " Date cannot be after #{date}"
       elsif record.respond_to?(options[:before])
         before_message << " Date cannot be after #{options[:before]}"
       end
@@ -78,13 +81,11 @@ class DateValidator < ActiveModel::EachValidator
              record.__send__(option) if record.respond_to?(option)
            end
     return unless date.present?
-    date = date.to_date unless options[:time]
-    if date.is_a?(Time)
-      value = value.to_time
-    elsif date.is_a?(Date)
-      value = value.to_date
+    if options[:time]
+      return [date.to_time, value.to_time]
+    else
+      return [date.to_date, value.to_date]
     end
-    [date, value]
   end
 
 end

data/lib/validators/must_be_validator.rb

@@ -1,4 +1,4 @@
-require 'active_record'
+require 'active_model'
 
 module ActiveModel
   module Validations
@@ -11,16 +11,19 @@ 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 )
+        original_value = value
+        original_value = record.read_attribute_before_type_cast( attribute ) rescue nil # only in rails
 
         message = self.class::MESSAGE_PREFIX.dup
 
@@ -68,13 +71,14 @@ module ActiveModel
           message << " when "
           condition_errors = []
           conditions.each do |field, values|
+            field_value = record.send(field)
             case values
             when Regexp
-              return if !values.match?(record[field])
-              condition_errors << "#{field} = #{record[field]}"
+              return if !values.match?(field_value)
+              condition_errors << "#{field} = #{field_value}"
             when Array
-              return if !values.flatten.include?(record[field])
-              condition_errors << "#{field} = #{record[field]}"
+              return if !values.flatten.include?(field_value)
+              condition_errors << "#{field} = #{field_value}"
             when :blank
               return unless record.send(field).blank?
               condition_errors << "#{field} is #{values.to_s.gsub('?', '')}"
@@ -85,8 +89,8 @@ module ActiveModel
               return if !record.send(field)&.send(values)
               condition_errors << "#{field} is #{values.to_s.gsub('?', '')}"
             else
-              return if values != record[field]
-              condition_errors << "#{field} = #{record[field]}"
+              return if values != field_value
+              condition_errors << "#{field} = #{field_value}"
             end
           end
           message << condition_errors.join(' and ')
@@ -104,6 +108,13 @@ module ActiveModel
 
         record.send(self.class::ERRORS_METHOD).add(attribute, (options[:message] || "#{message}."), rule_name: options[:rule_name])
       end
+      module ClassMethods
+        def validates_must_be_valid(*attr_names) 
+          validates_with MustBeValidator, _merge_attributes(attr_names)
+        end
+
+        alias_method :validates_must_be, :validates_must_be_valid
+      end
     end
   end
 end

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: be_valid
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.9
 platform: ruby
 authors:
 - John Stewart (johnsinco)
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-28 00:00:00.000000000 Z
+date: 2022-07-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     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
     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: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +72,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 +101,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - Gemfile
 - Gemfile.lock
@@ -97,7 +112,6 @@ files:
 - bin/console
 - bin/setup
 - lib/be_valid.rb
-- lib/be_valid/be_valid.rb
 - lib/be_valid/version.rb
 - lib/validators/date_validator.rb
 - lib/validators/must_be_validator.rb
@@ -113,14 +127,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Custom Ruby on Rails Validation library supporting 'conditional' validation

data/lib/be_valid/be_valid.rb

@@ -1,18 +0,0 @@
-module BeValid
-  def self.config
-    @@config ||= Configuration.new
-  end
-
-  def self.configure
-    self.config ||= Configuration.new
-    yield(config)
-  end
-
-  class Configuration
-    attr_accessor :notice_rules
-
-    def initialize
-      @notice_rules= []
-    end
-  end
-end