inform-runtime 1.2.2 → 1.3.1

data/lib/story_teller/grammar_parser.rb

@@ -1,7 +1,8 @@
+# lib/story_teller/grammar_parser.rb
 # encoding: utf-8
 # frozen_string_literal: false
 
-# Copyright Nels Nelson 2008-2025 but freely usable (see license)
+# Copyright Nels Nelson 2008-2026 but freely usable (see license)
 #
 # This file is part of StoryTeller.
 #
@@ -90,7 +91,12 @@ module Inform
     EmoteString = 'emote'.freeze
     Newline = "\n".freeze
 
+    # rubocop: disable Metrics/AbcSize
+    # rubocop: disable Metrics/MethodLength
     def to_s
+      grammar_lines = grammars.map(&:to_s)
+      grammar_lines[-1] = "#{grammar_lines[-1]};" if grammar_lines.any?
+
       VerbString + SpaceString +
         if meta?
           MetaString + SpaceString
@@ -100,8 +106,10 @@ module Inform
           ''
         end +
         map { |verb| "'#{verb}'" }.join(SpaceString) + Newline +
-        grammars.join(Newline)
+        grammar_lines.join(Newline)
     end
+    # rubocop: enable Metrics/AbcSize
+    # rubocop: enable Metrics/MethodLength
     alias to_str to_s
 
     def hash
@@ -115,15 +123,22 @@ module Inform
       CustomScopePattern = %r{^(.*)=(.*)$}.freeze
       attr_reader :source, :action, :expected_tokens
 
+      # rubocop: disable Metrics/MethodLength
       def initialize(grammar, source, action, reverse = nil)
         super()
-        concat(symbolize_grammar(grammar)) unless grammar.empty?
+        unless grammar.empty?
+          symbolized_grammar = symbolize_grammar(grammar)
+          concat(symbolized_grammar) unless symbolized_grammar.empty?
+        end
         push(:end)
         @action = action
-        @expected_tokens = grammar.map { |a| CustomScopePattern.match?(a) ? a.to_s.split('=').first.to_sym : a }
+        @expected_tokens = symbolized_grammar&.map do |a|
+          CustomScopePattern.match?(a) ? a.to_s.split('=').first.to_sym : a
+        end
         @reverse = reverse.nil? ? false : reverse
         @source = source
       end
+      # rubocop: enable Metrics/MethodLength
 
       def empty?
         length == (include?(:end) ? 1 : 0)
@@ -261,35 +276,64 @@ module Inform
       BuilderPattern = %r{builder}.freeze
       Profanity = %w[shit damn fuck sod].freeze
       ValidModes = %i[admin builder player].freeze
-      ModePatterns = ValidModes.each_with_object({}) { |key, memo| memo[key] = Regexp.new(key.to_s) }
+      ModePatterns = ValidModes.each_with_object({}) do |key, memo|
+        memo[key] = Regexp.new(key.to_s)
+      end
+
+      # TODO: Remove (2026-04-30) after confirming replacement below
+      # works better.
+      # def lookup(key, actor = nil, grammar_index = self)
+      #   return nil if key.nil? || !grammar_index.include?(key)
+      #   verb = grammar_index[key].dup
+      #   return verb if actor.nil?
+      #   return nil if guarded?(verb, actor)
+      #   filter_by_permission(verb, actor)
+      #   verb
+      # end
 
       def lookup(key, actor = nil, grammar_index = self)
         return nil if key.nil? || !grammar_index.include?(key)
+
         verb = grammar_index[key].dup
         return verb if actor.nil?
-        return nil if guarded?(verb, actor)
+
         filter_by_permission(verb, actor)
+        return nil if verb.grammars.empty?
+
         verb
       end
 
       def all(actor = nil, grammar_index = self)
         return grammar_index.map(&:keys).flatten.sort if actor.nil?
         mode = role(actor)
-        init_all_verbs_by_mode(mode, grammar_index, actor) unless Inform::Grammar.partitions.include?(mode)
+        unless Inform::Grammar.partitions.include?(mode)
+          init_all_verbs_by_mode(mode, grammar_index, actor)
+        end
         Inform::Grammar.partitions[mode]
       end
 
       def by_mode(mode = nil, grammar_index = self)
         mode = validate(mode)
