simple_validate 1.2.3 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a55b4307e3f7b02f9caf048c5e892bf4230100557460d58df45b28dab196a68
-  data.tar.gz: 54faeafbe20dc26a0ec96e6d087fa04195ea0efdf6593fcd28a356fc4decc8b7
+  metadata.gz: 215eb056ff7677f32a10c721a53879a52cf3c08f2b8567ba63b86a6aff81d544
+  data.tar.gz: 4340fa2cfb67c41853f9e5aa4f2d6d1ff8303916d648916bceb799503461dc59
 SHA512:
-  metadata.gz: 1dab29ca30408fd05ca35e81fe8e7fc7db0029b5622369a7bbc89d9a3b8a85c92947a5c423ac0d2494c52f933569bc4ae96328cf3ed0a9ae87a422627719b400
-  data.tar.gz: 3c78f456e17d56a3649e4bde7475a32a084de618676bb0318c230f0572e6a727271f9afefcbc8d3f47beeda49bf7bdf16a10f1dd4d1efb43563db2330b0b1cfb
+  metadata.gz: a0a854c7b4fd9005eb7e86b035aa585c709d25d33c2b784948ab9d824804c0fdffb04b6e29703bd330f69037d8f9043edf168ca6ede3055a91da5a543ff44db7
+  data.tar.gz: 67c997ae9cc465d5b54e68b11b5c8438d04cc6b138c981953958c7b8761ba77c472f4a09d9af6a1178ba96271ba2bb8b0bb9cdf81d968b17594f61998a20f68f

data/.rspec_status

@@ -0,0 +1,5 @@
+example_id                            | status | run_time        |
+------------------------------------- | ------ | --------------- |
+./spec/simple_validate_spec.rb[1:1:1] | passed | 0.00127 seconds |
+./spec/simple_validate_spec.rb[1:2:1] | passed | 0.0001 seconds  |
+./spec/simple_validate_spec.rb[1:3:1] | passed | 0.00106 seconds |

data/.rubocop.yml

@@ -1,3 +1,10 @@
+AllCops:
+  TargetRubyVersion: 3.1
+
+Style/StringLiterals:
+  Enabled: true
+  EnforcedStyle: double_quotes
+
 Metrics/BlockLength:
   Enabled: false
 
@@ -9,3 +16,6 @@ Metrics/AbcSize:
 
 Style/DoubleNegation:
   Enabled: false
+
+Lint/ConstantDefinitionInBlock:
+  Enabled: false

data/Gemfile

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rake'
+gem "rake"
 
 group :development do
-  gem 'pry'
+  gem "pry"
 end
 
 group :test do
-  gem 'rspec'
-  gem 'rubocop'
+  gem "rspec"
+  gem "rubocop"
 end
 
 gemspec

data/README.md

@@ -1,29 +1,15 @@
 # Simple Validate
 
