avm 0.42.0 → 0.44.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64ca72cb2ab91751e6ac2bf8e81404c0c5111ccbe4971ea349bd38ee490735e2
-  data.tar.gz: 1b840a43b5511128fa3f1cbf54395a3fb435f2c5cd0bb59293aac6fdd970c4e4
+  metadata.gz: 75da0735d17a4472beabdba8b1a848bd1df14e0e8b630885bbf2b1503d198e14
+  data.tar.gz: 4d71ad19868decc5d8eebcd01b71a1a518702345a06521edb0c27f55bd25cca5
 SHA512:
-  metadata.gz: 4a6b697d1114c887b4590f51afe76b0bde03b471b3eabfbcf904c5b31fcd686d15eb355cb43a9145e934de2cd60f3ecf045abefda892b4feb3835f7392e5d2cf
-  data.tar.gz: a9331ce632924f1bc83a6ac93b12609abbeb92eec20c04d6c3340d19779ffd8876c63b238cf017ad351e4b7b219fe9ab4ae84bd95ac912f6d92c26a09304c17f
+  metadata.gz: 8e75c632a176c1f15431466cf0fe85c53fcbaccf5d914e643b7a5a51ef17bc8a41ea7c5b2d6253feb0587557d01d66a40b7073ac375115f7e07afe1ffa13d694
+  data.tar.gz: d3c82791118497839cea0c53d9e8d838dedf1db1a7f462c022ea24d82411774f86db27b9e0e8d40b844a09ad6c2f918f0b23802f58f489e03490bc52f10d526f

data/lib/avm/entries/base/uri_components_entries_values/component_factory.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Base
+      class UriComponentsEntriesValues
+        class ComponentFactory
+          enable_method_class
+          common_constructor :owner, :component
+
+          def result
+            component_class.new(owner, component)
+          end
+
+          def component_class
+            specific_class || generic_class
+          end
+
+          def generic_class
+            parent_class.const_get('GenericComponent')
+          end
+
+          def parent_class
+            ::Avm::Entries::Base::UriComponentsEntriesValues
+          end
+
+          def specific_class
+            return nil unless parent_class.const_defined?(specific_class_basename)
+
+            parent_class.const_get(specific_class_basename)
+          end
+
+          def specific_class_basename
+            [component, 'component'].join('_').camelize
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/entries/base/uri_components_entries_values/generic_component.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'avm/entries/uri_builder'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Base
+      class UriComponentsEntriesValues
+        class GenericComponent
+          common_constructor :owner, :component
+          delegate :entries_provider_class, :prefix, to: :owner
+
+          def auto_method_name
+            ['auto', component_method_name].join('_')
+          end
+
+          def component_method_name
+            [prefix, component].join('_')
+          end
+
+          def define_auto_method(&block)
+            entries_provider_class.define_method(auto_method_name, &block)
+          end
+
+          def define_inherited_value_proc_method(&block)
+            entries_provider_class.define_method(inherited_value_proc_name, &block)
+          end
+
+          def entry_key_path
+            ::EacConfig::EntryPath.assert([prefix, component])
+          end
+
+          def id_component
+            @id_component ||= owner.component_factory('id')
+          end
+
+          def inherited_value_proc_name
+            [component_method_name, 'inherited_value_proc'].join('_')
+          end
+
+          def setup
+            outer_self = self
+            define_auto_method do
+              uri_component_entry_value(outer_self.entry_key_path.to_string)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/entries/base/uri_components_entries_values/path_component.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'avm/entries/base/uri_components_entries_values/generic_component'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Base
+      class UriComponentsEntriesValues
+        class PathComponent < ::Avm::Entries::Base::UriComponentsEntriesValues::GenericComponent
+          def setup
+            super
+            define_inherited_value_proc_method { |value| value + '/' + id }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/entries/base/uri_components_entries_values/url_component.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'avm/entries/base/uri_components_entries_values/generic_component'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Base
+      class UriComponentsEntriesValues
+        class UrlComponent < ::Avm::Entries::Base::UriComponentsEntriesValues::GenericComponent
+          def setup
+            outer_self = self
+            define_auto_method do
+              inherited_entry_value(outer_self.id_component.entry_key_path.to_string,
+                                    outer_self.entry_key_path.to_string) ||
+                outer_self.auto_install_url_by_parts(self)
+            end
+          end
+
+          def auto_install_url_by_parts(entries_provider)
+            require 'avm/entries/auto_values/uri_entry'
+            ::Avm::Entries::AutoValues::UriEntry.new(entries_provider, 'install').value
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/entries/base/uri_components_entries_values.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'avm/entries/uri_builder'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Base
+      class UriComponentsEntriesValues
+        require_sub __FILE__
+        common_constructor :entries_provider_class, :prefix, :extra_fields
+
+        ENTRIES_FIELDS = ::Avm::Entries::UriBuilder::ENTRIES_FIELDS + %w[url]
+
+        def fields
+          ENTRIES_FIELDS + extra_fields
+        end
+
+        def result
+          fields.map { |field| component_factory(field).setup }
+        end
+      end
+    end
+  end
+end

