model_driven_api 3.4.5 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 951936414180f6ab491448640ed2fe4ee4f0b8671d418ccfcab9506d6961ea13
-  data.tar.gz: 5de4bed2add4fe92b91eb07719d31cff988fa2133fd3dee91076eb06a90e120c
+  metadata.gz: 2a314e7709d9c9c7b77fd4f5ccdd39a8effa795026d0e69b09a586945776ce89
+  data.tar.gz: 77c639a19a4c0da657b4436022e30b4468d27f885ac3f16a8bd3cffd2e47c357
 SHA512:
-  metadata.gz: 333c65d5f70d52839340e9c9a281cc6487f968de32c0ab76545d36d40df5f2068a14238bbf067d08ce21db27db3a22e2ef9a6f1005a71661f2c78fe9a52ba94b
-  data.tar.gz: 0feea406b468bc54f49d81608521d5eddd6064c6b3e80fa879af0d702c221c12b09da06c4bb8fa3535a95f8292a37b775a8b464881dc98eaecbb4a73691c460c
+  metadata.gz: 9020280fe2d5cc0a41e32e25e198e0681c6a76730bd00f8c782fba35ae85209b7c5c9eacba8aa7e57cf72c3fd56c93eb73543a3556e3df960e209f11ac3bc657
+  data.tar.gz: 7d2ce4d012dc38bbb8a6edbbefb8161bd242c751cb924dde1c876ed517b05d628afdee7d0854a141c93170b331bc456a3747df79543064019b04b71ea548eacc

data/app/commands/authorize_api_request.rb

@@ -15,7 +15,7 @@ class AuthorizeApiRequest
     
     def api_user
         Rails.logger.debug "AuthorizeApiRequest: api_user -> #{decoded_auth_token}"
-        @api_user ||= (decoded_auth_token.blank? ? User.find(decoded_auth_token[:user_id]) : nil)
+        @api_user ||= (decoded_auth_token.blank? ? nil : User.find(decoded_auth_token[:user_id]))
         unless @api_user.blank?
             return @api_user
         else

data/config/initializers/auto_include_json.rb

@@ -0,0 +1,105 @@
+# config/initializers/auto_include_json.rb
+
+module AutoIncludeJson
+  # Recursively builds a hash suitable for ActiveRecord eager loading
+  def build_includes(include_option)
+    case include_option
+    when Array
+      include_option
+    when Hash
+      include_option.each_with_object({}) do |(assoc, value), hash|
+        if value.is_a?(Hash) && value[:include]
+          hash[assoc] = build_includes(value[:include])
+        else
+          hash[assoc] = {}
+        end
+      end
+    else
+      []
+    end
+  end
+
+  # Recursively sanitize include options to ensure only, except, methods propagate
+  def sanitize_includes(include_option)
+    case include_option
+    when Array
+      include_option
+    when Hash
+      include_option.each_with_object({}) do |(assoc, value), hash|
+        hash[assoc] = {}
+
+        if value.is_a?(Hash)
+          hash[assoc][:only]    = value[:only] if value[:only]
+          hash[assoc][:except]  = value[:except] if value[:except]
+          hash[assoc][:methods] = value[:methods] if value[:methods]
+
+          if value[:include]
+            hash[assoc][:include] = sanitize_includes(value[:include])
+          end
+        end
+      end
+    else
+      []
+    end
+  end
+end
+
+# For ActiveRecord::Relation (collections)
+module AutoIncludeRelationJson
+  include AutoIncludeJson
+
+  def to_json(options = nil)
+    return super unless options.is_a?(Hash) && options[:include]
+
+    includes_hash = build_includes(options[:include])
+    sanitized_includes = sanitize_includes(options[:include])
+    options = options.merge(include: sanitized_includes)
+
+    self.includes(includes_hash).load.to_a.to_json(options)
+  end
+
+  def as_json(options = nil)
+    return super unless options.is_a?(Hash) && options[:include]
+
+    includes_hash = build_includes(options[:include])
+    sanitized_includes = sanitize_includes(options[:include])
+    options = options.merge(include: sanitized_includes)
+
+    self.includes(includes_hash).load.to_a.as_json(options)
+  end
+end
+
+# For ActiveRecord::Base (single records)
+module AutoIncludeInstanceJson
+  include AutoIncludeJson
+
+  def to_json(options = nil)
+    preload_and_sanitize!(options)
+    super
+  end
+
+  def as_json(options = nil)
+    preload_and_sanitize!(options)
+    super
+  end
+
+  private
+
+  def preload_and_sanitize!(options)
+    return unless options.is_a?(Hash) && options[:include]
+
+    includes_hash = build_includes(options[:include])
+    sanitized_includes = sanitize_includes(options[:include])
+    options[:include] = sanitized_includes
+
+    ActiveRecord::Associations::Preloader.new(
+      records: [self],
+      associations: includes_hash
+    ).call
+  end
+
+end
+
+# Activate extensions
+ActiveRecord::Relation.prepend(AutoIncludeRelationJson)
+ActiveRecord::Base.prepend(AutoIncludeInstanceJson)

data/lib/model_driven_api/version.rb

@@ -1,3 +1,3 @@
 module ModelDrivenApi
-  VERSION = "3.4.5".freeze
+  VERSION = "3.5.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: model_driven_api
 version: !ruby/object:Gem::Version
-  version: 3.4.5
+  version: 3.5.0
 platform: ruby
 authors:
 - Gabriele Tassoni
@@ -130,6 +130,7 @@ files:
 - app/models/test_api.rb
 - app/models/used_token.rb
 - config/initializers/after_initialize_for_model_driven_api.rb
+- config/initializers/auto_include_json.rb
 - config/initializers/cors_api_thecore.rb
 - config/initializers/knock.rb
 - config/initializers/time_with_zone.rb