mikras_utils 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09748841bbccd2fc59e03f01fd240ac333963e7f6e8f35ed68d3d8268fdb4a97'
-  data.tar.gz: b058155721495e702725d5cf1a68d37139e3c8abe82089939e3c018ac5b3e7b3
+  metadata.gz: 4b53fcf02009d498760ed46a4e2e01fb5418ed6a8ee19b37a66504d5c524b209
+  data.tar.gz: b4361d6d864f9582fe93462b9d8b2fac2d846e96ac04d5a18777dce4d16bddfb
 SHA512:
-  metadata.gz: b25c043d64872f36c9b8d92e0f86d314164ef19695273255030d685e42497d0f7497395cf66718a41bf65e2ee6d4a4c1fad7db1b9202358ca6180e30df88eb76
-  data.tar.gz: b66d7b04e85ff125b6f8b5dc143bdb7893db08686c036899ca37ac0aa6aa7dd58edda99b976962266ebae4e00343fd80d1e66aa9c719846bf327dedc42c89888
+  metadata.gz: 414f6394b7c34992986a859875d69c14931ac913af2739a80759157effb38e20a55ee2addc815d024210908c15cddbf41669ab87ba474c527eada2aa92695458
+  data.tar.gz: 8ef782e64378a14de544d0099534d952963a223573bfb833e710acf673b6d3058d4928cd6c2f3c00805371bf163c85a3fbe3c41a5ce83e589170dc9e14f2e8d1

data/exe/mkacl

@@ -79,10 +79,12 @@ end
 
 spec = MkAcl::Parser.parse(file)
 MkAcl::Analyzer.analyze(spec, conn, warn: !opts.no_warn?)
+
 if opts.dump?
   spec.dump
   exit
 end
+
 MkAcl::Generator.generate(spec, conn, modules, interactive: opts.interactive?)
 
 

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

@@ -26,11 +26,15 @@ module MkAcl
           delete from acl_portal.acl_actions;
           delete from acl_portal.acl_tables;
         ).align
+        puts
       end
 
       def generate_seeds
         for table in spec.tables
           puts %(
+            --
+            -- #{table.name.gsub("_", " ").upcase}
+            --
             insert into acl_portal.acl_tables (
                 schema_name, table_name, record_name, domain,
                 parent_schema_name, parent_table_name, parent_link_field,
@@ -50,7 +54,8 @@ module MkAcl
 
           table.actions.values.each { |action|
             puts %(
-              insert into acl_portal.acl_actions (table_id, kind)
+              -- #{action.name.upcase}
+              insert into acl_portal.acl_actions (acl_table_id, kind)
                 values (:table_id, '#{action.name.upcase}')
                 returning id as "action_id"
               \\gset
@@ -63,26 +68,32 @@ module MkAcl
               puts %(
                 insert into acl_portal.acl_rules (
                     acl_action_id, roles, filter, assert, function_name, fields, tables, ordinal)
-                  values (:action_id, #{values.join(', ')});
+                  values (:action_id, #{values.join(', ')})
+                  returning id as "rule_id"
+                \\gset
               ).align
               puts
-            }
 
-            action.stamps.each { |stamp|
-              puts %(
-                insert into acl_portal.acl_stamps (action_id, watch, stamp)
-                  values (
-                    :action_id,
-                    #{conn.quote_value(stamp.watch)},
-                    #{conn.quote_value(stamp.stamp)}
-                  );
-              ).align
-              puts
+              rule.stamps.each { |stamp|
+                puts %(
+                  insert into acl_portal.acl_stamps (acl_rule_id, watch, stamp, value)
+                    values (
+                      :rule_id,
+                      #{conn.quote_value(stamp.watch)},
+                      #{conn.quote_value(stamp.stamp)},
+                      #{conn.quote_value(stamp.value)}
+                    );
+                ).align
+              }
             }
           }
         end
 
+        # Patch-up acl_tables
         puts %(
+          --
+          -- ASSIGN TABLE PARENT ID
+          --
           update acl_portal.acl_tables sub
             set parent_id = (
               select id
@@ -92,6 +103,33 @@ module MkAcl
             );
         ).align
         puts
+
+        # Patch-up acl_stamps
+        puts %(
+          --
+          -- ASSIGN STAMP TYPE AND VALUE
+          --
+          update acl_portal.acl_stamps s
+            set type = c.column_type,
+                value = coalesce(
+                  s.value,
+                  case c.column_type
+                    when 'int' then 'public.current_role_id()'
+                    when 'time' then 'now()'
+                  end
+                )
+          from
+            acl_portal.acl_rules r
+            join acl_portal.acl_actions a on a.id = r.acl_action_id
+            join acl_portal.acl_tables t on t.id = a.acl_table_id
+            join meta.columns c
+              on  c.schema_name = t.schema_name
+              and c.table_name = t.table_name
+          where
+            r.id = s.acl_rule_id
+            and c.column_name = s.stamp
+          ;
+        ).align
       end
     end
   end

data/lib/mikras_utils/mkacl/parser.rb

@@ -103,12 +103,9 @@ module MkAcl
     def parse_stamps(rule, stamps)
       constrain rule, Rule
       constrain stamps, String, Hash, Array
-#     constrain stamps, String, Hash[watch: NilClass | String | [String], stamp: String | [String]]
 
       # Normalize stamps
-      stamps = Array(stamps)
-
-      stamps.map! { |stamp|
+      stamps = Array(stamps).map! { |stamp|
         case stamp
           when Hash; stamp
           when String; { stamp: stamp }
@@ -120,32 +117,16 @@ module MkAcl
       # Check fields and create stamp
       stamps.each { |stamp|
         # Check fields
-        diff = stamp.keys - [:watch, :stamp]
+        diff = stamp.keys - [:watch, :stamp, :value]
         diff.empty? or raise "Illegal field '#{diff.first}' in #{rule.name} rule in table #{rule.table.name}"
-        Stamp.new(rule, stamp[:watch]&.split, stamp[:stamp].split)
+        (stamp[:watch]&.split || [nil]).map { |watch_field|
+          stamp[:stamp].split.map { |stamp_field|
+            Stamp.new(rule, watch_field, stamp_field, stamp[:value])
+          }
+        }
+        StampExpr.new(rule, stamp[:watch]&.split, stamp[:stamp].split, stamp[:value])
       }
     end
   end
 end
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

data/lib/mikras_utils/mkacl/spec.rb

@@ -164,22 +164,22 @@ module MkAcl
 
     def to_s() name end
 
-    def dump(header)
-      header = "#{header || name}:"
+    def dump_body
       if rules.size == 1
-        puts header
-        indent { rules.first.dump }
+        rules.first.dump
       elsif rules.size > 1
-        puts header
-        indent {
-          for rule in rules.sort_by(&:ordinal)
-            print "- "
-            indent(bol: false) { rule.dump }
-          end
-        }
+        for rule in rules.sort_by(&:ordinal)
+          print "- "
+          indent(bol: false) { rule.dump }
+        end
       end
     end
 
+    def dump(header = name)
+      puts "#{header || name}:"
+      indent { dump_body }
+    end
+
   private
     def attach_rule(rule)
       @rules << rule
@@ -198,6 +198,7 @@ module MkAcl
     attr_accessor :fields # Only used for insert and update, nil otherwise
     attr_accessor :tables # Only used for attach and detach, nil otherwise
     attr_accessor :stamps
+    attr_accessor :stamp_exprs
     attr_reader :ordinal
 
     # admin, internal, etc.
@@ -216,6 +217,7 @@ module MkAcl
       @fields = %w(insert update).include?(action.name) ? [] : nil
       @tables = %w(attach detach).include?(action.name) ? [] : nil
       @stamps = []
+      @stamp_exprs = []
 
       action.send :attach_rule, self
     end
@@ -228,47 +230,80 @@ module MkAcl
       puts "fields: #{fields.join(' ')}" if fields && !fields.empty?
       puts "tables: #{tables.join(' ')}" if tables && !tables.empty?
 
-      if stamps.size == 1
-        stamps.first.dump
-      elsif stamps.size > 1
+      if stamp_exprs.size == 1
+        stamp_exprs.first.dump
+      elsif stamp_exprs.size > 1
         puts "stamps:"
         indent {
-          for stamp in stamps
+          for stamp_expr in stamp_exprs
             print "- "
-            indent(bol: false) { stamp.dump }
+            indent(bol: false) { stamp_expr.dump }
           end
         }
       end
 
       puts "ordinal: #{ordinal}"
     end
+
   private
     def attach_stamp(stamp)
       @stamps << stamp
     end
+
+    def attach_stamp_expr(stamp_expr)
+      @stamp_exprs << stamp_expr
+    end
   end
 
   class Stamp
     attr_reader :rule
+
     forward_to :rule, :table, :name
 
     attr_accessor :watch
     attr_accessor :stamp
+    attr_accessor :value
 
-    def initialize(rule, watch = nil, stamp)
+    def initialize(rule, watch, stamp, value)
       constrain rule, Rule
+      constrain watch, String, nil
+      constrain stamp, String
       @rule = rule
-      @watch, @stamp = watch, stamp
+      @watch, @stamp, @value = watch, stamp, value
       rule.send :attach_stamp, self
     end
 
+    def to_s() = watch ? "#{watch}->#{stamp}" : stamp
+
+    def dump
+      puts "watch: #{watch}" if watch
+      puts "stamp: #{stamp}" if stamp
+      puts "value: #{value}" if value
+    end
+  end
+
+  class StampExpr # For debug. Express the structure of stamp syntax
+    attr_reader :rule
+    forward_to :rule, :table, :name
+
+    attr_accessor :watch # [String]
+    attr_accessor :stamp # [String]
+    attr_accessor :value
+
+    def initialize(rule, watch, stamp, value)
+      constrain rule, Rule
+      @rule = rule
+      @watch, @stamp, @value = watch, stamp, value
+      rule.send :attach_stamp_expr, self
+    end
+
     def to_s() = watch
 
     def dump
       puts "watch: #{watch.join(" ")}" if watch
       puts "stamp: #{stamp.join(" ")}" if stamp
+      puts "value: #{value}" if value
     end
   end
-
 end
 

data/lib/mikras_utils/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mikras_utils
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-21 00:00:00.000000000 Z
+date: 2025-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg_conn