mikras_utils 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 024ab7230a230c881d32e0e9ab939b65e131cee4e8cb9d86eff2678a489887ff
-  data.tar.gz: b70fbe491b3b25a32a6b571760df6f8e24c25efd6ad4711c974aaf6610d912a7
+  metadata.gz: 8dd821a71e85300806a80403130c21aa7030b7c81b2b2fb561e6fa973387f484
+  data.tar.gz: 89e10674d60fb851387f1a87466bb34a9e7a489644d8da774686b573d260fe6c
 SHA512:
-  metadata.gz: badf68f978b9feb22901292980f54d1cee6e23a4bb8465a7efeeea030ca1f4926f1e9378496564fce2f62c68723c2c106f1557def9b84b7bf7181ccb9d507f96
-  data.tar.gz: 63582f145aee95a223ee98d9b52f51c42742338f75f3d9524bec7fb7416efbc62b962e7a5c6eead279f15b454e2c5a36475352b8ea15e2fb746c38d42cfa2873
+  metadata.gz: 21108d406598b5ed0d75b6c0b47a2fd131e784545f2abcb2cf3553867ebb95c3b5385496438ad7d499837286b9fe168972a7e787b83e14c34359e045a7841604
+  data.tar.gz: 6216a7c2993315c6022494fd7f238ad6d103311200a5a41277b1462eac0eeda222f5bd3b9d4edb7b4c7c2132b3a2b4fa6b6fc66eda2bc314bba525f19cf8447b

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

@@ -65,6 +65,14 @@ module MkAcl
               ).align
               puts
             }
+
+            action.timestamps.each { |timestamp|
+              puts %(
+                insert into acl_portal.acl_timestamps (action_id, watch, stamp)
+                  values (:action_id, '#{timestamp.watch}', '#{timestamp.stamp}');
+              ).align
+              puts
+            }
           }
         end
 

data/lib/mikras_utils/mkacl/parser.rb

@@ -43,43 +43,75 @@ module MkAcl
     end
 
     def parse_tables(spec, tables)
-      for table_name, actions in tables
-        actions.is_a?(Hash) or error "Syntax error around '#{actions}'"
-        parent = actions.delete(:parent)
-        domain = actions.delete(:domain)
-        triggers = actions.key?(:triggers) ? actions.delete(:triggers) : true
-        acl = actions.key?(:acl) ? actions.delete(:acl) : true
+      for table_name, entries in tables
+        entries.is_a?(Hash) or error "Syntax error around '#{entries}'"
+        parent = entries.delete(:parent)
+        domain = entries.delete(:domain)
+        triggers = entries.key?(:triggers) ? entries.delete(:triggers) : true
+        acl = entries.key?(:acl) ? entries.delete(:acl) : true
         table = Table.new(spec, table_name, domain, parent, triggers, acl)
-        parse_actions(table, actions)
+        parse_actions(table, entries)
       end
     end
 
     def parse_actions(table, actions)
-      for action_name, rules in actions
+      for action_name, entries in actions
         constrain?(action_name, :insert, :select, :update, :delete, :attach, :detach) or
             error "Illegal action '#{action_name}'"
 
         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}'"
+          constrain?(entries, String, Array, Hash) or
+              error "Illegal value for #{action_name} entry '#{entries}'"
           action = Action.new(table, real_action_name)
 
-          # Normalize rules
-          case rules
+          # Normalize entries
+          case entries
             when Hash
-              rules = [rules]
+              timestamps = entries.delete(:timestamps) and parse_timestamps(action, timestamps)
+              entries = [entries]
             when String
-              rules = [{ roles: rules }]
+              entries = [{ roles: entries }]
+            when Array
+              entries.reject! { |element|
+                timestamps = element.delete(:timestamps) and parse_timestamps(action, timestamps)
+              }
           end
-
-          parse_rules(action, rules)
+          parse_rules(action, entries)
         end
       end
     end
 
+    def parse_timestamps(table, timestamps)
+      # Normalize timestamps
+      timestamps = [timestamps] if timestamps.is_a?(Hash)
+
+      case timestamps
+        when String
+          timestamps.split.each { |watch_field|
+            Timestamp.new(table, watch_field)
+          }
+        when Array
+          for entry in timestamps
+            timestamp = Timestamp.new(table)
+            for key, value in entry
+              case key
+                when :watch; timestamp.watch = value
+                when :stamp; timestamp.stamp = value
+              else
+                error "Illegal field '#{key}' in #{table} timestamps"
+              end
+            end
+          end
+      else
+        error "Illegal timestamp type: #{timestamps.class}"
+      end
+    end
+
     def parse_rules(action, rules)
       ordinal = 0
+
       for entry in rules
+        timestamps = entry.delete(:timestamps) and parse_timestamps(action, timestamps)
         rule = Rule.new(action, ordinal += 1)
         for key, value in entry
           case key
@@ -87,7 +119,6 @@ module MkAcl
             when :filter; rule.filter = norm_value(value)
             when :assert; rule.assert = norm_value(value)
             when :fields; rule.fields = value.nil? ? nil : norm_array(value)
-            when :fields; rule.fields = norm_array(value)
             when :tables; rule.tables = norm_array(value)
           else
             raise ArgumentError, "Illegal field '#{key}' in #{action.table}.#{action}"

data/lib/mikras_utils/mkacl/spec.rb

@@ -78,7 +78,7 @@ module MkAcl
     # Associated record name. Used in function names and in conversions
     attr_reader :record_name
 
-    # Action objects
+    # Action and timestamp objects
     def insert = @actions["insert"]
     def select = @actions["select"]
     def update = @actions["update"]
@@ -117,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"
@@ -137,26 +138,38 @@ module MkAcl
     attr_reader :table
     attr_reader :name
     attr_reader :rules
+    attr_reader :timestamps
 
     def initialize(table, name)
       @table = table
       @name = name.to_s
       @rules = []
+      @timestamps = []
       @table.send :attach_action, self
     end
 
     def to_s() name end
 
     def dump
-      if rules.empty?
+      if rules.empty? && timestamps.empty?
         puts "#{name}: []"
       else
-        puts name
+        puts "#{name}:"
         indent {
           for rule in rules.sort_by(&:ordinal)
             print "- "
             indent(bol: false) { rule.dump }
           end
+
+          if !timestamps.empty?
+            puts "- timestamps:"
+            indent {
+              for timestamp in timestamps
+                print "- "
+                indent(bol: false) { timestamp.dump }
+              end
+            }
+          end
         }
       end
     end
@@ -165,6 +178,43 @@ module MkAcl
     def attach_rule(rule)
       @rules << rule
     end
+
+    def attach_timestamp(timestamp)
+      @timestamps << timestamp
+    end
+  end
+
+  class Timestamp
+    attr_reader :action
+    forward_to :action, :table, :name
+    attr_accessor :watch
+    attr_accessor :stamp
+
+    def created_at?() = watch == "insert"
+    def updated_at?() = watch == "update"
+    def deleted_at?() = watch == "delete"
+
+    def initialize(action, watch = 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
+
+      action.send :attach_timestamp, self
+    end
+
+    def to_s() = watch
+
+    def dump
+      puts "watch: #{watch}"
+      puts "stamp: #{stamp}"
+    end
   end
 
   class Rule

data/lib/mikras_utils/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mikras_utils
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Claus Rasmussen