core-state 0.1.0 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a830666ebf18447a8c3274d2952173dc3533af6b0321b95e785b3008c58d6ab8
-  data.tar.gz: f3bd2ec548d47fa6fc9c66fa0dca8f6d1d9ecd721916a3de935827aab6a48805
+  metadata.gz: 7c21289439e5a70015dc1fad5f146ce0742296965b142b7e1a358195a4eeae7e
+  data.tar.gz: c02f0889fd523fcb34c865b2dd3232a2bd2bce51c0211bff5f21c14aef848daa
 SHA512:
-  metadata.gz: ba61451ed0cc6974c3b2808dfcbd72aa693be05630e77896ac3921deec4c9d3481a5cab7213bc33cf923449bd254babd875458bf3f9940e4c1433ec8ee82048a
-  data.tar.gz: 0654f08454d2d04e2daca056c08964fc4fc644b70e854208f7cb24e24f00fdb117e37e35856f333692a12653e8fc16d40525c55948de49e31d285022e231f1f7
+  metadata.gz: 753c19c8d932f869ab172136b3772e70502969ed4c702317c61de491d2fe52da8b6a6b32a1e5b00b02535e0a46bd0f3d33e62b56fa1862c7e6c2c6803fe3da84
+  data.tar.gz: f660e4cc842ef45e30b6ee665af5a4a8aa33de9c170e3852afb8bf4c5cd5fd5cf21b028be78927761e1febd2859655a3257d50e9870345469934a9146e94a534

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## [v0.1.4](https://github.com/metabahn/corerb/releases/tag/2021-09-30)
+
+*released on 2021-09-30*
+
+  * `fix` [#85](https://github.com/metabahn/corerb/pull/85) Initialize with class-level state when available ([bryanp](https://github.com/bryanp))
+
+## [v0.1.3](https://github.com/metabahn/corerb/releases/tag/2021-09-28)
+
+*released on 2021-09-28*
+
+  * `fix` [#84](https://github.com/metabahn/corerb/pull/84) Define core-local as a dependency of core-state ([bryanp](https://github.com/bryanp))
+
+## [v0.1.1](https://github.com/metabahn/corerb/releases/tag/2021-07-15)
+
+*released on 2021-07-15*
+
+  * `fix` [#62](https://github.com/metabahn/corerb/pull/62) Correctly isolate class-level state on access ([bryanp](https://github.com/bryanp))
+  * `fix` [#55](https://github.com/metabahn/corerb/pull/55) Correctly forward arguments to super initialize ([bryanp](https://github.com/bryanp))
+
 ## [v0.1.0](https://github.com/metabahn/corerb/releases/tag/2021-07-07)
 
 *released on 2021-07-07*

data/lib/core/state/version.rb

@@ -2,7 +2,7 @@
 
 module Core
   module State
-    VERSION = "0.1.0"
+    VERSION = "0.1.4"
 
     def self.version
       VERSION

data/lib/is/stateful.rb

@@ -1,24 +1,94 @@
 # frozen_string_literal: true
 
 require "core/extension"
-
-require "refine/object/copy"
+require "core/local"
 
 module Is
   # [public] Makes objects stateful.
   #
   module Stateful
+    # Adding core-copy as a dependency of core-state creates a recursive dependency, so just bundle it.
+    #
+    module Copy
+      DEFAULT = ::Object.new
+
+      refine ::Object do
+        # [public] Copies the object using `clone`.
+        #
+        if RbConfig::CONFIG["RUBY_PROGRAM_VERSION"] < "3"
+          def copy(freeze: DEFAULT)
+            should_freeze = resolve_freeze_argument(freeze)
+
+            value = clone(freeze: should_freeze)
+            value.freeze if should_freeze
+            value
+          end
+        else
+          def copy(freeze: DEFAULT)
+            clone(freeze: resolve_freeze_argument(freeze))
+          end
+        end
+
+        private def resolve_freeze_argument(value)
+          case value
+          when DEFAULT
+            frozen?
+          else
+            !!value
+          end
+        end
+      end
+
+      refine Array do
+        # [public] Copies the array, along with each value.
+        #
+        def copy(freeze: DEFAULT)
+          unless Stateful.copying?(self)
+            Stateful.prevent_recursion(self) do
+              array = map { |value|
+                value.copy(freeze: freeze)
+              }
+
+              array.freeze if resolve_freeze_argument(freeze)
+
+              array
+            end
+          end
+        end
+      end
+
+      refine Hash do
+        # [public] Copies the hash, along with each key and value.
+        #
+        def copy(freeze: DEFAULT)
+          unless Stateful.copying?(self)
+            Stateful.prevent_recursion(self) do
+              hash = {}
+
+              each_pair do |key, value|
+                hash[key.copy(freeze: freeze)] = value.copy(freeze: freeze)
+              end
+
+              hash.freeze if resolve_freeze_argument(freeze)
+
+              hash
+            end
+          end
+        end
+      end
+    end
+
     extend Is::Extension
 
-    using Refine::Object::Copy
+    using Copy
 
     ALLOWED_FLAGS = %i[class instance].freeze
 
-    applied do
+    applies do
       prepend_defined_state_modules
     end
 
-    extends :class do
+    extends :definition do
       # [public] Defines state by name.
       #
       # flags - Changes how the state is defined. Possible values include:
@@ -52,6 +122,10 @@ module Is
         defined_state[ivar_name] = state
         defined_state_isolations << ivar_name
 
+        if state[:class]
+          instance_variable_set(ivar_name, default)
+        end
+
         prefix = if private
           "private "
         else
@@ -62,9 +136,9 @@ module Is
           if state[:class]
             defined_state_class_module.module_eval <<~CODE, __FILE__, __LINE__ + 1
               #{prefix}def #{method_name}
-                unless defined_state_isolations.include?(#{ivar_name})
+                unless defined_state_isolations.include?(#{ivar_name.inspect})
                   #{ivar_name} = #{ivar_name}.copy
-                  defined_state_isolations << #{ivar_name}
+                  defined_state_isolations << #{ivar_name.inspect}
                 end
 
                 #{ivar_name}
@@ -75,9 +149,9 @@ module Is
           if state[:instance]
             defined_state_instance_module.module_eval <<~CODE, __FILE__, __LINE__ + 1
               #{prefix}def #{method_name}
-                unless defined_state_isolations.include?(#{ivar_name})
+                unless defined_state_isolations.include?(#{ivar_name.inspect})
                   #{ivar_name} = #{ivar_name}.copy
-                  defined_state_isolations << #{ivar_name}
+                  defined_state_isolations << #{ivar_name.inspect}
                 end
 
                 #{ivar_name}
@@ -167,25 +241,30 @@ module Is
       end
     end
 
-    extends :instance, prepend: true do
-      def initialize(*)
-        self.class.send(:defined_state).each_pair do |name, state|
+    extends :implementation, prepend: true do
+      def initialize(...)
+        self_class = self.class
+        self_class.send(:defined_state).each_pair do |name, state|
           if state[:instance]
-            instance_variable_set(name, state[:value])
+            if state[:class]
+              instance_variable_set(name, self_class.instance_variable_get(name))
+            else
+              instance_variable_set(name, state[:value])
+            end
           end
         end
 
         super
       end
 
-      def initialize_copy(*)
+      def initialize_copy(...)
         @__defined_state_isolations = []
 
         super
       end
     end
 
-    extends :class, :instance do
+    extends :definition, :implementation do
       # [public] Safely mutates state by name, yielding a copy of the current value to the block.
       #
       def mutate_state(name, &block)
@@ -196,5 +275,25 @@ module Is
         @__defined_state_isolations ||= []
       end
     end
+
+    class << self
+      include Is::Localized
+
+      def prevent_recursion(object)
+        object_id = object.object_id
+        copied_objects[object_id] = true
+        yield
+      ensure
+        copied_objects.delete(object_id)
+      end
+
+      def copying?(object)
+        copied_objects[object.object_id]
+      end
+
+      def copied_objects
+        localized(:__corerb_copied_objects) || localize(:__corerb_copied_objects, {})
+      end
+    end
   end
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: core-state
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.4
 platform: ruby
 authors:
 - Bryan Powell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-07 00:00:00.000000000 Z
+date: 2021-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: core-copy
+  name: core-extension
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: core-extension
+  name: core-local
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.1'
 description: Easily manage object state.
 email: bryan@metabahn.com
 executables: []
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Easily manage object state.