-[![Build Status](https://travis-ci.org/nikkypx/simple_validate.svg?branch=master)](https://travis-ci.org/nikkypx/simple_validate)
-
-> Borrowing ideas from [validatable](https://github.com/jnunemaker/validatable) and Rails validations, this is a library for validations for any ruby object.
+> PORO validation mixin with no deps
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
 ```ruby
 gem 'simple_validate'
 ```
 
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install simple_validate
-
 ## Usage
 
-### Example
-
 ```ruby
 require 'simple_validate'
 
@@ -54,10 +40,10 @@ end
   validates_presence_of :attribute
 ```
 
-### Numericality
+### Type
 
 ```ruby
-  validates_numericality_of :attribute
+  validates_type_of :attribute, as: :string
 ```
 
 ### Format
@@ -101,18 +87,6 @@ end
   validates_presence_of :attribute, if: Proc.new { true }
 ```
 
-
-## Development
-
-`$ rake` to run the specs
-
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/nikkypx/simple_validate.
-
-
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/Rakefile

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-require 'rubocop/rake_task'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+require "rubocop/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new
 
-task default: %i[spec rubocop:auto_correct]
+task default: %i[spec rubocop]

data/bin/console

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "simple_validate"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+require "irb"
+IRB.start(__FILE__)

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/lib/simple_validate/errors.rb

@@ -20,6 +20,10 @@ module SimpleValidate
       @messages.fetch(key)
     end
 
+    def clear!
+      @messages = {}
+    end
+
     def empty?
       @messages.empty?
     end

data/lib/simple_validate/utils.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module SimpleValidate
+  module Utils
+    def self.camelize(input) = input.to_s.split("_").map(&:capitalize).join
+    def self.extract_options!(args) = args.last.is_a?(Hash) ? args.pop : {}
+    def self.classify(input) = Object.const_get(camelize(input))
+
+    def self.article(input)
+      vowels = %w[a e i o u]
+      vowels.include?(input[0]) ? "an" : "a"
+    end
+  end
+end

data/lib/simple_validate/validates_format_of.rb

@@ -5,9 +5,9 @@ module SimpleValidate
     attr_accessor :regex
 
     def initialize(attribute, options)
-      self.regex = options[:with]
+      @regex = options[:with]
       super(attribute, options[:message] ||
-        'is incorrect format', options[:if] || proc { true })
+        "is incorrect format", options[:if] || proc { true })
     end
 
     def valid?(instance)

data/lib/simple_validate/validates_length_of.rb

@@ -15,15 +15,13 @@ module SimpleValidate
     end
 
     def message
-      @message ||= begin
-                     case validator
-                     when :minimum
-                       'is too short'
-                     when :maximum
-                       'is too long'
-                     else
-                       'is not the correct length'
-                     end
+      @message ||= case validator
+                   when :minimum
+                     "is too short"
+                   when :maximum
+                     "is too long"
+                   else
+                     "is not the correct length"
                    end
     end
 
@@ -49,9 +47,7 @@ module SimpleValidate
     end
 
     def valid?(instance)
-      if options.keys.size > 1
-        raise ArgumentError, 'Only one length argument can be provided'
-      end
+      raise ArgumentError, "Only one length argument can be provided" if options.keys.size > 1
 
       unless VALID_LENGTH_OPTIONS.include?(options.keys.first)
         raise InvalidLengthOption, "Invalid length option given #{options.keys}"

data/lib/simple_validate/validates_set_base.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'set'
-
 module SimpleValidate
   class ValidatesSetBase < ValidatesBase
     attr_accessor :set, :options
@@ -10,7 +8,7 @@ module SimpleValidate
       self.options = options
       self.set = Set.new(Array(options[:in]).map(&:to_s))
       super(attribute, options[:message] ||
-        'breaks inclusion/exclusion rules', options[:if] || proc { true })
+        "breaks inclusion/exclusion rules", options[:if] || proc { true })
     end
   end
 end

data/lib/simple_validate/validates_type_of.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module SimpleValidate
+  class ValidatesTypeOf < ValidatesBase
+    SUPPORTED_TYPES = %i[string integer float].freeze
+
+    def initialize(attribute, options)
+      @type = options[:as]
+
+      raise ArgumentError unless @type && SUPPORTED_TYPES.include?(@type)
+
+      @klass = Utils.classify(options[:as])
+
+      super(attribute, options[:message] ||
+        "must be #{Utils.article(@type)} #{@type}", options[:if] || proc { true })
+    end
+
+    def valid?(instance)
+      instance.send(attribute).is_a?(@klass)
+    end
+  end
+end

data/lib/simple_validate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SimpleValidate
-  VERSION = '1.2.3'
+  VERSION = "2.0.1"
 end

data/lib/simple_validate.rb

@@ -3,7 +3,7 @@
 %w[base
    presence_of
    format_of
-   numericality_of
+   type_of
    length_of
    set_base
    inclusion_of
@@ -11,9 +11,9 @@
      require "simple_validate/validates_#{validation}"
    end
 
-require 'simple_validate/errors'
-require 'simple_validate/version'
-require 'active_support/all'
+require "simple_validate/errors"
+require "simple_validate/version"
+require "simple_validate/utils"
 
 module SimpleValidate
   def self.included(klass)
@@ -38,7 +38,7 @@ module SimpleValidate
   module ClassMethods
     def method_missing(method, *args, &block)
       if respond_to?(method)
-        add_validations(args, const_get(method.to_s.classify))
+        add_validations(args, const_get(Utils.camelize(method)))
       else
         super
       end
@@ -48,7 +48,7 @@ module SimpleValidate
       method.to_s =~ /(validates_
                        (format|
                         presence|
-                        numericality|
+                        type|
                         inclusion|
                         exclusion|
                         length)_of)
@@ -56,7 +56,7 @@ module SimpleValidate
     end
 
     def add_validations(args, klass)
-      options = args.extract_options!
+      options = Utils.extract_options! args
       args.each do |attr|
         validations << klass.new(attr, options)
       end
@@ -67,6 +67,8 @@ module SimpleValidate
     end
 
     def validate(instance)
+      instance.errors.clear!
+
       validations.each do |validation|
         if validation.condition.call && !validation.valid?(instance)
           instance.errors.add(validation.attribute, validation.message)

data/simple_validate.gemspec

@@ -1,25 +1,24 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('lib', __dir__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'simple_validate/version'
+require "simple_validate/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'simple_validate'
+  spec.name          = "simple_validate"
   spec.version       = SimpleValidate::VERSION
-  spec.authors       = ['Nick Palaniuk']
-  spec.email         = ['npalaniuk@gmail.com']
+  spec.authors       = ["Nick Palaniuk"]
+  spec.email         = ["npalaniuk@gmail.com"]
 
-  spec.summary       = 'Validations for any plain old ruby object'
-  spec.description   = 'Validations for any ruby object'
-  spec.homepage      = 'https://github.com/nikkypx/simple_validate'
-  spec.license       = 'MIT'
+  spec.summary       = "PORO validation mixin with no deps"
+  spec.description   = "PORO validation mixin with no deps"
+  spec.homepage      = "https://github.com/nikkypx/simple_validate"
+  spec.license       = "MIT"
+  spec.required_ruby_version = ">= 3.1"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
 
-  spec.require_paths = ['lib']
-  spec.add_dependency 'activesupport'
-  spec.add_development_dependency 'bundler'
+  spec.require_paths = ["lib"]
 end

metadata

@@ -1,44 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: simple_validate
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 2.0.1
 platform: ruby
 authors:
 - Nick Palaniuk
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-25 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Validations for any ruby object
+date: 2023-08-28 00:00:00.000000000 Z
+dependencies: []
+description: PORO validation mixin with no deps
 email:
 - npalaniuk@gmail.com
 executables: []
@@ -47,29 +19,32 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rspec_status"
 - ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/console
+- bin/setup
 - lib/simple_validate.rb
 - lib/simple_validate/errors.rb
+- lib/simple_validate/utils.rb
 - lib/simple_validate/validates_base.rb
 - lib/simple_validate/validates_exclusion_of.rb
 - lib/simple_validate/validates_format_of.rb
 - lib/simple_validate/validates_inclusion_of.rb
 - lib/simple_validate/validates_length_of.rb
-- lib/simple_validate/validates_numericality_of.rb
 - lib/simple_validate/validates_presence_of.rb
 - lib/simple_validate/validates_set_base.rb
+- lib/simple_validate/validates_type_of.rb
 - lib/simple_validate/version.rb
 - simple_validate.gemspec
 homepage: https://github.com/nikkypx/simple_validate
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -77,15 +52,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
-summary: Validations for any plain old ruby object
+summary: PORO validation mixin with no deps
 test_files: []

data/.travis.yml

@@ -1,3 +0,0 @@
-language: ruby
-rvm:
-  - 2.2.2

data/lib/simple_validate/validates_numericality_of.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module SimpleValidate
-  class ValidatesNumericalityOf < ValidatesBase
-    def initialize(attribute, options)
-      super(attribute, options[:message] ||
-        'must be a number', options[:if] || proc { true })
-    end
-
-    def valid?(instance)
-      instance.send(attribute).is_a?(Numeric)
-    end
-  end
-end