gamefic 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: daf118f55bd232d6f2025016b109da61fa5fdb8b15b2ca32c3d43e45b42fa0c1
-  data.tar.gz: 12fcfc441c70b972b87a50f2a056ad6fd9fadcd0dae2eefd276a86fdf31ba26a
+  metadata.gz: 7d03f9cc05efbae7569a6dfa66f5ffeccc629180581e8b6acabeddd40f8dca12
+  data.tar.gz: f48f8890c0d894be3c2e888a4d7325b936d66ebda39c5e2dd1c1e324dd1c091b
 SHA512:
-  metadata.gz: 5ab94298bc3c7bfc03e688a4dea078c2317002c2da7c73d529a61356931b25f8f86b4fd154e75bd8e1fd515aeabb1fcbef4cf24737968f570cc850ee2d08f473
-  data.tar.gz: aa069d35340b8372c67988a106281fc185241e888293519a878ca4811c1d8976ccec4315772b32ce095f8be2a7be332b3e9ad5b25aef2cb5d9e230f5b7b69fca
+  metadata.gz: 7776a069549d44db264d012a00306f95edcf890988cbf2669edd61de97d8cf9527306136bb8c7d07ccb7975c5a48c04029f7401a2e7ea94baf372df58c454722
+  data.tar.gz: ed07e4a417207f63b6bd3f84467efb2a0cd32e73d07ecc57a642b05e6dab4bf788f98b2ee3184e42a7ac0cacbb7e2985d2cdade1df513f6f7d3539f5e7ef56c2

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.2.2 - September 6, 2021
+- Darkroom indexes non-static elements
+
 ## 2.2.1 - September 5, 2021
 - Retain unknown values in restored snapshots
 

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/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|

data/lib/gamefic/version.rb

@@ -1,3 +1,3 @@
 module Gamefic
-  VERSION = '2.2.1'
+  VERSION = '2.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gamefic
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Fred Snyder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-05 00:00:00.000000000 Z
+date: 2021-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake