inform-runtime 1.2.2 → 1.3.1

data/lib/story_teller/io.rb

@@ -1,7 +1,8 @@
+# lib/story_teller/io.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 the StoryTeller.
 #
@@ -23,8 +24,10 @@ module StoryTeller
   # The IO module
   module IO
     def session
-      return unless defined?(StoryTeller::IO::Session) && StoryTeller::IO::Session.respond_to?(:of)
-      @session ||= StoryTeller::IO::Session.of(self)
+      return @session if defined?(@session) && !@session.nil?
+      return nil unless defined?(StoryTeller::IO::Session)
+
+      StoryTeller::IO::Session.of(self)
     end
 
     def noop; end
@@ -98,76 +101,123 @@ module StoryTeller
       out(@prompt = s || "\n>")
     end
 
+    def preference_value(key)
+      prefs = session.preferences
+
+      return prefs.public_send(key) if prefs.respond_to?(key)
+      return prefs[key] if prefs.respond_to?(:[]) && prefs.key?(key)
+      return prefs[key.to_s] if prefs.respond_to?(:[]) && prefs.key?(key.to_s)
+
+      nil
+    end
+
   # ----------------------------------------------------------------------------
   #   Adapted from the C code for ls.  :-)
   # ----------------------------------------------------------------------------
 
     ItemPaddingString = '%<item>s%<padding>s'.freeze
+    DefaultLineLength = 30
     MinimumLineLength = 30
     MinimumCellPadding = 8
     MinimumColumnPadding = 2
 
+    def preferred_line_length
+      width = preference_value(:word_wrap).to_i
+      return width if width > MinimumLineLength
+
+      DefaultLineLength
+    end
+
+    # def many_per_line(items)
+    #   max = 0
+
+    #   lines = []
+    #   prefs = @player.linkto :preferences
+    #   line_length = preferred_line_length
+    #   buffer = ''
+
+    #   items.each do |item|
+    #     max = [item.length, max].max
+    #   end
+    #   max += MinimumColumnPadding
+    #   width = (line_length - MinimumCellPadding) / max
+    #   height = (items.length / width).ceil - 1
+
+    #   return if width == 0
+
+    #   columns = []
+    #   i = 0
+    #   loop do
+    #     # Build a list of columns with nil padding
+    #     column = items[i, height]
+    #     columns << column + Array.new(height - column.length)
+    #     i += height
+    #     break if (i + height) >= (items.length + height)
+    #   end
+
+    #   m = []
+    #   loop do
+    #     m << []
+    #     for column in columns
+    #       m.last << column.shift
+    #     end
+    #     break if columns.last.empty?
+    #   end
+
+    #   m.each do |row|
+    #     buffer = "\e[51m"
+    #     row.each do |item|
+    #       next unless item
+    #       n = [max - item.length, MinimumColumnPadding].max
+    #       padding = " " * n unless item == row.last
+    #       buffer += format(ItemPaddingString, item: item, padding: padding)
+    #     end
+    #     buffer += "\e[56m"
+    #     lines << buffer.strip
+    #     buffer = ''
+    #   end
+
+    #   lines
+    # end
+    # # def many_per_line
+
     # rubocop: disable Metrics/AbcSize
     # rubocop: disable Metrics/CyclomaticComplexity
     # rubocop: disable Metrics/MethodLength
-    # rubocop: disable Metrics/PerceivedComplexity
     def many_per_line(items)
-      max = 0
+      items = items.map(&:to_s)
+      return [] if items.empty?
 
-      lines = []
-      prefs = @player.linkto :preferences
-      line_length = prefs ? prefs.word_wrap.to_i : MinimumLineLength
-      line_length = MinimumLineLength if line_length <= MinimumLineLength
-      buffer = ''
+      line_length = preferred_line_length
+      max_item_length = items.map(&:length).max || 0
+      cell_width = max_item_length + MinimumColumnPadding
 
-      items.each do |item|
-        max = [item.length, max].max
-      end
-      max += MinimumColumnPadding
-      width = (line_length - MinimumCellPadding) / max
-      height = (items.length / width).ceil - 1
-
-      return if width == 0
-
-      columns = []
-      i = 0
-      loop do
-        # Build a list of columns with nil padding
-        column = items[i, height]
-        columns << column + Array.new(height - column.length)
-        i += height
-        break if (i + height) >= (items.length + height)
-      end
+      column_count = (line_length - MinimumCellPadding) / cell_width
+      column_count = 1 if column_count < 1
+      column_count = items.length if column_count > items.length
 
-      m = []
-      loop do
-        m << []
-        for column in columns
-          m.last << column.shift
-        end
-        break if columns.last.empty?
-      end
+      row_count = (items.length.to_f / column_count).ceil
+      rows = []
+
+      row_count.times do |row_index|
+        row = []
 
-      m.each do |row|
-        buffer = "\e[51m"
-        row.each do |item|
-          next unless item
-          n = [max - item.length, MinimumColumnPadding].max
-          padding = " " * n unless item == row.last
-          buffer += format(ItemPaddingString, item: item, padding: padding)
+        column_count.times do |column_index|
+          item_index = row_index + (column_index * row_count)
+          item = items[item_index]
+          next if item.nil?
+
+          row << item.ljust(cell_width)
         end
-        buffer += "\e[56m"
-        lines << buffer.strip
-        buffer = ''
+
+        rows << row.join.rstrip
       end
 
-      lines
+      rows
     end
     # rubocop: enable Metrics/AbcSize
     # rubocop: enable Metrics/CyclomaticComplexity
     # rubocop: enable Metrics/MethodLength
-    # rubocop: enable Metrics/PerceivedComplexity
-    # def many_per_line
   end
   # module IO
 end

data/lib/story_teller/kernel.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 StoryTeller.
 #
@@ -176,17 +176,23 @@ module Kernel
 
   raise MethodAlreadyDefined, :class_loader if respond_to?(:class_loader)
   def class_loader
-    JRuby.runtime.jruby_class_loader
+    return JRuby.runtime.jruby_class_loader if defined?(JRuby)
+
+    raise NotImplementedError, "class_loader is only available on JRuby"
   end
 
   raise MethodAlreadyDefined, :load_service if respond_to?(:load_service)
   def load_service
-    JRuby.runtime.load_service
+    return JRuby.runtime.load_service if defined?(JRuby)
+
+    raise NotImplementedError, "load_service is only available on JRuby"
   end
 
   raise MethodAlreadyDefined, :object_space if respond_to?(:object_space)
   def object_space
-    JRuby.runtime.object_space
+    return JRuby.runtime.object_space if defined?(JRuby)
+
+    raise NotImplementedError, "object_space is only available on JRuby"
   end
 
   JavaPattern = %r{java}.freeze
@@ -205,6 +211,8 @@ module Kernel
   raise MethodAlreadyDefined, :collect_garbage if respond_to?(:collect_garbage)
   # rubocop: disable Metrics/AbcSize
   def collect_garbage
+    return unless java?
+
     java.lang.System.gc()
     sleep 0.1
     java.lang.System.runFinalization()
@@ -338,7 +346,7 @@ remove_method :original_rand
     return 0 if obj.nil?
     obj.refresh if obj.respond_to?(:refresh)
     if defined? db
-    return db.run('SELECT count(id) from "object" where parent_id = ' + obj.id) unless sysobj?
+    return db.run('SELECT count(id) from "object" where parent_id = ' + obj.id) unless ephemeral?
     end
     return obj.instance_variable_get(prop).length if obj.instance_variable_defined?(prop)
     return unless obj.respond_to?(:children)

data/lib/story_teller/library/bootstrap.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.
 #
@@ -27,37 +27,20 @@ module StoryTeller
     module Bootstrap
       module_function
 
-      def ensure_location(inflib)
-        return if inflib.nil?
-        return if inflib.location
+      def manage_inform_library(player: nil)
+        existing = StoryTeller::Engine.libraries[player] unless player.nil?
+        return existing unless existing.nil?
 
-        player_obj = inflib.player
-        location = player_obj&.location
-        location ||= player_obj&.spawn_point if player_obj.respond_to?(:spawn_point)
-        inflib.instance_variable_set(:@location, location)
+        new_inform_library(player:)
       end
 
-      def set_selfobj(inflib, player)
-        inflib.selfobj = player unless player.nil?
-      end
-
-      # rubocop: disable Metrics/MethodLength
-      def manage_inform_library(player: nil, key: StoryTeller::Engine, &block)
-        inflib = StoryTeller::Engine.libraries[key]
-        unless inflib.nil? || player.nil?
-          set_selfobj(inflib, player)
-          return inflib
-        end
-
-        inflib = block_given? ? block.call : InformLibrary.new
-        return nil if inflib.nil?
-
-        set_selfobj(inflib, player)
+      def new_inform_library(player: nil)
+        inflib = InformLibrary.new
+        bind_inform_library(inflib, player)
         inflib.subscribe(inflib.selfobj)
-        ensure_location(inflib)
-        StoryTeller::Engine.libraries[key] = inflib
+        ensure_player_location(inflib) if StoryTeller::Engine.persist_player_location?
+        inflib
       end
-      # rubocop: enable Metrics/MethodLength
     end
     # module Bootstrap
   end

data/lib/story_teller/library/declarations.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.
 #

data/lib/story_teller/library/directives.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.
 #

data/lib/story_teller/library/loader.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.
 #
@@ -33,32 +33,18 @@ module StoryTeller
       module_function
 
       def augment_inform_library!
-        ensure_inform_object_model!
         InformLibrary.extend(StoryTeller::Engine::Library)
         InformLibrary.class_eval do
           include Inform::Context unless include?(Inform::Context)
           include Inform::StdLib unless include?(Inform::StdLib)
+          include Inform::Rules unless include?(Inform::Rules)
+          include Inform::History unless include?(Inform::History)
         end
         InformLibrary.prepend(StoryTeller::Library::Location)
       end
 
       def load_library
         augment_inform_library!
-        StoryTeller::Library::Bootstrap.manage_inform_library
-      end
-
-      def inform_object_model?
-        object_class = StoryTeller::ModelAdapter.object_class
-        return false if object_class.nil?
-
-        object_class.method_defined?(:<<) &&
-          object_class.method_defined?(:with)
-      end
-
-      def ensure_inform_object_model!
-        return if inform_object_model?
-
-        StoryTeller::EphemeralAdapter.register!
       end
 
       # rubocop: disable Metrics/AbcSize
@@ -84,6 +70,7 @@ module StoryTeller
       end
       # rubocop: enable Metrics/AbcSize
       # rubocop: enable Metrics/MethodLength
+
       def load_grammar(module_name)
         Inform::Grammar.load_by_name(module_name)
       end
@@ -97,8 +84,5 @@ module StoryTeller
         Inform::Grammar::Verbs.clear
       end
     end
-    # module Loader
   end
-  # module Library
 end
-# module StoryTeller

data/lib/story_teller/library/location.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.
 #
@@ -26,11 +26,17 @@ module StoryTeller
     # module Location
     module Location
       def location
-        @player&.location
+        return @location unless StoryTeller::Engine.persist_player_location?
+
+        @player&.location || @location
       end
 
       def location=(obj)
-        @player.location = obj
+        if StoryTeller::Engine.persist_player_location?
+          @player.location = obj
+        else
+          @location = obj
+        end
       end
     end
 

data/lib/story_teller/library.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.
 #