data/lib/avm/entries/base.rb

@@ -7,6 +7,13 @@ module Avm
   module Entries
     module Base
       require_sub __FILE__, require_dependency: true
+      common_concern
+
+      module ClassMethods
+        def uri_components_entries_values(prefix, extra_fields = [])
+          ::Avm::Entries::Base::UriComponentsEntriesValues.new(self, prefix, extra_fields).result
+        end
+      end
 
       def entries_provider_id
         id

data/lib/avm/entries/keys_constants_set.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    class KeysConstantsSet
+      common_constructor :entries_provider_class, :prefix, :suffixes
+
+      # @return [Array<String>]
+      def result
+        if suffixes.is_a?(::Hash)
+          keys_consts_set_from_hash
+        elsif suffixes.is_a?(::Enumerable)
+          keys_consts_set_from_enum
+        else
+          raise "Unmapped suffixes class: #{suffixes.class}"
+        end
+      end
+
+      private
+
+      # @return [String]
+      def key_const_set(prefix, suffix)
+        key = [prefix, suffix].reject(&:blank?).join('.')
+        entries_provider_class.const_set(key.gsub('.', '_').upcase, key)
+        key
+      end
+
+      # @return [Array<String>]
+      def keys_consts_set_from_enum
+        suffixes.map { |suffix| key_const_set(prefix, suffix) }
+      end
+
+      # @return [Array<String>]
+      def keys_consts_set_from_hash
+        suffixes.flat_map do |k, v|
+          self.class.new(entries_provider_class, prefix.to_s + (k.blank? ? '' : ".#{k}"), v).result
+        end
+      end
+    end
+  end
+end

data/lib/avm/instances/base/install.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'avm/entries/uri_builder'
+require 'avm/instances/entry_keys'
+
+module Avm
+  module Instances
+    class Base
+      module Install
+        common_concern do
+          uri_components_entries_values 'install', %w[data_path email groupname]
+        end
+
+        def install_data_path_inherited_value_proc(value)
+          value + '/' + id
+        end
+
+        def install_groupname_default_value
+          read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_USERNAME)
+        end
+      end
+    end
+  end
+end

data/lib/avm/instances/base/web.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'addressable'
+require 'avm/instances/entry_keys'
+
+module Avm
+  module Instances
+    class Base
+      module Web
+        common_concern do
+          uri_components_entries_values 'web'
+        end
+      end
+    end
+  end
+end

data/lib/avm/instances/base.rb

@@ -12,8 +12,8 @@ module Avm
       enable_abstract_methods
       enable_listable
       enable_simple_cache
-      require_sub __FILE__, include_modules: true
       include ::Avm::Entries::Base
+      require_sub __FILE__, include_modules: true
       include ::Avm::With::ExtraSubcommands
       include ::Avm::With::ApplicationStereotype
 

data/lib/avm/instances/entry_keys.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/entries/keys_constants_set'
 require 'avm/entries/uri_builder'
 require 'eac_ruby_utils/core_ext'
 
@@ -14,19 +15,7 @@ module Avm
         end
 
         def keys_consts_set(prefix, suffixes)
-          if suffixes.is_a?(::Hash)
-            keys_consts_set_from_hash(prefix, suffixes)
-          elsif suffixes.is_a?(::Enumerable)
-            keys_consts_set_from_enum(prefix, suffixes)
-          else
-            raise "Unmapped suffixes class: #{suffixes.class}"
-          end
-        end
-
-        def key_const_set(prefix, suffix)
-          key = [prefix, suffix].reject(&:blank?).join('.')
-          const_set(key.gsub('.', '_').upcase, key)
-          all_keys << key
+          all_keys.merge(::Avm::Entries::KeysConstantsSet.new(self, prefix, suffixes).result)
         end
 
         private
@@ -34,14 +23,6 @@ module Avm
         def all_keys
           @all_keys ||= ::Set.new
         end
