be_valid 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7edccd354585b1c23c1b623e936e48a442e63084ffdb50ec723c8e6c484d88dc
-  data.tar.gz: 8f1a9f325cf407a462749673476eedba4257df10d9a58520bfa686b31d9cadda
+  metadata.gz: '09ad2711308c18cd301eecd01ca9caf828c81909f9be6597c96a6353513ba4b4'
+  data.tar.gz: 79cff60db8a311481607f39f89191e84682f6d809e02710908f6aacb535b038f
 SHA512:
-  metadata.gz: f870bf1181a47bef15e48054ca0276090a55a9340f93dccb538e6ea94a62e15949c1b47c0c688c3347fa8f51ea6c0cbccfba19c51c23480acdb440f2c15d53b7
-  data.tar.gz: 36de4519138b8e10897ac761b99c71fb3b7726808ff11e3ef2ad5bc94cff19852dea31b8d4dedf835b3c025598ed1a832b08941053ba7adf1ebf5a3587d899a1
+  metadata.gz: 35c8e9420efe9154f461af5857a9e2c8bd81ef1cacd525b1be4f176b39d51b4e7ebcabade66152c308429b8b653dd76aeb230f11c8a5e80bde24661a7a8e20b4
+  data.tar.gz: a4475627627e9d0338f7117254b9dc3785de4b8500b5e960900eb90069e27347792dc8f7e2c232c00a36966fd3388ea5bd05e30acfd1effd30f423bac8b57147

data/.github/workflows/ruby.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.6', '2.7', '3.0']
+        ruby-version: ['3.0']
 
     steps:
     - uses: actions/checkout@v2

data/Gemfile.lock

@@ -1,31 +1,32 @@
 PATH
   remote: .
   specs:
-    be_valid (0.1.6)
+    be_valid (0.1.8)
+      activemodel (~> 6.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    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)
+    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 (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    concurrent-ruby (1.1.8)
+    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)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.1)
 
 PLATFORMS
   ruby
@@ -35,8 +36,8 @@ DEPENDENCIES
   be_valid!
   bundler (~> 2)
   minitest (~> 5.0)
-  rake (~> 10.0)
+  rake (~> 13.0)
   sqlite3 (~> 1.4)
 
 BUNDLED WITH
-   2.2.17
+   2.2.22

data/be_valid.gemspec

@@ -23,10 +23,12 @@ 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_dependency "activemodel", "~> 6.1"
 
   spec.add_development_dependency "bundler", "~> 2"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "activerecord", "~> 6"
   spec.add_development_dependency "sqlite3", "~> 1.4"

data/lib/be_valid/version.rb

@@ -1,3 +1,3 @@
 module BeValid
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 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,23 +8,24 @@ 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."
-      @error_hash.add(attribute, (options[:message] || message), rule_name: options[:rule_name])
+      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
       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}."), rule_name: options[:rule_name])
+        @error_hash.add(attribute, (options[:after_message] || "#{after_message}."))
       end
       if(options[:before] && (before_message = validate_before_option(record, attribute, value, original_value)) != true)
-        @error_hash.add(attribute, (options[:before_message] || "#{before_message}."), rule_name: options[:rule_name])
+        @error_hash.add(attribute, (options[:before_message] || "#{before_message}."))
       end
     end
   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
@@ -22,7 +22,8 @@ module ActiveModel
         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
 
@@ -70,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('?', '')}"
@@ -87,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 ')
@@ -106,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,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: be_valid
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - John Stewart (johnsinco)
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-18 00:00:00.000000000 Z
+date: 2021-11-30 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
@@ -30,14 +44,14 @@ dependencies:
     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
@@ -98,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
@@ -114,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.1.6
+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 :rules
-
-    def initialize
-      @rules = {}
-    end
-  end
-end