gamefic 3.1.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3900923aaef12a43321ce6f9cc5957953b12bba7d939e0a1666d8c6c75703855
-  data.tar.gz: 6023310c5e26e9632ed4c053a9bea619e1455dbb66966d82fc9e772044d19d3a
+  metadata.gz: ea395014528ad74c93bfc7e33809a6b6ea24c0c8e2d37a2f6e0d7067eef564d1
+  data.tar.gz: ec2fcf7c80c501cf93c036bf2416f3f583755460d38aca464a5844eb2705151f
 SHA512:
-  metadata.gz: aea9a57211541f056c730707227020f2c35376d59cc4e69c3c7463e8a8bafa7b6fcd4585a99bf2ce235fdc4c583393f53e060554e06f6e5912358959305627eb
-  data.tar.gz: 5351ea7cc8b3ff4e01e064eb12a594dc2d928641b19e8593243da00b672780acff0d808d73eca1a80cf2e2139fd657b870fa7a5a5315e0a2a3998bc306db0c05
+  metadata.gz: 7875f99a1d9d327f0251fdbeae15ddf31820091fd0cbdc43a1e5cbe7cabd8697057fe6333b84400d5e545fc31e3720c82ecc366dc2cc0066b71f3e2794b6e196
+  data.tar.gz: 91353478d4a994758c6fcc0a843335819cdb9086be9a29fdd429b333abdf58c4e2179e147b685a2f4720fb9e160ecd83ef5f4e5b4ab41a0ad582f583845f2843

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 3.2.1 - July 1, 2024
+- MultipleChoice accepts shortened text
+- Return Proxy::Agent from attr_seed and make_seed
+- MultipleChoice skips finish blocks for invalid input
+
+## 3.2.0 - April 9, 2024
+- Bug fix for marshal of structs in Opal
+- Add last_input and last_prompt at start of take
+
 ## 3.1.0 - April 8, 2024
 - Dispatcher prioritizes strict token matches
 - Scanner builds commands

data/lib/gamefic/active/messaging.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gamefic
   module Active
     # A module for active entities that provides a default Messenger with

data/lib/gamefic/active/take.rb

@@ -31,7 +31,6 @@ module Gamefic
 
       # @return [Props::Default]
       def start
-        props.output[:scene] = scene.to_hash
         scene.run_start_blocks actor, props
         scene.start actor, props
         # @todo See if this can be handled better
@@ -47,7 +46,6 @@ module Gamefic
       def finish
         actor.flush
         scene.finish(actor, props)
-        props.output.replace(last_prompt: props.prompt, last_input: props.input)
         scene.run_finish_blocks actor, props
       end
 

data/lib/gamefic/active.rb

@@ -164,6 +164,8 @@ module Gamefic
       cue :default_scene
       @props = Take.start(self, @last_cue)
       @last_output = self.output
+      @props.output[:last_prompt] = @last_output.prompt
+      @props.output[:last_input] = @last_input
       @output = @props.output.dup.freeze
     end
 
@@ -203,7 +205,7 @@ module Gamefic
     # True if the actor is ready to leave the game.
     #
     def concluding?
-      epic.empty? || @props&.scene&.type == 'Conclusion'
+      epic.empty? || @props&.scene&.fetch(:type) == 'Conclusion'
     end
 
     def accessible?

data/lib/gamefic/composer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gamefic
   # A function module for creating commands from expressions.
   #

data/lib/gamefic/props/default.rb

@@ -2,8 +2,6 @@
 
 module Gamefic
   module Props
-    SceneData = Struct.new(:name, :type)
-
     # A collection of data related to a scene. Scenes define which Props class
     # they use. Props can be accessed in a scene's on_start and on_finish
     # callbacks.
@@ -27,13 +25,13 @@ module Gamefic
       attr_reader :context
       alias data context
 
-      # @return [SceneData]
+      # @return [Hash]
       attr_reader :scene
 
       # @param scene [Scene]
       # @param context [Hash]
       def initialize scene, **context
-        @scene = SceneData.new(scene.name, scene.type)
+        @scene = { name: scene.name, type: scene.type }
         @context = context
       end
 

data/lib/gamefic/props/multiple_choice.rb

@@ -58,7 +58,8 @@ module Gamefic
       end
 
       def index_by_text
-        options.find_index { |text| input.downcase == text.downcase }
+        matches = options.map.with_index { |text, idx| next idx if text.downcase.start_with?(input.downcase) }.compact
+        matches.first if matches.one?
       end
     end
   end

data/lib/gamefic/props/output.rb

@@ -6,11 +6,10 @@ module Gamefic
     # data.
     #
     class Output
