eac_tools 0.70.0 → 0.72.0

data/sub/eac_config/lib/eac_config/yaml_file_node/self_entries.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require 'eac_config/entry_path'
+require 'eac_config/yaml_file_node/entry'
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/wildcards'
+
+module EacConfig
+  class YamlFileNode
+    class SelfEntries
+      acts_as_instance_method
+      common_constructor :node, :path do
+        self.path = ::EacConfig::EntryPath.assert(path)
+      end
+
+      # @return [Array<EacConfig::YamlFileNode>]
+      def result
+        head_node.result.map { |found_path| ::EacConfig::YamlFileNode::Entry.new(node, found_path) }
+      end
+
+      private
+
+      # @return [DataNode]
+      def head_node
+        DataNode.new(node.data, ::EacConfig::EntryPath.new, path)
+      end
+
+      class DataNode
+        common_constructor :data_node, :path_from, :path_to do
+          self.data_node = data_node.stringify_keys if data_node.is_a?(::Hash)
+        end
+
+        # @return [DataNode]
+        def child(child_key)
+          self.class.new(data_node.fetch(child_key), path_from.with_last(child_key),
+                         path_to.without_first)
+        end
+
+        def children
+          return [] unless data_node.is_a?(::Hash)
+
+          data_node.keys.select { |k| key_matcher.match?(k) }.map { |k| child(k) }
+        end
+
+        # @return [Symbol]
+        def key
+          path_to.first
+        end
+
+        # @return [EacRubyUtils::Wildcards]
+        def key_matcher
+          @key_matcher ||= ::EacRubyUtils::Wildcards.new(key)
+        end
+
+        # @return [Array<EacConfig::EntryPath>]
+        def result
+          (path_to.empty? ? result_from_self : result_from_children)
+        end
+
+        # @return [Array<EacConfig::EntryPath>]
+        def result_from_self
+          [path_from]
+        end
+
+        # @return [Array<EacConfig::EntryPath>]
+        def result_from_children
+          children.flat_map(&:result)
+        end
+      end
+    end
+  end
+end

data/sub/eac_config/lib/eac_config/yaml_file_node.rb

@@ -20,6 +20,7 @@ module EacConfig
     common_constructor :path do
       self.path = path.to_pathname
     end
+    compare_by :path
 
     def persist_data(new_data)
       path.parent.mkpath
@@ -47,5 +48,7 @@ module EacConfig
 
       r.is_a?(::Hash) ? r : {}
     end
+
+    require_sub __FILE__, require_mode: :kernel
   end
 end

data/sub/eac_config/spec/lib/eac_config/yaml_file_node_spec.rb

@@ -12,41 +12,77 @@ RSpec.describe ::EacConfig::YamlFileNode do
   end
 
   let(:fixtures_dir) { ::Pathname.new(__dir__).join('yaml_file_node_spec_files') }
-  let(:target_dir) { temp_copy(fixtures_dir) }
-  let(:yaml_file_path) do
-    r = target_dir.join('storage1.yaml')
-    r.write(r.read.gsub('%%STORAGE1_2_ABSOLUTE_PATH%%',
-                        target_dir.join('storage1_2.yaml').expand_path.to_path))
-    r
+  let(:instance) { storage1 }
+
+  storages.each do |storage|
+    let(storage.key) { described_class.new(fixtures_dir.join(storage.subpath)) }
   end
-  let(:instance) { described_class.new(yaml_file_path) }
 
-  context 'with common entry' do
-    let(:entry) { instance.entry('common') }
+  describe '#entry' do
+    context 'with common entry' do
+      let(:entry) { instance.entry('common') }
 
-    it { expect(entry.value).to eq('AAA') }
-    it { expect(entry.found_node).to eq(instance) }
-    it { expect(entry).to be_found }
-  end
+      it { expect(entry.value).to eq('AAA') }
+      it { expect(entry.found_node).to eq(instance) }
+      it { expect(entry).to be_found }
+    end
 
-  storages.each do |storage|
-    context "with entry in loaded path \"#{storage.subpath}\"" do
-      let(:entry) { instance.entry(storage.key) }
-      let(:storage_node) { described_class.new(target_dir.join(storage.subpath)) }
+    storages.each do |storage|
+      context "with entry in loaded path \"#{storage.subpath}\"" do
+        let(:entry) { instance.entry(storage.key) }
+        let(:storage_node) { send(storage.key) }
+
+        it { expect(entry).to be_a(::EacConfig::Entry) }
+        it { expect(entry).to be_found }
+        it { expect(entry.value).to eq(storage.key) }
+        it { expect(entry.found_node.url).to eq(storage_node.url) }
+      end
+    end
+
+    context 'with not existing entry' do
+      let(:entry) { instance.entry('no_exist') }
 
       it { expect(entry).to be_a(::EacConfig::Entry) }
-      it { expect(entry).to be_found }
-      it { expect(entry.value).to eq(storage.key) }
-      it { expect(entry.found_node.url).to eq(storage_node.url) }
+      it { expect(entry.value).to eq(nil) }
+      it { expect(entry.found_node).to eq(nil) }
+      it { expect(entry).not_to be_found }
     end
   end
 
-  context 'with not existing entry' do
-    let(:entry) { instance.entry('no_exist') }
+  describe '#entries' do
+    context 'when search path is "common"' do
+      let(:path) { 'common' }
+      let(:actual) { instance.entries(path).node_entries }
+      let(:expected) { [::EacConfig::YamlFileNode::Entry.new(storage1, path)] }
+
+      it { expect(actual).to eq(expected) }
+    end
+
+    context 'when search path is "same.path"' do
+      let(:path) { 'same.path' }
+      let(:actual) { instance.entries(path).node_entries }
+      let(:expected) do
+        [storage1_1, storage1_2_1].map do |n|
+          ::EacConfig::YamlFileNode::Entry.new(n, 'same.path')
+        end
+      end
 
-    it { expect(entry).to be_a(::EacConfig::Entry) }
-    it { expect(entry.value).to eq(nil) }
-    it { expect(entry.found_node).to eq(nil) }
-    it { expect(entry).not_to be_found }
+      it { expect(actual).to eq(expected) }
+    end
+
+    context 'when search path is "*.search_me"' do
+      let(:path) { '*.search_me' }
+      let(:actual) { instance.entries(path).node_entries }
+      let(:expected) do
+        [
+          [storage1, 'storage1_a'], [storage1, 'storage1_b'],
+          [storage1_2, 'storage1_2_a'], [storage1_2, 'storage1_2_b'], [storage1_2, 'storage1_2_c']
+        ].map do |args|
+          ::EacConfig::YamlFileNode::Entry.new(args[0], args[1] + '.search_me')
+        end
+      end
+
+      it { expect(actual).to eq(expected) }
+    end
   end
 end

data/sub/eac_config/spec/lib/eac_config/yaml_file_node_spec_files/storage1.yaml

@@ -2,5 +2,9 @@
 common: AAA
 load_path:
   - storage1_1.yaml
-  - %%STORAGE1_2_ABSOLUTE_PATH%%
+  - storage1_2.yaml
 storage1: storage1
+storage1_a:
+  search_me: 1_a
+storage1_b:
+  search_me: 1_b

data/sub/eac_config/spec/lib/eac_config/yaml_file_node_spec_files/storage1_1.yaml

@@ -1,2 +1,4 @@
 ---
 storage1_1: storage1_1
+same:
+  path: SAME_PATH_1_1

data/sub/eac_config/spec/lib/eac_config/yaml_file_node_spec_files/storage1_2/storage1_2_1.yaml

@@ -1,2 +1,4 @@
 ---
 storage1_2_1: storage1_2_1
+same:
+  path: SAME_PATH_1_2_1

data/sub/eac_config/spec/lib/eac_config/yaml_file_node_spec_files/storage1_2.yaml

@@ -2,3 +2,9 @@
 load_path:
   - ./storage1_2/storage1_2_1.yaml
 storage1_2: storage1_2
+storage1_2_a:
+  search_me: 1_2_a
+storage1_2_b:
+  search_me: 1_2_a
+storage1_2_c:
+  search_me: 1_2_a

data/sub/eac_envs-http/eac_envs-http.gemspec

@@ -13,12 +13,12 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*']
 
   s.add_dependency 'eac_fs', '~> 0.16'
-  s.add_dependency 'eac_ruby_utils', '~> 0.116'
-  s.add_dependency 'faraday', '~> 2.7', '>= 2.7.4'
+  s.add_dependency 'eac_ruby_utils', '~> 0.117', '>= 0.117.1'
+  s.add_dependency 'faraday', '~> 2.7', '>= 2.7.6'
   s.add_dependency 'faraday-follow_redirects', '~> 0.3'
   s.add_dependency 'faraday-gzip', '~> 0.1'
   s.add_dependency 'faraday-multipart', '~> 1.0', '>= 1.0.4'
-  s.add_dependency 'faraday-retry', '~> 2.1'
+  s.add_dependency 'faraday-retry', '~> 2.2'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.17'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5', '>= 0.5.1'

data/sub/eac_envs-http/lib/eac_envs/http/response/body.rb

@@ -34,6 +34,11 @@ module EacEnvs
           body_str
         end
 
+        # @param path [Pathname]
+        def write_body(path)
+          ::File.open(path, 'wb') { |fp| fp.write(performed.body) }
+        end
+
         private
 
         def body_data_from_application_json

data/sub/eac_envs-http/lib/eac_envs/http/version.rb

@@ -2,6 +2,6 @@
 
 module EacEnvs
   module Http
-    VERSION = '0.3.2'
+    VERSION = '0.4.0'
   end
 end

data/sub/eac_envs-http/spec/lib/eac_envs/http/request_spec_files/get.target.yaml

@@ -4,6 +4,6 @@ method: GET
 uri: "/path/to/service?field1=value1&field2=value2"
 body:
 headers:
-  user-agent: Faraday v2.7.4
+  user-agent: EacEnvs::Http
   accept: application/json
   accept-encoding: gzip,deflate

data/sub/eac_envs-http/spec/lib/eac_envs/http/request_spec_files/get_with_auth.target.yaml

@@ -4,7 +4,7 @@ method: GET
 uri: "/path/to/service?field1=value1&field2=value2"
 body:
 headers:
-  user-agent: Faraday v2.7.4
+  user-agent: EacEnvs::Http
   accept: application/json
   authorization: Basic dGhlX3VzZXI6dGhlX3NlY3JldA==
   accept-encoding: gzip,deflate

data/sub/eac_envs-http/spec/lib/eac_envs/http/request_spec_files/post_array_body.target.yaml

@@ -4,7 +4,7 @@ method: POST
 uri: "/path/to/service"
 body: field1=value1&field1=value3&field2=value2
 headers:
-  user-agent: Faraday v2.7.4
+  user-agent: EacEnvs::Http
   content-type: application/x-www-form-urlencoded
   accept-encoding: gzip,deflate
   accept: "*/*"

data/sub/eac_envs-http/spec/lib/eac_envs/http/request_spec_files/post_string_body.target.yaml

@@ -4,7 +4,7 @@ method: POST
 uri: "/path/to/service"
 body: field1=value1&field2=value2
 headers:
-  user-agent: Faraday v2.7.4
+  user-agent: EacEnvs::Http
   content-type: application/x-www-form-urlencoded
   accept-encoding: gzip,deflate
   accept: "*/*"

data/sub/eac_envs-http/spec/lib/eac_envs/http/request_spec_files/put_hash_body.target.yaml

