avm 0.39.1 → 0.41.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77d9c5ea0df6745cf1b9e1ee3d47ef031b2bc6caf956de84804dc32490d21776
-  data.tar.gz: f564b3b00470ab6643083ac1ec6fbd63c56dd5b65539049520f2aaac0f59a47b
+  metadata.gz: 01cc4fb71195c68ac7537f915a8a42233b781ed6c07d7ecf5eeafae0e213159a
+  data.tar.gz: a7de999e81365e9f8f05bfa6af80d5a4a73411db1fe4b0c839b571617a3cb14e
 SHA512:
-  metadata.gz: c31937f1858e5de2462d76a6880358fe8bdfb35faac91ead3d7e52eb881c53f6f2db2dcca071435b0a9aa4034a43fb7468258e52fb25025ce7fbff5131c0d480
-  data.tar.gz: 16eb08fcbef7cc5a905b3118af0f690bad53283f63623b7f0662009bb92c70d86098669da89f00124d46f94cd679cd6dcb98a6506ffca93dba23211a507b2790
+  metadata.gz: 6ae39e05f3e21ed0784f6c137c9ce41788e3431c6df80b5e03b61f5a6e0a19873aaf845a7d7d1b8a190c154bce8d6d9098d9dcec95022bbee808c48e1bc5dcd5
+  data.tar.gz: 50effabbbe2de5927f7d6d6e931f0593fa92b7f200445aee17f2e6c3bfba4709dfc461fc9acc3b172407d877b576417d9c67ffd450bad610edf2fc0a5ffdeea3

data/lib/avm/applications/base.rb

@@ -38,7 +38,7 @@ module Avm
 
       # @return [Avm::Sources::Base]
       def local_source_uncached
-        ::Avm::Registry.sources.detect(local_instance.fs_path)
+        ::Avm::Registry.sources.detect(local_instance.install_path)
       end
     end
   end

data/lib/avm/data/instance/files_unit.rb

@@ -18,7 +18,8 @@ module Avm
         before_load :clear_files
 
         def files_path
-          ::File.join(instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH), fs_path_subpath)
+          ::File.join(instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH),
+                      fs_path_subpath)
         end
 
         def dump_command

data/lib/avm/entries/base/uri_component_entry_value/default_value.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'avm/entries/uri_builder'
+require 'eac_config/entry_path'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Base
+      class UriComponentEntryValue
+        class DefaultValue
+          enable_method_class
+          common_constructor :uri_component_entry_value
+          delegate :component_entry_path, :entries_provider, to: :uri_component_entry_value
+
+          def default_value_method_name
+            "#{component_entry_path.parts.join('_').variableize}_default_value"
+          end
+
+          def result
+            entries_provider.if_respond(default_value_method_name)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/entries/base/uri_component_entry_value/inherited_value.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'avm/entries/uri_builder'
+require 'eac_config/entry_path'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Base
+      class UriComponentEntryValue
+        class InheritedValue
+          enable_method_class
+          common_constructor :uri_component_entry_value
+          delegate :entries_provider, :id_entry_path, :component_entry_path,
+                   to: :uri_component_entry_value
+
+          def result
+            entries_provider.inherited_entry_value(
+              id_entry_path.to_string,
+              component_entry_path.to_string,
+              &inherited_value_block
+            )
+          end
+
+          def inherited_value_block
+            return nil unless entries_provider.respond_to?(inherited_value_block_method_name)
+
+            ->(value) { entries_provider.send(inherited_value_block_method_name, value) }
+          end
+
+          def inherited_value_block_method_name
+            "#{component_entry_path.parts.join('_').variableize}_inherited_value_proc".to_sym
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/entries/base/uri_component_entry_value/url_entry_value.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'avm/entries/uri_builder'
+require 'eac_config/entry_path'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Base
+      class UriComponentEntryValue
+        class UrlEntryValue
+          enable_method_class
+          common_constructor :uri_component_entry_value
+          delegate :component, :entries_provider, :root_entry_path, to: :uri_component_entry_value
+
+          def result
+            return unless url_entry.context_found?
+
+            ::Avm::Entries::UriBuilder.from_source(url_entry.value.to_uri)
+              .avm_field_get(component)
+          end
+
+          # @return [Avm::Entries::Entry]
+          def url_entry
+            entries_provider.entry((root_entry_path + %w[url]).to_string)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -9,31 +9,16 @@ module Avm
     module Base
       class UriComponentEntryValue
         enable_method_class
+        require_sub __FILE__, require_dependency: true
 
         enable_listable
-        lists.add_symbol :option, :default_value, :inherited_value_block
+        lists.add_symbol :option
 
         common_constructor :entries_provider, :component_entry_path, :options, default: [{}] do
           self.component_entry_path = ::EacConfig::EntryPath.assert(component_entry_path)
           self.options = self.class.lists.option.hash_keys_validate!(options)
         end
 
-        def default_value
-          options[OPTION_DEFAULT_VALUE].call_if_proc
-        end
-
-        def inherited_result
-          entries_provider.inherited_entry_value(
-            id_entry_path.to_string,
-            component_entry_path.to_string,
-            &inherited_value_block
-          )
-        end
-
-        def inherited_value_block
-          options[OPTION_INHERITED_VALUE_BLOCK]
-        end
-
         # @return [EacConfig::EntryPath]
         def id_entry_path
           root_entry_path + %w[id]
@@ -41,7 +26,7 @@ module Avm
 
         # @return [String, nil]
         def result
-          url_entry_value || inherited_result || default_value
+          url_entry_value || inherited_value || default_value
         end
 
         # @return [EacConfig::EntryPath]
@@ -49,18 +34,6 @@ module Avm
           component_entry_path[0..-2]
         end
 
-        # @return [Avm::Entries::Entry]
-        def url_entry
-          entries_provider.entry((root_entry_path + %w[url]).to_string)
-        end
-
-        def url_entry_value
-          return unless url_entry.context_found?
-
-          ::Avm::Entries::UriBuilder.from_source(url_entry.value.to_uri)
-            .avm_field_get(component)
-        end
-
         # @return [String]
         def component
           component_entry_path.last

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

@@ -8,23 +8,7 @@ module Avm
     class Base
       module AutoValues
         module Install
-          def auto_install_data_path
-            uri_component_entry_value(
-              ::Avm::Instances::EntryKeys::INSTALL_DATA_PATH,
-              inherited_value_block: ->(v) { v + '/' + id }
-            )
-          end
-
-          def auto_install_groupname
-            uri_component_entry_value(
-              ::Avm::Instances::EntryKeys::INSTALL_GROUPNAME,
-              default_value: lambda do
-                read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_USERNAME)
-              end
-            )
-          end
-
-          ::Avm::Entries::UriBuilder::ENTRIES_FIELDS.each do |component|
+          (::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(
@@ -43,6 +27,18 @@ module Avm
             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

data/lib/avm/instances/entry_keys.rb

@@ -45,11 +45,10 @@ module Avm
       end
 
       {
-        '' => %w[fs_path name source_instance_id],
+        '' => %w[name source_instance_id],
         admin: URI_FIELDS + %w[api_key],
         database: URI_FIELDS + %w[id limit name system timeout extra],
         docker: %w[registry],
-        fs: %w[url],
         install: URI_FIELDS + %w[id data_path groupname],
         mailer: {
           '' => %w[id from reply_to],

data/lib/avm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.39.1
+  version: 0.41.1
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-18 00:00:00.000000000 Z
+date: 2022-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_cli
@@ -238,6 +238,9 @@ files:
 - lib/avm/entries/base.rb
 - lib/avm/entries/base/inherited_entry_value.rb
 - lib/avm/entries/base/uri_component_entry_value.rb
+- 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/entry.rb
 - lib/avm/entries/uri_builder.rb
 - lib/avm/executables.rb
@@ -247,7 +250,6 @@ files:
 - 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/filesystem.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

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

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/instances/entry_keys'
-
-module Avm
-  module Instances
-    class Base
-      module AutoValues
-        module Filesystem
-          def auto_fs_path
-            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
-                                  ::Avm::Instances::EntryKeys::FS_PATH) { |v| v + '/' + id }
-          end
-
-          def auto_fs_url
-            auto_fs_url_with_install || auto_fs_url_without_install
-          end
-
-          def auto_fs_url_with_install
-            read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_URL)
-              .if_present do |install_url|
-              read_entry_optional('fs_path').if_present do |fs_path|
-                "#{install_url}#{fs_path}"
-              end
-            end
-          end
-
-          def auto_fs_url_without_install
-            return nil if read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_URL).present?
-
-            read_entry_optional('fs_path').if_present do |fs_path|
-              "file://#{fs_path}"
-            end
-          end
-        end
-      end
-    end
-  end
-end