mikras_utils 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09748841bbccd2fc59e03f01fd240ac333963e7f6e8f35ed68d3d8268fdb4a97'
-  data.tar.gz: b058155721495e702725d5cf1a68d37139e3c8abe82089939e3c018ac5b3e7b3
+  metadata.gz: a7a7d9d893a73103e2159bfbc3ec2d0ff48fc644dec46bff98e35173d98bcff0
+  data.tar.gz: 872e5596dead57f495e4b7f903a5607063a4efd2e46b7716414fdfd0c6688e34
 SHA512:
-  metadata.gz: b25c043d64872f36c9b8d92e0f86d314164ef19695273255030d685e42497d0f7497395cf66718a41bf65e2ee6d4a4c1fad7db1b9202358ca6180e30df88eb76
-  data.tar.gz: b66d7b04e85ff125b6f8b5dc143bdb7893db08686c036899ca37ac0aa6aa7dd58edda99b976962266ebae4e00343fd80d1e66aa9c719846bf327dedc42c89888
+  metadata.gz: 198336a960602043f627077526bbdb1962ea32709aa9d82cecd6b244bdc64a59034db125f429c11fe51b19037e5d08141077f7b8d9145924169f06ebb9eb4daf
+  data.tar.gz: ace4fdcf35f66b9be6ee8e4ecdac0e0a70f6fdd4d9e79468bfbb39819a5a7c554f1be6ca4c73a7280139c0de1ad9e814c2eba90029d4482600c2ddf8fd8f937e

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,7 @@ module MkAcl
 
           table.actions.values.each { |action|
             puts %(
-              insert into acl_portal.acl_actions (table_id, kind)
+              insert into acl_portal.acl_actions (acl_table_id, kind)
                 values (:table_id, '#{action.name.upcase}')
                 returning id as "action_id"
               \\gset
@@ -63,21 +67,22 @@ 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)
+                    values (
+                      :rule_id,
+                      #{conn.quote_value(stamp.watch)},
+                      #{conn.quote_value(stamp.stamp)}
+                    );
+                ).align
+              }
             }
           }
         end

data/lib/mikras_utils/mkacl/spec.rb

@@ -164,19 +164,23 @@ 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 = nil)
+      if header
+        header = "#{header || name}:"
+        indent { dump_body }
+      else
+        dump_body
       end
     end
 

data/lib/mikras_utils/version.rb

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

metadata

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