interactor_with_steroids 0.0.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a01fa569ccb55a7a8c0c84cf3083e2f5a8eb43b34f1259494e9e0e2bce1efea5
-  data.tar.gz: 78dd08e37856356eca03ec1bd1c6ebf1c371f9222fe7711bf72acc31b5ededf0
+  metadata.gz: 66961ad27a598bec0b93dc0297720eb97d0cdd5199b05e7e1490b731bc098de0
+  data.tar.gz: 6432d13df06f22d9f30c8ad4a766b80dc5f3726be2f5a80495efc3edd6b0d444
 SHA512:
-  metadata.gz: b3087d4c955abb3b8c7f6e0baa067826e47504ad2aab8623daaffca2058ef37864e5c9bb9899693cf1cd24f6bda626fb926c91e5aea52502270a2976472c45ad
-  data.tar.gz: c8012d42a398afd2340d5ec00cf30f7c9116bdf4be3ab7c48d4bb521a44cfd540fe206af7a3de3bf99013fcc638161a9bdc77c6a87967d13fd27acad3319570c
+  metadata.gz: 23295d8872c9888924deb8f6937f3030f371a74ecb6c3ee0e5d0d79a7bf2a0419aa590c1705e18b76a731bb1f1bf5893599cd677835c8666b075fb3b86766cd4
+  data.tar.gz: ac5eaf844aa979041a8fe09c11336f413310576d9736209083baaf27a617208f5d8cc39be9a7e2ff308d0879488171099afd4e845d4bbb6da804a61e0c62e282

data/interactor.gemspec

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

data/lib/interactor/context.rb

@@ -53,15 +53,14 @@ module Interactor
     #
     # Returns the Interactor::Context.
     def self.build(context = {})
-      new(**context.to_h)
+      new.tap do |instance|
+        instance.assign_attributes(context.to_h)
+      end
     end
 
     attr_accessor :error
     delegate :to_s, to: :to_h
 
-    def initialize(*)
-    end
-
     # Public: Whether the Interactor::Context is successful. By default, a new
     # context is successful and only changes when explicitly failed.
     #
@@ -126,12 +125,18 @@ module Interactor
     #   # => Interactor::Failure: #<Interactor::Context foo="baz">
     #
     # Raises Interactor::Failure initialized with the Interactor::Context.
-    def fail!(error: nil)
-      self.error = error
+    def fail!(params = {})
+      assign_attributes(params)
       @failure = true
       raise Failure, self
     end
 
+    def assign_attributes(params)
+      params.each do |attribute, value|
+        self.send("#{attribute}=", value) if respond_to?(attribute)
+      end
+    end
+
     def to_h
       { error: error }
     end

data/lib/interactor/declaration.rb

@@ -37,19 +37,19 @@ module Interactor
           end
 
           class_eval %Q<
-            def initialize(
+            def self.build(
               #{new_required_arguments.map { |a| "#{a}:" }.join(', ')}#{new_required_arguments.empty? ? '' : ', '}
               **rest
             )
-              super(**rest)
-
-              #{new_required_arguments.map { |a| "self.#{a} = #{a}" }.join(';')}
-
-              #{
-                optional_arguments.keys.map do |k|
-                  "instance_variable_set('@#{k}', rest[:#{k}]) if rest.key?(:#{k})"
-                end.join("\n")
-              }
+              super(**rest).tap do |instance|
+                #{new_required_arguments.map { |a| "instance.#{a} = #{a}" }.join(';')}
+
+                #{
+                  optional_arguments.keys.map do |k|
+                    "instance.instance_variable_set('@#{k}', rest[:#{k}]) if rest.key?(:#{k})"
+                  end.join("\n")
+                }
+              end
             end
           >
 

data/lib/interactor.rb

@@ -92,7 +92,7 @@ module Interactor
   #   MyInteractor.new
   #   # => #<MyInteractor @context=#<Interactor::Context>>
   def initialize(context = {})
-    @context = self.context_class.build(context)
+    @context = self.context_class.build(**context.to_h)
   end
 
   # Internal: Invoke an interactor instance along with all defined hooks. The

data/spec/interactor/context_spec.rb

@@ -27,7 +27,7 @@ module Interactor
 
       it "doesn't affect the original hash" do
         hash = { foo: "bar" }
-        context = interactor.context_class.build(hash)
+        context = interactor.context_class.build(**hash)
 
         expect(context).to be_a(interactor.context_class)
         expect {
@@ -36,6 +36,11 @@ module Interactor
           hash[:foo]
         }
       end
+
+      it "ignores any additional argument" do
+        hash = { foo: 'bar', bar: "baz" }
+        expect { interactor.context_class.build(**hash) }.not_to raise_error
+      end
     end
 
     describe "#success?" do

data/spec/interactor/declaration_spec.rb

@@ -23,11 +23,11 @@ module Interactor
         }
 
         it "cannot be initialized without foo" do
-          expect { subject.new }.to raise_error(ArgumentError)
+          expect { subject.build }.to raise_error(ArgumentError)
         end
 
         it "can be initialized with foo" do
-          expect(subject.new(foo: 'bar').foo).to eq('bar')
+          expect(subject.build(foo: 'bar').foo).to eq('bar')
         end
 
         context 'when duplicated in a submodule' do
@@ -52,7 +52,7 @@ module Interactor
           before { stub_const("Submodule", submodule) }
 
           it "can be initialized with foo" do
-            expect(subject.new(foo: 'bar').foo).to eq('bar')
+            expect(subject.build(foo: 'bar').foo).to eq('bar')
           end
         end
 
@@ -67,15 +67,15 @@ module Interactor
           }
 
           it "can be initialized without foo" do
-            expect(subject.new.foo).to eq('bar')
+            expect(subject.build.foo).to eq('bar')
           end
 
           it "can be initialized with foo" do
-            expect(subject.new(foo: 'baz').foo).to eq('baz')
+            expect(subject.build(foo: 'baz').foo).to eq('baz')
           end
 
           it "can be initialized with nil" do
-            expect(subject.new(foo: nil).foo).to be nil
+            expect(subject.build(foo: nil).foo).to be nil
           end
         end
 
@@ -87,11 +87,11 @@ module Interactor
           }
 
           it "can be initialized without foo" do
-            expect(subject.new.foo).to be nil
+            expect(subject.build.foo).to be nil
           end
 
           it "can be initialized with foo" do
-            expect(subject.new(foo: 'baz').foo).to eq('baz')
+            expect(subject.build(foo: 'baz').foo).to eq('baz')
           end
         end
 
@@ -103,14 +103,28 @@ module Interactor
           }
 
           it "can be initialized without foo" do
-            expect(subject.new(bar: 'bar').foo).to eq('bar')
+            expect(subject.build(bar: 'bar').foo).to eq('bar')
           end
 
           it "can be initialized with foo" do
-            expect(subject.new(bar: 'bar', foo: 'baz').foo).to eq('baz')
+            expect(subject.build(bar: 'bar', foo: 'baz').foo).to eq('baz')
           end
         end
       end
     end
+
+    describe "#hold" do
+      let(:declared) {
+        build_declared do
+          hold :foo
+        end
+      }
+
+      it 'can hold foo' do
+        c = subject.build
+        c.foo = 'bar'
+        expect(c.foo).to eq('bar')
+      end
+    end
   end
 end

data/spec/interactor_spec.rb

@@ -52,7 +52,7 @@ describe Interactor do
     end
 
     it "initializes a blank context if none is given" do
-      expect(Interactor::Context).to receive(:build).once.with({}) { context }
+      expect(Interactor::Context).to receive(:build).once.with(no_args) { context }
 
       instance = interactor.new
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: interactor_with_steroids
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Collective Idea/Sorare Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-09 00:00:00.000000000 Z
+date: 2022-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Simple interactor implementation