-      # @return [String, nil]
-      attr_reader :last_input
+      READER_METHODS = %i[messages options queue scene prompt last_prompt last_input].freeze
+      WRITER_METHODS = %i[messages= prompt= last_prompt= last_input=].freeze
 
-      # @return [String, nil]
-      attr_reader :last_prompt
+      attr_reader :raw_data
 
       def initialize **data
         @raw_data = {
@@ -23,36 +22,49 @@ module Gamefic
         merge! data
       end
 
-      # @return [String]
-      def messages
-        raw_data[:messages]
-      end
-
-      # @return [Array<String>]
-      def options
-        raw_data[:options]
-      end
-
-      # @return [Array<String>]
-      def queue
-        raw_data[:queue]
-      end
-
-      # @todo Should this be a concrete class?
-      # @return [Hash]
-      def scene
-        raw_data[:scene]
-      end
-
-      # @return [String]
-      def prompt
-        raw_data[:prompt]
-      end
-
+      # @!attribute [rw] messages
+      #   A text message to be displayed at the start of a scene.
+      #
+      #   @return [String]
+
+      # @!attribute [rw] options
+      #   An array of options to be presented to the player, e.g., in a
+      #   MultipleChoice scene.
+      #
+      #   @return [Array<String>]
+
+      # @!attribute [rw] queue
+      #   An array of commands waiting to be executed.
+      #
+      #   @return [Array<String>]
+
+      # @!attribute [rw] scene
+      #   A hash containing the scene's :name and :type.
+      #
+      #   @return [Hash]
+
+      # @!attribute [rw] [prompt]
+      #   The input prompt to be displayed to the player.
+      #
+      #   @return [String]
+
+      # @!attribute [rw] last_input
+      #   The input received from the player in the previous scene.
+      #
+      #   @return [String, nil]
+
+      # @!attribute [rw] last_prompt
+      #   The input prompt from the previous scene.
+      #
+      #   @return [String, nil]
+
+      # @param key [Symbol]
       def [] key
         raw_data[key]
       end
 
+      # @param key [Symbol]
+      # @param value [Object]
       def []= key, value
         raw_data[key] = value
       end
@@ -74,9 +86,22 @@ module Gamefic
         raw_data.replace data
       end
 
-      private
+      def freeze
+        raw_data.freeze
+        super
+      end
 
-      attr_reader :raw_data
+      def method_missing method, *args
+        return raw_data[method] if READER_METHODS.include?(method)
+
+        return raw_data[method.to_s[0..-2].to_sym] = args.first if WRITER_METHODS.include?(method)
+
+        super
+      end
+
+      def respond_to_missing?(method, _with_private = false)
+        READER_METHODS.include?(method) || WRITER_METHODS.include?(method)
+      end
     end
   end
 end

data/lib/gamefic/props/pause.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gamefic
   module Props
     # Props for Pause scenes.

data/lib/gamefic/scanner.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gamefic
   # A module for matching objects to tokens.
   #

data/lib/gamefic/scene/default.rb

@@ -53,7 +53,7 @@ module Gamefic
       # @param props [Props::Default]
       # @return [void]
       def finish actor, props
-        props.input = actor.queue.shift
+        props.input = actor.queue.shift&.strip
       end
 
       def run_start_blocks actor, props

data/lib/gamefic/scene/multiple_choice.rb

@@ -20,6 +20,12 @@ module Gamefic
         actor.tell format(props.invalid_message, input: props.input)
         actor.recue
       end
+
+      def run_finish_blocks actor, props
+        return unless props.index
+
+        super
+      end
     end
   end
 end

data/lib/gamefic/scriptable/proxy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gamefic
   module Scriptable
     # Functions that provide proxies for referencing a narrative's entities

data/lib/gamefic/scriptable.rb

@@ -104,7 +104,7 @@ module Gamefic
     def make_seed klass, **opts
       @count ||= 0
       seed { make(klass, **opts) }
-      @count.tap { @count += 1 }
+      Proxy::Agent.new(@count.tap { @count += 1 })
     end
 
     # Seed an entity with an attribute method.
@@ -124,7 +124,7 @@ module Gamefic
         instance_variable_set("@#{name}", make(klass, **opts))
         self.class.define_method(name) { instance_variable_get("@#{name}") }
       end
-      @count.tap { @count += 1 }
+      Proxy::Agent.new(@count.tap { @count += 1 })
     end
 
     if RUBY_ENGINE == 'opal'

data/lib/gamefic/vault.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gamefic
   # An array wrapper that exposes a protected interface. The array is always
   # returned frozen. It can only be modified through #add and #delete. The

data/lib/gamefic/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gamefic
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Fred Snyder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-08 00:00:00.000000000 Z
+date: 2024-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal