statinize 0.3.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8076207399abda2e6f39e33f71e78a318819bbdb9cd7ae759d6a896f62cf49ce
-  data.tar.gz: 53378fe3b67039c26472294ac3061c2d9a2dbd7801a77d61602f6804e05c389e
+  metadata.gz: b3184b7bdea5121e7355c91ad65b4929f9e3a13fcd6f6849a5bf971bb4f3ad3a
+  data.tar.gz: 6ab5f9e27b4a3f337dfb6fbffd018d847a25bf743df3788824f219668ea58650
 SHA512:
-  metadata.gz: a6919c84d1fb55b306fc37663152b438c23b199dc952d68e4ee8618d9f2987be236583f7bf7035a9c1e1397edfcd70b58e09a99d71ef4e87d9d3a210cd893c8f
-  data.tar.gz: 6f6d9af898f648a285f377bed8f5be59ab9045f67296dfd7ed4bc0807a544f8bc62aef377c585d1f2ddd258d9b5012a6c1eff95c1a0c5fe36071bf1f951b321f
+  metadata.gz: 134c65ae58d093141b00c284367304951e5d7da83ba07a6dc0ababc35fd5fff4020fd6d6c7ce794bdb69095fa2bb6dcf53d3fdeb387c19e79c34e814c5a292c0
+  data.tar.gz: bbf362bb6cf6f87b190c4042f6897ad1b7c2ccf74ead7c6646dbc8bdf8e6d829e6503ca45806d306c6ccccd80b6b040b5a962e5ee9d5114a396bc7aa5e3959a1

data/lib/statinize/attribute.rb

@@ -2,26 +2,28 @@ module Statinize
   class Attribute
     include Comparable
 
-    attr_reader :klass, :name
-    attr_accessor :options
+    attr_reader :klass, :name, :default, :arg_name
+    attr_accessor :options_collection, :options
 
-    def initialize(klass, name, opts)
+    def initialize(klass, name, options)
       @klass = klass
       @name = name
-      @options = OptionsCollection.new
-      @options << opts.clone.extend(Options) unless opts.empty?
+      @options = options
+      @options_collection = OptionsCollection.new # TODO: think of a better way
+      @options_collection << options.clone.extend(Options) unless options.empty?
+
+      @default = options[:default] if options.key?(:default)
+      @arg_name = name
+      @name = options[:name] || name
     end
 
-    def self.create(klass, name, opts = {})
-      new(klass, name, opts).create
+    def self.create(klass, name, options = {})
+      new(klass, name, options).create
     end
 
     def create
-      if attribute?
-        statinizer.attributes.find { |a| a.name == name }.options = options
-      else
-        statinizer.add_attribute(self)
-      end
+      attribute? ? override : add_attribute
+
       klass.class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
         def #{name}
           @#{name}
@@ -37,7 +39,7 @@ module Statinize
     end
 
     def add_options(opts)
-      options << opts.extend(Options)
+      options_collection << opts.extend(Options)
     end
 
     def <=>(other)
@@ -48,6 +50,16 @@ module Statinize
 
     private
 
+    def override
+      attribute = statinizer.attributes.find { |a| a.name == name }
+      attribute.options_collection = options_collection
+      attribute.options = options
+    end
+
+    def add_attribute
+      statinizer.add_attribute(self)
+    end
+
     def statinizer
       klass.statinizer
     end

data/lib/statinize/configuration.rb

@@ -1,11 +1,7 @@
 module Statinize
-  class Configuration
-    include Singleton
+  module Config
+    extend self
 
     attr_accessor :force
-
-    def self.configure
-      yield instance if block_given?
-    end
   end
 end

data/lib/statinize/dsl.rb

@@ -16,15 +16,22 @@ module Statinize
     end
 
     def with(**options, &block)
+      # create new statinizer instance
       instance = self.class.new(klass)
       instance.force(force)
 
+      # execute block in the context of that statinizer
+      # while it's attached to the klass
+      # then rewind and attach the original statinizer(self)
+      # back to the klass
       klass.instance_variable_set(:@statinizer, instance)
       instance.instance_exec(&block)
       klass.instance_variable_set(:@statinizer, self)
 
+      # merge the newly created statinizer with the options
       instance.merge_options(**options)
 
+      # populate self with the instance's attributes
       populate(instance.attributes)
     end
 

data/lib/statinize/statinizable.rb

@@ -18,15 +18,17 @@ module Statinize
     end
 
     module PrependedMethods
-      def initialize(options = {}, *args, **kwargs, &block)
-        symbolized = kwargs.merge(options).transform_keys(&:to_sym)
+      def initialize(options = {}, *args, &block)
+        symbolized = options.transform_keys(&:to_sym)
+
+        instantiate_defaults
 
         if private_methods(false).include? :initialize
-          super(*args, **kwargs, &block)
+          super(options, *args, &block)
           check_defined!(symbolized)
         else
-          statinizer.attributes.map(&:name).each do |attr|
-            instance_variable_set("@#{attr}", symbolized[attr]) if symbolized.key?(attr)
+          statinizer.attributes.each do |attr|
+            instance_variable_set("@#{attr.name}", symbolized[attr.arg_name]) if symbolized.key?(attr.arg_name)
           end
         end
 
@@ -60,11 +62,17 @@ module Statinize
 
       def check_defined!(options)
         statinizer.attributes.map(&:name).each do |attr|
-          undefined_attrs << attr if public_send(attr) != options[attr] || !options.key?(attr)
+          undefined_attrs << attr unless options.key?(attr)
         end
 
         raise UndefinedAttributeError, "Not all attributes defined in statinize block are defined in initialize"
       end
+
+      def instantiate_defaults
+        statinizer.attributes.select { |a| a.options.key?(:default) }.each do |attribute|
+          public_send("#{attribute.name}=", attribute.default)
+        end
+      end
     end
 
     module ClassMethods

data/lib/statinize/statinizer.rb

@@ -4,10 +4,6 @@ module Statinize
 
     attr_reader :klass, :before_callbacks
 
-    def self.configure(&block)
-      Configuration.configure(&block)
-    end
-
     def initialize(klass)
       @klass = klass
       @force = config.force
@@ -15,7 +11,7 @@ module Statinize
     end
 
     def config
-      @config ||= Configuration.instance
+      @config ||= Config
     end
 
     def force?
@@ -46,7 +42,7 @@ module Statinize
 
     def merge_options(**options)
       attributes.each do |attribute|
-        attribute.options.each do |option|
+        attribute.options_collection.each do |option|
           option.merge!(options)
         end
       end
@@ -54,17 +50,18 @@ module Statinize
 
     def populate(attrs)
       attrs.each do |attr|
-        attribute attr.name
-        attributes
-          .find { _1.name == attr.name }
-          .options = attr.options.clone
+        attribute attr.arg_name, name: attr.name, default: attr.default
+        attributes.find { _1.name == attr.name }.tap do |attr_to_populate|
+          attr_to_populate.options_collection = attr.options_collection.clone
+          attr_to_populate.options = attr.options.clone
+        end
       end
     end
 
     protected
 
     def all_validators_defined?
-      attributes.map { |attr| attr.options.all_validators_defined? }.all? { !!_1 }
+      attributes.map { |attr| attr.options_collection.all_validators_defined? }.all? { !!_1 }
     end
   end
 end

data/lib/statinize/validation.rb

@@ -37,7 +37,7 @@ module Statinize
 
     def fill_errors
       attributes.each do |attr|
-        attr.options.each do |option|
+        attr.options_collection.each do |option|
           next unless option.should_validate?(instance)
 
           attr_value = instance.public_send(attr.name)

data/lib/statinize/validator.rb

@@ -1,6 +1,6 @@
 module Statinize
   class Validator
-    NOT_VALIDATORS = %i[force cast if unless]
+    NOT_VALIDATORS = %i[force cast if unless default name]
 
     attr_accessor :attr_value, :validator_value
 

data/lib/statinize.rb

@@ -1,20 +1,27 @@
 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"
-require_relative "statinize/attribute/options"
-require_relative "statinize/attribute/options/conditions"
-require_relative "statinize/attribute/options_collection"
-require_relative "statinize/validator"
-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"
+require "statinize/statinizable"
+require "statinize/dsl"
+require "statinize/statinizer"
+require "statinize/configuration"
+require "statinize/attribute"
+require "statinize/attribute/options"
+require "statinize/attribute/options/conditions"
+require "statinize/attribute/options_collection"
+require "statinize/validator"
+require "statinize/validation"
+require "statinize/validators/type_validator"
+require "statinize/validators/presence_validator"
+require "statinize/validators/inclusion_validator"
+require "statinize/validators/nil_validator"
+require "statinize/caster"
+require "statinize/errors"
+
+module Statinize
+  def self.included(klass)
+    klass.include(Statinize::Statinizable)
+  end
+
+  def self.configure = yield Config
+end

metadata

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