textus 0.10.4 → 0.12.1

data/lib/textus/store/staleness/generator_check.rb

@@ -0,0 +1,88 @@
+require "time"
+
+module Textus
+  class Store
+    class Staleness
+      # Reports staleness for generator-zone entries — derived files whose
+      # generator's listed sources have been modified more recently than the
+      # entry's `_meta.generated.at` timestamp. Returns an Array of row hashes
+      # (possibly empty) per entry.
+      class GeneratorCheck
+        def initialize(manifest:)
+          @manifest = manifest
+        end
+
+        def rows_for(mentry)
+          return [] unless mentry.in_generator_zone?
+
+          gen = mentry.generator
+          return [] unless gen
+
+          path = Textus::Key::Path.resolve(@manifest, mentry)
+          return [stale_row(mentry, path, "derived entry has never been generated")] unless File.exist?(path)
+
+          parsed = Entry.for_format(mentry.format).parse(File.binread(path), path: path)
+          generated_at = parsed["_meta"].dig("generated", "at")
+          return [stale_row(mentry, path, "missing generated.at frontmatter")] unless generated_at
+
+          gen_time = parse_time(generated_at)
+          return [stale_row(mentry, path, "unparseable generated.at: #{generated_at.inspect}")] unless gen_time
+
+          offender = newest_source_after(gen, gen_time)
+          return [stale_row(mentry, path, "source '#{offender}' modified after generated.at")] if offender
+
+          []
+        end
+
+        private
+
+        def parse_time(str)
+          Time.parse(str.to_s)
+        rescue StandardError
+          nil
+        end
+
+        def newest_source_after(gen, gen_time)
+          Array(gen["sources"]).each do |src|
+            offender = check_source(src, gen_time)
+            return offender if offender
+          end
+          nil
+        end
+
+        def check_source(src, gen_time)
+          if src.match?(/\A[a-z0-9.][a-z0-9._-]*\z/) && !src.include?("/")
+            @manifest.enumerate(prefix: src).each do |row|
+              return src if File.mtime(row[:path]) > gen_time
+            end
+            nil
+          else
+            check_filesystem_source(src, gen_time)
+          end
+        end
+
+        def check_filesystem_source(src, gen_time)
+          abs = File.absolute_path?(src) ? src : File.join(File.dirname(@manifest.root), src)
+          if File.directory?(abs)
+            Dir.glob(File.join(abs, "**", "*")).each do |fp|
+              next unless File.file?(fp)
+              return src if File.mtime(fp) > gen_time
+            end
+            nil
+          elsif File.exist?(abs) && File.mtime(abs) > gen_time
+            src
+          end
+        end
+
+        def stale_row(mentry, path, reason)
+          {
+            "key" => mentry.key,
+            "path" => path,
+            "generator" => mentry.generator,
+            "reason" => reason,
+          }
+        end
+      end
+    end
+  end
+end

data/lib/textus/store/staleness/intake_check.rb

@@ -0,0 +1,46 @@
+require "time"
+
+module Textus
+  class Store
+    class Staleness
+      # Reports TTL-exceeded staleness for intake-handler entries. Returns an
+      # Array of row hashes (possibly empty) per entry.
+      class IntakeCheck
+        def initialize(manifest:)
+          @manifest = manifest
+        end
+
+        def rows_for(mentry)
+          return [] unless mentry.intake_handler
+
+          ttl = @manifest.rules_for(mentry.key).refresh&.ttl_seconds
+          return [] unless ttl
+
+          path = Textus::Key::Path.resolve(@manifest, mentry)
+          return [row(mentry, path, "never refreshed")] unless File.exist?(path)
+
+          meta = Entry.for_format(mentry.format).parse(File.binread(path), path: path)["_meta"]
+          last_str = meta["last_refreshed_at"]
+          return [row(mentry, path, "never refreshed (no last_refreshed_at)")] if last_str.nil?
+
+          last = parse_time(last_str)
+          return [row(mentry, path, "ttl exceeded (#{ttl}s)")] if last.nil? || (Time.now - last) > ttl
+
+          []
+        end
+
+        private
+
+        def parse_time(str)
+          Time.parse(str.to_s)
+        rescue StandardError
+          nil
+        end
+
+        def row(mentry, path, reason)
+          { "key" => mentry.key, "path" => path, "handler" => mentry.intake_handler, "reason" => reason }
+        end
+      end
+    end
+  end
+end

data/lib/textus/store/staleness.rb

@@ -1,121 +1,26 @@
-require "time"
-
 module Textus
   class Store
