apia 3.3.1 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b329db4c1e00be2afbb4160dff2feb3e3be2dfb0feab05b2b6f591045fe953b4
-  data.tar.gz: 3eff127300b99d73b3a15d86c0edba9bdb30f404500e35890aec1498a5f73337
+  metadata.gz: f40c9dba04e5b064ced8833f9edb42f96efd59c9d4e9342a4fa6535a1e76c6ee
+  data.tar.gz: 2506e79260735d3c2029ac7eaa9733e481b975b177506f03fcdeba21760b8781
 SHA512:
-  metadata.gz: 1d2af39e3de24f4ee4f3dbefa8206dde25648274793bcecfdca183faedfd7d6622bb60552ae7134b9abda3ccb667f285884957cc542f045ecc71b6f2da4b6138
-  data.tar.gz: ad96bf7677bf7d8c1d8b438f79f9c3d743f4184c9351c82eceeea5e5bc7d7dd97d039cba51eca4e0c8bd013bc6be96c8558aa61de41d87de2faacb008d3fe31e
+  metadata.gz: 7ae74d9f396b7dda8d14513d072f3e7f0902724c5b3e8bd0a430341f8d1e91dd83e4e6aae0b377dc954e3f248c5da7ba3984da354202fa42043c1e5d8d0e5ba7
+  data.tar.gz: 7e735b6a11cfc48325cd60ce0d01a36cb9eb776afeb2b74c3efe8de034b02413df3c8cec149b9ffa0883af4c85d4f631d7cc9f67e63c169e3fbcaeb4d0dbe517

data/lib/apia/field_set.rb

@@ -5,6 +5,7 @@ require 'apia/scalar'
 require 'apia/object'
 require 'apia/enum'
 require 'apia/field_spec'
+require 'apia/generated_hash'
 
 module Apia
   class FieldSet < Hash
@@ -35,10 +36,12 @@ module Apia
     #
     # @param source [Object, Hash]
     # @param request [Apia::Request]
+    # @param object [Apia::Object] the object that this fieldset belongs to
     # @param only [Array]
     # @return [Hash]
-    def generate_hash(source, request: nil, path: [])
-      each_with_object({}) do |(_, field), hash|
+    def generate_hash(source, request: nil, path: [], object: nil)
+      new_hash = GeneratedHash.enabled? ? GeneratedHash.new(object, source, path: path) : {}
+      each_with_object(new_hash) do |(_, field), hash|
         next unless field.include?(source, request)
 
         field_path = path + [field]

data/lib/apia/generated_hash.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Apia
+  class GeneratedHash < Hash
+
+    attr_reader :object
+    attr_reader :source
+    attr_reader :path
+
+    def initialize(object, source, path: nil)
+      super()
+      @object = object
+      @source = source
+      @path = path
+    end
+
+    class << self
+
+      def enabled?
+        @enabled == true
+      end
+
+      def enable
+        @enabled = true
+      end
+
+    end
+
+  end
+end

data/lib/apia/object.rb

@@ -49,7 +49,7 @@ module Apia
     # @param request [Apia::Request] the associated request
     # @return [Hash]
     def hash(request: nil, path: [])
-      self.class.definition.fields.generate_hash(@value, request: request, path: path)
+      self.class.definition.fields.generate_hash(@value, object: self, request: request, path: path)
     end
 
     # Should this type be included in any output?

data/lib/apia/version.rb

@@ -2,11 +2,6 @@
 
 module Apia
 
-  VERSION_FILE_ROOT = File.expand_path('../../VERSION', __dir__)
-  if File.file?(VERSION_FILE_ROOT)
-    VERSION = File.read(VERSION_FILE_ROOT).strip.sub(/\Av/, '')
-  else
-    VERSION = '0.0.0.dev'
-  end
+  VERSION = '3.4.0'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apia
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.4.0
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-14 00:00:00.000000000 Z
+date: 2023-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -45,7 +45,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- VERSION
 - lib/apia.rb
 - lib/apia/api.rb
 - lib/apia/argument_set.rb
@@ -110,6 +109,7 @@ files:
 - lib/apia/errors/standard_error.rb
 - lib/apia/field_set.rb
 - lib/apia/field_spec.rb
+- lib/apia/generated_hash.rb
 - lib/apia/helpers.rb
 - lib/apia/hook_set.rb
 - lib/apia/lookup_argument_set.rb

data/VERSION

@@ -1 +0,0 @@
-3.3.1