eac_ruby_utils 0.98.0 → 0.101.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e589ad673e489c92596bc3ad46ec06db307af584835cae664a96b163a9e1534
-  data.tar.gz: 6a8f0a202d5fd79decc0a3e416b4b83a559f36ff2258510b2a92db2d5ea8c653
+  metadata.gz: 53696f879b967bfd596c78de749bae9cf4faf9cc0e783cd94ef93f8801228aa4
+  data.tar.gz: 20f707f22860ae13a5b8f7032d91ef37a6d431d2d073e0070d2263053bed0076
 SHA512:
-  metadata.gz: '0184ca1df801cbbc7bdd241e15e628dbc42fa692695500ce0b77c11384d131712587834d36ddc6399926c3513548c6d59d1be53d9777306d12714f9b2d63d7af'
-  data.tar.gz: 36991e903d0f00b8cac236477e8775915cb03dfb2a521308fba707dce3142b4ca0b305b4da34c04c9932de26ae7074ba22ce510b493621b97af815732ec7c678
+  metadata.gz: 5c0de088366c5722e63312031f81695cc023d3fd0846ad343d3f7c987ca4fc679249fc729fb715f46844cff1aee4cce9833471fb712f2d967c417d7d48067299
+  data.tar.gz: eb0ab7f25211706f098ac5d2c73be11319f7034b5574997d5ded5b6acd10c3da0daa5f4333f682cfc74bdb34a2f01f48000c093c88ee6f65a883d3609becb17b

data/lib/eac_ruby_utils/common_constructor/class_accessors.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/common_constructor/instance_initialize'
+require 'eac_ruby_utils/common_constructor/super_args'
+
+module EacRubyUtils
+  class CommonConstructor
+    class ClassAccessors
+      attr_reader :common_constructor, :klass
+
+      def initialize(common_constructor, klass)
+        @common_constructor = common_constructor
+        @klass = klass
+      end
+
+      def args
+        common_constructor.all_args
+      end
+
+      def perform
+        setup_class_attr_readers
+        setup_class_attr_writers
+      end
+
+      def setup_class_attr_readers
+        klass.send(:attr_reader, *args)
+        klass.send(:public, *args) if args.any?
+      end
+
+      def setup_class_attr_writers
+        klass.send(:attr_writer, *args)
+        klass.send(:private, *args.map { |a| "#{a}=" }) if args.any?
+      end
+    end
+  end
+end

data/lib/eac_ruby_utils/common_constructor/class_initialize.rb

@@ -13,17 +13,27 @@ module EacRubyUtils
         @klass = klass
       end
 
-      def run
+      def define_initialize_callbacks
+        klass.include(::ActiveSupport::Callbacks)
+        klass.define_callbacks :initialize
+      end
+
+      def define_initialize_method
         class_initialize = self
-        klass.send(:define_method, :initialize) do |*args|
+        klass.send(:define_method, :initialize) do |*args, &block|
           ::EacRubyUtils::CommonConstructor::InstanceInitialize.new(
-            class_initialize.common_constructor, args, self
-          ).run
+            class_initialize.common_constructor, args, self, block
+          ).perform
           super(*::EacRubyUtils::CommonConstructor::SuperArgs.new(
             class_initialize, args, self
           ).result)
         end
       end
+
+      def perform
+        define_initialize_callbacks
+        define_initialize_method
+      end
     end
   end
 end

data/lib/eac_ruby_utils/common_constructor/instance_initialize.rb

@@ -3,18 +3,20 @@
 module EacRubyUtils
   class CommonConstructor
     class InstanceInitialize
-      attr_reader :common_constructor, :args, :object
+      attr_reader :common_constructor, :args, :object, :block
 
-      def initialize(common_constructor, args, object)
+      def initialize(common_constructor, args, object, block)
         @common_constructor = common_constructor
         @args = args
         @object = object
+        @block = block
       end
 
-      def run
+      def perform
         validate_args_count
         object.run_callbacks :initialize do
           object_attributes_set
+          object_block_set
           object_after_callback
         end
       end
@@ -36,12 +38,21 @@ module EacRubyUtils
         object.instance_eval(&common_constructor.after_set_block)
       end
 
+      def object_attribute_set(attr_name, attr_value)
+        object.send("#{attr_name}=", attr_value)
+      end
+
       def object_attributes_set
         common_constructor.args.each do |arg_name|
-          object.send("#{arg_name}=", arg_value(arg_name))
+          object_attribute_set(arg_name, arg_value(arg_name))
         end
       end
 
+      def object_block_set
+        block_arg = common_constructor.block_arg
+        object_attribute_set(block_arg, block) if block_arg
+      end
+
       def validate_args_count
         return if common_constructor.args_count.include?(args.count)
 

data/lib/eac_ruby_utils/common_constructor.rb

@@ -2,12 +2,13 @@
 
 require 'active_support/callbacks'
 require 'eac_ruby_utils/arguments_consumer'
+require 'eac_ruby_utils/common_constructor/class_accessors'
 require 'eac_ruby_utils/common_constructor/class_initialize'
 require 'ostruct'
 
 module EacRubyUtils
   class CommonConstructor
-    attr_reader :args, :options, :after_set_block
+    attr_reader :all_args, :options, :after_set_block
 
     class << self
       def parse_args_options(args)
@@ -37,11 +38,15 @@ module EacRubyUtils
 
     def initialize(*args, &after_set_block)
       args_processed = self.class.parse_args_options(args)
-      @args = args_processed.args
+      @all_args = args_processed.args
       @options = args_processed.options
       @after_set_block = after_set_block
     end
 
+    def args
+      block_arg? ? all_args[0..-2] : all_args
+    end
+
     def args_count
       (args_count_min..args_count_max)
     end
@@ -54,32 +59,32 @@ module EacRubyUtils
       args.count
     end
 
+    def block_arg
+      block_arg? ? all_args.last : nil
+    end
+
+    def block_arg?
+      options[:block_arg] || false
+    end
+
     def default_values
       options[:default] || []
     end
 
     def setup_class(klass)
-      setup_class_attr_readers(klass)
-      setup_class_attr_writers(klass)
+      setup_class_accessors(klass)
+
       setup_class_initialize(klass)
 
       klass
     end
 
-    def setup_class_attr_readers(klass)
-      klass.send(:attr_reader, *args)
-      klass.send(:public, *args) if args.any?
-    end
-
-    def setup_class_attr_writers(klass)
-      klass.send(:attr_writer, *args)
-      klass.send(:private, *args.map { |a| "#{a}=" }) if args.any?
+    def setup_class_accessors(klass)
+      ::EacRubyUtils::CommonConstructor::ClassAccessors.new(self, klass).perform
     end
 
     def setup_class_initialize(klass)
-      klass.include(::ActiveSupport::Callbacks)
-      klass.define_callbacks :initialize
-      ::EacRubyUtils::CommonConstructor::ClassInitialize.new(self, klass).run
+      ::EacRubyUtils::CommonConstructor::ClassInitialize.new(self, klass).perform
     end
 
     def super_args

data/lib/eac_ruby_utils/listable/list.rb

@@ -29,8 +29,16 @@ module EacRubyUtils
         @values.values.map(&:value)
       end
 
+      def values_with_blank
+        [blank_value.value] + values
+      end
+
       def options
-        @values.values.map { |v| [v.label, v.value] }
+        @values.values.map(&:to_option)
+      end
+
+      def options_with_blank
+        [blank_value.to_option] + options
       end
 
       def method_missing(name, *args, &block)

data/lib/eac_ruby_utils/listable/value.rb

@@ -30,6 +30,11 @@ module EacRubyUtils
         translate('description')
       end
 
+      # @return [Array] A two-item array in format `[label, value]`.
+      def to_option
+        [label, value]
+      end
+
       def translation_required?
         @translation_required
       end

data/lib/eac_ruby_utils/patches/object/debug.rb

@@ -1,18 +1,33 @@
 # frozen_string_literal: true
 
 class Object
-  def pretty_debug
+  def pretty_debug(options = {})
+    print_debug_title(options)
+
     STDERR.write(pretty_inspect)
 
     self
   end
 
-  def print_debug
+  def print_debug(options = {})
+    print_debug_title(options)
     STDERR.write(to_debug + "\n")
 
     self
   end
 
+  def print_debug_title(title)
+    if title.is_a?(::Hash)
+      return unless title[:title]
+
+      title = title[:title]
+    end
+    char = '='
+    STDERR.write(char * (4 + title.length) + "\n")
+    STDERR.write("#{char} #{title} #{char}\n")
+    STDERR.write(char * (4 + title.length) + "\n")
+  end
+
   def to_debug
     "|#{::Object.instance_method(:to_s).bind(self).call}|#{self}|"
   end

data/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.98.0'
+  VERSION = '0.101.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_ruby_utils
 version: !ruby/object:Gem::Version
-  version: 0.98.0
+  version: 0.101.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-04 00:00:00.000000000 Z
+date: 2022-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -121,6 +121,7 @@ files:
 - lib/eac_ruby_utils/common_concern/class_setup.rb
 - lib/eac_ruby_utils/common_concern/module_setup.rb
 - lib/eac_ruby_utils/common_constructor.rb
+- lib/eac_ruby_utils/common_constructor/class_accessors.rb
 - lib/eac_ruby_utils/common_constructor/class_initialize.rb
 - lib/eac_ruby_utils/common_constructor/instance_initialize.rb
 - lib/eac_ruby_utils/common_constructor/super_args.rb