interactor-initializer 0.4.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5af4b74086ee54c325a0978227a41cba1449b7369ae4d77d8144cb93e4392a36
-  data.tar.gz: cc5551943cffcf530daf69fe18c29bee0fcb46a4c07cb411bb13074a5f74772d
+  metadata.gz: 5281abc2705c0b4a4b4df43058e28534c06b5e340dc4e6a246ef0f1558aa6927
+  data.tar.gz: be879db3848729be75fb39497950bb290ff5aa20a42471b1c47d2400a301374b
 SHA512:
-  metadata.gz: f7cf6987a066b3649813d0c38da664c6c6f49aac8541e34055c636e5f182c03c30a3d55987cce42b36c299bc8b49003e92a3a52780e9ea8dec45a7fb9fc2bc9b
-  data.tar.gz: 5ee5a3989601d9c70eec1245c1fab592ff78b45aa4a2efe614f5036382bbcf4986e692581dda139470f29ee1d205e8c5f9c29b8be46ea363fdaabed156b9c6f9
+  metadata.gz: 9796a8c8e98ede7c50f0c126e20f06a28d1b797b37868275fcdd82bad66636dc7320f487b3165250fd27d6482189442c629dd46a09dc44e28aa238c6ed7fd850
+  data.tar.gz: 6a4fed719d00690a75c603dd089a7e438eb4d3117479f60a3bd40912b7caa2bd6978e3a8c2ed0c9f6c3f1752bc901e24bbcf9492b4fac859e2d67a911f947737

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/.ruby-version

@@ -0,0 +1 @@
+3.0.3

data/Gemfile.lock

@@ -0,0 +1,35 @@
+PATH
+  remote: .
+  specs:
+    interactor-initializer (1.1.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.5.0)
+    rake (10.5.0)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  interactor-initializer!
+  rake (~> 10.0)
+  rspec (~> 3.0)
+
+BUNDLED WITH
+   2.2.32

data/interactor-initializer.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'interactor/initializer/version'

