Protect internal accessors (#5)

Author: afuno

lib/stroma/hooks/collection.rb

@@ -59,7 +59,7 @@ def initialize(collection = Set.new)
       # @return [void]
       def initialize_dup(original)
         super
-        @collection = original.instance_variable_get(:@collection).dup
+        @collection = original.collection.dup
       end
 
       # Adds a new hook to the collection.
@@ -96,6 +96,10 @@ def before(key)
       def after(key)
         @collection.select { |hook| hook.after? && hook.target_key == key }
       end
+
+      protected
+
+      attr_reader :collection
     end
   end
 end

lib/stroma/settings/collection.rb

@@ -61,7 +61,7 @@ def initialize(storage = {})
       # @return [void]
       def initialize_dup(original)
         super
-        @storage = original.instance_variable_get(:@storage).transform_values(&:dup)
+        @storage = original.storage.transform_values(&:dup)
       end
 
       # Accesses or creates RegistrySettings for a registry key.
@@ -83,6 +83,10 @@ def [](registry_key)
       def to_h
         @storage.transform_values(&:to_h)
       end
+
+      protected
+
+      attr_reader :storage
     end
   end
 end

lib/stroma/settings/registry_settings.rb

@@ -59,7 +59,7 @@ def initialize(storage = {})
       # @return [void]
       def initialize_dup(original)
         super
-        @storage = original.instance_variable_get(:@storage).transform_values(&:dup)
+        @storage = original.storage.transform_values(&:dup)
       end
 
       # Accesses or creates a Setting for an extension.
@@ -81,6 +81,10 @@ def [](extension_name)
       def to_h
         @storage.transform_values(&:to_h)
       end
+
+      protected
+
+      attr_reader :storage
     end
   end
 end

lib/stroma/settings/setting.rb

@@ -69,7 +69,7 @@ def initialize(data = {})
       # @return [void]
       def initialize_dup(original)
         super
-        @data = deep_dup(original.instance_variable_get(:@data))
+        @data = deep_dup(original.data)
       end
 
       # Converts to a plain Hash.
@@ -93,6 +93,10 @@ def fetch(key, *args, &block)
         @data.fetch(key.to_sym, *args, &block)
       end
 
+      protected
+
+      attr_reader :data
+
       private
 
       # Recursively duplicates nested Hash and Array structures.

lib/stroma/state.rb

@@ -60,8 +60,8 @@ def initialize
     # @return [void]
     def initialize_dup(original)
       super
-      @hooks = original.instance_variable_get(:@hooks).dup
-      @settings = original.instance_variable_get(:@settings).dup
+      @hooks = original.hooks.dup
+      @settings = original.settings.dup
     end
   end
 end

sig/lib/stroma/hooks/collection.rbs

@@ -22,6 +22,9 @@ module Stroma
       def empty?: () -> bool
 
       def size: () -> Integer
+
+      # Protected in Ruby; declared here for Steep visibility in initialize_dup
+      attr_reader collection: Set[Hook]
     end
   end
 end

sig/lib/stroma/settings/collection.rbs

@@ -22,6 +22,9 @@ module Stroma
       def empty?: () -> bool
 
       def to_h: () -> Hash[Symbol, Hash[Symbol, Hash[Symbol, untyped]]]
+
+      # Protected in Ruby; declared here for Steep visibility in initialize_dup
+      attr_reader storage: Hash[Symbol, RegistrySettings]
     end
   end
 end

sig/lib/stroma/settings/registry_settings.rbs

@@ -22,6 +22,9 @@ module Stroma
       def empty?: () -> bool
 
       def to_h: () -> Hash[Symbol, Hash[Symbol, untyped]]
+
+      # Protected in Ruby; declared here for Steep visibility in initialize_dup
+      attr_reader storage: Hash[Symbol, Setting]
     end
   end
 end

sig/lib/stroma/settings/setting.rbs

@@ -32,6 +32,9 @@ module Stroma
                | (Symbol key, untyped default) -> untyped
                | (Symbol key) { (Symbol) -> untyped } -> untyped
 
+      # Protected in Ruby; declared here for Steep visibility in initialize_dup
+      attr_reader data: Hash[Symbol, untyped]
+
       private
 
       def deep_dup: (untyped obj) -> untyped

spec/stroma/hooks/collection_spec.rb

@@ -110,4 +110,10 @@
       expect(hooks.map(&:itself)).to all(be_a(Stroma::Hooks::Hook))
     end
   end
+
+  describe "protected interface" do
+    it "does not expose collection publicly" do
+      expect { hooks.collection }.to raise_error(NoMethodError)
+    end
+  end
 end