-        init_verbs_filtered_by_mode(mode, grammar_index) unless Inform::Grammar.selections.include?(mode)
+        unless Inform::Grammar.selections.include?(mode)
+          init_verbs_filtered_by_mode(mode, grammar_index)
+        end
         Inform::Grammar.selections[mode]
       end
 
       private
 
+      # TODO: Remove (2026-04-30) after confirming replacement below
+      # works better.
+      # def init_all_verbs_by_mode(mode, grammar_index, actor, set = verbs_set_instance)
+      #   verbs = grammar_index.each_with_object(set) do |(key, verb), memo|
+      #     memo.add(key) unless Profanity.include?(key) || guarded?(verb, actor)
+      #   end
+      #   Inform::Grammar.partitions[mode] = verbs.to_a
+      # end
+
       def init_all_verbs_by_mode(mode, grammar_index, actor, set = verbs_set_instance)
         verbs = grammar_index.each_with_object(set) do |(key, verb), memo|
-          memo.add(key) unless Profanity.include?(key) || guarded?(verb, actor)
+          memo.add(key) unless Profanity.include?(key) || !visible_to?(verb, actor)
         end
         Inform::Grammar.partitions[mode] = verbs.to_a
       end
@@ -312,13 +356,16 @@ module Inform
       end
 
       def guarded?(resource, obj)
-        (AdminPattern.match?(resource.source) && !obj.admin?) ||
-          (BuilderPattern.match?(resource.source) && !obj.builder?)
+        (AdminPattern.match?(resource.source) &&
+          !StoryTeller::Privileges.privileged?(obj, :admin)) ||
+          (BuilderPattern.match?(resource.source) &&
+            !StoryTeller::Privileges.privileged?(obj, :builder))
       end
 
       def role(obj)
-        return :builder if obj.builder?
-        return :admin if obj.admin?
+        return :admin if StoryTeller::Privileges.privileged?(obj, :admin)
+        return :builder if StoryTeller::Privileges.privileged?(obj, :builder)
+
         :player
       end
 

data/lib/story_teller/helpers.rb

@@ -1,7 +1,8 @@
+# lib/story_teller/helpers.rb
 # encoding: utf-8
 # frozen_string_literal: false
 
-# Copyright Nels Nelson 2008-2025 but freely usable (see license)
+# Copyright Nels Nelson 2008-2026 but freely usable (see license)
 #
 # This file is part of StoryTeller.
 #
@@ -138,30 +139,19 @@ end
 module Inform
   # The ObjectHelpers module functionality
   module ObjectHelpers
+    # rubocop: disable Style/CaseEquality
     def object?(obj = self)
-      Inform::Object === obj # rubocop: disable Style/CaseEquality
+      defined?(Inform::Ephemeral::Object) && Inform::Ephemeral::Object === obj ||
+        defined?(Inform::Object) && Inform::Object === obj
     end
+    # rubocop: enable Style/CaseEquality
 
-    def sysobj?(obj = self)
+    def ephemeral?(obj = self)
       defined?(Inform::Ephemeral::Object) && obj.is_a?(Inform::Ephemeral::Object)
     end
   end
 end
 
-# # The Inform module
-# module Inform
-#   # The ObjectHelpers module functionality
-#   module ObjectHelpers
-#     def object?(obj = self)
-#       obj.is_a?(Inform::Object) || obj.is_a?(Inform::Ephemeral::Object)
-#     end
-
-#     def sysobj?(obj = self)
-#       obj.is_a?(Inform::Ephemeral::Object)
-#     end
-#   end
-# end
-
 # The Inform module
 module Inform
   # The NilClassObjectHelpers module functionality
@@ -170,7 +160,7 @@ module Inform
       false
     end
 
-    def sysobj?
+    def ephemeral?
       false
     end
 

data/lib/story_teller/history.rb

@@ -1,7 +1,8 @@
+# lib/story_teller/history.rb
 # encoding: utf-8
 # frozen_string_literal: false
 
