json2sql 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb3184ddebd15d9412944f3e518524bbb0ae82b37dfcc925acb4c907e1244c3a
-  data.tar.gz: 0575b7e23355d4c08954cdf08a8da924bb8fccf67cd77086bb191c10b35a5780
+  metadata.gz: b734e672123b35d6b3878a30bf9629821915140e3240eba21cd8e853ac414911
+  data.tar.gz: 819e7767505a2154f0071a46ffee6640d30954e7bae623f308cb185791f2f1f3
 SHA512:
-  metadata.gz: 3501e46e1a5f0d10abe56a545f965e6c501864e436064f1cbe69e7e3573e35d177ae41b379df5e90ca77baf8d9ca19ea2b3843d21bdbc22b8e5bd21aab86f125
-  data.tar.gz: 5df88c1b1c985fc920baea0717746e7348c6040ec2d3ef8309a0f52dbb3c72a8f2cdc4e1e520e347bcceb6001ee59206680f90f7663522d0ba40b718ef82a8d7
+  metadata.gz: 8a0743bbb6f1e26aacf1cdf62e0e81ce19992a79b0c748225a3d563a810ef4d8278b59d068fe28ee8707bb55080130d27538dc6711a2782dc392762aefd92a32
+  data.tar.gz: 90cb0a70a7443c7bd6b3f4c6f12d02298d6e6c906d399cebc02c1edf1c566dc5eef470790d7f9213ef88b266a3b11f39f53fd74eaaa1ca1f37ef8daa015331d8

data/lib/json2sql/input_policy.rb

@@ -16,8 +16,8 @@ module Json2sql
   #               nil or absent = no column restriction for that table.
   #     children: nested hash of allowed/denied child tables with their own config.
   #               nil or absent = no restriction on children.
-  #               In :deny mode: use empty hash {} to deny the relation entirely;
-  #               a non-empty config applies column/where filtering without blocking.
+  #               In :deny mode: a child relation is removed only when all its
+  #               columns are denied (result is empty array).
   #     parents:  nested hash of allowed/denied parent tables with their own config.
   #               nil or absent = no restriction on parents.
   #               In :deny mode: same rules as children.
@@ -81,23 +81,34 @@ module Json2sql
 
       %w[children parents].each do |relation|
 
-        filter_relations(params, config, relation)
+        if @mode == :deny
 
-        next unless params[relation].is_a?(Hash)
+          next unless params[relation].is_a?(Hash)
 
-        relation_configs = config[relation].is_a?(Hash) ? config[relation] : {}
+          relation_configs = config[relation].is_a?(Hash) ? config[relation] : {}
 
-        params[relation].each { |child_table, child_params| sanitize_table(child_params, relation_configs[child_table] || {}) }
+          params[relation].each { |child_table, child_params| sanitize_table(child_params, relation_configs[child_table] || {}) }
+
+          params[relation].reject! { |_, child_params| child_params.is_a?(Hash) && child_params["columns"].is_a?(Array) && child_params["columns"].empty? }
+
+        else
+
+          filter_relations(params, config, relation)
+
+          next unless params[relation].is_a?(Hash)
+
+          relation_configs = config[relation].is_a?(Hash) ? config[relation] : {}
+
+          params[relation].each { |child_table, child_params| sanitize_table(child_params, relation_configs[child_table] || {}) }
+
+        end
       end
     end
 
-    # Filters children/parents relations using mode.
-    # In :allow mode, only relations present as keys in config[relation_key] pass.
-    # In :deny mode:
-    #   - relation config is nil or {} → relation is denied entirely.
-    #   - relation config is a non-empty Hash  → relation passes; sub-config is
-    #     applied recursively (column filtering, where injection, etc.).
+    # Filters children/parents relations in :allow mode.
+    # Only relations present as keys in config[relation_key] pass through.
     # If config[relation_key] is absent or not a Hash, relations are untouched.
+    # In :deny mode, pruning is handled in sanitize_table after column filtering.
 
     def filter_relations(params, config, relation_key)
 
@@ -109,15 +120,7 @@ module Json2sql
 
       return unless relation_config.is_a?(Hash)
 
-      params[relation_key] = if @mode == :deny
-
-        relations.reject { |t, _| relation_config.key?(t) && (relation_config[t].nil? || (relation_config[t].is_a?(Hash) && relation_config[t].empty?)) }
-
-      else
-
-        relations.select { |t, _| relation_config.key?(t) }
-
-      end
+      params[relation_key] = relations.select { |t, _| relation_config.key?(t) }
     end
 
     # Filters "columns" using mode (:allow or :deny).

data/lib/json2sql/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Json2sql
-  VERSION = "1.0.10"
+  VERSION = "1.0.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json2sql
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Tiago da Silva