simple_validate 2.1.2 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ac8df574ea6749497a31f423b343ddbb5e7f444a3d5d8ab60d57a3faaa594cf
-  data.tar.gz: 0122ded6d697df547de47dc9a47556f8ecffacfe79369675558ad9714c1565fc
+  metadata.gz: 628e641750b3b4b70e0b5c1e9dfe71d96a328f21ecc84120384d49c8e9016e4f
+  data.tar.gz: dbbbaf33a3f1e2597a2e621ae571715d7b02c20556aadc38c36330d24d458662
 SHA512:
-  metadata.gz: 8391463f35b4ae5e04c7025941d8a85d0533b69eac371c3b85c8e5e437dd6cdcf7d8c7d7203cc54a8acf00bba2da126a3218fe4eb65642529c2c069fe21254a6
-  data.tar.gz: 405ea7f377be0e0f561f8c597dd7c5dc6ac1712663421999014f810a521e85b21224458386154e7e8e9529dc97ba198cd2a463105553ad5e335561bce0a52e35
+  metadata.gz: c27471e667d574519a90093a454a154908298f2a3667bac826122453582e1d3401e466401e10b7308e436f4e47c8b8de408fb69290cf77b2d1acb0658a0c752d
+  data.tar.gz: d4613f09b11db76d5c1406a012b8073ac384a9121f6fa99208ef809bffcfb5dabc60589b4fcf17d9d5070867e618eb18c34ad5427ec045d93d2300c76645300b

data/.rspec_status

@@ -1,8 +1,28 @@
-example_id                            | status | run_time        |
-------------------------------------- | ------ | --------------- |
-./spec/simple_validate_spec.rb[1:1:1] | passed | 0.00132 seconds |
-./spec/simple_validate_spec.rb[1:2:1] | passed | 0.00012 seconds |
-./spec/simple_validate_spec.rb[1:3:1] | passed | 0.00108 seconds |
-./spec/simple_validate_spec.rb[1:4:1] | passed | 0.00007 seconds |
-./spec/simple_validate_spec.rb[1:5:1] | passed | 0.00006 seconds |
-./spec/simple_validate_spec.rb[1:6:1] | passed | 0.00007 seconds |
+example_id                                   | status | run_time        |
+-------------------------------------------- | ------ | --------------- |
+./spec/simple_validate_spec.rb[1:1:1]        | passed | 0.00128 seconds |
+./spec/simple_validate_spec.rb[1:2:1]        | passed | 0.00008 seconds |
+./spec/validators/exclusion_spec.rb[1:1:1]   | passed | 0.00005 seconds |
+./spec/validators/exclusion_spec.rb[1:2:1:1] | passed | 0.00006 seconds |
+./spec/validators/exclusion_spec.rb[1:2:2:1] | passed | 0.00005 seconds |
+./spec/validators/inclusion_spec.rb[1:1:1]   | passed | 0.00004 seconds |
+./spec/validators/inclusion_spec.rb[1:2:1:1] | passed | 0.00005 seconds |
+./spec/validators/inclusion_spec.rb[1:2:2:1] | passed | 0.00005 seconds |
+./spec/validators/length_spec.rb[1:1:1]      | passed | 0.00007 seconds |
+./spec/validators/length_spec.rb[1:2:1]      | passed | 0.00007 seconds |
+./spec/validators/length_spec.rb[1:3:1]      | passed | 0.00007 seconds |
+./spec/validators/length_spec.rb[1:4:1:1]    | passed | 0.00008 seconds |
+./spec/validators/length_spec.rb[1:4:2:1]    | passed | 0.00007 seconds |
+./spec/validators/length_spec.rb[1:5:1:1]    | passed | 0.00005 seconds |
+./spec/validators/length_spec.rb[1:5:2:1]    | passed | 0.00006 seconds |
+./spec/validators/length_spec.rb[1:6:1]      | passed | 0.00005 seconds |
+./spec/validators/presence_spec.rb[1:1:1]    | passed | 0.00006 seconds |
+./spec/validators/type_spec.rb[1:1:1]        | passed | 0.00005 seconds |
+./spec/validators/type_spec.rb[1:2:1:1]      | passed | 0.00006 seconds |
+./spec/validators/type_spec.rb[1:2:2:1]      | passed | 0.00006 seconds |
+./spec/validators/type_spec.rb[1:3:1:1]      | passed | 0.00005 seconds |
+./spec/validators/type_spec.rb[1:3:2:1]      | passed | 0.00006 seconds |
+./spec/validators/type_spec.rb[1:4:1:1]      | passed | 0.00006 seconds |
+./spec/validators/type_spec.rb[1:4:2:1]      | passed | 0.00006 seconds |
+./spec/validators/type_spec.rb[1:5:1:1]      | passed | 0.00005 seconds |
+./spec/validators/type_spec.rb[1:5:2:1]      | passed | 0.00006 seconds |

data/lib/simple_validate/validates_exclusion_of.rb

@@ -1,11 +1,23 @@
 # frozen_string_literal: true
 
 module SimpleValidate
-  class ValidatesExclusionOf < ValidatesSetBase
+  class ValidatesExclusionOf < ValidatesBase
+    def initialize(attribute, options)
+      @set = options[:in]
+      @allow_nil = options[:allow_nil]
+
+      raise ArgumentError unless [Array, Range].include?(@set.class)
+
+      super(attribute, options[:message] ||
+        "breaks exclusion rules", options[:if] || proc { true })
+    end
+
     def valid?(instance)
-      raise ArgumentError if set.empty? || !options.fetch(:in).is_a?(Array)
+      val = instance.send(attribute)
+
+      return true if val.nil? && @allow_nil == true
 
