ii_interactor 2.1.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f27fe194dd295f5882f0533132588686a9fead26c638f86db95b8b66979553bf
-  data.tar.gz: '08c3c2fbd0687fb42077215abb8edd0e85a76eda538c418fa5f869f50957ed90'
+  metadata.gz: f6b2635fa972f56d9ec9fe34b487411b9021e41cff5d2da7dfe5977d954a901d
+  data.tar.gz: d585efc287ffa979969a47fb2257689d025f6f9719b4bb09168d019fd9c51f35
 SHA512:
-  metadata.gz: ab6289235d21d6085ce7b20d123efd152d1e387f6d17a708a107e735f259036bb87be8533e9e7e5b07613cc9ca14fd0b699521bbb1c6f42c855054884f0e690e
-  data.tar.gz: 76c6d853fc4ef5b6103d9dda4cdac6ecb9179b0b21c6b35e72519dd2059bb1efb95a431ae23dca207f51a78e8a8e598c56028851842b98b6a4181221da725f76
+  metadata.gz: 45044189f8450083926b037a0999f82c1c03ab1aae721369cbc53c9506ab60904159f2660c1ad1f369635c59ed59d1c7c688b5bee5d52742f1e7fc844f687752
+  data.tar.gz: 85342c80ea1992ffc5a9b7042eb3dba442cb510d0e494f4d478dec8bb7b93d764916bd55144c6ad6e209479ace00e378323c95214be1691a27f30680e0d48e49

data/.github/workflows/ci.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.3, 2.4, 2.5, 2.6, 2.7, '3.0']
+        ruby: [2.3, 2.4, 2.5, 2.6, 2.7, '3.0', 3.1, 3.2]
         gemfile: ['rails50', 'rails51', 'rails52', 'rails60', 'rails61', 'rails70']
         exclude:
           - ruby: 2.3
@@ -33,6 +33,18 @@ jobs:
             gemfile: rails51
           - ruby: 3.0
             gemfile: rails52
+          - ruby: 3.1
+            gemfile: rails50
+          - ruby: 3.1
+            gemfile: rails51
+          - ruby: 3.1
+            gemfile: rails52
+          - ruby: 3.2
+            gemfile: rails50
+          - ruby: 3.2
+            gemfile: rails51
+          - ruby: 3.2
+            gemfile: rails52
 
     name: ruby ${{ matrix.ruby }}, ${{ matrix.gemfile }}
 
@@ -40,7 +52,7 @@ jobs:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 2.2.1
+
+* Indent log messages.
+
+## 2.2.0
+
+* Use coactive 0.3.
+
 ## 2.1.0
 
 * Add traversal config.

data/bin/console

@@ -10,5 +10,5 @@ require "ii_interactor"
 # require "pry"
 # Pry.start
 
-# require "irb"
-# IRB.start
+require "irb"
+IRB.start

data/gemfiles/rails50.gemfile

@@ -2,5 +2,6 @@ source 'https://rubygems.org'
 
 gem "rails", "~> 5.0.0"
 gem "sqlite3", "~> 1.3.6"
+gem "loofah", "~> 2.19.1"
 
 gemspec path: "../"

data/gemfiles/rails51.gemfile

@@ -2,5 +2,6 @@ source 'https://rubygems.org'
 
 gem "rails", "~> 5.1.0"
 gem "sqlite3", "~> 1.3.6"
+gem "loofah", "~> 2.19.1"
 
 gemspec path: "../"

data/gemfiles/rails52.gemfile

@@ -2,5 +2,6 @@ source 'https://rubygems.org'
 
 gem "rails", "~> 5.2.0"
 gem "sqlite3", "~> 1.3.6"
+gem "loofah", "~> 2.19.1"
 
 gemspec path: "../"

data/gemfiles/rails60.gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
 gem "rails", "~> 6.0.0"
+gem "psych", "~> 3.3.0"
 
 gemspec path: "../"

data/gemfiles/rails70.gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem "rails", "~> 7.0.0"
+gem "rails", "~> 7.0.1"
 
 gemspec path: "../"

data/ii_interactor.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activesupport", ">= 5.0"
-  spec.add_dependency "coactive", ">= 0.2"
+  spec.add_dependency "coactive", ">= 0.3"
 
   spec.add_development_dependency "rails", ">= 5.0"
   spec.add_development_dependency "sqlite3"

data/lib/ii_interactor/context.rb

@@ -2,21 +2,33 @@
 
 module IIInteractor
   class Context < Coactive::Context
+    class Status < Struct.new(:failed, :stopped, :called)
+      def initialize(*)
+        self.failed = false
+        self.stopped = false
+        self.called = []
+      end
+    end
+
+    attr_reader :_status, :_block
+
     def initialize(data = {}, &block)
+      if data.is_a?(IIInteractor::Context)
+        @_block = data._block
+        @_status = data._status
+      else
+        @_block = block
+        @_status = Status.new
+      end
       super
-      @_data[:_block] ||= block
-      @_data[:_failed] ||= false
-      @_data[:_stopped] ||= false
-      @_data[:_called] ||= []
     end
 
     def to_s
-      attrs = @_data.reject { |k, _| k.to_s =~ /^_/ }.map { |k, v| "#{k}=#{v.to_s.truncate(300)}" }.join(', ')
-      "#<#{self.class} #{attrs}>"
+      "#<#{self.class} #{self.class.inspect(@_data)} (#{self.class.inspect(@_status.to_h)})>"
     end
 
     def call_block!(*args)
-      @_data[:_block].call(*args) if @_data[:_block]
+      @_block.call(*args) if @_block
     end
 
     def success?
@@ -24,27 +36,27 @@ module IIInteractor
     end
 
     def failure?
-      @_data[:_failed] == true
+      @_status.failed == true
     end
 
     def stopped?
-      @_data[:_stopped] == true
+      @_status.stopped == true
     end
 
     def fail!(data = {})
-      @_data[:_failed] = true
+      @_status.failed = true
       data.each { |k, v| @_data[k] = v }
       define_accessors!(data.keys)
     end
 
     def stop!(data = {})
-      @_data[:_stopped] = true
+      @_status.stopped = true
       data.each { |k, v| @_data[k] = v }
       define_accessors!(data.keys)
     end
 
     def called!(interactor)
-      @_data[:_called] << interactor
+      @_status.called << interactor
     end
   end
 end

data/lib/ii_interactor/core.rb

@@ -65,7 +65,7 @@ module IIInteractor
         interactor.call_all
         interactor.context
       rescue UnprogressableError
-        interactor.context[:_called].reverse.each do |called|
+        interactor.context._status.called.reverse.each do |called|
           called.rollback
         end
         interactor.context

data/lib/ii_interactor/log_subscriber.rb

@@ -5,14 +5,14 @@ module IIInteractor
     def calling(event)
       debug do
         interactor = event.payload[:interactor]
-        "Calling #{interactor.class} with #{interactor.context}"
+        "  Calling #{interactor.class} with #{interactor.context}"
       end
     end
 
     def call(event)
       debug do
         interactor = event.payload[:interactor]
-        "Called #{interactor.class} (#{additional_log(event)})"
+        "  Called #{interactor.class} (#{additional_log(event)})"
       end
     end
 

data/lib/ii_interactor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IIInteractor
-  VERSION = '2.1.0'
+  VERSION = '2.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ii_interactor
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Yoshikazu Kaneta
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-04 00:00:00.000000000 Z
+date: 2023-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +162,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: A base interactor to support management of bussiness logic