ecoportal-api-graphql 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cc6136dc79d157acebf842f4b451e86a0f0266a5d239ad11dfa1f1db2f27ae7
-  data.tar.gz: 0a484624cc89b965ecb36e33beeb24470041288167deb2d48f52933a2f5f1d46
+  metadata.gz: a601be8bd2712d265a92f530ea2737d1df427b73066daf3a7dd5eb4befdfb14d
+  data.tar.gz: 68152b23448092ec5da50a052c600ff5f768eb1ff5ae20db37de174af785ef3a
 SHA512:
-  metadata.gz: aa8a69f025ff59c272b9b4285d76740d680e4a1757936ccc88383b9cda0335b1142842469cce72a330bc58bec970ca29ef1151b88761407f7938feeb4dbed220
-  data.tar.gz: 5da6da6b51a4795ba03f148a7b50d73f2465aa1c424be3f5accaebcd8eae3e599c022132458eabc0448d66df31f990d9f66b8efb5886b51bdbb061351afda4e5
+  metadata.gz: 11ab235ee54f4a3c42986a5c1f5a066b4ed235c530ff7011bbf7d02cd30afe403d8d82c158aa1bd974a0b320f3bcbf52d19cfb45cfc5012b4c1cc1afb7ba30c4
+  data.tar.gz: 03c9e3ca74579879996c8a3edf44f03e240dcd79c6418a599fd4ff6eb05a2084d506037139207dcc8713f785fd23cf0f7486e829c8d87511127036235b7875f5

data/CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file.
 
-## [1.3.5] - 2025-09-xx
+## [1.3.6] - 2026-05-26
 
 ### Added
 
@@ -10,6 +10,13 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 
+## [1.3.5] - 2026-05-26
+
+### Changed
+
+- Moved `graphql` endpoint to `external/graphql`
+- Missing env var (i.e. `ORG_ID`) will **raise** now an error (instead of just a print)
+
 ## [1.3.4] - 2025-09-04
 
 ### Added

data/ecoportal-api-graphql.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop-rake', '~> 0'
   spec.add_development_dependency 'yard',         '>= 0.9.34', '< 1'
 
-  spec.add_dependency 'ecoportal-api',    '~> 0.10',  '>= 0.10.14'
+  spec.add_dependency 'ecoportal-api',    '~> 0.10',  '>= 0.10.15'
   spec.add_dependency 'ecoportal-api-v2', '~> 3.3',   '>= 3.3.1'
   spec.add_dependency 'graphlient',       '>= 0.8.0', '< 0.9'
 end

data/lib/ecoportal/api/common/graphql/auth_service.rb

@@ -7,14 +7,13 @@ module Ecoportal
           TOKEN_AUTORENEW = 90 # minutes
 
           module InstanceMethods
-            def session_token(host: server, version: nil, auto_renew: true)
-              session_token_data(host: host, version: version).then do |body|
+            def session_token(host: server, auto_renew: true)
+              session_token_data(host: host).then do |body|
                 next unless body
 
                 if auto_renew && token_renew?(body['expires_in'])
                   session_token_renewed(
                     host:          host,
-                    version:       version,
                     refresh_token: body['refresh_token']
                   )
                 else
@@ -23,15 +22,14 @@ module Ecoportal
               end
             end
 
-            def session_token_renewed(host: server, version: nil, refresh_token: nil)
+            def session_token_renewed(host: server, refresh_token: nil)
               unless refresh_token
-                return unless (body = session_token_data(host: host, version: version))
+                return unless (body = session_token_data(host: host))
                 return unless (refresh_token = body['resfresh_token'])
               end
 
               session_refresh_token_data(
                 host:          host,
-                version:       version,
                 refresh_token: refresh_token
               ).then do |bdy|
                 bdy['access_token'] if bdy
@@ -40,8 +38,8 @@ module Ecoportal
 
             private
 
