interactor_with_steroids 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c29f3d44762d497592a20ae9da8a448fbdf2121116fc5c222f6323e1352c98e
-  data.tar.gz: b6f0cca693608e9c8cfecd0dd51098c9befb29ef26395e8750c9fd0ffd253699
+  metadata.gz: 2e5289e3868d4b8ae37dbe8078ff4c96e0206bc39e94fa465f32bf4c73bb4c65
+  data.tar.gz: 66d785650382be1320340c0791ad9d7c2efbdbbe6245e24e9048d4d82197ca09
 SHA512:
-  metadata.gz: 761a11f3eaead34c27ce5df13af3f17449d3b7317da05d77efd3091debfa1b249b2db8a5759ed189470f3f16e0aff25a70f8ac84d4b788d7ab06a08f2f1c7927
-  data.tar.gz: '039491509364e1df4dfb16084b782d8be7983900da3a15120001f811f68509a33656d376aa388ea279530ab2b7e17e5f3ebd704f158a98b17e3e877f5e9dd91c'
+  metadata.gz: 2208ac798a7531e5e8615683e9ed8251bc3377bd243a14047f433e672f1a5e37b869a84cc19918b9059c225211ee2eb73e211851566fc29138104238b1448e6e
+  data.tar.gz: ac631eb1de4cea38bcae466cb0ff7726fdfb04a582b0c5f483fe106da5ad0b88c106f2cec29bbc5f529f79c61119ca92796a6ff62f22c08c0f85e003ebca74fe

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.4.0"
 
   spec.author = "Collective Idea/Sorare Team"
   spec.email = "hello@sorare.com"

data/lib/interactor/declaration.rb

@@ -63,18 +63,26 @@ module Interactor
         end
       end
 
-      def hold(*held_fields)
-        @held_fields ||= []
-        @held_fields += held_fields
-
-        delegate(*@held_fields, to: :context)
+      def hold(*held_fields, **held_fields_with_default_value)
+        attributes = [*held_fields, *held_fields_with_default_value.keys]
+        delegate(*attributes, to: :context)
 
         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

data/spec/interactor/declaration_spec.rb

@@ -125,6 +125,42 @@ module Interactor
         c.foo = 'bar'
         expect(c.foo).to eq('bar')
       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.4.0
 platform: ruby
 authors:
 - Collective Idea/Sorare Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-22 00:00:00.000000000 Z
+date: 2023-01-04 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