data/lib/interactor/initializer/helper.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+class Interactor::Initializer::Helper
+  def self.modify_class(target_class, signature, attributes, class_methods)
+    assignments = attr_assignments(attributes)
+
+    target_class.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+      def initialize(#{signature})
+        #{assignments}
+      end
+
+      #{class_methods}
+    RUBY
+
+    attr_readers(target_class, attributes)
+  end
+
+  def self.attr_readers(target_class, attributes)
+    target_class.class_eval do
+      attributes.each do |attr|
+        attr_reader(attr)
+        protected(attr)
+      end
+    end
+  end
+
+  def self.methods_with_params
+    <<-RUBY
+      def self.for(*args)
+        new(*args).run
+      end
+
+      def self.run(*args)
+        new(*args).run
+      end
+
+      def self.with(*args)
+        new(*args).run
+      end
+    RUBY
+  end
+
+  def self.methods_with_keywords
+    <<-RUBY
+      def self.for(args)
+        new(**args).run
+      end
+
+      def self.run(args)
+        new(**args).run
+      end
+
+      def self.with(args)
+        new(**args).run
+      end
+    RUBY
+  end
+
+  def self.attr_assignments(attributes)
+    attributes.map { |attr| "@#{attr} = #{attr}" }.join(';')
+  end
+end

data/lib/interactor/initializer/version.rb

@@ -1,5 +1,5 @@
 module Interactor
   module Initializer
-    VERSION = '0.4.0'.freeze
+    VERSION = '1.1.0'.freeze
   end
 end

data/lib/interactor/initializer.rb

@@ -1,36 +1,32 @@
+# frozen_string_literal: true
+
 require 'interactor/initializer/version'
-require 'interactor/initializer/attr_readers'
-require 'interactor/initializer/initialize'
+require 'interactor/initializer/helper'
 
 module Interactor
   module Initializer
     def self.included(target_class)
       target_class.extend ClassMethods
+
+      class_methods = Interactor::Initializer::Helper.methods_with_params
+      Interactor::Initializer::Helper.modify_class(target_class, '', [], class_methods)
     end
 
     module ClassMethods
-      def for(*args)
-        new(*args).run
-      end
-
-      def with(*args)
-        new(*args).run
-      end
-
-      def run(*args)
-        new(*args).run
-      end
-
       module_function
 
       def initialize_with(*attributes)
-        Interactor::Initializer::Initialize.for(self, attributes)
-        Interactor::Initializer::AttrReaders.for(self, attributes)
+        signature = attributes.join(', ')
+        class_methods = Interactor::Initializer::Helper.methods_with_params
+
+        Interactor::Initializer::Helper.modify_class(self, signature, attributes, class_methods)
       end
 
       def initialize_with_keyword_params(*attributes)
-        Interactor::Initializer::Initialize.for(self, attributes, keyword_params: true)
-        Interactor::Initializer::AttrReaders.for(self, attributes)
+        signature = attributes.map { |attr| "#{attr}:" }.join(', ')
+        class_methods = Interactor::Initializer::Helper.methods_with_keywords
+
+        Interactor::Initializer::Helper.modify_class(self, signature, attributes, class_methods)
       end
     end
   end

data/spec/interactor/initializer/{attr_readers_spec.rb → helper_spec.rb}

@@ -1,8 +1,11 @@
-describe Interactor::Initializer::AttrReaders do
-  describe '.for' do
-    subject { described_class.for(dummy_class, attributes) }
+# frozen_string_literal: true
+
+describe Interactor::Initializer::Helper do
+  describe '.attr_readers' do
+    subject { described_class.attr_readers(dummy_class, attributes) }
+
     let(:dummy_class) { Class.new }
-    let(:attributes) { [:test1, :test2] }
+    let(:attributes) { %i[test1 test2] }
 
     it 'adds protected attr_reader' do
       subject

data/spec/interactor/initializer_spec.rb

@@ -1,29 +1,157 @@
+# frozen_string_literal: true
+
 describe Interactor::Initializer do
   let(:interactor) do
     Class.new do
       include Interactor::Initializer
 
+      initialize_with :arg1, :arg2
+
       def run
         :result
       end
     end
   end
+  let(:params) { %w[value1 value2] }
 
   describe '.for' do
-    subject { interactor.for }
+    subject { interactor.for(*params) }
 
     it { is_expected.to eq(:result) }
   end
 
   describe '.with' do
-    subject { interactor.with }
+    subject { interactor.with(*params) }
 
     it { is_expected.to eq(:result) }
   end
 
   describe '.run' do
-    subject { interactor.run }
+    subject { interactor.run(*params) }
 
     it { is_expected.to eq(:result) }
   end
+
+  describe '.new' do
+    subject { interactor.new(*params) }
+
+    it 'adds instance variables' do
+      expect(subject.instance_variable_get(:@arg1)).to eq 'value1'
+      expect(subject.instance_variable_get(:@arg2)).to eq 'value2'
+    end
+  end
+
+  context 'when incorrect number of params' do
+    subject { interactor.for(*params) }
+
+    let(:params) { %w[value1] }
+
+    it 'raises an error' do
+      expect { subject }.to raise_error(/wrong number of arguments/)
+    end
+  end
+
+  context 'when initialization with keywords' do
+    let(:interactor) do
+      Class.new do
+        include Interactor::Initializer
+
+        initialize_with_keyword_params :arg1, :arg2
+
+        def run
+          :result
+        end
+      end
+    end
+    let(:params) do
+      { arg1: 'value1', arg2: 'value2' }
+    end
+
+    describe '.for' do
+      subject { interactor.for(params) }
+
+      it { is_expected.to eq(:result) }
+    end
+
+    describe '.with' do
+      subject { interactor.with(params) }
+
+      it { is_expected.to eq(:result) }
+    end
+
+    describe '.run' do
+      subject { interactor.run(params) }
+
+      it { is_expected.to eq(:result) }
+    end
+
+    describe '.new' do
+      subject { interactor.new(**params) }
+
+      it 'adds instance variables' do
+        expect(subject.instance_variable_get(:@arg1)).to eq 'value1'
+        expect(subject.instance_variable_get(:@arg2)).to eq 'value2'
+      end
+    end
+
+    context 'when incorrect keywords' do
+      subject { interactor.for(params) }
+
+      let(:params) do
+        { arg1: 'value2', arg4: 'value2' }
+      end
+
+      it 'raises an error' do
+        expect { subject }.to raise_error(/missing keyword: :arg2/)
+      end
+    end
+  end
+
+  context 'with bare inclusion' do
+    let(:interactor) do
+      Class.new do
+        include Interactor::Initializer
+
+        def run
+          :result
+        end
+      end
+    end
+
+    describe '.run' do
+      subject { interactor.run }
+
+      it { is_expected.to eq(:result) }
+    end
+
+    describe '.for' do
+      subject { interactor.for }
+
+      it { is_expected.to eq(:result) }
+    end
+
+    describe '.with' do
+      subject { interactor.with }
+
+      it { is_expected.to eq(:result) }
+    end
+
+    context 'when class is not including interactor initializer' do
+      let(:interactor) do
+        Class.new do
+          def run
+            :result
+          end
+        end
+      end
+
+      describe '.run' do
+        subject { interactor.run }
+
+        it 'cannot call interactor' do
+          expect { subject }.to raise_error(/undefined method/)
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: interactor-initializer
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Šarūnas Kūjalis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-21 00:00:00.000000000 Z
+date: 2022-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -63,17 +63,17 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - interactor-initializer.gemspec
 - lib/interactor/initializer.rb
-- lib/interactor/initializer/attr_readers.rb
-- lib/interactor/initializer/initialize.rb
+- lib/interactor/initializer/helper.rb
 - lib/interactor/initializer/version.rb
-- spec/interactor/initializer/attr_readers_spec.rb
-- spec/interactor/initializer/initialize_spec.rb
+- spec/interactor/initializer/helper_spec.rb
 - spec/interactor/initializer_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/vinted/interactor-initializer

data/lib/interactor/initializer/attr_readers.rb

@@ -1,10 +0,0 @@
-class Interactor::Initializer::AttrReaders
-  def self.for(target_class, attributes)
-    target_class.class_eval do
-      attributes.each do |attribute|
-        attr_reader(attribute)
-        protected(attribute)
-      end
-    end
-  end
-end

data/lib/interactor/initializer/initialize.rb

@@ -1,35 +0,0 @@
-class Interactor::Initializer::Initialize
-  def self.for(*args, **kwargs)
-    new(*args, **kwargs).run
-  end
-
-  attr_reader :target_class, :attributes, :keyword_params
-
-  def initialize(target_class, attributes, keyword_params: false)
-    @target_class = target_class
-    @attributes = attributes
-    @keyword_params = keyword_params
-  end
-
-  def run
-    target_class.class_eval <<-RUBY
-      def initialize(#{initializer_signature(attributes)})
-        #{attr_assignments(attributes)}
-      end
-    RUBY
-  end
-
-  private
-
-  def initializer_signature(attributes)
-    return attributes.join(', ') unless keyword_params
-
-    attributes.map { |attribute| "#{attribute}:" }.join(', ')
-  end
-
-  def attr_assignments(attributes)
-    attributes.inject('') do |assignments, attribute|
-      "#{assignments}@#{attribute} = #{attribute};"
-    end
-  end
-end

data/spec/interactor/initializer/initialize_spec.rb

@@ -1,28 +0,0 @@
-describe Interactor::Initializer::Initialize do
-  describe '.for' do
-    subject { described_class.for(dummy_class, attributes, keyword_params: keyword_params) }
-    let(:dummy_class) { Class.new }
-    let(:attributes) { [:test1, :test2] }
-    let(:keyword_params) { false }
-
-    shared_examples 'object initializer' do
-      it 'adds object initializer' do
-        subject
-        expect(dummy_instance.instance_variable_get(:@test1)).to eq 1
-        expect(dummy_instance.instance_variable_get(:@test2)).to eq 2
-      end
-    end
-
-    it_behaves_like 'object initializer' do
-      let(:dummy_instance) { dummy_class.new(1, 2) }
-    end
-
-    context 'when keyword params' do
-      let(:keyword_params) { true }
-
-      it_behaves_like 'object initializer' do
-        let(:dummy_instance) { dummy_class.new(test1: 1, test2: 2) }
-      end
-    end
-  end
-end