eac_ruby_utils 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbc288c5822f1c0981eb007a0ac8398e0d06e8355b39a1f2aa7a5dbf12fb9e2b
-  data.tar.gz: 7aa562293120d2e8da628bf6d471f7ec23416c9b49f03b8a2205881c6fd166c1
+  metadata.gz: b0ddfde05215993f63e4489e1b54cb4434d0dce6f9c7d401d985c229461ca106
+  data.tar.gz: 7f06d22a45ed253237e0033da8e07f90a327858352bc1cd99ac8396127a094af
 SHA512:
-  metadata.gz: a30eed73757ef9d54ee35f35f1b9753c43b543959760c2fe1320dd8fb81b0f30a912b991b0066d8b6cfc9d062a0d65a7bc31325d46067c066ac876a6cf8863b5
-  data.tar.gz: 48d825385999066c7b1b366e5f47d934069e5b8f7fb272e4a5805645bbf4a2c88c4506be462666e204a993b276423c1867f8e9e30b23f710d80c9c5d7d6fe3f8
+  metadata.gz: d28f2608835e09ce813974309bbb87742118f71d294e907699575d99ed422a33d87d0af0528c8bdc8f200141fee74db6a9b54799fa55dd52c21c37981995d103
+  data.tar.gz: 507b28c0c90e84105ab30b62038857ea01b4f8b46de4d012a41e58b8fb31f63dce03f22ce3cb0a7387b77b7c4bd7c74f96f8262df6185e7d13d8284d45e966e0

data/lib/eac_ruby_utils/common_constructor.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module EacRubyUtils
+  class CommonConstructor
+    attr_reader :args, :options
+
+    def initialize(*args)
+      @args = args
+    end
+
+    def setup_class(klass)
+      setup_class_attr_readers(klass)
+      setup_class_attr_writers(klass)
+      setup_class_initialize(klass)
+    end
+
+    def setup_class_attr_readers(klass)
+      klass.send(:attr_reader, *args)
+      klass.send(:public, *args)
+    end
+
+    def setup_class_attr_writers(klass)
+      klass.send(:attr_writer, *args)
+      klass.send(:private, *args.map { |a| "#{a}=" })
+    end
+
+    def setup_class_initialize(klass)
+      klass.class_eval initialize_method_code, __FILE__, __LINE__
+    end
+
+    def initialize_method_code
+      b = "def initialize(#{initialize_method_args_code})\n"
+      initialize_method_args.each do |arg|
+        b += "  self.#{arg} = #{arg}\n"
+      end
+      b += "end\n"
+      b
+    end
+
+    def initialize_method_args_code
+      initialize_method_args.join(', ')
+    end
+
+    def initialize_method_args
+      args
+    end
+  end
+end

data/lib/eac_ruby_utils/console/speaker/_class_methods.rb

@@ -17,6 +17,7 @@ module EacRubyUtils
 
         def pop
           return nodes_stack.pop if nodes_stack.count > 1
+
           raise "Cannot remove first node (nodes_stack.count: #{nodes_stack.count})"
         end
 

data/lib/eac_ruby_utils/console/speaker.rb

@@ -2,7 +2,7 @@
 
 require 'colorize'
 require 'io/console'
-require 'eac_ruby_utils/options_consumer'
+require 'eac_ruby_utils/patches/hash/options_consumer'
 require 'eac_ruby_utils/console/speaker/_class_methods'
 require 'eac_ruby_utils/console/speaker/list'
 require 'eac_ruby_utils/console/speaker/node'
@@ -44,10 +44,12 @@ module EacRubyUtils
         puts string.to_s.yellow
       end
 
+      # Options:
+      #   +bool+ ([Boolean], default: +false+): requires a answer "yes" or "no".
+      #   +list+ ([Hash] or [Array], default: +nil+): requires a answer from a list.
+      #   +noecho+ ([Boolean], default: +false+): does not output answer.
       def request_input(question, options = {})
-        options = ::EacRubyUtils::OptionsConsumer.new(options)
-        bool, list, noecho = options.consume_all(:bool, :list, :noecho)
-        options.validate
+        bool, list, noecho = options.to_options_consumer.consume_all(:bool, :list, :noecho)
         if list
           request_from_list(question, list, noecho)
         elsif bool
@@ -105,13 +107,17 @@ module EacRubyUtils
 
       def request_string(question, noecho)
         current_node.stderr.write "#{question}: ".to_s.yellow
-        if noecho
-          r = current_node.stdin.noecho(&:gets).chomp.strip
-          current_node.stderr.write("\n")
-          r
-        else
-          current_node.stdin.gets.chomp.strip
-        end
+        noecho ? request_string_noecho : request_string_echo
+      end
+
+      def request_string_noecho
+        r = current_node.stdin.noecho(&:gets).chomp.strip
+        current_node.stderr.write("\n")
+        r
+      end
+
+      def request_string_echo
+        current_node.stdin.gets.chomp.strip
       end
 
       def current_node

data/lib/eac_ruby_utils/options_consumer.rb

@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 
 require 'active_support/core_ext/hash/indifferent_access'
+require 'ostruct'
 
 module EacRubyUtils
   class OptionsConsumer
+    DEFAULT_OPTIONS = { validate: true, ostruct: false }.with_indifferent_access.freeze
+
     def initialize(data)
       @data = data.with_indifferent_access
     end
@@ -16,8 +19,16 @@ module EacRubyUtils
       value
     end
 
+    # If last argument is a Hash it is used a options.
+    # Options:
+    # * +validate+: validate after consume.
+    # * +ostruct+: return a [OpenStruct] instead a [Hash].
+    # @return [Hash] (Default) or [OpenStruct].
     def consume_all(*keys)
-      keys.map { |key| consume(key) }
+      options = consume_all_extract_options(keys)
+      result = consume_all_build_result(keys, options.fetch(:ostruct))
+      validate if options.fetch(:validate)
+      result
     end
 
     def validate
@@ -33,5 +44,19 @@ module EacRubyUtils
     private
 
     attr_reader :data
+
+    def consume_all_extract_options(keys)
+      options = DEFAULT_OPTIONS
+      options = options.merge(keys.pop.with_indifferent_access) if keys.last.is_a?(Hash)
+      options
+    end
+
+    def consume_all_build_result(keys, ostruct)
+      if ostruct
+        ::OpenStruct.new(keys.map { |key| [key, consume(key)] }.to_h)
+      else
+        keys.map { |key| consume(key) }
+      end
+    end
   end
 end

data/lib/eac_ruby_utils/patches/class/common_constructor.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/common_constructor'
+
+class Class
+  def common_constructor(*args)
+    ::EacRubyUtils::CommonConstructor.new(*args).setup_class(self)
+  end
+end

data/lib/eac_ruby_utils/patches/class.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+::EacRubyUtils.require_sub(__FILE__)

data/lib/eac_ruby_utils/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_ruby_utils
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-06 00:00:00.000000000 Z
+date: 2019-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -117,6 +117,7 @@ files:
 - README.rdoc
 - lib/eac_ruby_utils.rb
 - lib/eac_ruby_utils/arguments_consumer.rb
+- lib/eac_ruby_utils/common_constructor.rb
 - lib/eac_ruby_utils/configs.rb
 - lib/eac_ruby_utils/console.rb
 - lib/eac_ruby_utils/console/configs.rb
@@ -152,6 +153,8 @@ files:
 - lib/eac_ruby_utils/options_consumer.rb
 - lib/eac_ruby_utils/patch.rb
 - lib/eac_ruby_utils/patches.rb
+- lib/eac_ruby_utils/patches/class.rb
+- lib/eac_ruby_utils/patches/class/common_constructor.rb
 - lib/eac_ruby_utils/patches/hash.rb
 - lib/eac_ruby_utils/patches/hash/options_consumer.rb
 - lib/eac_ruby_utils/patches/hash/sym_keys_hash.rb