core-state 0.1.1 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5ce4cb2ff3e96c75306c312db38fc09e9f95499d2e4d133d48093b38f64423b
-  data.tar.gz: 04a0e78d72397976690d10d37431a6765809906a5c1708a7ac504bb20bf2d329
+  metadata.gz: db495761cd564d756fb99e985b29d4e8176c532d605724a321670cfa8888e4b9
+  data.tar.gz: 96f7b2337e73e82a7ea5735a98e7b6a7055b9098656248e4c658584d5eb074b7
 SHA512:
-  metadata.gz: f03ad4241c69ef2d263741efc9ada4aecd984f8e699bf413ba503e8f0fe14174afcb6aa0a4ea602e7c39a68dbecd7da1d47418fa45c271c48dee822c78490871
-  data.tar.gz: d4b2bbd0e812133cc774b399519e109c2b32787aa20866d134f3b55b2523cee40fdff7936ee3e70a49edd3ce56a5aacde2c6298a177801c59e2ec280e66f9d6f
+  metadata.gz: fe3dfb3399854e9ffd96cd257b195b545cd31cda25d95db4af6be40c17890653322a015881672c75df64d4a451d4c11cf7004b90aa62cb83937d29de90d1ea9a
+  data.tar.gz: 229caf7f8a616ed01498420f688f6c8366663684791be54581e074836f035d52c1cd5d2123c953da2ac861bbf703984b0324fbbbd2d0b4142989cb20a4175c7d

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## [v0.1.5](https://github.com/metabahn/corerb/releases/tag/2021-10-22)
+
+*released on 2021-10-22*
+
+  * `fix` [#88](https://github.com/metabahn/corerb/pull/88) Fix an issue causing state to be shared between sibling subclasses ([bryanp](https://github.com/bryanp))
+
+## [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*

data/lib/core/state/version.rb

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

data/lib/is/stateful.rb

@@ -1,16 +1,80 @@
 # 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 creates a recursive dependency, so just bundle it.
+    #
+    module Copy
+      DEFAULT = ::Object.new
+
+      refine ::Object do
+        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
+        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
+        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
 
@@ -52,6 +116,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
@@ -118,7 +186,9 @@ module Is
         end
 
         subclass.send(:prepend_defined_state_modules)
-        subclass.instance_variable_set("@__defined_state", @__defined_state.dup)
+        subclass.instance_variable_set("@__defined_state", @__defined_state.each_with_object({}) { |(key, value), state|
+          state[key] = value.dup
+        })
 
         super
       end
@@ -169,9 +239,14 @@ module Is
 
     extends :implementation, prepend: true do
       def initialize(...)
-        self.class.send(:defined_state).each_pair do |name, state|
+        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
 
@@ -196,5 +271,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.1
+  version: 0.1.5
 platform: ruby
 authors:
 - Bryan Powell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-15 00:00:00.000000000 Z
+date: 2021-10-23 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.3'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        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.