eac_ruby_utils 0.22.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b861a9c3b748b6aeb1e66d0ddbdecd38f5fecf08f14ca42a31a486ed7d7ae9b4
-  data.tar.gz: be84a8533d1a4fea360b9e250799724acc7f3ef3e5f4d99e9bd567dda73d5b11
+  metadata.gz: 50c460eb97537968f851b321ff60f2cd09a59311fc5355ec178a4df1423fb1ef
+  data.tar.gz: e1930099e96f86521138af568396cc90a561a6902fe830921c4b2e91f274ef5f
 SHA512:
-  metadata.gz: 29ab7e2c0c8d9aea6bf0ff222c1c0fad81fd077d5b06315186bf152e00d77b32ca121adb1c2542f8c26cb03803705caed99237046aea118ee4286e89de288bf6
-  data.tar.gz: 479e0d22d8ff085defebb333916ec103a681f5940a32df4ea42f892fe51b62a3bd6baac495a2ff6d6827f1e3707e846e69fd91a783c68cd13369c78e7bc25161
+  metadata.gz: f9ba27537563ede2af48698e8c2aead81872fbe00752f7f177d66af8a0ad003216061f1b07054ad02f4a0d57582331597b2e32118b8b44a8bf97db10b927ef7c
+  data.tar.gz: 4543eb2929914244b81e5bad736ccb3821f0fb963f240a7163c47b0a111936ee3a3b4f0eabe98289dcd68f634f9d60778e2fbc2360a0e40805bd8b85d125b17a

data/lib/eac_ruby_utils/arguments_consumer.rb

@@ -22,14 +22,6 @@ module EacRubyUtils
       Parser.new(self, args).data
     end
 
-    def initialize2(args, positional, _default_options)
-      @positional = positional.dup
-      @positional.freeze
-      @args = args
-
-      @options_found = false
-    end
-
     class Parser
       attr_reader :data, :arguments_consumer
 
@@ -74,7 +66,7 @@ module EacRubyUtils
       end
 
       def invalid_argument(arg, message)
-        raise InvalidArgumentError, self, arg, message
+        raise InvalidArgumentError.new(self, arg, message)
       end
     end
 

data/lib/eac_ruby_utils/common_constructor.rb

@@ -1,13 +1,60 @@
 # frozen_string_literal: true
 
 require 'active_support/callbacks'
+require 'eac_ruby_utils/arguments_consumer'
+require 'ostruct'
 
 module EacRubyUtils
   class CommonConstructor
-    attr_reader :args, :options
+    attr_reader :args, :options, :after_set_block
 
-    def initialize(*args)
-      @args = args
+    class << self
+      def parse_args_options(args)
+        result = ::OpenStruct.new(args: [], options: {})
+        options_reached = false
+        args.each do |arg|
+          raise "Options reached and there is more arguments (Arguments: #{args})" if
+          options_reached
+
+          options_reached = parse_arg_options_process_arg(result, arg)
+        end
+        result
+      end
+
+      private
+
+      def parse_arg_options_process_arg(result, arg)
+        if arg.is_a?(::Hash)
+          result.options = arg
+          true
+        else
+          result.args << arg
+          false
+        end
+      end
+    end
+
+    def initialize(*args, &after_set_block)
+      args_processed = self.class.parse_args_options(args)
+      @args = args_processed.args
+      @options = args_processed.options
+      @after_set_block = after_set_block
+    end
+
+    def args_count
+      (args_count_min..args_count_max)
+    end
+
+    def args_count_min
+      args.count - default_values.count
+    end
+
+    def args_count_max
+      args.count
+    end
+
+    def default_values
+      options[:default] || []
     end
 
     def setup_class(klass)
@@ -27,28 +74,60 @@ module EacRubyUtils
     end
 
     def setup_class_initialize(klass)
+      common_constructor = self
       klass.include(::ActiveSupport::Callbacks)
       klass.define_callbacks :initialize
-      klass.class_eval initialize_method_code, __FILE__, __LINE__
+      klass.send(:define_method, :initialize) do |*args|
+        Initialize.new(common_constructor, args, self).run
+      end
     end
 
-    def initialize_method_code
-      b = "def initialize(#{initialize_method_args_code})\n"
-      b += "  run_callbacks :initialize do\n"
-      initialize_method_args.each do |arg|
-        b += "  self.#{arg} = #{arg}\n"
+    class Initialize
+      attr_reader :common_constructor, :args, :object
+
+      def initialize(common_constructor, args, object)
+        @common_constructor = common_constructor
+        @args = args
+        @object = object
       end
-      b += "  end\n"
-      b += "end\n"
-      b
-    end
 
-    def initialize_method_args_code
-      initialize_method_args.join(', ')
-    end
+      def run
+        validate_args_count
+        object.run_callbacks :initialize do
+          object_attributes_set
+          object_after_callback
+        end
+      end
+
+      private
+
+      def arg_value(arg_name)
+        arg_index = common_constructor.args.index(arg_name)
+        if arg_index < args.count
+          args[arg_index]
+        else
+          common_constructor.default_values[arg_index - common_constructor.args_count_min]
+        end
+      end
 
-    def initialize_method_args
-      args
+      def object_after_callback
+        return unless common_constructor.after_set_block
+
+        object.instance_eval(&common_constructor.after_set_block)
+      end
+
+      def object_attributes_set
+        common_constructor.args.each do |arg_name|
+          object.send("#{arg_name}=", arg_value(arg_name))
+        end
+      end
+
+      def validate_args_count
+        return if common_constructor.args_count.include?(args.count)
+
+        raise ArgumentError, "#{object.class}.initialize: wrong number of arguments" \
+          " (given #{args.count}, expected #{common_constructor.args_count})"
+      end
     end
   end
 end

data/lib/eac_ruby_utils/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_ruby_utils
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-06 00:00:00.000000000 Z
+date: 2020-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport