eac_ruby_utils 0.59.0 → 0.60.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 548ad31ed6381e0a51802ea856dfa885fdaef16080305285698872baa9dc9b24
-  data.tar.gz: ee4ddee8e898704ef248d82296d7cb63093a3ff8a72e929b6815c854e8e66e70
+  metadata.gz: 70fe181d734d1e97b9467b44302604bb7b2a61ef3102e08aeddd1a9dd9a5d6be
+  data.tar.gz: d04e61f84fd5c9fa22bca11be939732c23e352eb019ba7a2260c5ef3012b339d
 SHA512:
-  metadata.gz: 2dcbd2e28932d4a287e94798511973b1ec0803838294f2eba2d5fb7ea5e7399ee5092d2bde598e5f403195c3832bdc57a4de2a9ba7514ac4f3c9ff5f23523243
-  data.tar.gz: 8a3259581c69448604dcc452f7ede39ef6ba1eaf9081d609c837e16377aa11bdd0bba9100256226334b7863149a5d93ad43d4410b4d7b660ce61f6498850612c
+  metadata.gz: ce2f14b7c8cc05f34337212a54cf4ae4d33a44fb1cfb83c1365e5c86a08e4d4bd3395c29bc4cf4a09969d25760c0340094939c804956b4a5e586caeffdfaf4e7
+  data.tar.gz: 8b243bf7a7de4cadadbd3497df8ecf8ac97fbc16bbc084d9459e12f72244963c878043eaeb95c180cee10b6ead01c044530732196cdaf13a55997431f74e2816

data/lib/eac_ruby_utils/settings_provider.rb

@@ -1,15 +1,14 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/string/inflections'
-require 'eac_ruby_utils/options_consumer'
+require 'eac_ruby_utils/require_sub'
 
 module EacRubyUtils
   # Provide a option by constant, method or options object.
   module SettingsProvider
+    ::EacRubyUtils.require_sub __FILE__, base: self
+
     def setting_constant_name(key, fullname = false)
-      name = key.to_s.underscore.upcase
-      name = "#{self.class.name}::#{name}" if fullname
-      name
+      setting_value_instance(key).constant_name(fullname)
     end
 
     def setting_search_order
@@ -25,41 +24,23 @@ module EacRubyUtils
     end
 
     def setting_value(key, options = {})
-      options = parse_setting_value_options(options)
-      options.order.each do |method|
-        value = send("setting_value_by_#{method}", key)
-        return value if value
-      end
-      return nil unless options.required
-
-      raise "Setting \"#{key}\" not found. Supply in #{settings_object_name}, implement a " \
-        "\"#{key}\" method or declare a #{setting_constant_name(key, true)} constant."
+      setting_value_instance(key, options).value
     end
 
     def setting_value_by_constant(key)
-      constant_name = setting_constant_name(key)
-      begin
-        self.class.const_get(constant_name)
-      rescue NameError
-        nil
-      end
+      setting_value_instance(key).value_by_constant
     end
 
     def setting_value_by_method(key)
-      respond_to?(key) ? send(key) : nil
+      setting_value_instance(key).value_by_method
     end
 
     def setting_value_by_settings_object(key)
-      settings_object[key.to_s] || settings_object[key.to_sym]
+      setting_value_instance(key).value_by_settings_object
     end
 
-    private
-
-    def parse_setting_value_options(options)
-      r = ::EacRubyUtils::OptionsConsumer.new(options).consume_all(:required, :order, ostruct: true)
-      r.required = true if r.required.nil?
-      r.order = setting_search_order if r.order.nil?
-      r
+    def setting_value_instance(key, options = {})
+      ::EacRubyUtils::SettingsProvider::SettingValue.new(self, key, options)
     end
   end
 end

data/lib/eac_ruby_utils/settings_provider/setting_value.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/string/inflections'
+require 'eac_ruby_utils/listable'
+require 'eac_ruby_utils/simple_cache'
+require 'eac_ruby_utils/struct'
+
+module EacRubyUtils
+  module SettingsProvider
+    class SettingValue
+      include ::EacRubyUtils::Listable
+      include ::EacRubyUtils::SimpleCache
+
+      attr_reader :source, :key, :options
+      lists.add_symbol :option, :default, :order, :required
+
+      def initialize(source, key, options)
+        @source = source
+        @key = key
+        @options = options
+      end
+
+      def constant_name(fullname = false)
+        name = key.to_s.underscore.upcase
+        name = "#{source.class.name}::#{name}" if fullname
+        name
+      end
+
+      def value
+        parsed_options.order.each do |method|
+          value = send("value_by_#{method}")
+          return value if value
+        end
+        return parsed_options.default if parsed_options.respond_to?(OPTION_DEFAULT)
+        return nil unless parsed_options.required
+
+        raise_key_not_found
+      end
+
+      def value_by_constant
+        source.class.const_get(constant_name)
+      rescue NameError
+        nil
+      end
+
+      def value_by_method
+        source.respond_to?(key, true) ? source.send(key) : nil
+      end
+
+      def value_by_settings_object
+        source.settings_object[key.to_s] || source.settings_object[key.to_sym]
+      end
+
+      private
+
+      def parsed_options_uncached
+        r = self.class.lists.option.hash_keys_validate!(options.symbolize_keys)
+        r[:required] = true unless r.key?(OPTION_REQUIRED)
+        r[:order] = source.setting_search_order if r[OPTION_ORDER].nil?
+        ::EacRubyUtils::Struct.new(r)
+      end
+
+      def raise_key_not_found
+        raise "Setting \"#{key}\" not found. Supply in #{source.settings_object_name}, implement "\
+          "a \"#{key}\" method or declare a #{constant_name(true)} constant."
+      end
+    end
+  end
+end

data/lib/eac_ruby_utils/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_ruby_utils
 version: !ruby/object:Gem::Version
-  version: 0.59.0
+  version: 0.60.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-21 00:00:00.000000000 Z
+date: 2021-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -242,6 +242,7 @@ files:
 - lib/eac_ruby_utils/ruby/command.rb
 - lib/eac_ruby_utils/ruby/on_clean_environment.rb
 - lib/eac_ruby_utils/settings_provider.rb
+- lib/eac_ruby_utils/settings_provider/setting_value.rb
 - lib/eac_ruby_utils/simple_cache.rb
 - lib/eac_ruby_utils/struct.rb
 - lib/eac_ruby_utils/templates.rb