statinize 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8e1c828e69c088b99e338e49626e98faf5dc89a62a86545aa5e4041ce962647
-  data.tar.gz: '094d296e476cd29e3c850542d71119eb2f48ac28fc366ecf3deebabb79f9db24'
+  metadata.gz: 49d4254b241b024535b320e063744a0ee01cfc45a8ec289265c89b3af65cc729
+  data.tar.gz: 178add180ff764c00eda41df13b9bf4d52eb51a6d4dd55b7bbc316793ac56dd6
 SHA512:
-  metadata.gz: 40df9591e11075cd22f8c72b6c48ba31a0904ea679d5039cdb4f4508665fc9e02d443a3cb406352323a7be00048537248314914ff1a1523c736dde3dddfaa776
-  data.tar.gz: f594086d4366967f456a21fb03f43b5aa83eccbf01865466b90be8130d9fcaac0925f369be2f0375af684d1fc2f4c1533c92f1f24d8acce3fce9f102271841ed
+  metadata.gz: 9b3c92ef8e0f345d92d307a30c8a7c60450fd9c9289e10ee88412e8bcee0859334c6be936a3e806eb08add2d270aa577658abd3998db505c962d8670cf19d723
+  data.tar.gz: 36a54dde0c7c615eb1610e5a0249d43c374eaed76bd8a6a447acd5fffbc62e74294c85a986c788a7c07b43d45aff39cb1629714327ff1f27eccf9ea46d07157a

data/lib/statinize/attribute.rb

@@ -8,7 +8,7 @@ module Statinize
       @klass = klass
       @name = name
       @options = OptionsCollection.new
-      @options << opts.clone.extend(Options)
+      @options << opts.clone.extend(Options) unless opts.empty?
     end
 
     def self.create(klass, name, opts)
@@ -17,7 +17,17 @@ module Statinize
 
     def create
       statinizer.add_attribute(self) unless attribute?
-      klass.send(:attr_accessor, name)
+      klass.class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
+        def #{name}
+          @#{name}
+        end
+
+        def #{name}=(attr)
+          @#{name} = attr
+          validate if respond_to?(:validate)
+          attr
+        end
+      RUBY_EVAL
       self
     end
 

data/lib/statinize/errors.rb

@@ -5,6 +5,8 @@ module Statinize
 
   class InvalidConditionError < StandardError; end
 
+  class UndefinedAttribute < StandardError; end
+
   class Errors < Array
     def to_s
       nice_errors = map do |i|

data/lib/statinize/statinizable.rb

@@ -6,26 +6,45 @@ module Statinize
     end
 
     module PrependedMethods
-      def initialize(*args, **kwargs)
-        self.class.statinizer.attributes.map(&:name).each do |attr|
-          instance_variable_set("@#{attr}", kwargs.delete(attr)) if kwargs.key?(attr)
+      def initialize(*args, **kwargs, &block)
+        if private_methods(false).include? :initialize
+          super(*args, **kwargs, &block)
+          check_defined!(kwargs)
+        else
+          statinizer.attributes.map(&:name).each do |attr|
+            instance_variable_set("@#{attr}", kwargs[attr]) if kwargs.key?(attr)
+          end
         end
 
         define_validation
         validate!
-
-        super(*args, **kwargs)
       end
 
       def validation
         @validation ||= Validation.new(statinizer, self)
       end
 
+      def attributes
+        @attributes = Hash[
+          statinizer.attributes.map { |a| [a.name, public_send(a.name)] }
+        ]
+      end
+
       alias_method :define_validation, :validation
 
       def statinizer
         self.class.statinizer
       end
+
+      private
+
+      def check_defined!(kwargs)
+        statinizer.attributes.map(&:name).each do |attr|
+          undefined_attrs << attr if public_send(attr) != kwargs[attr] || !kwargs.key?(attr)
+        end
+
+        raise UndefinedAttributeError, "Not all attributes defined in statinize block are defined in initialize"
+      end
     end
 
     module ClassMethods
@@ -34,7 +53,7 @@ module Statinize
 
         statinizer.instance_eval(&block)
 
-        # statinizer.check_validators_exist!
+        statinizer.check_validators_exist!
       end
 
       def statinizer

data/lib/statinize/statinizer.rb

@@ -8,6 +8,8 @@ module Statinize
     end
 
     def attribute(*attrs, **options)
+      options.merge!(@validate_with) if @validate_with
+
       attrs.each do |attr|
         Attribute.create(klass, attr, options)
       end
@@ -20,6 +22,13 @@ module Statinize
       end
     end
 
+    def validate_with(**kwargs, &block)
+      @validate_with = kwargs
+      instance_exec(&block)
+
+      remove_instance_variable(:@validate_with) if @validate_with
+    end
+
     def force(force = nil)
       force.nil? ? @force : @force = force
     end

data/lib/statinize/validation.rb

@@ -13,8 +13,8 @@ module Statinize
 
     def validate
       @errors = Errors.new
-      @erroneous_attributes = Set.new
-      @erroneous_forced_attributes = Set.new
+      @erroneous_attributes = Hash.new { |h, k| h[k] = Set.new }
+      @erroneous_forced_attributes = Hash.new { |h, k| h[k] = Set.new }
 
       fill_errors
     end
@@ -48,8 +48,11 @@ module Statinize
             next if validator_instance.valid?
             next if validator_class == TypeValidator && cast(attr, option)
 
-            erroneous_attributes.add(attr)
-            erroneous_forced_attributes.add(attr) if option[:force]
+            force = option[:force] ||
+              (statinizer.force? && option[:force].nil?)
+
+            erroneous_attributes[attr.name].add option
+            erroneous_forced_attributes[attr.name].add option if force
             @errors << { attr.name => validator_instance.error }
           end
         end
@@ -65,8 +68,7 @@ module Statinize
     def should_raise?
       return false if valid?
 
-      statinizer.force? ||
-        erroneous_attributes.intersect?(erroneous_forced_attributes)
+      erroneous_attributes.keys.intersect?(erroneous_forced_attributes.keys)
     end
 
     def attributes

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.nil?
+      attr_value.is_a?(validator_value)
     end
 
     def error

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: statinize
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Barseek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-06 00:00:00.000000000 Z
+date: 2022-07-08 00:00:00.000000000 Z
 dependencies: []
 description: Statinization gem. Allows for creation of attributes for a class with
   a given type.