eac_rest 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 945584092ca9aed7a69937868f4d63f064372e74315c359f43d1fb8d6ec23546
-  data.tar.gz: 44353ff6d28eb8515f75b79bf7a6b6e2eee0c8be20ff5866a45395ffe3e339a2
+  metadata.gz: 0fe5757eaf77cd67597c26aa58e150392aa661781cd19123f835aa503dad12fc
+  data.tar.gz: 9982b978e4718a87847522ef9b140a159f36d29379efe85e5c2d7be5c5bd34ca
 SHA512:
-  metadata.gz: ffa21fcadef6f88f12f549b23cc8b844c4d8bda459e7e1e2d8824ae1ff137ae5ff55fa84b713da8e2d5e2652acc46eb41f22d0c7bf444833c5a47b641e5b8898
-  data.tar.gz: e7828dd79341ea1b2af6002e4ae2d1420ab79a514c9b687f4cd0f64540f3ccd85f5596dcb3a8dac80d19b2971c80eebbe3e19aa055943386dc04aeee5f0ef8b0
+  metadata.gz: 37fc4fd969a082152524de5313b08b9ae9f246b86725da8635365e9487cb6dde875b1aeff87852dd1016d2017b6edc59fadc7b8c4f221a399017be04f43f818b
+  data.tar.gz: 3486088ae1c66584166bae20afe57641eb7f1d4fe5ad27a5441989bc10dd0fd04c439a4effed9f6859b88c9eeced958988c05c8385bdd73e72be706c297b4052

data/lib/eac_rest/api.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'eac_rest/helper'
 require 'eac_rest/request'
 require 'eac_ruby_utils/core_ext'
 
@@ -40,20 +41,7 @@ module EacRest
 
     # @return [Addressable::URI]
     def build_service_url(suffix)
-      r = ::Addressable::URI.parse(suffix)
-      return r if r.scheme.present?
-
-      s = build_service_url_suffix(suffix)
-      r = ::Addressable::URI.parse(root_url)
-      r.path += s.path
-      r.query_values = r.query_values(::Array).if_present([]) +
-                       s.query_values(::Array).if_present([])
-      r
-    end
-
-    # @return [Addressable::URI]
-    def build_service_url_suffix(suffix)
-      ::Addressable::URI.parse(suffix)
+      ::EacRest::Helper.url_join(root_url, suffix)
     end
 
     # @return [EacRest::Entity]

data/lib/eac_rest/entity/data.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacRest
+  class Entity
+    module Data
+      common_concern
+
+      # @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
+
+      private
+
+      attr_accessor :internal_data
+    end
+  end
+end

data/lib/eac_rest/entity/fetching.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'eac_rest/helper'
+require 'eac_ruby_utils/core_ext'
+
+module EacRest
+  class Entity
+    module Fetching
+      # @return [Addressable::URI]
+      def entity_root_url_suffix
+        parent_entity.if_present('', &:entity_root_url_suffix).to_uri
+      end
+
+      # @return [EacRest::Request]
+      def request(url_suffix)
+        api.request(::EacRest::Helper.url_join(entity_root_url_suffix, url_suffix))
+      end
+    end
+  end
+end

data/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/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/lib/eac_rest/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_rest
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-22 00:00:00.000000000 Z
+date: 2023-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_envs-http
@@ -101,7 +101,10 @@ files:
 - lib/eac_rest.rb
 - lib/eac_rest/api.rb
 - lib/eac_rest/entity.rb
+- lib/eac_rest/entity/data.rb
+- lib/eac_rest/entity/fetching.rb
 - lib/eac_rest/error.rb
+- lib/eac_rest/helper.rb
 - lib/eac_rest/request.rb
 - lib/eac_rest/response.rb
 - lib/eac_rest/version.rb