-            def session_token_data(host: server, version: nil)
-              http_client(host: host, version: version).post(
+            def session_token_data(host: server)
+              auth_http_client(host: host).post(
                 '/oauth/token',
                 data: {
                   'grant_type' => 'password',
@@ -53,8 +51,8 @@ module Ecoportal
               end
             end
 
-            def session_refresh_token_data(refresh_token:, host: server, version: nil)
-              http_client(host: host, version: version).post(
+            def session_refresh_token_data(refresh_token:, host: server)
+              auth_http_client(host: host).post(
                 '/oauth/token',
                 data: {
                   'grant_type'    => 'refresh_token',
@@ -69,10 +67,10 @@ module Ecoportal
               (TOKEN_AUTORENEW * 60) > seconds
             end
 
-            def http_client(host: server, version: nil)
-              @http_client ||= Ecoportal::API::Common::GraphQL::HttpClient.new(
+            def auth_http_client(host: server)
+              @auth_http_client ||= Ecoportal::API::Common::GraphQL::HttpClient.new(
                 host:    host,
-                version: version
+                version: 'http'
               )
             end
 
@@ -89,7 +87,7 @@ module Ecoportal
             end
 
             def fetch_env_required(name)
-              abort("Missing ENV '#{name}'") unless ENV.key?(name)
+              raise "Missing ENV '#{name}'" unless ENV.key?(name)
               ENV[name]
             end
 

data/lib/ecoportal/api/common/graphql/client.rb

@@ -4,6 +4,8 @@ module Ecoportal
     module Common
       module GraphQL
         class Client < ::Graphlient::Client
+          ENDPOINT_PATH = 'external/graphql'.freeze
+
           attr_accessor :host
 
           READ_TIMEOUT  = 90
@@ -42,7 +44,12 @@ module Ecoportal
           end
 
           def new(org_id: self.org_id, host: self.host, schema_path: host, no_schema: @no_schema)
-            self.class.new(org_id: org_id, host: host, schema_path: schema_path, no_schema: no_schema)
+            self.class.new(
+              org_id:      org_id,
+              host:        host,
+              schema_path: schema_path,
+              no_schema:   no_schema
+            )
           end
 
           def org_id
@@ -52,7 +59,8 @@ module Ecoportal
           private
 
           def url
-            "#{Ecoportal::API::Common::GraphQL::HttpClient.base_url(host)}/api/#{org_id}/graphql"
+            base_url = Ecoportal::API::Common::GraphQL::HttpClient.base_url(host)
+            "#{base_url}/api/#{org_id}/#{ENDPOINT_PATH}"
           end
         end
       end

data/lib/ecoportal/api/common/graphql/http_client.rb

@@ -13,20 +13,36 @@ module Ecoportal
             end
           end
 
+          READ_TIMEOUT  = 90
+          WRITE_TIMEOUT = 90
+
           attr_reader :host, :version
 
+          include Ecoportal::API::Common::GraphQL::AuthService
+
           def initialize(
+            email:        nil,
+            pass:         nil,
+            org_id:       nil,
             api_key:      nil,
-            version:      nil,
+            version:      'graphql',
             host:         'live.ecoportal.com',
             logger:       ::Logger.new(IO::NULL),
-            deep_logging: false
+            deep_logging: false,
+            no_schema:    true
           )
-            super
-          end
+            @org_id      = org_id
+            @user_email  = email
+            @user_pass   = pass
+            @no_schema   = no_schema
+            @version     = version
 
-          def refresh_key(value)
-            @api_key = value
+            super(
+              api_key:      api_key,
+              host:         host,
+              logger:       logger,
+              deep_logging: deep_logging
+            )
           end
 
           # Creates a HTTP object adding the `X-ApiKey` or `X-ECOPORTAL-API-KEY` param to the header, depending on the API version.
@@ -35,52 +51,92 @@ module Ecoportal
           def base_request
             @base_request ||=
               case @version
-              when NilClass
-                HTTP.accept(:json)
-              when 'v2'
-                HTTP.headers('X-ECOPORTAL-API-KEY' => key_token).accept(:json)
+              when NilClass, 'http'
+                HTTP
+              when 'v1', 'v0'
+                HTTP.headers('X-ApiKey' => key_token)
+              when 'v2', 'v3'
+                HTTP.headers('X-ECOPORTAL-API-KEY' => key_token)
               when 'graphql'
-                HTTP.headers('Authorization' => "Bearer #{key_token}").accept(:json)
-              else
-                HTTP.headers('X-ApiKey' => key_token).accept(:json)
+                HTTP.headers('Authorization' => "Bearer #{key_token}")
+              end.then do |request|
+                request.accept(:json).timeout(
+                  read:  READ_TIMEOUT,
+                  write: WRITE_TIMEOUT
+                )
               end
           end
 
+          def org_id
+            @org_id || fetch_env_required('ORGANIZATION_ID')
+          end
+
           # Full URl builder of the request
           # @param path [String] the tail that completes the url of the request.
           # @return [String] the final url.
           def url_for(path)
-            version? ? "#{base_url_api}#{path}" : "#{base_url}#{path}"
+            "#{api_url}#{path}"
           end
 
           private
 
-          def version?
-            !!@version
+          def key_token
+            return                           if http?
+            return session_token(host: host) if graphql?
+            return @api_key                  if api_key?
+            return ENV['ORG_INT_KEY']        if v0?
+
+            puts 'Api-key missing!'
           end
 
-          def protocol
-            @protocol ||= self.class.protocol(host)
+          def api_url
+            base_url.then do |url|
+              next "#{url}/api/#{version}"        if v1_0? || v2_3?
+              next "#{url}/api/#{org_id}/graphql" if graphql?
+
+              url
+            end
           end
 
           def base_url
             @base_url ||= self.class.base_url(host)
           end
 
-          def base_url_api
-            @base_url_api ||= "#{base_url}/api/#{version}"
+          def protocol
+            @protocol ||= self.class.protocol(host)
           end
 
-          def key_token
-            if @api_key.nil? || @api_key.match(/\A\W*\z/)
-              if (version == 'v0') && (key = ENV['ORG_INT_KEY'])
-                key
-              elsif !version.nil?
-                puts 'Api-key missing!'
-              end
-            else
-              @api_key
-            end
+          def http?
+            return true if @version.nil?
+
+            @version == 'http'
+          end
+
+          def api_key?
+            @api_key && !@api_key.match(/\A\W*\z/)
+          end
+
+          def v1_0?
+            v1? || v0?
+          end
+
+          def v1?
+            @version == 'v1'
+          end
+
+          def v0?
+            @version == 'v0'
+          end
+
+          def v2_3?
+            return true if @version == 'v2'
+            return true if @version == 'v3'
+
+            false
+          end
+
+          def graphql?
+            @version == 'graphql'
           end
         end
       end

data/lib/ecoportal/api/common/graphql.rb

@@ -7,8 +7,8 @@ module Ecoportal
   end
 end
 
-require 'ecoportal/api/common/graphql/http_client'
 require 'ecoportal/api/common/graphql/auth_service'
+require 'ecoportal/api/common/graphql/http_client'
 require 'ecoportal/api/common/graphql/client'
 require 'ecoportal/api/common/graphql/class_helpers'
 require 'ecoportal/api/common/graphql/hash_helpers'

data/lib/ecoportal/api/graphql/base/page/data_field.rb

@@ -0,0 +1,12 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Base
+        module Page
+          class DataField < Logic::BaseModel
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ecoportal/api/graphql/base/page/phased/stage.rb

@@ -0,0 +1,14 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Base
+        module Page
+          class Phased
+            class Stage < Logic::BaseModel
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ecoportal/api/graphql/base/page/phased.rb

@@ -0,0 +1,14 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Base
+        module Page
+          class Phased < Interface::BasePage
+            require_relative 'phased/stage'
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ecoportal/api/graphql/base/page/section.rb

@@ -0,0 +1,12 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Base
+        module Page
+          class Section < Logic::BaseModel
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ecoportal/api/graphql/base/page.rb

@@ -2,9 +2,13 @@ module Ecoportal
   module API
     class GraphQL
       module Base
-        class Page < Interface::BasePage
+        module Page
         end
       end
     end
   end
 end
+
+require_relative 'page/data_field'
+require_relative 'page/section'
+require_relative 'page/phased'

data/lib/ecoportal/api/graphql/base.rb

@@ -7,18 +7,18 @@ module Ecoportal
   end
 end
 
-require 'ecoportal/api/graphql/base/date_time'
-require 'ecoportal/api/graphql/base/page_info'
-require 'ecoportal/api/graphql/base/location_classification_type'
-require 'ecoportal/api/graphql/base/location_node'
-require 'ecoportal/api/graphql/base/location_structure'
-require 'ecoportal/api/graphql/base/person_member'
-require 'ecoportal/api/graphql/base/file_attachment'
-require 'ecoportal/api/graphql/base/file_container'
-require 'ecoportal/api/graphql/base/field'
-require 'ecoportal/api/graphql/base/page'
-require 'ecoportal/api/graphql/base/resource'
-require 'ecoportal/api/graphql/base/action_category'
-require 'ecoportal/api/graphql/base/action'
-require 'ecoportal/api/graphql/base/contractor_entity'
-require 'ecoportal/api/graphql/base/organization'
+require_relative 'base/date_time'
+require_relative 'base/page_info'
+require_relative 'base/location_classification_type'
+require_relative 'base/location_node'
+require_relative 'base/location_structure'
+require_relative 'base/person_member'
+require_relative 'base/file_attachment'
+require_relative 'base/file_container'
+require_relative 'base/field'
+require_relative 'base/page'
+require_relative 'base/resource'
+require_relative 'base/action_category'
+require_relative 'base/action'
+require_relative 'base/contractor_entity'
+require_relative 'base/organization'

data/lib/ecoportal/api/graphql/builder/page.rb

@@ -0,0 +1,41 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Builder
+        class Page
+          attr_reader :client
+
+          def initialize(client)
+            @client = client
+          end
+
+          # def archive(**kargs, &block)
+          #   archiveMutation.query(**kargs, &block)
+          # end
+
+          # def update(**kargs, &block)
+          #   updateMutation.query(**kargs, &block)
+          # end
+
+          # def create(**kargs, &block)
+          #   createMutation.query(**kargs, &block)
+          # end
+
+          private
+
+          # def archiveMutation
+          #   Mutation::Page::Archive.new(client)
+          # end
+
+          # def updateMutation
+          #   Mutation::Page::Update.new(client)
+          # end
+
+          # def createMutation
+          #   Mutation::Page::Create.new(client)
+          # end
+        end
+      end
+    end
+  end
+end

data/lib/ecoportal/api/graphql/builder/register.rb

@@ -0,0 +1,41 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Builder
+        class Register
+          attr_reader :client
+
+          def initialize(client)
+            @client = client
+          end
+
+          # def archive(**kargs, &block)
+          #   archiveMutation.query(**kargs, &block)
+          # end
+
+          # def update(**kargs, &block)
+          #   updateMutation.query(**kargs, &block)
+          # end
+
+          # def create(**kargs, &block)
+          #   createMutation.query(**kargs, &block)
+          # end
+
+          private
+
+          # def archiveMutation
+          #   Mutation::Register::Archive.new(client)
+          # end
+
+          # def updateMutation
+          #   Mutation::Register::Update.new(client)
+          # end
+
+          # def createMutation
+          #   Mutation::Register::Create.new(client)
+          # end
+        end
+      end
+    end
+  end
+end

data/lib/ecoportal/api/graphql/builder.rb

@@ -7,6 +7,8 @@ module Ecoportal
   end
 end
 
-require 'ecoportal/api/graphql/builder/location_structure'
-require 'ecoportal/api/graphql/builder/action'
-require 'ecoportal/api/graphql/builder/contractor_entity'
+require_relative 'builder/location_structure'
+require_relative 'builder/action'
+require_relative 'builder/contractor_entity'
+require_relative 'builder/register'
+require_relative 'builder/page'

data/lib/ecoportal/api/graphql/concerns/fragment_definitions.rb

@@ -0,0 +1,75 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Concerns
+        module FragmentDefinitions
+
+          class << self
+            private
+
+            def included(base)
+              super
+
+              base.send :include, Ecoportal::API::Common::GraphQL::ClassHelpers
+              base.extend ClassMethods
+              base.send :include, InstanceMethods
+            end
+          end
+
+          module ClassMethods
+            def fragment(sym, heredoc)
+              fragments[sym] = heredoc
+            end
+
+            def fragments
+              @fragments ||= {}
+            end
+          end
+
+          module InstanceMethods
+            attr_reader :client, :fragments
+
+            def initialize(client)
+              @client = client
+              parse
+            end
+
+            def define(sym, heredoc, namespace: ::Fragment)
+              namespace.send(:remove_const, sym) if namespace.const_defined?(sym)
+
+              client.parse(heredoc).tap do |fragment|
+                without_warnings do
+                  namespace.const_set(sym, fragment)
+                end
+              end
+            rescue ::GraphQL::Client::ValidationError, ::Graphlient::Errors::ClientError => err
+              raise err.class, "On fragment #{sym} -- #{err.message}", cause: nil
+            end
+
+            private
+
+            def without_warnings
+              original_verbose = $VERBOSE
+              $VERBOSE         = nil
+
+              yield if block_given?
+            ensure
+              $VERBOSE = original_verbose
+            end
+
+            def parse
+              @fragments = self.class.fragments.
+                each_with_object({}) do |(sym, heredoc), out|
+                  out[sym] = define(
+                    sym,
+                    heredoc,
+                    namespace: self.class
+                  )
+                end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ecoportal/api/graphql/concerns.rb

@@ -0,0 +1,10 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Concerns
+      end
+    end
+  end
+end
+
+require_relative 'concerns/fragment_definitions'

data/lib/ecoportal/api/graphql/connection.rb

@@ -7,7 +7,7 @@ module Ecoportal
   end
 end
 
-require 'ecoportal/api/graphql/connection/person_member'
-require 'ecoportal/api/graphql/connection/contractor_entity'
-require 'ecoportal/api/graphql/connection/action_category'
-require 'ecoportal/api/graphql/connection/action'
+require_relative 'connection/person_member'
+require_relative 'connection/contractor_entity'
+require_relative 'connection/action_category'
+require_relative 'connection/action'

data/lib/ecoportal/api/graphql/error.rb

@@ -7,6 +7,6 @@ module Ecoportal
   end
 end
 
-require 'ecoportal/api/graphql/error/locations_validation_error'
-require 'ecoportal/api/graphql/error/validation_errors'
-require 'ecoportal/api/graphql/error/locations_error'
+require_relative 'error/locations_validation_error'
+require_relative 'error/validation_errors'
+require_relative 'error/locations_error'

data/lib/ecoportal/api/graphql/fragment.rb

@@ -8,64 +8,20 @@ module Ecoportal
   module API
     class GraphQL
       class Fragment
-        include Ecoportal::API::Common::GraphQL::ClassHelpers
+        include Ecoportal::API::GraphQL::Concerns::FragmentDefinitions
 
-        class << self
-          def fragment(sym, heredoc)
-            fragments[sym] = heredoc
-          end
-
-          def fragments
-            @fragments ||= {}
-          end
-        end
-
-        attr_reader :client, :fragments
-
-        def initialize(client)
-          @client = client
-          parse
-        end
-
-        def define(sym, heredoc, namespace: ::Fragment)
-          namespace.send(:remove_const, sym) if namespace.const_defined?(sym)
-
-          client.parse(heredoc).tap do |fragment|
-            without_warnings do
-              namespace.const_set(sym, fragment)
-              ::Fragment.const_set(sym, fragment) unless namespace == ::Fragment
-            end
-          end
-        rescue ::GraphQL::Client::ValidationError, ::Graphlient::Errors::ClientError => err
-          raise err.class, "On fragment #{sym} -- #{err.message}", cause: nil
-        end
-
-        private
-
-        def without_warnings
-          original_verbose = $VERBOSE
-          $VERBOSE         = nil
-
-          yield if block_given?
-        ensure
-          $VERBOSE = original_verbose
-        end
-
-        def parse
-          @fragments = self.class.fragments.
-            each_with_object({}) do |(sym, heredoc), out|
-              out[sym] = define(sym, heredoc, namespace: self.class)
-            end
+        def initialize(...)
+          super(...)
         end
       end
     end
   end
 end
 
-require 'ecoportal/api/graphql/fragment/pagination'
-require 'ecoportal/api/graphql/fragment/locations_error'
-require 'ecoportal/api/graphql/fragment/location_node'
-require 'ecoportal/api/graphql/fragment/location_draft'
-require 'ecoportal/api/graphql/fragment/action_category'
-require 'ecoportal/api/graphql/fragment/action'
-require 'ecoportal/api/graphql/fragment/contractor_entity'
+require_relative 'fragment/pagination'
+require_relative 'fragment/locations_error'
+require_relative 'fragment/location_node'
+require_relative 'fragment/location_draft'
+require_relative 'fragment/action_category'
+require_relative 'fragment/action'
+require_relative 'fragment/contractor_entity'

data/lib/ecoportal/api/graphql/helpers/locations_tree.rb

@@ -9,6 +9,7 @@ module Ecoportal
             parents = nodes.each_with_object({}) do |node, out|
               (out[node.parent_id_upcase] ||= []).push(node)
             end
+
             get_children(nil, parents)
           end
 

data/lib/ecoportal/api/graphql/helpers.rb

@@ -7,4 +7,4 @@ module Ecoportal
   end
 end
 
-require 'ecoportal/api/graphql/helpers/locations_tree'
+require_relative 'helpers/locations_tree'

data/lib/ecoportal/api/graphql/input.rb

@@ -7,10 +7,10 @@ module Ecoportal
   end
 end
 
-require 'ecoportal/api/graphql/input/id_diff'
-require 'ecoportal/api/graphql/input/search_filter'
-require 'ecoportal/api/graphql/input/search_sorter'
-require 'ecoportal/api/graphql/input/search'
-require 'ecoportal/api/graphql/input/location_structure'
-require 'ecoportal/api/graphql/input/contractor_entity'
-require 'ecoportal/api/graphql/input/action'
+require_relative 'input/id_diff'
+require_relative 'input/search_filter'
+require_relative 'input/search_sorter'
+require_relative 'input/search'
+require_relative 'input/location_structure'
+require_relative 'input/contractor_entity'
+require_relative 'input/action'

data/lib/ecoportal/api/graphql/logic/mutation.rb

@@ -23,7 +23,12 @@ module Ecoportal
           # Query rely that manages the different blocks.
           # @return [Class] an object of `response_class` with the results hanving from `path`.
           def query(input:, path: self.path, **kargs, &block)
-            super(input: as_input(input), path: path, **kargs, &block)
+            super(
+              input: as_input(input),
+              path:  path,
+              **kargs,
+              &block
+            )
           end
 
           def response_class

data/lib/ecoportal/api/graphql/logic/query_array.rb

@@ -7,6 +7,7 @@ module Ecoportal
 
           def each(item_block: nil, **kargs, &block)
             return to_enum(:each, item_block: connection_block, **kargs) unless block
+
             query(**kargs, &item_block).each do |item|
               yield(item) if block_given?
             end

data/lib/ecoportal/api/graphql/logic/query_connection.rb

@@ -18,7 +18,9 @@ module Ecoportal
               #total    = connection.totalCount
               page_info = connection.pageInfo
               connection.nodes.each(&block)
+
               break unless (cursor = page_info.endCursor)
+              # break unless page_info.hasNextPage
             end
           end
 

data/lib/ecoportal/api/graphql/logic.rb

@@ -7,12 +7,12 @@ module Ecoportal
   end
 end
 
-require 'ecoportal/api/graphql/logic/base_model'
-require 'ecoportal/api/graphql/logic/base_query'
-require 'ecoportal/api/graphql/logic/query'
-require 'ecoportal/api/graphql/logic/mutation'
-require 'ecoportal/api/graphql/logic/connection'
-require 'ecoportal/api/graphql/logic/query_array'
-require 'ecoportal/api/graphql/logic/query_connection'
-require 'ecoportal/api/graphql/logic/payload'
-require 'ecoportal/api/graphql/logic/input'
+require_relative 'logic/base_model'
+require_relative 'logic/base_query'
+require_relative 'logic/query'
+require_relative 'logic/mutation'
+require_relative 'logic/connection'
+require_relative 'logic/query_array'
+require_relative 'logic/query_connection'
+require_relative 'logic/payload'
+require_relative 'logic/input'

data/lib/ecoportal/api/graphql/model/organization.rb

@@ -11,7 +11,10 @@ module Ecoportal
             extend Ecoportal::API::Common::GraphQL::QueryIntegration
 
             def path(*add)
-              DEFAULT_PATH.dup.push(*add)
+              return @path if add.empty? && instance_variable_defined?(:@path)
+
+              @path ||= self::DEFAULT_PATH.dup
+              @path   = @path.push(*add)
             end
 
             query :locationStructure,
@@ -35,13 +38,13 @@ module Ecoportal
               query_klass: 'Ecoportal::API::GraphQL::Query::Actions'
             query :archiveAction,
               query_klass: 'Ecoportal::API::GraphQL::Mutation::Action::Archive'
-            #action, actionsByPage, actionsCounter
-            #actionCategories
+            # actionsByPage, actionsCounter
 
-            #userGroup, userGroups
+            # userGroup, userGroups
+            # personMembers, attachablePersonMembers
 
-            #register, registers
-            #personMembers, attachablePersonMembers
+            # register, registers
+            # page, pages
           end
         end
       end

data/lib/ecoportal/api/graphql/model/page/data_field.rb

@@ -0,0 +1,12 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Model
+        module Page
+          class DataField < Base::Page::DataField
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ecoportal/api/graphql/model/page/phased/stage.rb

@@ -0,0 +1,14 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Model
+        module Page
+          class Phased
+            class Stage < Base::Page::Phased::Stage
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ecoportal/api/graphql/model/page/phased.rb

@@ -0,0 +1,20 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Model
+        module Page
+          class Phased < Base::Page::Phased
+            require_relative 'phased/stage'
+
+            class_resolver :user_class, 'Ecoportal::API::GraphQL::Model::User'
+            # class_resolver :force_class, 'Ecoportal::API::GraphQL::Model::Force'
+            # class_resolver :theme_class, 'Ecoportal::API::GraphQL::Model::Theme'
+            # class_resolver :template_class, 'Ecoportal::API::GraphQL::Model::Template'
+            # class_resolver :register_class, 'Ecoportal::API::GraphQL::Model::Register'
+            class_resolver :organization_class, 'Ecoportal::API::GraphQL::Model::Organization'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ecoportal/api/graphql/model/page/section.rb

@@ -0,0 +1,12 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Model
+        module Page
+          class Section < Base::Page::Section
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ecoportal/api/graphql/model/page.rb

@@ -2,15 +2,13 @@ module Ecoportal
   module API
     class GraphQL
       module Model
-        class Page < Base::Page
-          class_resolver :user_class, 'Ecoportal::API::GraphQL::Model::User'
-          # class_resolver :force_class, 'Ecoportal::API::GraphQL::Model::Force'
-          # class_resolver :theme_class, 'Ecoportal::API::GraphQL::Model::Theme'
-          # class_resolver :template_class, 'Ecoportal::API::GraphQL::Model::Template'
-          # class_resolver :register_class, 'Ecoportal::API::GraphQL::Model::Register'
-          class_resolver :organization_class, 'Ecoportal::API::GraphQL::Model::Organization'
+        module Page
         end
       end
     end
   end
 end
+
+require_relative 'page/data_field'
+require_relative 'page/section'
+require_relative 'page/phased'

data/lib/ecoportal/api/graphql/model/resource.rb

@@ -3,7 +3,7 @@ module Ecoportal
     class GraphQL
       module Model
         class Resource < Base::Resource
-          embeds_one :page, klass: 'Ecoportal::API::GraphQL::Model::Page', read_only: true # PageUnion
+          embeds_one :page, klass: 'Ecoportal::API::GraphQL::Model::Page::Phased', read_only: true # PageUnion
           embeds_one :field, klass: 'Ecoportal::API::GraphQL::Model::Field', read_only: true
           # embeds_many :stages, klass: 'Ecoportal::API::GraphQL::Model::SimpleStage'
         end

data/lib/ecoportal/api/graphql/model.rb

@@ -7,16 +7,16 @@ module Ecoportal
   end
 end
 
-require 'ecoportal/api/graphql/model/location_node'
-require 'ecoportal/api/graphql/model/location_structure'
-require 'ecoportal/api/graphql/model/account'
-require 'ecoportal/api/graphql/model/user'
-require 'ecoportal/api/graphql/model/person_member'
-require 'ecoportal/api/graphql/model/file_attachment'
-require 'ecoportal/api/graphql/model/file_container'
-require 'ecoportal/api/graphql/model/field'
-require 'ecoportal/api/graphql/model/page'
-require 'ecoportal/api/graphql/model/resource'
-require 'ecoportal/api/graphql/model/action'
-require 'ecoportal/api/graphql/model/contractor_entity'
-require 'ecoportal/api/graphql/model/organization'
+require_relative 'model/location_node'
+require_relative 'model/location_structure'
+require_relative 'model/account'
+require_relative 'model/user'
+require_relative 'model/person_member'
+require_relative 'model/file_attachment'
+require_relative 'model/file_container'
+require_relative 'model/field'
+require_relative 'model/page'
+require_relative 'model/resource'
+require_relative 'model/action'
+require_relative 'model/contractor_entity'
+require_relative 'model/organization'

data/lib/ecoportal/api/graphql/mutation.rb

@@ -7,6 +7,6 @@ module Ecoportal
   end
 end
 
-require 'ecoportal/api/graphql/mutation/location_structure'
-require 'ecoportal/api/graphql/mutation/contractor_entity'
-require 'ecoportal/api/graphql/mutation/action'
+require_relative 'mutation/location_structure'
+require_relative 'mutation/contractor_entity'
+require_relative 'mutation/action'

data/lib/ecoportal/api/graphql/payload.rb

@@ -7,6 +7,6 @@ module Ecoportal
   end
 end
 
-require 'ecoportal/api/graphql/payload/location_structure'
-require 'ecoportal/api/graphql/payload/contractor_entity'
-require 'ecoportal/api/graphql/payload/action'
+require_relative 'payload/location_structure'
+require_relative 'payload/contractor_entity'
+require_relative 'payload/action'

data/lib/ecoportal/api/graphql/query/action_categories.rb

@@ -39,6 +39,7 @@ module Ecoportal
               totalCount
               pageInfo {
                 endCursor
+                hasNextPage
               }
               nodes {
                 ___Ecoportal__API__GraphQL__Fragment__ActionCategory

data/lib/ecoportal/api/graphql/query/contractor_entities.rb

@@ -39,6 +39,7 @@ module Ecoportal
               totalCount
               pageInfo {
                 endCursor
+                hasNextPage
               }
               nodes {
                 ___Ecoportal__API__GraphQL__Fragment__ContractorEntity

data/lib/ecoportal/api/graphql/query.rb

@@ -7,10 +7,10 @@ module Ecoportal
   end
 end
 
-require 'ecoportal/api/graphql/query/location_classifications'
-require 'ecoportal/api/graphql/query/location_structure'
-require 'ecoportal/api/graphql/query/location_structures'
-require 'ecoportal/api/graphql/query/action_categories'
-require 'ecoportal/api/graphql/query/action'
-require 'ecoportal/api/graphql/query/actions'
-require 'ecoportal/api/graphql/query/contractor_entities'
+require_relative 'query/location_classifications'
+require_relative 'query/location_structure'
+require_relative 'query/location_structures'
+require_relative 'query/action_categories'
+require_relative 'query/action'
+require_relative 'query/actions'
+require_relative 'query/contractor_entities'

data/lib/ecoportal/api/graphql.rb

@@ -5,6 +5,8 @@ module Ecoportal
     class GraphQL
       include Ecoportal::API::Common::GraphQL::ClassHelpers
 
+      class_resolver :client_class, Ecoportal::API::Common::GraphQL::Client
+
       attr_reader :client, :fragments
 
       # Creates a `GraphQL` object to interact with the ecoPortal `GraphQL API`.
@@ -12,8 +14,15 @@ module Ecoportal
       #    It defaults to the environmental variable `ORGANIZATION_ID`, if defined
       # @param logger [Logger] an object with `Logger` interface to generate logs.
       def initialize(email: nil, pass: nil, org_id: nil, host: "live.ecoportal.com")
-        kargs = {email: email, pass: pass, host: host, org_id: org_id, no_schema: true}
-        @client = Ecoportal::API::Common::GraphQL::Client.new(**kargs)
+        kargs    = {
+          email:     email,
+          pass:      pass,
+          host:      host,
+          org_id:    org_id,
+          no_schema: true
+        }
+
+        @client    = client_class.new(**kargs)
         @fragments = Ecoportal::API::GraphQL::Fragment.new(client)
       end
 
@@ -55,6 +64,7 @@ module Ecoportal
 end
 
 require_relative 'graphql/helpers'
+require_relative 'graphql/concerns'
 require_relative 'graphql/logic/base_model'
 require_relative 'graphql/error'
 require_relative 'graphql/interface'

data/lib/ecoportal/api/graphql_version.rb

@@ -1,5 +1,5 @@
 module Ecoportal
   module API
-    GRAPQL_VERSION = '1.3.4'.freeze
+    GRAPQL_VERSION = '1.3.5'.freeze
   end
 end

data/tests/local_libs.rb

@@ -1,20 +1,20 @@
 require 'byebug'
 base_dir = 'C:/ruby_scripts/git'
 
-api_path   = File.join(base_dir,'/ecoportal-api/lib')
+api_path   = File.join(base_dir, '/ecoportal-api/lib')
 $LOAD_PATH.unshift File.expand_path(api_path)
 #require 'ecoportal/api'
-api_req = File.join(base_dir,'/ecoportal-api/lib/ecoportal/api')
+api_req = File.join(base_dir, '/ecoportal-api/lib/ecoportal/api')
 require api_req
 
-api_v2_path = File.join(base_dir,'/ecoportal-api-v2/lib')
+api_v2_path = File.join(base_dir, '/ecoportal-api-v2/lib')
 $LOAD_PATH.unshift File.expand_path(api_v2_path)
 #require 'ecoportal/api-v2'
-require File.join(base_dir,'/ecoportal-api-v2/lib/ecoportal/api-v2')
+require File.join(base_dir, '/ecoportal-api-v2/lib/ecoportal/api-v2')
 
-$LOAD_PATH.unshift File.join(base_dir,'/graphlient/lib')
-require File.join(base_dir,'/graphlient/lib/graphlient')
+$LOAD_PATH.unshift File.join(base_dir, '/graphlient/lib')
+require File.join(base_dir, '/graphlient/lib/graphlient')
 
-graphql = File.join(base_dir,'/ecoportal-api-graphql/lib')
+graphql = File.join(base_dir, '/ecoportal-api-graphql/lib')
 $LOAD_PATH.unshift File.expand_path(graphql)
 require_relative File.expand_path(File.join(graphql, 'ecoportal/api-graphql'))

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ecoportal-api-graphql
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Oscar Segura
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-09-04 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -141,7 +140,7 @@ dependencies:
         version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.14
+        version: 0.10.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -151,7 +150,7 @@ dependencies:
         version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.14
+        version: 0.10.15
 - !ruby/object:Gem::Dependency
   name: ecoportal-api-v2
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +191,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.9'
-description:
 email:
 - oscar@ecoportal.co.nz
 executables: []
@@ -248,6 +246,10 @@ files:
 - lib/ecoportal/api/graphql/base/location_structure/draft/structure.rb
 - lib/ecoportal/api/graphql/base/organization.rb
 - lib/ecoportal/api/graphql/base/page.rb
+- lib/ecoportal/api/graphql/base/page/data_field.rb
+- lib/ecoportal/api/graphql/base/page/phased.rb
+- lib/ecoportal/api/graphql/base/page/phased/stage.rb
+- lib/ecoportal/api/graphql/base/page/section.rb
 - lib/ecoportal/api/graphql/base/page_info.rb
 - lib/ecoportal/api/graphql/base/person_member.rb
 - lib/ecoportal/api/graphql/base/resource.rb
@@ -256,6 +258,10 @@ files:
 - lib/ecoportal/api/graphql/builder/contractor_entity.rb
 - lib/ecoportal/api/graphql/builder/location_structure.rb
 - lib/ecoportal/api/graphql/builder/location_structure/draft.rb
+- lib/ecoportal/api/graphql/builder/page.rb
+- lib/ecoportal/api/graphql/builder/register.rb
+- lib/ecoportal/api/graphql/concerns.rb
+- lib/ecoportal/api/graphql/concerns/fragment_definitions.rb
 - lib/ecoportal/api/graphql/connection.rb
 - lib/ecoportal/api/graphql/connection/action.rb
 - lib/ecoportal/api/graphql/connection/action_category.rb
@@ -333,6 +339,10 @@ files:
 - lib/ecoportal/api/graphql/model/location_structure/draft/structure.rb
 - lib/ecoportal/api/graphql/model/organization.rb
 - lib/ecoportal/api/graphql/model/page.rb
+- lib/ecoportal/api/graphql/model/page/data_field.rb
+- lib/ecoportal/api/graphql/model/page/phased.rb
+- lib/ecoportal/api/graphql/model/page/phased/stage.rb
+- lib/ecoportal/api/graphql/model/page/section.rb
 - lib/ecoportal/api/graphql/model/person_member.rb
 - lib/ecoportal/api/graphql/model/resource.rb
 - lib/ecoportal/api/graphql/model/user.rb
@@ -394,7 +404,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -409,8 +418,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.23
-signing_key:
+rubygems_version: 4.0.8
 specification_version: 4
 summary: A collection of helpers for interacting with the ecoPortal GraphQL API
 test_files: []