eac_tools 0.75.1 → 0.76.0

data/sub/eac_rest/lib/eac_rest/entity.rb

@@ -25,42 +25,11 @@ module EacRest
       api.entity(entity_class, data_or_id, options.merge(OPTION_PARENT => self))
     end
 
-    # @return [Hash]
-    def data
-      if internal_data.blank?
-        self.internal_data = data_or_id_data? ? data_or_id : data_from_id
-      end
-
-      internal_data
-    end
-
-    # @return [Boolean]
-    def data_or_id_data?
-      data_or_id.is_a?(::Hash)
-    end
-
-    # @return [Hash]
-    def data_from_id
-      raise_abstract_method __method__
-    end
-
-    # @return [Object]
-    def id
-      data_or_id_data? ? id_from_data : data_or_id
-    end
-
-    # @return [Object]
-    def id_from_data
-      raise_abstract_method __method__
-    end
-
     # @return [EacRest::Entity, nil]
     def parent_entity
       options[OPTION_PARENT]
     end
 
-    private
-
-    attr_accessor :internal_data
+    require_sub __FILE__, include_modules: :include
   end
 end

data/sub/eac_rest/lib/eac_rest/helper.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacRest
+  module Helper
+    # @param parts [Array<Addressable::URI>]
+    # @return [Addressable::URI]
+    def url_join(*parts)
+      left = parts.shift
+      left = url_join_pair(left, parts.shift) while parts.any?
+      left
+    end
+
+    private
+
+    # @param left [Addressable::URI]
+    # @param right [Addressable::URI]
+    # @return [Addressable::URI]
+    def url_join_pair(left, right)
+      r = ::Addressable::URI.parse(right)
+      return r if r.scheme.present?
+
+      s = ::Addressable::URI.parse(right)
+      r = ::Addressable::URI.parse(left)
+      r.path += s.path
+      r.query_values = r.query_values(::Array).if_present([]) +
+                       s.query_values(::Array).if_present([])
+      r
+    end
+
+    extend self
+  end
+end

data/sub/eac_rest/lib/eac_rest/response.rb

@@ -19,6 +19,8 @@ module EacRest
         internal_response.send(method_name, *args, &block)
       rescue ::EacEnvs::Http::Error
         raise ::EacRest::Error
+      rescue ::EacEnvs::Http::Response
+        raise self
       end
     end
   end

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

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

data/sub/eac_ruby_utils/eac_ruby_utils.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*', 'MIT-LICENSE', 'README.rdoc']
 
   s.add_dependency 'activesupport', '>= 4', '< 7'
-  s.add_dependency 'addressable', '~> 2.8', '>= 2.8.4'
+  s.add_dependency 'addressable', '~> 2.8', '>= 2.8.5'
   s.add_dependency 'bundler'
   s.add_dependency 'filesize', '~> 0.2'
   s.add_dependency 'net-ssh', '~> 4.2'

data/sub/eac_ruby_utils/lib/eac_ruby_utils/module_ancestors_variable.rb

@@ -3,7 +3,7 @@
 require 'eac_ruby_utils/patches/module/require_sub'
 
 module EacRubyUtils
-  class ModuleAncestorsVariable
+  module ModuleAncestorsVariable
     require_sub __FILE__
   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.119.1'
+  VERSION = '0.119.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.75.1
+  version: 0.76.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-19 00:00:00.000000000 Z
+date: 2023-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -178,20 +178,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: '0.21'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: avm-eac_redmine_plugin_base0
   requirement: !ruby/object:Gem::Requirement
@@ -215,7 +209,7 @@ dependencies:
         version: '0.31'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.31.1
+        version: 0.31.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -225,7 +219,7 @@ dependencies:
         version: '0.31'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.31.1
+        version: 0.31.2
 - !ruby/object:Gem::Dependency
   name: avm-eac_webapp_base0
   requirement: !ruby/object:Gem::Requirement
@@ -275,7 +269,7 @@ dependencies:
         version: '0.13'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 0.13.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -285,7 +279,7 @@ dependencies:
         version: '0.13'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 0.13.4
 - !ruby/object:Gem::Dependency
   name: avm-tools
   requirement: !ruby/object:Gem::Requirement
@@ -309,7 +303,7 @@ dependencies:
         version: '0.119'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.119.1
+        version: 0.119.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -319,21 +313,21 @@ dependencies:
         version: '0.119'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.119.1
+        version: 0.119.2
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.8.0
 description: 
 email: 
 executables: []
@@ -671,6 +665,7 @@ files:
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/incompatible_parser/line_buffer.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/incompatible_parser/line_factory.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/incompatible_parser/line_parser_base.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/incompatible_parser/ruby_requirement.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/incompatible_parser/version_requirement.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/file_formats.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/file_formats/base.rb
@@ -744,6 +739,8 @@ files:
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/bundler/incompatible_parser_spec_files/1.target.yaml
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/bundler/incompatible_parser_spec_files/2.source.out
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/bundler/incompatible_parser_spec_files/2.target.yaml
+- sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/bundler/incompatible_parser_spec_files/3.source.out
+- sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/bundler/incompatible_parser_spec_files/3.target.yaml
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/file_formats/base_spec.rb
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/file_formats/base_spec_files/Gemfile.source
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/file_formats/base_spec_files/Gemfile.target
@@ -1374,6 +1371,10 @@ files:
 - sub/eac_cli/lib/eac_cli/runner_with/help/layout.rb
 - sub/eac_cli/lib/eac_cli/runner_with/input.rb
 - sub/eac_cli/lib/eac_cli/runner_with/output.rb
+- sub/eac_cli/lib/eac_cli/runner_with/output_item.rb
+- sub/eac_cli/lib/eac_cli/runner_with/output_item/base_formatter.rb
+- sub/eac_cli/lib/eac_cli/runner_with/output_item/csv_formatter.rb
+- sub/eac_cli/lib/eac_cli/runner_with/output_item/yaml_formatter.rb
 - sub/eac_cli/lib/eac_cli/runner_with/output_list.rb
 - sub/eac_cli/lib/eac_cli/runner_with/output_list/base_formatter.rb
 - sub/eac_cli/lib/eac_cli/runner_with/output_list/csv_formatter.rb
@@ -1760,7 +1761,10 @@ files:
 - sub/eac_rest/lib/eac_rest.rb
 - sub/eac_rest/lib/eac_rest/api.rb
 - sub/eac_rest/lib/eac_rest/entity.rb
+- sub/eac_rest/lib/eac_rest/entity/data.rb
+- sub/eac_rest/lib/eac_rest/entity/fetching.rb
 - sub/eac_rest/lib/eac_rest/error.rb
+- sub/eac_rest/lib/eac_rest/helper.rb
 - sub/eac_rest/lib/eac_rest/request.rb
 - sub/eac_rest/lib/eac_rest/response.rb
 - sub/eac_rest/lib/eac_rest/version.rb
@@ -2145,7 +2149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="