gamefic 2.2.0 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 361eaf767babb3c8b5d7e47616d326a85e1b42269da33c518de33f16f9568451
-  data.tar.gz: 96f4d79e833f93c41714c5781cf863d7e0b8832e90c746f6bafe6164e10095b5
+  metadata.gz: a57ab533bcfbcbd650cf3ee60c5a639b3ddd40ad3ad96d0d4e42e6658547f3d9
+  data.tar.gz: 904c5211a6bde65f870ae8bab1218423afd6618c6ddd79c44b01174bb069256b
 SHA512:
-  metadata.gz: b9ad845f6f0271da17b64268b911f5d3fe40fbfd7fd563b411f6ef02e15b8a117abcd924d3586072040f428aafc0a92827458639f9f2c0ba9fa4883af7f33e05
-  data.tar.gz: 6f65996ac0ee16805763dd25fa89b1809a89acd0e44cb5d55f83ce22636aeadb6e43b733a15d44e6a397a636d5abde899c332d3601af60bcc4322a0c0ad1fb72
+  metadata.gz: afc3e6a06d6ac451827cea70db94b8c9e4b10c795dac9812df0c24f8c1e0ce654748dfae53c4c0565bbfff8abb5d2f853f866c1aac8b398c5cf8331ee3ea1795
+  data.tar.gz: dd790a5574ae81e91b61d01c7f18adba0abcd7e43650e72934329dfd84c9515adb54b6e1e0938814c9d6c6582d23801c66a470a28ae99700659fa0c462830660

data/.rubocop.yml

@@ -10,7 +10,4 @@ Style/StringLiterals:
 
 Style/Documentation:
   Description: 'Document classes and non-namespace modules.'
-  Enabled: false
-
-Style/MethodDefParentheses:
-  Enabled: false
+  Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 2.2.3 - July 9, 2022
+- Fix Ruby version incompatibilities
+
+## 2.2.2 - September 6, 2021
+- Darkroom indexes non-static elements
+
+## 2.2.1 - September 5, 2021
+- Retain unknown values in restored snapshots
+
 ## 2.2.0 - September 4, 2021
 - Dynamically inherit default attributes
 

data/lib/gamefic/plot/darkroom.rb

@@ -3,9 +3,10 @@ module Gamefic
   #
   class Plot
     class Darkroom
-      # @return [Gamefic::Plot]
+      # @return [Plot]
       attr_reader :plot
 
+      # @param plot [Plot]
       def initialize plot
         @plot = plot
       end
@@ -14,20 +15,9 @@ module Gamefic
       #
       # @return [Hash]
       def save
-        index = plot.static + plot.players
-        plot.to_serial(index)
         {
           'program' => {}, # @todo Metadata for version control, etc.
-          'index' => index.map do |i|
-            if i.is_a?(Gamefic::Serialize)
-              {
-                'class' => i.class.to_s,
-                'ivars' => i.serialize_instance_variables(index)
-              }
-            else
-              i.to_serial(index)
-            end
-          end
+          'index' => index.map { |obj| serialize_indexed(obj) }
         }
       end
 
@@ -75,6 +65,56 @@ module Gamefic
           end
         end
       end
+
+      private
+
+      def index
+        @index ||= begin
+          populate_full_index_from(plot)
+          Set.new(plot.static + plot.players).merge(full_index).to_a
+        end
+      end
+
+      def full_index
+        @full_index ||= Set.new
+      end
+
+      def populate_full_index_from(object)
+        return if full_index.include?(object)
+        if object.is_a?(Array) || object.is_a?(Set)
+          object.each { |ele| populate_full_index_from(ele) }
+        elsif object.is_a?(Hash)
+          object.each_pair do |k, v|
+            populate_full_index_from(k)
+            populate_full_index_from(v)
+          end
+        else
+          if object.is_a?(Gamefic::Serialize)
+            full_index.add object unless object.is_a?(Module) && object.name
+            object.instance_variables.each do |v|
+              next if object.class.excluded_from_serial.include?(v)
+              populate_full_index_from(object.instance_variable_get(v))
+            end
+          else
+            object.instance_variables.each do |v|
+              populate_full_index_from(object.instance_variable_get(v))
+            end
+          end
+        end
+      end
+
+      def serialize_indexed object
+        if object.is_a?(Gamefic::Serialize)
+          # Serialized objects in the index should be a full serialization.
+          # Serialize#to_serial rturns a reference to the indexed object.
+          {
+            'class' => object.class.to_s,
+            'ivars' => object.serialize_instance_variables(index)
+          }
+        else
+          object.to_serial(index)
+        end
+      end
     end
   end
 end

data/lib/gamefic/scriptable.rb

@@ -76,8 +76,9 @@ Gamefic::Scriptable.module_exec do
       instance = self
       theater ||= Object.new
       theater.instance_exec do
-        define_singleton_method :method_missing do |symbol, *args, &block|
-          instance.public_send :public_send, symbol, *args, &block
+        define_singleton_method :method_missing do |symbol, *args, **splat, &block|
+          result = instance.public_send :public_send, symbol, *args, **splat, &block
+          result
         end
       end
       theater.extend Gamefic::Serialize

data/lib/gamefic/serialize.rb

@@ -15,7 +15,6 @@ module Gamefic
             'name' => name
           }
         else
-          index.push self if self.is_a?(Gamefic::Serialize)
           {
             'class' => serialized_class(index),
             'ivars' => serialize_instance_variables(index)
@@ -89,7 +88,6 @@ class Object
           end
           raise "Unable to find class #{self['class']} #{self}" if klass.nil?
           object = klass.allocate
-          index.push object if object.is_a?(Gamefic::Serialize)
         end
       end
       self['ivars'].each_pair do |k, v|
@@ -103,7 +101,6 @@ class Object
       return index.index(match[1].to_i) if match
       match = self.match(/#<SYM:([a-z0-9_\?\!]+)>/i)
       return match[1].to_sym if match
-      return nil if self == '#<UNKNOWN>'
       self
     else
       # true, false, or nil

data/lib/gamefic/subplot.rb

@@ -19,7 +19,7 @@ module Gamefic
       @next_cue = next_cue
       @concluded = false
       @more = more
-      configure more
+      configure **more
       run_scripts
       playbook.freeze
       self.introduce introduce unless introduce.nil?
@@ -97,7 +97,7 @@ module Gamefic
     # Subclasses can override this method to handle additional configuration
     # options.
     #
-    def configure more
+    def configure **more
     end
   end
 end

data/lib/gamefic/version.rb

@@ -1,3 +1,3 @@
 module Gamefic
-  VERSION = '2.2.0'
+  VERSION = '2.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gamefic
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.3
 platform: ruby
 authors:
 - Fred Snyder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-04 00:00:00.000000000 Z
+date: 2022-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Gamefic