statinize 0.2.1 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7814eb5a73fe5fb67c846398c6d22573b183cafd88c243175ef4fb39c5f71fbe
-  data.tar.gz: b7eec7d141ae6a0deda224802f67dae791ea7b9c96957922c9a7fa9c1b052e6a
+  metadata.gz: b3dda46ee65052ce2579b2b223c659c3c76d68d85df008400d14432aeaf53fb1
+  data.tar.gz: bd60810a6e386bdad9d9628dc9f1cb2f0cf2b1e04df41f6fc1762109c7909081
 SHA512:
-  metadata.gz: 8bea982ae518d67bb7f9c0a9cab47dd081d869dabbdf01874e14de5c2004217bd6f395e5e040f93499cbe5de413e1d3ed6b59222e9d8089cb6b01289748d1be9
-  data.tar.gz: '08111b888a705bb74fe044f9de93ebcfd6863646df65510bf62e0566b23af1e4ef410609a22b0fc1afb1b15ffac62edbd9b43264a02191504e25296a99eab1e8'
+  metadata.gz: d3ca8f71c4efa6b8298fffc4ff94fa45193d7aa0ef60bfb6128ca539683c8500086362e520c6e8937dfd82d7896475d90854b01a947a38519d08105a4c048cb3
+  data.tar.gz: d2d6b696b3195cd9b75cfe8b35ce7eb149965ed89c3d79c2f3737e575cb5bcd2a2be80e6e5061c712e4f68a57aa9d71fcdf90a4c5c36a2e7d7f4069d07a2826b

data/lib/statinize/attribute/options.rb

@@ -24,7 +24,7 @@ module Statinize
       end
 
       def should_cast?
-        key?(:type) && key?(:cast)
+        key?(:type) && public_send(:[], :cast)
       end
 
       def should_validate?(instance)

data/lib/statinize/attribute.rb

@@ -2,7 +2,8 @@ module Statinize
   class Attribute
     include Comparable
 
-    attr_reader :klass, :name, :options
+    attr_reader :klass, :name
+    attr_accessor :options
 
     def initialize(klass, name, opts)
       @klass = klass
@@ -11,7 +12,7 @@ module Statinize
       @options << opts.clone.extend(Options) unless opts.empty?
     end
 
-    def self.create(klass, name, opts)
+    def self.create(klass, name, opts = {})
       new(klass, name, opts).create
     end
 

data/lib/statinize/caster.rb

@@ -9,6 +9,8 @@ module Statinize
       Symbol => :to_sym,
       Enumerator => :to_enum,
       Proc => :to_proc,
+      Array => :to_a,
+      BigDecimal => :to_d,
     }.freeze
 
     def initialize(instance, attr, option)
@@ -30,7 +32,9 @@ module Statinize
     attr_reader :instance, :attr_name, :attr_value, :validator_value
 
     def castable?
-      attr_value.respond_to? casting
+      return attr_value.respond_to?(casting) if casting.is_a?(String) || casting.is_a?(Symbol)
+
+      false
     end
 
     def casting

data/lib/statinize/dsl.rb

@@ -0,0 +1,60 @@
+# Defines DSL for statinize block
+module Statinize
+  module DSL
+    def attribute(*attrs, **options)
+      attrs.each do |attr|
+        Attribute.create(klass, attr, options) unless attribute? attr
+      end
+    end
+
+    def validate(*attrs, **options)
+      attrs.each do |attr|
+        attribute = attributes.find { _1.name == attr }
+        attribute = Attribute.create(klass, attr) unless attribute
+        attribute.add_options(options)
+      end
+    end
+
+    def with(**options, &block)
+      instance = self.class.new(klass)
+      instance.force(force)
+
+      klass.instance_variable_set(:@statinizer, instance)
+      instance.instance_exec(&block)
+      klass.instance_variable_set(:@statinizer, self)
+
+      instance.merge_options(**options)
+
+      populate(instance.attributes)
+    end
+
+    def before(&block)
+      return unless block_given?
+
+      before_callbacks << block
+    end
+
+    def force(force = nil)
+      force.nil? ? @force : @force = force
+    end
+
+    protected
+
+    def merge_options(**options)
+      attributes.each do |attribute|
+        attribute.options.each do |option|
+          option.merge!(options)
+        end
+      end
+    end
+
+    def populate(attrs)
+      attrs.each do |attr|
+        attribute attr.name
+        attributes
+          .find { _1.name == attr.name }
+          .options = attr.options.clone
+      end
+    end
+  end
+end

data/lib/statinize/errors.rb

@@ -7,10 +7,12 @@ module Statinize
 
   class UndefinedAttribute < StandardError; end
 
-  class Errors < Array
-    def to_s
-      nice_errors = map do |i|
-        "#{i.keys.first.to_s.split("_").tap { |attr| attr.first.capitalize! }.join(" ")} #{i.values.first}"
+  class Errors < Hash
+    def nice
+      nice_errors = map do |attr_name, errors|
+        errors.map do |error|
+          "#{attr_name.to_s.split("_").tap { |attr| attr.first.capitalize! }.join(" ")} #{error}"
+        end.join("; ")
       end.join("; ")
 
       "ValidationError: #{nice_errors}"

data/lib/statinize/statinizable.rb

@@ -6,16 +6,21 @@ module Statinize
     end
 
     module PrependedMethods
-      def initialize(*args, **kwargs, &block)
+      def initialize(options = {}, *args, **kwargs, &block)
+        symbolized = kwargs.transform_keys(&:to_sym)
+          .merge(options.transform_keys(&:to_sym))
+
         if private_methods(false).include? :initialize
           super(*args, **kwargs, &block)
-          check_defined!(kwargs)
+          check_defined!(symbolized)
         else
           statinizer.attributes.map(&:name).each do |attr|
-            instance_variable_set("@#{attr}", kwargs[attr]) if kwargs.key?(attr)
+            instance_variable_set("@#{attr}", symbolized[attr]) if symbolized.key?(attr)
           end
         end
 
+        run_before_callbacks
+
         define_validation
         validate!
       end
@@ -24,6 +29,10 @@ module Statinize
         @validation ||= Validation.new(statinizer, self)
       end
 
+      def run_before_callbacks
+        statinizer.run_before_callbacks(self)
+      end
+
       def attributes
         @attributes = Hash[
           statinizer.attributes.map { |a| [a.name, public_send(a.name)] }

data/lib/statinize/statinizer.rb

@@ -1,44 +1,19 @@
 module Statinize
   class Statinizer
-    attr_reader :klass
+    include DSL
 
-    def initialize(klass)
-      @klass = klass
-      @force = config.force
-    end
-
-    def attribute(*attrs, **options)
-      options.merge!(@with) if @with
-
-      attrs.each do |attr|
-        Attribute.create(klass, attr, options)
-      end
-    end
-
-    def validate(*attrs, **options)
-      options.merge!(@with) if @with
-
-      attrs.each do |attr|
-        attribute = attributes.find { _1.name == attr }
-        attribute&.add_options(options)
-      end
-    end
-
-    def with(**kwargs, &block)
-      @with = kwargs
-      instance_exec(&block)
-
-      remove_instance_variable(:@with) if @with
-    end
-
-    def force(force = nil)
-      force.nil? ? @force : @force = force
-    end
+    attr_reader :klass, :before_callbacks
 
     def self.configure(&block)
       Configuration.configure(&block)
     end
 
+    def initialize(klass)
+      @klass = klass
+      @force = config.force
+      @before_callbacks = []
+    end
+
     def config
       @config ||= Configuration.instance
     end
@@ -48,22 +23,28 @@ module Statinize
     end
 
     def add_attribute(attribute)
-      attributes.add(attribute)
+      attributes.add(attribute) unless attribute? attribute
     end
 
     def attributes
       @attributes ||= Set.new
     end
 
+    def run_before_callbacks(instance)
+      before_callbacks.each do |callback|
+        instance.instance_exec(&callback) if callback.is_a? Proc
+      end
+    end
+
     def attribute?(attribute)
-      attributes.include? attribute
+      attributes.map(&:name).include? attribute.name
     end
 
     def check_validators_exist!
       raise NoSuchValidatorError unless all_validators_defined?
     end
 
-    private
+    protected
 
     def all_validators_defined?
       attributes.map { |attr| attr.options.all_validators_defined? }.all? { !!_1 }

data/lib/statinize/validation.rb

@@ -12,7 +12,7 @@ module Statinize
     end
 
     def validate
-      @errors = Errors.new
+      @errors = Errors.new { |h, k| h[k] = [] }
       @erroneous_attributes = Hash.new { |h, k| h[k] = Set.new }
       @erroneous_forced_attributes = Hash.new { |h, k| h[k] = Set.new }
 
@@ -22,7 +22,7 @@ module Statinize
     def validate!
       validate
 
-      raise ValidationError, errors.to_s if should_raise?
+      raise ValidationError, errors.nice if should_raise?
     end
 
     def valid?
@@ -45,24 +45,38 @@ module Statinize
           option.validators.each do |validator_class, validator_value|
             validator_instance = validator_class.new(attr_value, validator_value)
 
+            if option[:type] && option.should_cast? && attr_value.nil? && (option[:presence] || option[:nil] == false)
+              cast(attr, option)
+            end
+
             next if validator_instance.valid?
-            next if validator_class == TypeValidator && cast(attr, option)
+            next if validator_class == TypeValidator && cast?(attr, option)
 
             force = option[:force] ||
               (statinizer.force? && option[:force].nil?)
 
-            erroneous_attributes[attr.name].add option
+            erroneous_attributes[attr.name].add? option
+
+            unless @errors[attr.name].include?(validator_instance.error)
+              @errors[attr.name] << validator_instance.error
+            end
+
             erroneous_forced_attributes[attr.name].add option if force
-            @errors << { attr.name => validator_instance.error }
           end
         end
       end
     end
 
+    def cast?(attr, option)
+      option.should_cast? && cast(attr, option)
+    end
+
     def cast(attr, option)
-      caster = Caster.new(instance, attr, option)
+      caster(attr, option).cast
+    end
 
-      option.should_cast? && caster.cast
+    def caster(attr, option)
+      Caster.new(instance, attr, option)
     end
 
     def should_raise?

data/lib/statinize/validators/nil_validator.rb

@@ -0,0 +1,13 @@
+module Statinize
+  class NilValidator < Validator
+    def valid?
+      return true if validator_value
+
+      !attr_value.nil?
+    end
+
+    def error
+      "is nil"
+    end
+  end
+end

data/lib/statinize/validators/presence_validator.rb

@@ -1,8 +1,9 @@
 module Statinize
   class PresenceValidator < Validator
     def valid?
-      validator_value &&
-        !empty_array? &&
+      return true unless validator_value
+
+      !empty_array? &&
         !empty_hash? &&
         !empty_string? &&
         !attr_value.nil?

data/lib/statinize/validators/type_validator.rb

@@ -1,7 +1,7 @@
 module Statinize
   class TypeValidator < Validator
     def valid?
-      attr_value.is_a?(validator_value)
+      attr_value.is_a?(validator_value) || attr_value.nil?
     end
 
     def error

data/lib/statinize.rb

@@ -1,7 +1,9 @@
 require "set"
 require "pry"
 require "singleton"
+require "bigdecimal/util"
 require_relative "statinize/statinizable"
+require_relative "statinize/dsl"
 require_relative "statinize/statinizer"
 require_relative "statinize/configuration"
 require_relative "statinize/attribute"
@@ -13,5 +15,6 @@ require_relative "statinize/validation"
 require_relative "statinize/validators/type_validator"
 require_relative "statinize/validators/presence_validator"
 require_relative "statinize/validators/inclusion_validator"
+require_relative "statinize/validators/nil_validator"
 require_relative "statinize/caster"
 require_relative "statinize/errors"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: statinize
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.4
 platform: ruby
 authors:
 - Barseek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-08 00:00:00.000000000 Z
+date: 2022-09-03 00:00:00.000000000 Z
 dependencies: []
 description: Statinization gem. Allows for creation of attributes for a class with
   a given type.
@@ -24,12 +24,14 @@ files:
 - lib/statinize/attribute/options_collection.rb
 - lib/statinize/caster.rb
 - lib/statinize/configuration.rb
+- lib/statinize/dsl.rb
 - lib/statinize/errors.rb
 - lib/statinize/statinizable.rb
 - lib/statinize/statinizer.rb
 - lib/statinize/validation.rb
 - lib/statinize/validator.rb
 - lib/statinize/validators/inclusion_validator.rb
+- lib/statinize/validators/nil_validator.rb
 - lib/statinize/validators/presence_validator.rb
 - lib/statinize/validators/type_validator.rb
 homepage: