gamefic 3.4.0 → 3.6.0

data/lib/gamefic/subplot.rb

@@ -7,6 +7,8 @@ module Gamefic
   # started and concluded at any time during the parent plot's runtime.
   #
   class Subplot < Narrative
+    extend Scriptable::PlotProxies
+
     # @return [Hash]
     attr_reader :config
 
@@ -22,7 +24,20 @@ module Gamefic
       configure
       @config.freeze
       super()
-      [introduce].flatten.each { |pl| self.introduce pl }
+      @concluded = false
+      [introduce].flatten.each { |plyr| self.introduce plyr }
+    end
+
+    def self.persist!
+      @persistent = true
+    end
+
+    def self.persistent?
+      @persistent ||= false
+    end
+
+    def persistent?
+      self.class.persistent?
     end
 
     def included_blocks
@@ -41,6 +56,7 @@ module Gamefic
         uncast plyr
       end
       entities.each { |ent| destroy ent }
+      @concluded = true
     end
 
     # Make an entity that persists in the subplot's parent plot.
@@ -69,8 +85,24 @@ module Gamefic
     #
     def configure; end
 
+    def concluding?
+      return super unless persistent?
+
+      @concluded
+    end
+
+    def introduce player
+      @concluded ? player : super
+    end
+
     def inspect
       "#<#{self.class}>"
     end
+
+    class << self
+      def config
+        Proxy::Config.new
+      end
+    end
   end
 end

data/lib/gamefic/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gamefic
-  VERSION = '3.4.0'
+  VERSION = '3.6.0'
 end

data/lib/gamefic.rb

@@ -17,6 +17,7 @@ require 'gamefic/command'
 require 'gamefic/action'
 require 'gamefic/props'
 require 'gamefic/scene'
+require 'gamefic/proxy'
 require 'gamefic/scriptable'
 require 'gamefic/block'
 require 'gamefic/stage'
@@ -30,7 +31,6 @@ require 'gamefic/node'
 require 'gamefic/describable'
 require 'gamefic/messenger'
 require 'gamefic/entity'
-require 'gamefic/composer'
 require 'gamefic/dispatcher'
 require 'gamefic/active'
 require 'gamefic/active/cue'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gamefic
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.6.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-10 00:00:00.000000000 Z
+date: 2024-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -138,7 +138,6 @@ files:
 - lib/gamefic/callback.rb
 - lib/gamefic/chapter.rb
 - lib/gamefic/command.rb
-- lib/gamefic/composer.rb
 - lib/gamefic/core_ext/array.rb
 - lib/gamefic/core_ext/string.rb
 - lib/gamefic/describable.rb
@@ -156,7 +155,13 @@ files:
 - lib/gamefic/props/output.rb
 - lib/gamefic/props/pause.rb
 - lib/gamefic/props/yes_or_no.rb
+- lib/gamefic/proxy.rb
+- lib/gamefic/proxy/base.rb
+- lib/gamefic/proxy/config.rb
+- lib/gamefic/proxy/pick.rb
+- lib/gamefic/proxy/plot_pick.rb
 - lib/gamefic/query.rb
+- lib/gamefic/query/abstract.rb
 - lib/gamefic/query/base.rb
 - lib/gamefic/query/general.rb
 - lib/gamefic/query/result.rb
@@ -169,6 +174,12 @@ files:
 - lib/gamefic/rulebook/hooks.rb
 - lib/gamefic/rulebook/scenes.rb
 - lib/gamefic/scanner.rb
+- lib/gamefic/scanner/base.rb
+- lib/gamefic/scanner/fuzzy.rb
+- lib/gamefic/scanner/fuzzy_nesting.rb
+- lib/gamefic/scanner/nesting.rb
+- lib/gamefic/scanner/result.rb
+- lib/gamefic/scanner/strict.rb
 - lib/gamefic/scene.rb
 - lib/gamefic/scene/activity.rb
 - lib/gamefic/scene/conclusion.rb
@@ -179,6 +190,7 @@ files:
 - lib/gamefic/scope.rb
 - lib/gamefic/scope/base.rb
 - lib/gamefic/scope/children.rb
+- lib/gamefic/scope/descendants.rb
 - lib/gamefic/scope/family.rb
 - lib/gamefic/scope/myself.rb
 - lib/gamefic/scope/parent.rb
@@ -187,7 +199,8 @@ files:
 - lib/gamefic/scriptable/actions.rb
 - lib/gamefic/scriptable/entities.rb
 - lib/gamefic/scriptable/events.rb
-- lib/gamefic/scriptable/proxy.rb
+- lib/gamefic/scriptable/plot_proxies.rb
+- lib/gamefic/scriptable/proxies.rb
 - lib/gamefic/scriptable/queries.rb
 - lib/gamefic/scriptable/scenes.rb
 - lib/gamefic/snapshot.rb

data/lib/gamefic/composer.rb

@@ -1,70 +0,0 @@
-# frozen_string_literal: true
-
-module Gamefic
-  # A function module for creating commands from expressions.
-  #
-  module Composer
-    # Create a command from the first expression that matches a response.
-    #
-    # @param actor [Actor]
-    # @param expressions [Array<Expression>]
-    # @return [Command]
-    def self.compose actor, expressions
-      %i[strict fuzzy].each do |method|
-        result = match_expressions_to_response actor, expressions, method
-        return result if result
-      end
-      Command.new(nil, [])
-    end
-
-    class << self
-      private
-
-      def match_expressions_to_response actor, expressions, method
-        expressions.each do |expression|
-          result = match_response_arguments actor, expression, method
-          return result if result
-        end
-        nil
-      end
-
-      def match_response_arguments actor, expression, method
-        actor.epic.responses_for(expression.verb).each do |response|
-          next unless response.queries.length >= expression.tokens.length
-
-          result = match_query_arguments(actor, expression, response, method)
-          return result if result
-        end
-        nil
-      end
-
-      def match_query_arguments actor, expression, response, method
-        remainder = response.verb ? '' : expression.verb.to_s
-        arguments = []
-        response.queries.each_with_index do |query, idx|
-          result = Scanner.send(method, query.select(actor), "#{remainder} #{expression.tokens[idx]}".strip)
-          break unless valid_result_from_query?(result, query)
-
-          if query.ambiguous?
-            arguments.push result.matched
-          else
-            arguments.push result.matched.first
-          end
-          remainder = result.remainder
-        end
-
-        return nil if arguments.length != response.queries.length || remainder != ''
-
-        Command.new(response.verb, arguments)
-      end
-
-      # @param result [Scanner::Result]
-      # @param query [Query::Base]
-      def valid_result_from_query? result, query
-        return false if result.matched.empty?
-
-        result.matched.length == 1 || query.ambiguous?
-      end
-    end
-  end
-end

data/lib/gamefic/scriptable/proxy.rb

@@ -1,69 +0,0 @@
-# frozen_string_literal: true
-
-module Gamefic
-  module Scriptable
-    # Functions that provide proxies for referencing a narrative's entities
-    # from class-level scripts.
-    #
-    module Proxy
-      # The object that fetches a proxied entity.
-      #
-      class Agent
-        attr_reader :symbol
-
-        # @param symbol [Symbol, Integer]
-        def initialize symbol
-          @symbol = symbol
-        end
-
-        def fetch container
-          result = safe_fetch(container)
-          raise ArgumentError, "Unable to fetch entity from proxy agent symbol `#{symbol}`" unless result
-
-          result
-        end
-
-        private
-
-        def safe_fetch container
-          if symbol.to_s =~ /^\d+$/
-            Stage.run(container, symbol) { |sym| entities[sym] }
-          elsif symbol.to_s.start_with?('@')
-            Stage.run(container, symbol) { |sym| instance_variable_get(sym) }
-          else
-            Stage.run(container, symbol) { |sym| send(sym) }
-          end
-        rescue NoMethodError
-          nil
-        end
-      end
-
-      # Proxy a method or instance variable.
-      #
-      # @example
-      #   proxy(:method_name)
-      #   proxy(:@instance_variable_name)
-      #
-      # @param symbol [Symbol]
-      # @return [Agent]
-      def proxy symbol
-        Agent.new(symbol)
-      end
-
-      # @param object [Object]
-      # @return [Object]
-      def unproxy object
-        case object
-        when Agent
-          object.fetch self
-        when Array
-          object.map { |obj| unproxy obj }
-        when Hash
-          object.transform_values { |val| unproxy val }
-        else
-          object
-        end
-      end
-    end
-  end
-end