@@ -4,7 +4,7 @@ method: PUT
 uri: "/path/to/service"
 body: field1=value1&field2=value2
 headers:
-  user-agent: Faraday v2.7.4
+  user-agent: EacEnvs::Http
   content-type: application/x-www-form-urlencoded
   accept-encoding: gzip,deflate
   accept: "*/*"

data/sub/eac_envs-http/spec/lib/eac_envs/http/request_spec_files/put_with_file.target.yaml

@@ -6,7 +6,7 @@ body: "-------------RubyMultipartPost-0123456789abcdef0123456789abcdef\r\nConten
   form-data; name=\"field1\"; filename=\"basename\"\r\nContent-Length: 6\r\nContent-Type:
   text/plain\r\nContent-Transfer-Encoding: binary\r\n\r\nvalue1\r\n-------------RubyMultipartPost-0123456789abcdef0123456789abcdef--\r\n"
 headers:
-  user-agent: Faraday v2.7.4
+  user-agent: EacEnvs::Http
   content-type: multipart/form-data; boundary=-----------RubyMultipartPost-0123456789abcdef0123456789abcdef
   content-length: '290'
   accept-encoding: gzip,deflate

data/sub/eac_envs-http/spec/lib/eac_envs/http/request_spec_files/root.target.yaml

@@ -4,6 +4,6 @@ method: GET
 uri: "/"
 body:
 headers:
-  user-agent: Faraday v2.7.4
+  user-agent: EacEnvs::Http
   accept-encoding: gzip,deflate
   accept: "*/*"

data/sub/eac_envs-http/spec/spec_helper/request_builder.rb

@@ -26,6 +26,7 @@ class RequestBuilder
     r = %i[verb headers].inject(new_request) do |a, e|
       data[e].if_present(a) { |v| a.send(e, v) }
     end
+    r = r.header('user-agent', 'EacEnvs::Http')
     result_body_data(result_auth(r))
   end
 

data/sub/eac_rest/eac_rest.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'eac_envs-http', '~> 0.3', '>= 0.3.1'
+  s.add_dependency 'eac_envs-http', '~> 0.4'
   s.add_dependency 'eac_fs', '~> 0.16'
-  s.add_dependency 'eac_ruby_utils', '~> 0.112'
+  s.add_dependency 'eac_ruby_utils', '~> 0.117', '>= 0.117.1'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.15'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

data/sub/eac_rest/lib/eac_rest/api.rb

@@ -32,7 +32,7 @@ module EacRest
 
     def request_json(service_url_suffix, headers = {}, &body_data_proc)
       request(service_url_suffix, headers.merge('Accept' => 'application/json')) do |body_data|
-        r = ::JSON.parse(body_data)
+        r = body_data.is_a?(::Enumerable) ? body_data : ::JSON.parse(body_data)
         r = body_data_proc.call(r) if body_data_proc
         r
       end

data/sub/eac_rest/lib/eac_rest/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRest
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

data/sub/eac_rest/spec/lib/eac_rest/api_spec_files/get.target.yaml

@@ -4,6 +4,6 @@ method: GET
 uri: "/path/to/service?field1=value1&field2=value2"
 body:
 headers:
-  user-agent: Faraday v2.7.4
+  user-agent: EacRest
   accept: application/json
   accept-encoding: gzip,deflate

data/sub/eac_rest/spec/lib/eac_rest/api_spec_files/get_with_auth.target.yaml

@@ -4,7 +4,7 @@ method: GET
 uri: "/path/to/service?field1=value1&field2=value2"
 body:
 headers:
-  user-agent: Faraday v2.7.4
+  user-agent: EacRest
   accept: application/json
   authorization: Basic dGhlX3VzZXI6dGhlX3NlY3JldA==
   accept-encoding: gzip,deflate

data/sub/eac_rest/spec/lib/eac_rest/api_spec_files/post_array_body.target.yaml

@@ -4,7 +4,7 @@ method: POST
 uri: "/path/to/service"
 body: field1=value1&field1=value3&field2=value2
 headers:
-  user-agent: Faraday v2.7.4
+  user-agent: EacRest
   content-type: application/x-www-form-urlencoded
   accept-encoding: gzip,deflate
   accept: "*/*"

data/sub/eac_rest/spec/lib/eac_rest/api_spec_files/post_string_body.target.yaml

@@ -4,7 +4,7 @@ method: POST
 uri: "/path/to/service"
 body: field1=value1&field2=value2
 headers:
-  user-agent: Faraday v2.7.4
+  user-agent: EacRest
   content-type: application/x-www-form-urlencoded
   accept-encoding: gzip,deflate
   accept: "*/*"

data/sub/eac_rest/spec/lib/eac_rest/api_spec_files/put_hash_body.target.yaml

@@ -4,7 +4,7 @@ method: PUT
 uri: "/path/to/service"
 body: field1=value1&field2=value2
 headers:
-  user-agent: Faraday v2.7.4
+  user-agent: EacRest
   content-type: application/x-www-form-urlencoded
   accept-encoding: gzip,deflate
   accept: "*/*"

data/sub/eac_rest/spec/lib/eac_rest/api_spec_files/put_with_file.target.yaml

@@ -6,7 +6,7 @@ body: "-------------RubyMultipartPost-0123456789abcdef0123456789abcdef\r\nConten
   form-data; name=\"field1\"; filename=\"basename\"\r\nContent-Length: 6\r\nContent-Type:
   text/plain\r\nContent-Transfer-Encoding: binary\r\n\r\nvalue1\r\n-------------RubyMultipartPost-0123456789abcdef0123456789abcdef--\r\n"
 headers:
-  user-agent: Faraday v2.7.4
+  user-agent: EacRest
   content-type: multipart/form-data; boundary=-----------RubyMultipartPost-0123456789abcdef0123456789abcdef
   content-length: '290'
   accept-encoding: gzip,deflate

data/sub/eac_rest/spec/lib/eac_rest/api_spec_files/root.target.yaml

@@ -4,6 +4,6 @@ method: GET
 uri: "/"
 body:
 headers:
-  user-agent: Faraday v2.7.4
+  user-agent: EacRest
   accept-encoding: gzip,deflate
   accept: "*/*"

data/sub/eac_rest/spec/spec_helper/request_builder.rb

@@ -17,10 +17,11 @@ class RequestBuilder
     self.data = data.with_indifferent_access
   end
 
-  def result
+  def result # rubocop:disable Metrics/AbcSize
     r = %i[verb headers].inject(selected_api.request(data.fetch(:url_suffix))) do |a, e|
       data[e].if_present(a) { |v| a.send(e, v) }
     end
+    r = r.header('user-agent', 'EacRest')
     data[:body_data].if_present(r) { |v| r.body_data(build_body_data(v)) }
   end
 

data/sub/eac_ruby_utils/lib/eac_ruby_utils/acts_as_instance_method.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/module/introspection'
+require 'eac_ruby_utils/patches/class/common_constructor'
+require 'eac_ruby_utils/patches/module/module_parent'
+require 'eac_ruby_utils/patches/string/inflector'
+
+module EacRubyUtils
+  class ActsAsInstanceMethod
+    common_constructor :method_class
+
+    # @param sender_module [Module, nil]
+    # @return [self]
+    def setup(sender_module = nil)
+      sender_module ||= default_sender_module
+      the_setup = self
+      sender_module.define_method(method_name) do |*args, &block|
+        the_setup.method_class.new(self, *args, &block).result
+      end
+
+      self
+    end
+
+    # @return [String]
+    def method_name
+      method_class.name.demodulize.underscore.variableize
+    end
+
+    # @return [Module]
+    def default_sender_module
+      method_class.module_parent
+    end
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/gems_registry.rb

@@ -29,7 +29,6 @@ module EacRubyUtils
     # @return [Array<EacRubyUtils::GemsRegistry::Gem>]
     def all_gems
       ::Gem::Specification.map { |gemspec| ::EacRubyUtils::GemsRegistry::Gem.new(self, gemspec) }
-        .sort
     end
   end
 end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/method_class.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/module/introspection'
+require 'eac_ruby_utils/acts_as_instance_method'
 require 'eac_ruby_utils/patches/class/common_constructor'
 require 'eac_ruby_utils/patches/module/common_concern'
-require 'eac_ruby_utils/patches/module/module_parent'
-require 'eac_ruby_utils/patches/string/inflector'
 
 module EacRubyUtils
   module MethodClass
@@ -12,24 +10,18 @@ module EacRubyUtils
       ::EacRubyUtils::MethodClass::Setup.new(self)
     end
 
-    class Setup
-      common_constructor :method_class, :static_method, default: [false] do
+    class Setup < ::EacRubyUtils::ActsAsInstanceMethod
+      common_constructor :method_class, :static_method, default: [false],
+                                                        super_args: -> { [method_class] } do
         perform
       end
 
       def perform
-        the_setup = self
-        sender_module.define_method(method_name) do |*args, &block|
-          the_setup.method_class.new(self, *args, &block).result
-        end
+        setup
       end
 
-      def method_name
-        method_class.name.demodulize.underscore.variableize
-      end
-
-      def sender_module
-        r = method_class.module_parent
+      def default_sender_module
+        r = super
         r = r.singleton_class if static_method
         r
       end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/patches/module/acts_as_instance_method.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/acts_as_instance_method'
+
+class Module
+  # @return [EacRubyUtils::ActsAsInstanceMethod]
+  def acts_as_instance_method
+    ::EacRubyUtils::ActsAsInstanceMethod.new(self).setup
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/version.rb

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

data/sub/eac_ruby_utils/lib/eac_ruby_utils/wildcards.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module EacRubyUtils
+  # The `Wildcards` class provides pattern matching with wildcards using regular expressions.
+  class Wildcards
+    # Initializes a new instance of the `Wildcards` class with the specified pattern.
+    #
+    # @param pattern [String] The pattern to match against.
+    def initialize(pattern)
+      @pattern = pattern
+    end
+
+    # Matches the given string against the pattern.
+    #
+    # @param string [String] The string to match.
+    # @return [Boolean] Returns `true` if the string matches the pattern, otherwise `false`.
+    delegate :match?, to: :regex
+
+    private
+
+    # @return [Regexp]
+    def regex
+      ::Regexp.new("^#{::Regexp.escape(@pattern).gsub('\*', '.*').gsub('\?', '.?')}$")
+    end
+  end
+end

data/sub/eac_ruby_utils/spec/lib/eac_ruby_utils/wildcards_spec.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/wildcards'
+
+::RSpec.describe ::EacRubyUtils::Wildcards do
+  describe '#match' do
+    {
+      'h*llo' => { 'hello' => true, 'hallo' => true, 'hxllo' => true, 'hillo' => true },
+      'w?rld' => { 'world' => true, 'warld' => true, 'wzzrld' => false },
+      'h*l?o' => { 'hello' => true, 'hallo' => true, 'hxxllo' => true, 'hilbbo' => false },
+      '' => { '' => true, 'hello' => false },
+      'hello' => { '' => false, 'hello' => true }
+    }.each do |pattern, examples|
+      context "when pattern is '#{pattern}'" do
+        let(:instance) { described_class.new(pattern) }
+
+        examples.each do |string, expected_result|
+          context "when string is \"#{string}\"" do # rubocop:disable RSpec/NestedGroups
+            it do
+              expect(instance.match?(string)).to eq(expected_result)
+            end
+          end
+        end
+      end
+    end
+  end
+end