-
-        def keys_consts_set_from_enum(prefix, suffixes)
-          suffixes.each { |suffix| key_const_set(prefix, suffix) }
-        end
-
-        def keys_consts_set_from_hash(prefix, suffixes)
-          suffixes.each { |k, v| keys_consts_set(prefix.to_s + (k.blank? ? '' : ".#{k}"), v) }
-        end
       end
 
       {
@@ -49,7 +30,7 @@ module Avm
         admin: URI_FIELDS + %w[api_key],
         database: URI_FIELDS + %w[id limit name system timeout extra],
         docker: %w[registry],
-        install: URI_FIELDS + %w[id data_path groupname],
+        install: URI_FIELDS + %w[id data_path email groupname],
         mailer: {
           '' => %w[id from reply_to],
           smtp: URI_FIELDS + %w[address domain authentication openssl_verify_mode starttls_auto tls]

data/lib/avm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avm
-  VERSION = '0.42.0'
+  VERSION = '0.44.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.42.0
+  version: 0.44.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-08 00:00:00.000000000 Z
+date: 2022-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_cli
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.27'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.27.8
+        version: '0.28'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.27'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.27.8
+        version: '0.28'
 - !ruby/object:Gem::Dependency
   name: eac_config
   requirement: !ruby/object:Gem::Requirement
@@ -96,20 +90,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.102'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.102.1
+        version: '0.104'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.102'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.102.1
+        version: '0.104'
 - !ruby/object:Gem::Dependency
   name: eac_templates
   requirement: !ruby/object:Gem::Requirement
@@ -119,7 +107,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -129,7 +117,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
@@ -247,22 +235,27 @@ files:
 - lib/avm/entries/base/uri_component_entry_value/default_value.rb
 - lib/avm/entries/base/uri_component_entry_value/inherited_value.rb
 - lib/avm/entries/base/uri_component_entry_value/url_entry_value.rb
+- lib/avm/entries/base/uri_components_entries_values.rb
+- lib/avm/entries/base/uri_components_entries_values/component_factory.rb
+- lib/avm/entries/base/uri_components_entries_values/generic_component.rb
+- lib/avm/entries/base/uri_components_entries_values/path_component.rb
+- lib/avm/entries/base/uri_components_entries_values/url_component.rb
 - lib/avm/entries/entry.rb
+- lib/avm/entries/keys_constants_set.rb
 - lib/avm/entries/uri_builder.rb
 - lib/avm/executables.rb
 - lib/avm/instances.rb
 - lib/avm/instances/base.rb
 - lib/avm/instances/base/auto_values.rb
-- lib/avm/instances/base/auto_values/admin.rb
 - lib/avm/instances/base/auto_values/data.rb
 - lib/avm/instances/base/auto_values/database.rb
-- lib/avm/instances/base/auto_values/install.rb
 - lib/avm/instances/base/auto_values/mailer.rb
 - lib/avm/instances/base/auto_values/ruby.rb
 - lib/avm/instances/base/auto_values/source.rb
-- lib/avm/instances/base/auto_values/web.rb
 - lib/avm/instances/base/dockerizable.rb
 - lib/avm/instances/base/entry_keys.rb
+- lib/avm/instances/base/install.rb
+- lib/avm/instances/base/web.rb
 - lib/avm/instances/docker_image.rb
 - lib/avm/instances/entry_keys.rb
 - lib/avm/instances/runner.rb

data/lib/avm/instances/base/auto_values/admin.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Avm
-  module Instances
-    class Base
-      module AutoValues
-        module Admin
-          def auto_admin_email
-            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, 'admin.email')
-          end
-
-          def auto_admin_name
-            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, 'admin.name')
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/instances/base/auto_values/install.rb

@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/entries/uri_builder'
-require 'avm/instances/entry_keys'
-
-module Avm
-  module Instances
-    class Base
-      module AutoValues
-        module Install
-          (::Avm::Entries::UriBuilder::ENTRIES_FIELDS + %w[data_path groupname]).each do |component|
-            method_suffix = "install_#{component}"
-            define_method "auto_#{method_suffix}" do
-              uri_component_entry_value(
-                ::Avm::Instances::EntryKeys.const_get(method_suffix.underscore.upcase)
-              )
-            end
-          end
-
-          def auto_install_url
-            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
-                                  ::Avm::Instances::EntryKeys::INSTALL_URL) ||
-              auto_install_url_by_parts
-          end
-
-          def auto_install_url_by_parts
-            require 'avm/entries/auto_values/uri_entry'
-            ::Avm::Entries::AutoValues::UriEntry.new(self, 'install').value
-          end
-
-          def install_data_path_inherited_value_proc(value)
-            value + '/' + id
-          end
-
-          def install_groupname_default_value
-            read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_USERNAME)
-          end
-
-          def install_path_inherited_value_proc(value)
-            install_data_path_inherited_value_proc(value)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/instances/base/auto_values/web.rb

@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-require 'addressable'
-require 'avm/instances/entry_keys'
-
-module Avm
-  module Instances
-    class Base
-      module AutoValues
-        module Web
-          def auto_web_authority
-            web_url_as_uri(&:authority)
-          end
-
-          def auto_web_hostname
-            web_url_as_uri(&:host)
-          end
-
-          def auto_web_path
-            web_url_as_uri(&:path)
-          end
-
-          def auto_web_port
-            web_url_as_uri(&:port)
-          end
-
-          def auto_web_scheme
-            web_url_as_uri(&:scheme)
-          end
-
-          def auto_web_userinfo
-            web_url_as_uri(&:userinfo)
-          end
-
-          private
-
-          def web_url_as_uri
-            read_entry_optional(::Avm::Instances::EntryKeys::WEB_URL).if_present do |v|
-              yield(::Addressable::URI.parse(v))
-            end
-          end
-        end
-      end
-    end
-  end
-end