-# Copyright Nels Nelson 2008-2025 but freely usable (see license)
+# Copyright Nels Nelson 2008-2026 but freely usable (see license)
 #
 # This file is part of StoryTeller.
 #

data/lib/story_teller/inflector.rb

@@ -1,7 +1,8 @@
+# lib/story_teller/inflector.rb
 # encoding: utf-8
 # frozen_string_literal: false
 
-# Copyright (c) 2004-2014 David Heinemeier Hansson
+# Copyright (c) David Heinemeier Hansson
 
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -31,6 +32,8 @@
 # The StoryTeller module
 module StoryTeller
   # The Inflector module
+  # Mostly adapted from:
+  # https://github.com/rails/rails/blob/main/activesupport/lib/active_support/inflections.rb
   module Inflector
     # The Inflections class
     class Inflections
@@ -181,7 +184,6 @@ module StoryTeller
     inflect.irregular('child', 'children')
     inflect.irregular('man', 'men')
     inflect.irregular('move', 'moves')
-    inflect.irregular('glove', 'gloves')
     inflect.irregular('person', 'people')
     inflect.irregular('sex', 'sexes')
     inflect.irregular('zombie', 'zombies')

data/lib/story_teller/inform/ephemeral/link.rb

@@ -2,7 +2,7 @@
 # encoding: utf-8
 # frozen_string_literal: false
 
-# Copyright Nels Nelson 2008-2025 but freely usable (see license)
+# Copyright Nels Nelson 2008-2026 but freely usable (see license)
 #
 # This file is part of the StoryTeller.
 #
@@ -21,17 +21,18 @@
 
 # Link
 
-# The Inform module
+# module Inform
 module Inform
 # module Ephemeral
 module Ephemeral
   # The Inform::Ephemeral::Link class
-  class Link < Inform::Link
+  class Link
     LinkTemplate = '%<link_name>s -> %<to_name>s [%<to_identity>s]'.freeze
-    attr_reader :name, :to, :from
+    attr_accessor :name, :to, :from, :created_at, :modified_at
 
     def initialize(properties)
       super()
+      before_create
       @name = properties[:name]
       @to = properties[:to]
       @from = properties[:from]
@@ -39,11 +40,13 @@ module Ephemeral
 
     def before_create
       self.created_at ||= Time.now
-      super
+    end
+
+    def save
+      after_save
     end
 
     def after_save
-      super
       self.modified_at = Time.now.utc
     end
 
@@ -54,14 +57,6 @@ module Ephemeral
     def <=>(other)
       self.name <=> other.name
     end
-
-    def init_with(coder)
-      LinkMethods.each do |method_name|
-        method_symbol = format(MethodWriterTemplate, method_name: method_name).to_sym
-        self.send(method_symbol, coder[method_name]) if self.respond_to? method_symbol
-      end
-      self
-    end
   end
   # class Link
 end
@@ -71,6 +66,11 @@ end
 
 # The Inform module
 module Inform
+  def link_klass
+    Inform::Ephemeral::Link
+  end
+  module_function :link_klass
+
   # The Linkable module
   module Linkable
     def links
@@ -80,16 +80,29 @@ module Inform
     end
 
     # rubocop: disable Metrics/AbcSize
+    # rubocop: disable Metrics/CyclomaticComplexity
     # rubocop: disable Metrics/MethodLength
+    # rubocop: disable Metrics/PerceivedComplexity
     def link(link_name, obj = nil)
-      link = Inform::Link.first(name: link_name.to_s, from_id: self.id)
+      link = if Inform.link_klass.respond_to?(:first)
+        Inform.link_klass.first(name: link_name.to_s, from_id: self.id)
+      else
+        self.links.find { |l| l.name == link_name.to_s }
+      end
       link&.to&.refresh
       return link if obj.nil?
       if link.nil?
-        clauses = { name: link_name.to_s, from_id: self.id, to_id: obj.id }
-        link = Inform::Link.find_or_create(**clauses) do |l|
-          l.from = self
-          l.to = obj
+        link = if Inform.link_klass.respond_to?(:find_or_create)
+          clauses = { name: link_name.to_s, from_id: self.id, to_id: obj.id }
+          Inform.link_klass.find_or_create(**clauses) do |l|
+            l.from = self
+            l.to = obj
+          end
+        else
+          properties = { name: link_name.to_s, from: self, to: obj }
+          Inform::Ephemeral::Link.new(properties).tap do |l|
+            self.links << l
+          end
         end
       else
         link.to = obj
