mikras_utils 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46a6caa587baa5d73d1eee1af5a8cf764fc64e70be223f0b66aae6f1f41c6b91
-  data.tar.gz: a13096682ea8ec58b36b0154922b7e56fa914e51a756eda8a0f434106e8b1cc2
+  metadata.gz: 3ec0c38f1246b0c0f580adc107c6251c70e9600bd08424d05e612c01ae9bd2de
+  data.tar.gz: 2a9c833e5475ef646072f4a642309e33616202db3f18d1acc25b46fbb4d10fe2
 SHA512:
-  metadata.gz: ac6234c5bcdbc6b2bcf1301c8a6b2c23c4a71a43abaeb47e37c3908126c3d8bfd25bafa439d7ec59a3070f6f5b4706edafc454191a4725d46ab487dad0bf1686
-  data.tar.gz: 005a114875b9eedbbf2d87d20fa752d8fbde45fd18773bee8d7a7f16373e80d65f0d9a8b9546c3bff67b3c9f429a3119cef8d13e96dbaa916ca6bd19d3f6aa51
+  metadata.gz: 264615a11fb958dc628e43e712e069d165640fc87865dd379678aefea9a0d8a16ca4bf0e55b373c53140cf9f53d06ff6c141427d858cb37c5b7300533c525b8d
+  data.tar.gz: 87c06e2aa94737f4cababcb7b6154978b974a53b72a79e65a915827a34216179a86665da978a010dac65cfc22106a9d711d6d4ea1349fb07cc4a43a68af2c4d1

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/generators/seeds.rb

@@ -33,12 +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_link_fields, acl)
+                triggers, acl_link_fields, acl)
               values (
                 '#{app_schema}', '#{table}', #{conn.quote_value(table.domain)},
                 #{PgConn.quote_value(table.parent && table.app_schema)},
                 #{PgConn.quote_value(table.parent)},
                 #{PgConn.quote_value(table.parent_link_field)},
+                #{table.triggers},
                 #{PgConn.quote_value(table.references.values.map(&:last), elem_type: 'text')},
                 #{table.acl || 'false'})
               returning id as "table_id"

data/lib/mikras_utils/mkacl/parser.rb

@@ -44,10 +44,11 @@ module MkAcl
 
     def parse_tables(spec, tables)
       for table_name, actions in tables
-        acl = actions.key?(:acl) ? actions.delete(:acl) : true
         parent = actions.delete(:parent)
         domain = actions.delete(:domain)
-        table = Table.new(spec, table_name, domain, parent, acl)
+        triggers = actions.key?(:triggers) ? actions.delete(:triggers) : true
+        acl = actions.key?(:acl) ? actions.delete(:acl) : true
+        table = Table.new(spec, table_name, domain, parent, triggers, acl)
         parse_actions(table, actions)
       end
     end

data/lib/mikras_utils/mkacl/spec.rb

@@ -69,6 +69,9 @@ module MkAcl
     # the analyzer
     attr_accessor :domain
 
+    # True if the portal object triggers should be active on the table
+    attr_accessor :triggers
+
     # SQL to create the ACL for a table. No ACL if false, default ACL if nil
     attr_accessor :acl
 
@@ -84,7 +87,7 @@ module MkAcl
     # Hash from action name to action object
     attr_reader :actions
 
-    def initialize(spec, name, domain, parent_name, acl)
+    def initialize(spec, name, domain, parent_name, triggers, acl)
       @spec = spec
       @references = {}
       @name = name.to_s
@@ -93,6 +96,7 @@ module MkAcl
       @parent_name = parent_name
       @parent_link_fields = []
       @domain = domain
+      @triggers = triggers
       @acl = acl
       @actions = {}
       @spec.send :attach_table, self
@@ -113,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"
           when true;

data/lib/mikras_utils/version.rb

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

metadata

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