mikras_utils 0.10.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 664cc0291b18e0f9068704c14f3e65adb808c099510b0334684a3b5a13a0d83a
-  data.tar.gz: 1e372dae3fb50ada2eb071a5d4b679777cb159b43db1e71a343e02802f279771
+  metadata.gz: c16e80939523ecb0aaaf1c5bcc688f78868fc3074e9baf59f33376b119048816
+  data.tar.gz: 1d8ff5f5f1b5cf67841f6e21737b31bb12b3d5ed5f0813694e403450b5c9324f
 SHA512:
-  metadata.gz: 195f1c258a5e54092eae258420f850b8719ea7bc3e2d5ebbba3ffb2cf8ec813d008dc0e0ba8263f0383064914c0dc96267c7652b5a052008c307824c2f76bca2
-  data.tar.gz: 5827e7fdaa3d2888b341b4a1d70d4d2a42b3890ab00b090747556e3a85d8b459418a3b669302b6ed53b7392911680f833e5c01938831182f9ecfe02627bcdf7f
+  metadata.gz: 83cf23edadfd58d6aa08af29bf832146f7860924d9a2899f69473e82431d8bf2bbfb0707f375d3c11a0947830cde968c3481e04cdb92e2928306d21cd60b256d
+  data.tar.gz: 9520bc10e0e990be7d5a17efba03682881396b4ab6928a06dea92357213abe430d06af02705090c561d8a2b00eca6faeda2e6a06bebb78c8fadcfe59fa63c1a2

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

@@ -21,6 +21,7 @@ module MkAcl
     private
       def clean_tables
         puts %(
+          delete from acl_portal.acl_timestamps;
           delete from acl_portal.acl_rules;
           delete from acl_portal.acl_actions;
           delete from acl_portal.acl_tables;
@@ -57,10 +58,11 @@ module MkAcl
             puts
 
             action.rules.each { |rule|
-              fields = %w(roles filter assert fields tables ordinal)
+              fields = %w(roles filter assert mutation fields tables ordinal)
               values = fields.map { |field| conn.quote_value(rule.send(field.to_sym), elem_type: :text) }
               puts %(
-                insert into acl_portal.acl_rules (acl_action_id, roles, filter, assert, fields, tables, ordinal)
+                insert into acl_portal.acl_rules (
+                    acl_action_id, roles, filter, assert, mutation, fields, tables, ordinal)
                   values (:action_id, #{values.join(', ')});
               ).align
               puts
@@ -68,8 +70,13 @@ module MkAcl
 
             action.timestamps.each { |timestamp|
               puts %(
-                insert into acl_portal.acl_timestamps (action_id, watch, stamp)
-                  values (:action_id, #{conn.quote_value(timestamp.watch)}, '#{timestamp.stamp}');
+                insert into acl_portal.acl_timestamps (action_id, watch, assign, stamp)
+                  values (
+                    :action_id,
+                    #{conn.quote_value(timestamp.watch)},
+                    #{conn.quote_value(timestamp.assign)},
+                    #{conn.quote_value(timestamp.stamp)}
+                  );
               ).align
               puts
             }

data/lib/mikras_utils/mkacl/parser.rb

@@ -59,6 +59,7 @@ module MkAcl
         constrain?(action_name, :insert, :select, :update, :delete, :attach, :detach) or
             error "Illegal action '#{action_name}'"
 
+        # real_action_names break :attach into both :attach and :detach
         for real_action_name in (action_name == :attach ? [:attach, :detach] : [action_name])
           constrain?(entries, String, Array, Hash) or
               error "Illegal value for #{action_name} entry '#{entries}'"
@@ -72,6 +73,7 @@ module MkAcl
             when String
               entries = [{ roles: entries }]
             when Array
+              # Arrays can't specify mutations (for now)
               entries.reject! { |element|
                 timestamps = element.delete(:timestamps) and parse_timestamps(action, timestamps)
               }
@@ -88,14 +90,23 @@ module MkAcl
       case timestamps
         when String
           timestamps.split.each { |watch_field|
-            Timestamp.new(table, watch_field)
+            case watch_field
+              when /^(.*)(?:_by_id|_to_id)$/
+                Timestamp.new(table, watch_field, nil, "#{$1}_at")
+              when /^(created|updated|deleted)_at$/
+                Timestamp.new(table, nil, "#{$1}_by_id", watch_field)
+            else
+              raise ArgumentError, "Illegal timestamp specifier: #{watch_field.inspect}"
+            end
           }
+
         when Array
           for entry in timestamps
             timestamp = Timestamp.new(table)
             for key, value in entry
               case key
                 when :watch; timestamp.watch = value
+                when :assign; timestamp.assign = value
                 when :stamp; timestamp.stamp = value
               else
                 error "Illegal field '#{key}' in #{table} timestamps"
@@ -118,6 +129,7 @@ module MkAcl
             when :roles; rule.roles = norm_array(value)
             when :filter; rule.filter = norm_value(value)
             when :assert; rule.assert = norm_value(value)
+            when :mutation; rule.mutation = value.nil? ? nil : norm_value(value)
             when :fields; rule.fields = value.nil? ? nil : norm_array(value)
             when :tables; rule.tables = norm_array(value)
           else
@@ -131,4 +143,27 @@ module MkAcl
     end
   end
 end
+
+#def declare_record(name, array_arg = nil, &record_
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 

data/lib/mikras_utils/mkacl/spec.rb

@@ -1,5 +1,7 @@
 
 module MkAcl
+  DEFAULT_MUTATION = "app_portal.mutate"
+
   class Spec
     # Source SPEC file. Only for informational purposes
     attr_reader :file
@@ -188,24 +190,16 @@ module MkAcl
     attr_reader :action
     forward_to :action, :table, :name
     attr_accessor :watch
+    attr_accessor :assign
     attr_accessor :stamp
 
-    def created_at?() = watch == "insert"
-    def updated_at?() = watch == "update"
-    def deleted_at?() = watch == "delete"
+#   def created_at?() = watch == "insert"
+#   def updated_at?() = watch == "update"
+#   def deleted_at?() = watch == "delete"
 
-    def initialize(action, watch = nil, stamp = nil)
+    def initialize(action, watch = nil, assign = nil, stamp = nil)
       @action = action
-
-      case watch
-        when /^(.*)(?:_by_id|_to_id)$/
-          @watch, @stamp = watch, stamp || "#{$1}_at"
-        when "created_at", "updated_at", "deleted_at"
-          @watch, @stamp = nil, watch
-        else
-          @watch, @stamp = watch, stamp
-      end
-
+      @watch, @assign, @stamp = watch, assign, stamp
       action.send :attach_timestamp, self
     end
 
@@ -213,6 +207,7 @@ module MkAcl
 
     def dump
       puts "watch: #{watch}"
+      puts "watch: #{assign}"
       puts "stamp: #{stamp}"
     end
   end
@@ -225,6 +220,7 @@ module MkAcl
     attr_accessor :roles # Roles that this rule applies to
     attr_accessor :filter # Goes into the postgres policy, may be nil
     attr_accessor :assert # Goes into the postgres trigger, may be nil
+    attr_accessor :mutation # Mutation function to use, may be nil. Default app_portal.mutate()
     attr_accessor :fields # Only used for insert and update, nil otherwise
     attr_accessor :tables # Only used for attach and detach, nil otherwise
     attr_reader :ordinal
@@ -241,6 +237,7 @@ module MkAcl
       @roles = []
       @filter = nil
       @assert = nil
+      @mutation = DEFAULT_MUTATION
       @fields = %w(insert update).include?(action.name) ? [] : nil
       @tables = %w(attach).include?(action.name) ? [] : nil
 
@@ -251,6 +248,7 @@ module MkAcl
       puts "roles: [#{roles.join(' ')}]"
       puts "filter: #{filter}" if filter
       puts "assert: #{assert}" if assert
+      puts "mutation: #{mutation || 'nil'}" if mutation != DEFAULT_MUTATION
       puts "fields: [#{fields.join(' ')}]" if fields && !fields.empty?
       puts "tables: [#{tables.join(' ')}]" if tables && !tables.empty?
       puts "ordinal: #{ordinal}"

data/lib/mikras_utils/version.rb

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

metadata

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