-      !set.include?(instance.send(attribute).to_s)
+      !@set.to_a.include?(val)
     end
   end
 end

data/lib/simple_validate/validates_format_of.rb

@@ -5,15 +5,22 @@ module SimpleValidate
     attr_accessor :regex
 
     def initialize(attribute, options)
+      @allow_nil = options[:allow_nil]
       @regex = options[:with]
-      super(attribute, options[:message] ||
-        "is incorrect format", options[:if] || proc { true })
+      super(
+        attribute,
+        options[:message] || "is incorrect format",
+        options[:if] || proc { true }
+      )
     end
 
     def valid?(instance)
+      val = instance.send(attribute)
+
+      return true if val.nil? && @allow_nil == true
       raise ArgumentError if regex.nil? || !regex.is_a?(Regexp)
 
-      !!(instance.send(attribute) =~ regex)
+      !!(val =~ regex)
     end
   end
 end

data/lib/simple_validate/validates_inclusion_of.rb

@@ -1,11 +1,23 @@
 # frozen_string_literal: true
 
 module SimpleValidate
-  class ValidatesInclusionOf < ValidatesSetBase
+  class ValidatesInclusionOf < ValidatesBase
+    def initialize(attribute, options)
+      @set = options[:in]
+      @allow_nil = options[:allow_nil]
+
+      raise ArgumentError unless [Array, Range].include?(@set.class)
+
+      super(attribute, options[:message] ||
+        "breaks inclusion rules", options[:if] || proc { true })
+    end
+
     def valid?(instance)
-      raise ArgumentError if set.empty? || !options.fetch(:in).is_a?(Array)
+      val = instance.send(attribute)
+
+      return true if val.nil? && @allow_nil == true
 
-      set.include?(instance.send(attribute).to_s)
+      @set.to_a.include?(val)
     end
   end
 end

data/lib/simple_validate/validates_length_of.rb

@@ -2,58 +2,49 @@
 
 module SimpleValidate
   class ValidatesLengthOf < ValidatesBase
-    class InvalidLengthOption < ArgumentError; end
-    attr_reader :attribute
-    attr_accessor :options
-
-    VALID_LENGTH_OPTIONS = %i[maximum minimum in is].freeze
+    VALIDATORS = %i[maximum minimum in is].freeze
 
     def initialize(attribute, options)
-      super(attribute, options.delete(:message), options.delete(:if) ||
-        proc { true })
-      self.options = options
-    end
+      @validator = options.keys.first
 
-    def message
-      @message ||= case validator
-                   when :minimum
-                     "is too short"
-                   when :maximum
-                     "is too long"
-                   else
-                     "is not the correct length"
-                   end
-    end
+      raise ArgumentError, "Invalid length option" unless VALIDATORS.include?(@validator)
 
-    def validator
-      options.keys.first
+      @valid_length = options[@validator]
+      @allow_nil = options[:allow_nil]
+
+      super(attribute, options[:message], options[:if] || proc { true })
     end
 
-    def valid_length
-      options.values.first
+    def message
+      @message = case @validator
+                 when :minimum
+                   "is too short"
+                 when :maximum
+                   "is too long"
+                 else
+                   "is not valid length"
+                 end
     end
 
     def valid_length?(actual_length)
-      case validator
+      case @validator
       when :minimum
-        actual_length >= valid_length
+        actual_length >= @valid_length
       when :maximum
-        actual_length <= valid_length
+        actual_length <= @valid_length
       when :in
-        valid_length.member?(actual_length)
+        @valid_length.member?(actual_length)
       when :is
-        actual_length == valid_length
+        actual_length == @valid_length
       end
     end
 
     def valid?(instance)
-      raise ArgumentError, "Only one length argument can be provided" if options.keys.size > 1
+      val = instance.send(attribute)
 
-      unless VALID_LENGTH_OPTIONS.include?(options.keys.first)
-        raise InvalidLengthOption, "Invalid length option given #{options.keys}"
-      end
+      return true if val.nil? && @allow_nil == true
 
-      actual_length = instance.send(attribute)&.length
+      actual_length = val&.length
       valid_length?(actual_length)
     end
   end

data/lib/simple_validate/validates_type_of.rb

@@ -5,6 +5,7 @@ module SimpleValidate
     SUPPORTED_TYPES = %i[string integer float boolean].freeze
 
     def initialize(attribute, options)
+      @allow_nil = options[:allow_nil]
       @type = options[:as]
 
       raise ArgumentError unless @type && SUPPORTED_TYPES.include?(@type)
@@ -14,11 +15,15 @@ module SimpleValidate
     end
 
     def valid?(instance)
+      val = instance.send(attribute)
+
+      return true if val.nil? && @allow_nil == true
+
       if @type == :boolean
-        [true, false].include? instance.send(attribute)
+        [true, false].include? val
       else
         klass = Utils.classify(@type)
-        instance.send(attribute).is_a?(klass)
+        val.is_a?(klass)
       end
     end
   end

data/lib/simple_validate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SimpleValidate
-  VERSION = "2.1.2"
+  VERSION = "2.2.2"
 end

data/lib/simple_validate.rb

@@ -5,7 +5,6 @@
    format_of
    type_of
    length_of
-   set_base
    inclusion_of
    exclusion_of].each do |validation|
      require "simple_validate/validates_#{validation}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_validate
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.2
 platform: ruby
 authors:
 - Nick Palaniuk
@@ -36,7 +36,6 @@ files:
 - lib/simple_validate/validates_inclusion_of.rb
 - lib/simple_validate/validates_length_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

data/lib/simple_validate/validates_set_base.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module SimpleValidate
-  class ValidatesSetBase < ValidatesBase
-    attr_accessor :set, :options
-
-    def initialize(attribute, options)
-      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 })
-    end
-  end
-end