-    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity, Metrics/BlockLength
     class Staleness
       def initialize(manifest:)
         @manifest = manifest
+        @generator_check = GeneratorCheck.new(manifest: manifest)
+        @intake_check = IntakeCheck.new(manifest: manifest)
       end
 
       def call(prefix: nil, zone: nil)
-        out = []
-        @manifest.entries.each do |mentry|
-          next unless mentry.in_generator_zone?
-          next if zone && mentry.zone != zone
-
-          gen = mentry.generator
-          next unless gen
-          next if prefix && !(mentry.key == prefix || mentry.key.start_with?("#{prefix}."))
-
-          path = Textus::Key::Path.resolve(@manifest, mentry)
-
-          unless File.exist?(path)
-            out << stale_row(mentry, path, "derived entry has never been generated")
-            next
-          end
-
-          raw = File.binread(path)
-          parsed = Entry.for_format(mentry.format).parse(raw, path: path)
-          generated_at = parsed["_meta"].dig("generated", "at")
-          unless generated_at
-            out << stale_row(mentry, path, "missing generated.at frontmatter")
-            next
-          end
-          gen_time = begin
-            Time.parse(generated_at.to_s)
-          rescue StandardError
-            nil
-          end
-          unless gen_time
-            out << stale_row(mentry, path, "unparseable generated.at: #{generated_at.inspect}")
-            next
-          end
-
-          offender = newest_source_after(gen, gen_time)
-          out << stale_row(mentry, path, "source '#{offender}' modified after generated.at") if offender
-        end
-
-        @manifest.entries.each do |mentry|
-          next unless mentry.intake_handler
-          next if zone && mentry.zone != zone
-          next if prefix && !(mentry.key == prefix || mentry.key.start_with?("#{prefix}."))
-
-          policy_set = @manifest.policies_for(mentry.key)
-          ttl = policy_set.refresh&.ttl_seconds
-          next unless ttl
-
-          path = Textus::Key::Path.resolve(@manifest, mentry)
-
-          unless File.exist?(path)
-            out << intake_stale_row(mentry, path, "never refreshed")
-            next
-          end
-
-          meta = Entry.for_format(mentry.format).parse(File.binread(path), path: path)["_meta"]
-          last_str = meta["last_refreshed_at"]
-          if last_str.nil?
-            out << intake_stale_row(mentry, path, "never refreshed (no last_refreshed_at)")
-            next
-          end
-
-          last = begin
-            Time.parse(last_str.to_s)
-          rescue StandardError
-            nil
-          end
-          out << intake_stale_row(mentry, path, "ttl exceeded (#{ttl}s)") if last.nil? || (Time.now - last) > ttl
-        end
-
-        out
+        @manifest.entries
+                 .select { |m| entry_matches?(m, prefix: prefix, zone: zone) }
+                 .flat_map { |m| @generator_check.rows_for(m) + @intake_check.rows_for(m) }
       end
 
       private
 
-      def newest_source_after(gen, gen_time)
-        Array(gen["sources"]).each do |src|
-          if src.match?(/\A[a-z0-9.][a-z0-9._-]*\z/) && !src.include?("/")
-            @manifest.enumerate(prefix: src).each do |row|
-              return src if File.mtime(row[:path]) > gen_time
-            end
-          else
-            abs = File.absolute_path?(src) ? src : File.join(File.dirname(@manifest.root), src)
-            if File.directory?(abs)
-              Dir.glob(File.join(abs, "**", "*")).each do |fp|
-                next unless File.file?(fp)
-                return src if File.mtime(fp) > gen_time
-              end
-            elsif File.exist?(abs)
-              return src if File.mtime(abs) > gen_time
-            end
-          end
-        end
-        nil
-      end
-
-      def intake_stale_row(mentry, path, reason)
-        { "key" => mentry.key, "path" => path, "handler" => mentry.intake_handler, "reason" => reason }
-      end
+      def entry_matches?(mentry, prefix:, zone:)
+        return false if zone && mentry.zone != zone
+        return false if prefix && !(mentry.key == prefix || mentry.key.start_with?("#{prefix}."))
 
-      def stale_row(mentry, path, reason)
-        {
-          "key" => mentry.key,
-          "path" => path,
-          "generator" => mentry.generator,
-          "reason" => reason,
-        }
+        true
       end
     end
-    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity, Metrics/BlockLength
   end
 end

data/lib/textus/store/writer.rb

@@ -2,8 +2,9 @@ require "fileutils"
 
 module Textus
   class Store
-    # rubocop:disable Metrics/ParameterLists
     class Writer
+      Payload = Data.define(:meta, :body, :content)
+
       def initialize(store)
         @store = store
         @manifest = store.manifest
@@ -11,28 +12,30 @@ module Textus
       end
 
       # Backward-compat shim — orchestration now lives in Application::Writes::Put.
+      # rubocop:disable Metrics/ParameterLists
       def put(key, meta: nil, body: nil, content: nil, if_etag: nil, as: Role::DEFAULT, suppress_events: false)
         ctx = Textus::Application::Context.new(store: @store, role: as)
         Textus::Application::Writes::Put.new(ctx: ctx, bus: @store.bus).call(
           key, meta: meta, body: body, content: content, if_etag: if_etag, suppress_events: suppress_events
         )
       end
+      # rubocop:enable Metrics/ParameterLists
 
       # Pure I/O: validate, serialize, etag-check, write to disk, audit. No
       # permission check and no event firing — those are handled by the caller
       # (Application::Writes::Put).
-      def write_envelope_to_disk(key, mentry:, meta: nil, body: nil, content: nil, if_etag: nil, as: Role::DEFAULT, correlation_id: nil)
+      def write_envelope_to_disk(key, mentry:, payload:, ctx:, if_etag: nil)
         _, path, = @manifest.resolve(key)
 
-        meta ||= {}
+        meta = payload.meta || {}
         strategy = Entry.for_format(mentry.format)
 
         existing_uid = existing_uid_for(mentry, path)
-        meta, content = ensure_uid(mentry.format, meta, content, existing_uid)
+        meta, content = ensure_uid(mentry.format, meta, payload.content, existing_uid)
 
         bytes, eff_meta, eff_body, eff_content = serialize_for_put(
           mentry: mentry, path: path, strategy: strategy,
-          meta: meta, body: body, content: content
+          meta: meta, body: payload.body, content: content
         )
 
         enforce_name_match!(path, eff_meta, mentry.format)
@@ -52,9 +55,9 @@ module Textus
         File.binwrite(path, bytes)
         etag_after = Etag.for_bytes(bytes)
         @store.audit_log.append(
-          role: as, verb: "put", key: key,
+          role: ctx.role, verb: "put", key: key,
           etag_before: etag_before, etag_after: etag_after,
-          extras: correlation_id ? { "correlation_id" => correlation_id } : nil
+          extras: ctx.correlation_id ? { "correlation_id" => ctx.correlation_id } : nil
         )
         Envelope.build(
           key: key, mentry: mentry, path: path,
@@ -129,7 +132,7 @@ module Textus
       # Pure I/O: resolve path, validate etag, delete from disk, audit. No
       # permission check and no event firing — those are handled by the caller
       # (Application::Writes::Delete).
-      def delete_envelope_from_disk(key, if_etag: nil, as: Role::DEFAULT, correlation_id: nil)
+      def delete_envelope_from_disk(key, ctx:, if_etag: nil)
         _, path, = @manifest.resolve(key)
         raise UnknownKey.new(key, suggestions: @manifest.suggestions_for(key)) unless File.exist?(path)
 
@@ -138,9 +141,9 @@ module Textus
 
         File.delete(path)
         @store.audit_log.append(
-          role: as, verb: "delete", key: key,
+          role: ctx.role, verb: "delete", key: key,
           etag_before: etag_before, etag_after: nil,
-          extras: correlation_id ? { "correlation_id" => correlation_id } : nil
+          extras: ctx.correlation_id ? { "correlation_id" => ctx.correlation_id } : nil
         )
       end
 
@@ -160,10 +163,9 @@ module Textus
         target_key = proposal["target_key"] or raise ProposalError.new("proposal missing target_key")
 
         delete(pending_key, as: as)
-        @store.fire_event(:reject, key: pending_key, target_key: target_key)
+        @store.fire_event(:proposal_rejected, key: pending_key, target_key: target_key)
         { "protocol" => PROTOCOL, "rejected" => pending_key, "target_key" => target_key }
       end
     end
-    # rubocop:enable Metrics/ParameterLists
   end
 end

data/lib/textus/store.rb

@@ -45,7 +45,7 @@ module Textus
       load_hooks
       @reader = Reader.new(self)
       @writer = Writer.new(self)
-      fire_event(:loaded)
+      fire_event(:store_loaded)
     end
 
     def load_hooks

data/lib/textus/version.rb

@@ -1,4 +1,4 @@
 module Textus
-  VERSION = "0.10.4"
-  PROTOCOL = "textus/2"
+  VERSION = "0.12.1"
+  PROTOCOL = "textus/3"
 end

data/lib/textus.rb

@@ -7,6 +7,7 @@ loader.inflector.inflect(
   "cli" => "CLI",
   "json" => "Json",
   "yaml" => "Yaml",
+  "hook_dsl_scanner" => "HookDSLScanner",
 )
 loader.ignore(File.expand_path("textus/errors.rb", __dir__))
 loader.setup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: textus
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.12.1
 platform: ruby
 authors:
 - Patrick
@@ -133,7 +133,8 @@ files:
 - lib/textus/cli/group.rb
 - lib/textus/cli/group/hook.rb
 - lib/textus/cli/group/key.rb
-- lib/textus/cli/group/policy.rb
+- lib/textus/cli/group/refresh.rb
+- lib/textus/cli/group/rule.rb
 - lib/textus/cli/group/schema.rb
 - lib/textus/cli/verb.rb
 - lib/textus/cli/verb/accept.rb
@@ -149,17 +150,17 @@ files:
 - lib/textus/cli/verb/hooks.rb
 - lib/textus/cli/verb/init.rb
 - lib/textus/cli/verb/intro.rb
+- lib/textus/cli/verb/key_normalize.rb
 - lib/textus/cli/verb/list.rb
-- lib/textus/cli/verb/migrate_keys.rb
 - lib/textus/cli/verb/mv.rb
-- lib/textus/cli/verb/policy_explain.rb
-- lib/textus/cli/verb/policy_list.rb
 - lib/textus/cli/verb/published.rb
 - lib/textus/cli/verb/put.rb
 - lib/textus/cli/verb/rdeps.rb
 - lib/textus/cli/verb/refresh.rb
 - lib/textus/cli/verb/refresh_stale.rb
 - lib/textus/cli/verb/reject.rb
+- lib/textus/cli/verb/rule_explain.rb
+- lib/textus/cli/verb/rule_list.rb
 - lib/textus/cli/verb/schema.rb
 - lib/textus/cli/verb/schema_diff.rb
 - lib/textus/cli/verb/schema_init.rb
@@ -176,7 +177,8 @@ files:
 - lib/textus/doctor/check/illegal_keys.rb
 - lib/textus/doctor/check/intake_registration.rb
 - lib/textus/doctor/check/manifest_files.rb
-- lib/textus/doctor/check/policy_ambiguity.rb
+- lib/textus/doctor/check/protocol_version.rb
+- lib/textus/doctor/check/rule_ambiguity.rb
 - lib/textus/doctor/check/schema_parse_error.rb
 - lib/textus/doctor/check/schema_violations.rb
 - lib/textus/doctor/check/schemas.rb
@@ -192,7 +194,10 @@ files:
 - lib/textus/domain/policy.rb
 - lib/textus/domain/policy/handler_allowlist.rb
 - lib/textus/domain/policy/matcher.rb
+- lib/textus/domain/policy/predicates/human_accept.rb
+- lib/textus/domain/policy/predicates/schema_valid.rb
 - lib/textus/domain/policy/promote.rb
+- lib/textus/domain/policy/promotion.rb
 - lib/textus/domain/policy/refresh.rb
 - lib/textus/entry.rb
 - lib/textus/entry/base.rb
@@ -220,7 +225,8 @@ files:
 - lib/textus/key/path.rb
 - lib/textus/manifest.rb
 - lib/textus/manifest/entry.rb
-- lib/textus/manifest/policies.rb
+- lib/textus/manifest/rules.rb
+- lib/textus/manifest/schema.rb
 - lib/textus/migrate_keys.rb
 - lib/textus/mustache.rb
 - lib/textus/projection.rb
@@ -235,6 +241,8 @@ files:
 - lib/textus/store/reader.rb
 - lib/textus/store/sentinel.rb
 - lib/textus/store/staleness.rb
+- lib/textus/store/staleness/generator_check.rb
+- lib/textus/store/staleness/intake_check.rb
 - lib/textus/store/validator.rb
 - lib/textus/store/writer.rb
 - lib/textus/version.rb

data/lib/textus/cli/group/policy.rb

@@ -1,11 +0,0 @@
-module Textus
-  class CLI
-    class Group
-      class Policy < Group
-        self.cli_name = "policy"
-        subcommands["list"]    = Verb::PolicyList
-        subcommands["explain"] = Verb::PolicyExplain
-      end
-    end
-  end
-end