@@ -98,40 +111,59 @@ module Inform
       link
     end
     # rubocop: enable Metrics/AbcSize
+    # rubocop: enable Metrics/CyclomaticComplexity
     # rubocop: enable Metrics/MethodLength
+    # rubocop: enable Metrics/PerceivedComplexity
 
     def linked?(link_name)
-      if Inform::Link.respond_to?(:filter)
-        Inform::Link.filter(name: link_name.to_s, from_id: self.id).count > 0
+      if Inform.link_klass.respond_to?(:filter)
+        Inform.link_klass.filter(name: link_name.to_s, from_id: self.id).count > 0
       else
-        !self.links.find(&:link_name).nil?
+        self.links.any? { |link| link.name == link_name.to_s && link.from == self }
       end
     end
 
+    # rubocop: disable Metrics/AbcSize
     def unlink(link_name)
-      Inform::Link.first(name: link_name.to_s, from_id: self.id).destroy&.to
+      if Inform.link_klass.respond_to?(:first)
+        Inform.link_klass.first(name: link_name.to_s, from_id: self.id).destroy&.to
+      else
+        self.links.delete { |link| link.name == link_name.to_s && link.from == self }
+      end
     rescue Sequel::NoExistingObject => e
-      log.warn 'Error: ' + e.message
-      log.warn 'No such link: ' + link_name
+      log.warn "Error: #{e.message}"
+      log.warn "No such link: #{link_name}"
       nil
     end
+    # rubocop: enable Metrics/AbcSize
 
     def linkto(link_name)
-      Inform::Link.first(name: link_name.to_s, from_id: self.id)&.to&.refresh
+      if Inform.link_klass.respond_to?(:first)
+        Inform.link_klass.first(name: link_name.to_s, from_id: self.id)&.to&.refresh
+      else
+        self.links.find { |link| link.name == link_name.to_s && link.from == self }&.to
+      end
     end
 
+    # rubocop: disable Metrics/AbcSize
     def linksfrom(link_name = nil)
-      if link_name.nil?
-        Inform::Link.filter(to_id: self.id).map(&:from)
+      if Inform.link_klass.respond_to?(:filter)
+        if link_name.nil?
+          Inform.link_klass.filter(to_id: self.id)
+        else
+          Inform.link_klass.filter(name: link_name.to_s, to_id: self.id)
+        end
       else
-        Inform::Link.filter(name: link_name.to_s, to_id: self.id).map(&:from)
-      end
+        self.links.select { |link| link.name == link_name.to_s && link.to == self }
+      end.map(&:from)
     end
+    # rubocop: enable Metrics/AbcSize
 
     alias _key? linked?
     alias _get_object linkto
     def _set_object(link_name, obj = nil)
-      link(link_name, obj).to
+      link = link(link_name, obj)
+      link.to
     end
     alias _unset_object unlink
   end

data/lib/story_teller/inform/ephemeral/module.rb

@@ -1,7 +1,8 @@
+# lib/story_teller/inform/module.rb
 # encoding: utf-8
 # frozen_string_literal: false
 
-# Copyright Nels Nelson 2008-2025 but freely usable (see license)
+# Copyright Nels Nelson 2008-2026 but freely usable (see license)
 #
 # This file is part of StoryTeller.
 #
@@ -20,12 +21,12 @@
 
 # Module
 
-# The Inform module
+# module Inform
 module Inform
 # module Ephemeral
 module Ephemeral
-  # The Inform::Module class
-  class Module < Inform::Module
+  # class Module
+  class Module
     def to_s
       name
     end
@@ -81,7 +82,7 @@ module Inform
 # module Ephemeral
 module Ephemeral
   # The Inform::Ephemeral::Modularized class
-  class Modularized < Inform::Modularized; end
+  class Modularized; end
 end
 end
 # module Inform