mikras_utils 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 664cc0291b18e0f9068704c14f3e65adb808c099510b0334684a3b5a13a0d83a
-  data.tar.gz: 1e372dae3fb50ada2eb071a5d4b679777cb159b43db1e71a343e02802f279771
+  metadata.gz: d40acc7f4c2837481e47b7f46cc1dbcb79af1259fbafc8ad48284592da8f585e
+  data.tar.gz: 7d1a196b2b3a56394c7359877386eb4fd4cd7c5e54867754c2b8d94d9f51582a
 SHA512:
-  metadata.gz: 195f1c258a5e54092eae258420f850b8719ea7bc3e2d5ebbba3ffb2cf8ec813d008dc0e0ba8263f0383064914c0dc96267c7652b5a052008c307824c2f76bca2
-  data.tar.gz: 5827e7fdaa3d2888b341b4a1d70d4d2a42b3890ab00b090747556e3a85d8b459418a3b669302b6ed53b7392911680f833e5c01938831182f9ecfe02627bcdf7f
+  metadata.gz: 4134754e87c32513569e8f2050da0fb0ce9518cb0ab17a105c84e48a55449a5de59389a0e5a711e6076fb6228f8d471dbe03b3ff1a1a665b63b242787737a7f8
+  data.tar.gz: f84cbcdf08dab513d0dcc8a129e122444ccf46b6e5018012ce8f944660b48d2346f80e4b8aa2f3e4c4f72d9210e8e5c55176de5cd2b17659a4b6e5aaa9087cb1

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;
@@ -68,8 +69,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

@@ -88,14 +88,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"

data/lib/mikras_utils/mkacl/spec.rb

@@ -188,24 +188,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 +205,7 @@ module MkAcl
 
     def dump
       puts "watch: #{watch}"
+      puts "watch: #{assign}"
       puts "stamp: #{stamp}"
     end
   end

data/lib/mikras_utils/version.rb

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

metadata

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