mikras_utils 0.4.3 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ab95c37caacbe1ab7ed069d6d6fb83b6a234e1b64e5206e1a5382d5e7eb6507
-  data.tar.gz: a778c6dd04db370c1be6b6af571929dbadc2b5220148726c21da74527a84693a
+  metadata.gz: 5ed0f08aeac113ce1baaab8a61f252fc80db284204cf6092ef9a4396f0cbe90a
+  data.tar.gz: '09bbf4ada5bb30f2ccd9b69ce88fbedc77c36cdb6518a485a3d605c3df0df7c5'
 SHA512:
-  metadata.gz: 84004bdb6c46d4f41a992fc5929d557704b886a975ba167011a2afd8e867cdf0787703a8cc12aa61443a4987b8b05a7a8c70595714bafcd81510cd37524c309d
-  data.tar.gz: 3bece44a7fba65f2db3a7016a9a9d26595c1e7d97b4c1b5759628977e23cd0db980307c6d73987dbb75bd74cc3f0184fd9cd7440d2c1d571573aa90df4af62d9
+  metadata.gz: 94326cd108d93deebb637cf69684679cd16d20e760c63ad56e60a0f2d2a3b7af4d5a3cfbe58900f705c7eb1066979bffebe6751a14ae916896a4eed83d394385
+  data.tar.gz: f19ba5e3ab24f4874a1a63d9ea8389bcc9a3a3c2e3faf557c497f9f59b4b5704f622d1542679c2ebd21355389652c3708d94e49420da6821b5390f767db4794a

data/lib/mikras.rb

@@ -1,6 +1,17 @@
 
 require 'yaml'
 
+module Find # Monkey patching standard library
+  def self.upfind(dir, file)
+    loop do
+      return dir if File.exist? File.join(dir, file)
+      return nil if dir == "/"
+      dir = File.dirname(dir)
+    end
+    return nil
+  end
+end
+
 module Prick
   # FIXME Hardcoded to avoid dragging in the whole prick environment. Should be
   # kept in sync with Prick::PRICK_STATE_FILE
@@ -8,13 +19,20 @@ module Prick
   # TODO: Make prick.rb includable
   #
   PRICK_STATE_FILE = ".prick.state.yml"
+  PRICK_DIR = Find.upfind(Dir.getwd, PRICK_STATE_FILE)
+  PRICK_STATE_PATH = PRICK_DIR && File.join(PRICK_DIR, PRICK_STATE_FILE)
 end
 
 module Mikras
+  MIKRAS_LIBDIR = Prick::PRICK_DIR && File.join(Prick::PRICK_DIR, "lib")
+
+  # Add project-dir/lib to search path
+  $LOAD_PATH.unshift MIKRAS_LIBDIR if MIKRAS_LIBDIR
+
   # Find database/username. Called from scripts that may take a database and an
   # username argument. If the arguments are absent, the database/username is
   # initialized using the PRICK_DATABASE and PRICK_USERNAME environment
-  # variables, and if they are also absent, the PRICK_STATE_FILE is read. If
+  # variables and if they are also absent, the PRICK_STATE_FILE is read. If
   # everything fails, the user's username is used as the database and username
   #
   def self.credentials(database_argument, username_argument = nil)
@@ -25,8 +43,8 @@ module Mikras
       database = ENV['PRICK_DATABASE']
       username = username_argument || ENV['PRICK_USERNAME'] || database
     else
-      if File.exist?(Prick::PRICK_STATE_FILE)
-        prick_state = YAML.load(IO.read Prick::PRICK_STATE_FILE)
+      if Prick::PRICK_STATE_PATH
+        prick_state = YAML.load(IO.read Prick::PRICK_STATE_PATH)
         database = prick_state["database"]
         username = prick_state["username"]
       else

data/lib/mikras_utils/mkacl/analyzer.rb

@@ -28,8 +28,8 @@ module MkAcl
           and ref_schema_name = '#{spec.app_schema}'
       )
 
-      # Assign table references
       for child_table_name, child_table_uid, parent_table_name, parent_table_uid, parent_link_field in links
+        # Detect uncovered tables
         if !spec.key?(child_table_name)
           @uncovered_tables << child_table_name
           next
@@ -38,9 +38,11 @@ module MkAcl
           next
         end
 
+        # Find referenced table objects
         child_table = spec[child_table_name] or raise "Can't find table #{parent_table_name.inspect}"
         parent_table = spec[parent_table_name] or raise "Can't find referenced table #{parent_table_name.inspect}"
 
+        # Assign table references
         child_table.references[parent_table.name] = [parent_table, parent_link_field]
       end
 

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

@@ -33,10 +33,13 @@ module MkAcl
             insert into acl_portal.acl_tables (
                 schema_name, table_name, domain,
                 parent_schema_name, parent_table_name, parent_link_field,
-                acl)
+                acl_link_fields, acl)
               values (
                 '#{app_schema}', '#{table}', #{conn.quote_value(table.domain)},
-                '#{table.parent && table.app_schema}', '#{table.parent}', '#{table.parent_link_field}',
+                #{PgConn.quote_value(table.parent && table.app_schema)},
+                #{PgConn.quote_value(table.parent)},
+                #{PgConn.quote_value(table.parent_link_field)},
+                #{PgConn.quote_value(table.references.values.map(&:last), elem_type: 'text')},
                 #{table.acl || 'false'})
               returning id as "table_id"
             \\gset

data/lib/mikras_utils/mkacl/spec.rb

@@ -47,14 +47,14 @@ module MkAcl
     attr_reader :spec
     forward_to :@spec, :app_schema, :acl_schema
 
-    # Hash from referenced table name to a tuple of the table object and the
-    # link field.  Initialized by the analyzer
-    attr_accessor :references
-
     # Table name and uid
     attr_reader :name
     attr_reader :uid # SCHEMA.TABLE name
 
+    # Hash from referenced table name to a tuple of the table object and the
+    # link field. Initialized by the analyzer
+    attr_accessor :references
+
     # Parent domain table. Initialized by the analyzer
     attr_accessor :parent
 
@@ -91,6 +91,7 @@ module MkAcl
       @uid = "#{app_schema}.#{@name}"
       @record_name = Prick::Inflector.singularize(@name)
       @parent_name = parent_name
+      @parent_link_fields = []
       @domain = domain
       @acl = acl
       @actions = {}
@@ -108,7 +109,7 @@ module MkAcl
       indent {
         puts "domain: #{domain}" if domain
         puts "parent: #{parent}" if parent
-        puts "references: [#{references.values.map(&:first).map(&:name).join(' ')}]"
+        puts "references: [#{references.values.map { |k,v| "#{v}->#{k.name}" }.join(' ')}]"
         for action_name in %w(insert select update delete)
           actions[action_name]&.dump
         end
@@ -166,11 +167,11 @@ module MkAcl
 
     attr_reader :action
     forward_to :action, :table, :name
-    attr_accessor :roles
-    attr_accessor :filter # Goes into the postgres policy
-    attr_accessor :assert # Goes into the postgres trigger
-    attr_accessor :fields # Only used for insert and update
-    attr_accessor :tables # Only used for attach
+    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 :fields # Only used for insert and update, nil otherwise
+    attr_accessor :tables # Only used for attach, nil otherwise
     attr_reader :ordinal
 
     # admin, internal, etc.
@@ -183,8 +184,10 @@ module MkAcl
       @action = action
       @ordinal = ordinal
       @roles = []
-      @fields = []
-      @tables = []
+      @filter = nil
+      @assert = nil
+      @fields = %w(insert update).include?(action.name) ? [] : nil
+      @tables = %w(attach).include?(action.name) ? [] : nil
 
       action.send :attach_rule, self
     end
@@ -193,8 +196,8 @@ module MkAcl
       puts "roles: [#{roles.join(' ')}]"
       puts "filter: #{filter}" if filter
       puts "assert: #{assert}" if assert
-      puts "fields: [#{fields.join(' ')}]" if !fields.empty?
-      puts "tables: [#{tables.join(' ')}]" if !tables.empty?
+      puts "fields: [#{fields.join(' ')}]" if fields && !fields.empty?
+      puts "tables: [#{tables.join(' ')}]" if tables && !tables.empty?
       puts "ordinal: #{ordinal}"
     end
   end

data/lib/mikras_utils/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mikras_utils
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.1
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-08 00:00:00.000000000 Z
+date: 2025-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg_conn