mikras_utils 0.5.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ed0f08aeac113ce1baaab8a61f252fc80db284204cf6092ef9a4396f0cbe90a
-  data.tar.gz: '09bbf4ada5bb30f2ccd9b69ce88fbedc77c36cdb6518a485a3d605c3df0df7c5'
+  metadata.gz: a5f3f5143ea3be29ccbdf96438b10ff7f2f59808ca6648065e5c743be051909f
+  data.tar.gz: 9b61802622cbaa60b2a597a477c625f4c5c2fc0d81d0a9f6e2523e1aec0abe68
 SHA512:
-  metadata.gz: 94326cd108d93deebb637cf69684679cd16d20e760c63ad56e60a0f2d2a3b7af4d5a3cfbe58900f705c7eb1066979bffebe6751a14ae916896a4eed83d394385
-  data.tar.gz: f19ba5e3ab24f4874a1a63d9ea8389bcc9a3a3c2e3faf557c497f9f59b4b5704f622d1542679c2ebd21355389652c3708d94e49420da6821b5390f767db4794a
+  metadata.gz: 931288e3bf45321e92f6245da259948768cf7f4289250c6089e96cd70fe54324f3dcdfdd8668ae22d1f5e76d7b66b5ff4cee89243058faab2baafe6fffcb43de
+  data.tar.gz: bb6bdf8753f2761015a88effa7345435d0177fffdb16523e5d579b2ec24427e856064a9b5e6610d4eaf0ce2752d2120fe602c1a545720d149ec8b32018c0d805

data/lib/mikras_utils/mkacl/generators/seeds.rb

@@ -33,12 +33,13 @@ module MkAcl
             insert into acl_portal.acl_tables (
                 schema_name, table_name, domain,
                 parent_schema_name, parent_table_name, parent_link_field,
-                acl_link_fields, acl)
+                triggers, acl_link_fields, acl)
               values (
                 '#{app_schema}', '#{table}', #{conn.quote_value(table.domain)},
                 #{PgConn.quote_value(table.parent && table.app_schema)},
                 #{PgConn.quote_value(table.parent)},
                 #{PgConn.quote_value(table.parent_link_field)},
+                #{table.triggers},
                 #{PgConn.quote_value(table.references.values.map(&:last), elem_type: 'text')},
                 #{table.acl || 'false'})
               returning id as "table_id"

data/lib/mikras_utils/mkacl/parser.rb

@@ -44,31 +44,35 @@ module MkAcl
 
     def parse_tables(spec, tables)
       for table_name, actions in tables
-        acl = actions.key?(:acl) ? actions.delete(:acl) : true
         parent = actions.delete(:parent)
         domain = actions.delete(:domain)
-        table = Table.new(spec, table_name, domain, parent, acl)
+        triggers = actions.key?(:triggers) ? actions.delete(:triggers) : true
+        acl = actions.key?(:acl) ? actions.delete(:acl) : true
+        table = Table.new(spec, table_name, domain, parent, triggers, acl)
         parse_actions(table, actions)
       end
     end
 
     def parse_actions(table, actions)
       for action_name, rules in actions
-        constrain?(action_name, :insert, :select, :update, :delete, :attach) or
+        constrain?(action_name, :insert, :select, :update, :delete, :attach, :detach) or
             error "Illegal action '#{action_name}'"
-        constrain?(rules, String, Array, Hash) or
-            error "Illegal value for #{action} action '#{rules}'"
-        action = Action.new(table, action_name)
-
-        # Normalize rules
-        case rules
-          when Hash
-            rules = [rules]
-          when String
-            rules = [{ roles: rules }]
-        end
 
-        parse_rules(action, rules)
+        for real_action_name in (action_name == :attach ? [:attach, :detach] : [action_name])
+          constrain?(rules, String, Array, Hash) or
+              error "Illegal value for #{action_name} action '#{rules}'"
+          action = Action.new(table, real_action_name)
+
+          # Normalize rules
+          case rules
+            when Hash
+              rules = [rules]
+            when String
+              rules = [{ roles: rules }]
+          end
+
+          parse_rules(action, rules)
+        end
       end
     end
 

data/lib/mikras_utils/mkacl/spec.rb

@@ -69,6 +69,9 @@ module MkAcl
     # the analyzer
     attr_accessor :domain
 
+    # True if the portal object triggers should be active on the table
+    attr_accessor :triggers
+
     # SQL to create the ACL for a table. No ACL if false, default ACL if nil
     attr_accessor :acl
 
@@ -84,7 +87,7 @@ module MkAcl
     # Hash from action name to action object
     attr_reader :actions
 
-    def initialize(spec, name, domain, parent_name, acl)
+    def initialize(spec, name, domain, parent_name, triggers, acl)
       @spec = spec
       @references = {}
       @name = name.to_s
@@ -93,6 +96,7 @@ module MkAcl
       @parent_name = parent_name
       @parent_link_fields = []
       @domain = domain
+      @triggers = triggers
       @acl = acl
       @actions = {}
       @spec.send :attach_table, self
@@ -113,6 +117,7 @@ module MkAcl
         for action_name in %w(insert select update delete)
           actions[action_name]&.dump
         end
+        puts "triggers: #{triggers}"
         case acl
           when false; puts "acl: false"
           when true;
@@ -171,7 +176,7 @@ module MkAcl
     attr_accessor :filter # Goes into the postgres policy, may be nil
     attr_accessor :assert # Goes into the postgres trigger, may be nil
     attr_accessor :fields # Only used for insert and update, nil otherwise
-    attr_accessor :tables # Only used for attach, nil otherwise
+    attr_accessor :tables # Only used for attach and detach, nil otherwise
     attr_reader :ordinal
 
     # admin, internal, etc.

data/lib/mikras_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MikrasUtils
-  VERSION = "0.5.1"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mikras_utils
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-20 00:00:00.000000000 Z
+date: 2025-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg_conn