interactor_with_steroids 1.3.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c29f3d44762d497592a20ae9da8a448fbdf2121116fc5c222f6323e1352c98e
-  data.tar.gz: b6f0cca693608e9c8cfecd0dd51098c9befb29ef26395e8750c9fd0ffd253699
+  metadata.gz: a641ca1acbb8c2de2ec87757ef54c644189997860477ccdbfd138ded126ccd3b
+  data.tar.gz: c5d85b0aa88784f4b60c5dafbc49338d7508674f589528a75671568dcc697383
 SHA512:
-  metadata.gz: 761a11f3eaead34c27ce5df13af3f17449d3b7317da05d77efd3091debfa1b249b2db8a5759ed189470f3f16e0aff25a70f8ac84d4b788d7ab06a08f2f1c7927
-  data.tar.gz: '039491509364e1df4dfb16084b782d8be7983900da3a15120001f811f68509a33656d376aa388ea279530ab2b7e17e5f3ebd704f158a98b17e3e877f5e9dd91c'
+  metadata.gz: e703700a5efd8100e78c846fd31aa9b6ee1bd535608f8bfb92f6d8512804e279e73b2a62f2b9d70bcd822a1cbd1e0ad16012d6d874aa519bf2edf32682c209b4
+  data.tar.gz: 55c97b6ad6da3e4f9f35ccc6be6df32414e8bf12a00c3c865af9fe72dfa3d19ab895e53d1bf7fd182b3994d91dbbb0aeb7f57de7097edeca67c68bcc7ccaf84b

data/interactor.gemspec

@@ -2,7 +2,7 @@ require "English"
 
 Gem::Specification.new do |spec|
   spec.name = "interactor_with_steroids"
-  spec.version = "1.3.0"
+  spec.version = "1.5.0"
 
   spec.author = "Collective Idea/Sorare Team"
   spec.email = "hello@sorare.com"

data/lib/interactor/declaration.rb

@@ -18,6 +18,8 @@ module Interactor
         new_required_arguments = required_arguments - @required_arguments
         @required_arguments += new_required_arguments
 
+        (required_arguments + optional_arguments.keys).each { |arg| received_arguments << arg }
+
         delegate(*new_required_arguments, to: :context) unless new_required_arguments.empty?
         delegate(*optional_arguments.keys, to: :context) unless optional_arguments.empty?
 
@@ -63,23 +65,41 @@ module Interactor
         end
       end
 
-      def hold(*held_fields)
-        @held_fields ||= []
-        @held_fields += held_fields
+      def received_arguments
+        @received_arguments ||= []
+      end
+
+      def hold(*held_fields, **held_fields_with_default_value)
+        attributes = [*held_fields, *held_fields_with_default_value.keys]
+        delegate(*attributes, to: :context)
 
-        delegate(*@held_fields, to: :context)
+        attributes.each { |attr| held_attributes << attr }
 
         self.context_class = Class.new(context_class) do
           attr_accessor *held_fields
+          attr_writer *held_fields_with_default_value.keys
+
+          held_fields_with_default_value.each do |k, v|
+            define_method(k) do
+              ivar = "@#{k}"
+              return instance_variable_get(ivar) if instance_variable_defined?(ivar)
+
+              instance_variable_set(ivar, v.is_a?(Proc) ? instance_eval(&v) : v)
+            end
+          end
 
           class_eval %Q<
             def to_h
-              super.merge(#{held_fields.map { |f| "#{f}: self.#{f}"}.join(', ')})
+              super.merge(#{attributes.map { |f| "#{f}: self.#{f}"}.join(', ')})
             end
           >
         end
 
       end
+
+      def held_attributes
+        @held_attributes ||= []
+      end
     end
   end
 end

data/spec/interactor/declaration_spec.rb

@@ -14,22 +14,26 @@ module Interactor
 
     subject { declared.context_class }
 
-    describe "#receive" do
-      context "with a required argument" do
-        let(:declared) {
+    describe '#receive' do
+      context 'with a required argument' do
+        let(:declared) do
           build_declared do
             receive :foo
           end
-        }
+        end
 
-        it "cannot be initialized without foo" do
+        it 'cannot be initialized without foo' do
           expect { subject.build }.to raise_error(ArgumentError)
         end
 
-        it "can be initialized with foo" do
+        it 'can be initialized with foo' do
           expect(subject.build(foo: 'bar').foo).to eq('bar')
         end
 
+        it 'can introspect the received arguments' do
+          expect(declared.received_arguments).to eq([:foo])
+        end
+
         context 'when duplicated in a submodule' do
           let(:submodule) do
             Module.new do
@@ -41,79 +45,82 @@ module Interactor
             end
           end
 
-          let(:declared) {
+          let(:declared) do
             build_declared do
               include Submodule
 
               receive :foo
             end
-          }
+          end
 
-          before { stub_const("Submodule", submodule) }
+          before { stub_const('Submodule', submodule) }
 
-          it "can be initialized with foo" do
+          it 'can be initialized with foo' do
             expect(subject.build(foo: 'bar').foo).to eq('bar')
           end
         end
-
       end
 
-      context "with an optional argument" do
-        context "with a constant default value" do
-          let(:declared) {
+      context 'with an optional argument' do
+        context 'with a constant default value' do
+          let(:declared) do
             build_declared do
               receive foo: 'bar'
             end
-          }
+          end
 
-          it "can be initialized without foo" do
+          it 'can be initialized without foo' do
             expect(subject.build.foo).to eq('bar')
           end
 
-          it "can be initialized with foo" do
+          it 'can be initialized with foo' do
             expect(subject.build(foo: 'baz').foo).to eq('baz')
           end
 
-          it "can be initialized with nil" do
+          it 'can be initialized with nil' do
             expect(subject.build(foo: nil).foo).to be nil
           end
         end
 
-        context "with a nil default value" do
+        context 'with a nil default value' do
           let(:declared) {
             build_declared do
               receive foo: nil
             end
           }
 
-          it "can be initialized without foo" do
+          it 'can be initialized without foo' do
             expect(subject.build.foo).to be nil
           end
 
-          it "can be initialized with foo" do
+          it 'can be initialized with foo' do
             expect(subject.build(foo: 'baz').foo).to eq('baz')
           end
         end
 
-        context "with a Proc default value" do
+        context 'with a Proc default value' do
           let(:declared) {
             build_declared do
               receive :bar, foo: ->(context) { context.bar }
             end
           }
 
-          it "can be initialized without foo" do
+          it 'can be initialized without foo' do
             expect(subject.build(bar: 'bar').foo).to eq('bar')
           end
 
-          it "can be initialized with foo" do
+          it 'can be initialized with foo' do
             expect(subject.build(bar: 'bar', foo: 'baz').foo).to eq('baz')
           end
+
+          it 'can introspect the received arguments' do
+            expect(declared.received_arguments).to eq(%i[bar foo])
+          end
         end
       end
     end
 
-    describe "#hold" do
+    describe '#hold' do
       let(:declared) {
         build_declared do
           hold :foo
@@ -125,6 +132,46 @@ module Interactor
         c.foo = 'bar'
         expect(c.foo).to eq('bar')
       end
+
+      it 'can introspect the held attributes' do
+        expect(declared.held_attributes).to eq([:foo])
+      end
+
+      context 'with default value' do
+        let(:declared) {
+          build_declared do
+            hold foo: 'bar'
+          end
+        }
+
+        it 'can hold foo with default value' do
+          c = subject.build
+          expect(c.foo).to eq('bar')
+
+          c.foo = 'baz'
+          expect(c.foo).to eq('baz')
+        end
+
+        context 'when default value is a proc' do
+          let(:declared) {
+            build_declared do
+              hold foo: proc { [] }
+            end
+          }
+
+          it 'can hold foo with default value different for each new context through proc' do
+            c = subject.build
+            expect(c.foo).to eq([])
+
+            other_c = subject.build
+            expect(other_c.foo).to eq([])
+
+            c.foo << 'baz'
+            expect(c.foo).to eq(['baz'])
+            expect(other_c.foo).to eq([])
+          end
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: interactor_with_steroids
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Collective Idea/Sorare Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-22 00:00:00.000000000 Z
+date: 2023-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Simple interactor implementation