mime_actor 0.7.2 → 1.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/README.md +2 -2
- data/lib/mime_actor/action.rb +1 -1
- data/lib/mime_actor/callbacks.rb +31 -5
- data/lib/mime_actor/dispatcher.rb +4 -2
- data/lib/mime_actor/logging.rb +4 -4
- data/lib/mime_actor/railtie.rb +1 -1
- data/lib/mime_actor/rescue.rb +2 -2
- data/lib/mime_actor/scene.rb +21 -2
- data/lib/mime_actor/stage.rb +2 -2
- data/lib/mime_actor/version.rb +3 -3
- metadata +13 -13
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: fbf21714856f466dcd213606d554c45634a8601d4d83c1157cf48979ab680c3a
|
4
|
+
data.tar.gz: 6a3f623b039d7cd3fdc41b7bce4e4f827779aedf9537a87f2cafc6667d985c23
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 9250e3561b80891aabeae7808abd60370be195d7d3139520f83b5346208be3e420841caed5002e073ab9417d3c7f815205f4f086d2c575bbf876070b4f82fb4a
|
7
|
+
data.tar.gz: a93d0cb88e4fab401fd5dd6e02674f5ef834c19c9755577c8410073ed4ce30c364f0368eeda3fdb7960d4f81810297977cb89c512cb86418e95a05a9452918a7
|
data/README.md
CHANGED
@@ -221,8 +221,8 @@ Bug reports and pull requests are welcome on GitHub at [https://github.com/ryanc
|
|
221
221
|
|
222
222
|
[rubygems_badge]: https://img.shields.io/gem/v/mime_actor.svg
|
223
223
|
[rubygems]: https://rubygems.org/gems/mime_actor
|
224
|
-
[ci_badge]: https://github.com/ryancyq/mime_actor/actions/workflows/
|
225
|
-
[ci_workflows]: https://github.com/ryancyq/mime_actor/actions/workflows/
|
224
|
+
[ci_badge]: https://github.com/ryancyq/mime_actor/actions/workflows/ci.yml/badge.svg
|
225
|
+
[ci_workflows]: https://github.com/ryancyq/mime_actor/actions/workflows/ci.yml
|
226
226
|
[coverage_badge]: https://codecov.io/gh/ryancyq/mime_actor/graph/badge.svg?token=4C091RHXC3
|
227
227
|
[coverage]: https://codecov.io/gh/ryancyq/mime_actor
|
228
228
|
[maintainability_badge]: https://api.codeclimate.com/v1/badges/06689606dc3f3945dc1b/maintainability
|
data/lib/mime_actor/action.rb
CHANGED
@@ -68,7 +68,7 @@ module MimeActor
|
|
68
68
|
end
|
69
69
|
|
70
70
|
collector.public_send(format) do
|
71
|
-
fill_run_sheet(action, format) { cue_actor(callable, action, format, action
|
71
|
+
fill_run_sheet(action, format) { cue_actor(callable, action, format, action: action, format: format) }
|
72
72
|
end
|
73
73
|
end
|
74
74
|
end
|
data/lib/mime_actor/callbacks.rb
CHANGED
@@ -5,9 +5,9 @@
|
|
5
5
|
require "mime_actor/validator"
|
6
6
|
|
7
7
|
require "active_support/callbacks"
|
8
|
-
require "active_support/code_generator"
|
9
8
|
require "active_support/concern"
|
10
9
|
require "active_support/core_ext/module/attr_internal"
|
10
|
+
require "active_support/version"
|
11
11
|
|
12
12
|
module MimeActor
|
13
13
|
# # MimeActor Callbacks
|
@@ -32,10 +32,13 @@ module MimeActor
|
|
32
32
|
include ActiveSupport::Callbacks
|
33
33
|
include MimeActor::Validator
|
34
34
|
|
35
|
+
LIFECYCLES = %i[before after around].freeze
|
36
|
+
|
35
37
|
included do
|
36
38
|
attr_internal_reader :act_action, :act_format
|
37
39
|
define_callbacks :act, skip_after_callbacks_if_terminated: true
|
38
|
-
|
40
|
+
|
41
|
+
ActiveSupport.version >= "7.2" ? generate_act_callback_methods : eval_act_callback_methods
|
39
42
|
end
|
40
43
|
|
41
44
|
module ClassMethods
|
@@ -43,8 +46,13 @@ module MimeActor
|
|
43
46
|
attr_reader :actions, :formats
|
44
47
|
|
45
48
|
def initialize(actions, formats)
|
46
|
-
|
47
|
-
|
49
|
+
if RUBY_VERSION < "2.6"
|
50
|
+
@actions = actions ? Array(actions).to_set(&:to_sym) : nil
|
51
|
+
@formats = formats ? Array(formats).to_set(&:to_sym) : nil
|
52
|
+
else
|
53
|
+
@actions = actions&.then { |a| Array(a).to_set(&:to_sym) }
|
54
|
+
@formats = formats&.then { |f| Array(f).to_set(&:to_sym) }
|
55
|
+
end
|
48
56
|
end
|
49
57
|
|
50
58
|
def match?(controller)
|
@@ -76,9 +84,27 @@ module MimeActor
|
|
76
84
|
validate!(:format_or_formats, format) unless format.nil?
|
77
85
|
end
|
78
86
|
|
87
|
+
def eval_act_callback_methods
|
88
|
+
singleton_class.module_eval(<<-RUBY, __FILE__, __LINE__ + 1)
|
89
|
+
# def append_act_before(*callbacks, action: nil, format: nil, &block)
|
90
|
+
# validate_callback_options!(action, format)
|
91
|
+
# configure_callbacks(callbacks, action, format, block) do |callback, options|
|
92
|
+
# set_callback(:act, :before, callback, options.merge!(prepend: false))
|
93
|
+
# end
|
94
|
+
# end
|
95
|
+
#
|
96
|
+
# alias_method :act_before, :append_act_before
|
97
|
+
#
|
98
|
+
#{LIFECYCLES.map { |kind| act_callback_kind_template(kind, append: true) }.join(";")}
|
99
|
+
#{LIFECYCLES.map { |kind| act_callback_kind_template(kind, append: false) }.join(";")}
|
100
|
+
#{LIFECYCLES.map { |kind| "alias_method :act_#{kind}, :append_act_#{kind}" }.join(";")}
|
101
|
+
RUBY
|
102
|
+
end
|
103
|
+
|
79
104
|
def generate_act_callback_methods
|
105
|
+
require "active_support/code_generator"
|
80
106
|
ActiveSupport::CodeGenerator.batch(singleton_class, __FILE__, __LINE__) do |owner|
|
81
|
-
|
107
|
+
LIFECYCLES.each do |kind|
|
82
108
|
owner.define_cached_method(:"append_act_#{kind}", as: :"act_#{kind}", namespace: :mime_callbacks) do |batch|
|
83
109
|
batch << act_callback_kind_template(kind, append: true)
|
84
110
|
end
|
@@ -26,7 +26,9 @@ module MimeActor
|
|
26
26
|
private
|
27
27
|
|
28
28
|
def validate!
|
29
|
-
|
29
|
+
return if method_name.is_a?(String) || method_name.is_a?(Symbol)
|
30
|
+
|
31
|
+
raise ArgumentError, "invalid method name: #{method_name.inspect}"
|
30
32
|
end
|
31
33
|
end
|
32
34
|
|
@@ -47,7 +49,7 @@ module MimeActor
|
|
47
49
|
private
|
48
50
|
|
49
51
|
def validate!
|
50
|
-
raise ArgumentError, "invalid block: #{block.inspect}" unless block
|
52
|
+
raise ArgumentError, "invalid block: #{block.inspect}" unless block.is_a?(Proc)
|
51
53
|
end
|
52
54
|
end
|
53
55
|
|
data/lib/mime_actor/logging.rb
CHANGED
@@ -4,7 +4,7 @@
|
|
4
4
|
|
5
5
|
# required by active_support/tagged_logging
|
6
6
|
require "active_support/version"
|
7
|
-
require "active_support/isolated_execution_state" if ActiveSupport
|
7
|
+
require "active_support/isolated_execution_state" if ActiveSupport.version >= "7.0"
|
8
8
|
|
9
9
|
require "active_support/concern"
|
10
10
|
require "active_support/configurable"
|
@@ -22,7 +22,7 @@ module MimeActor
|
|
22
22
|
|
23
23
|
included do
|
24
24
|
default_logger = ActiveSupport::TaggedLogging.new(ActiveSupport::Logger.new($stdout))
|
25
|
-
if ActiveSupport
|
25
|
+
if ActiveSupport.version >= "7.0"
|
26
26
|
config_accessor :logger, default: default_logger
|
27
27
|
else
|
28
28
|
config_accessor :logger do
|
@@ -33,12 +33,12 @@ module MimeActor
|
|
33
33
|
|
34
34
|
private
|
35
35
|
|
36
|
-
def fill_run_sheet(*scenes, &)
|
36
|
+
def fill_run_sheet(*scenes, &block)
|
37
37
|
return yield unless logger.respond_to?(:tagged)
|
38
38
|
|
39
39
|
scenes.unshift "MimeActor" unless logger.formatter.current_tags.include?("MimeActor")
|
40
40
|
|
41
|
-
logger.tagged(*scenes, &)
|
41
|
+
logger.tagged(*scenes, &block)
|
42
42
|
end
|
43
43
|
end
|
44
44
|
end
|
data/lib/mime_actor/railtie.rb
CHANGED
@@ -5,7 +5,7 @@
|
|
5
5
|
module MimeActor
|
6
6
|
class Railtie < Rails::Railtie
|
7
7
|
initializer "mime_actor.deprecator", before: :load_environment_config do |app|
|
8
|
-
app.deprecators[:mime_actor] = MimeActor.deprecator if
|
8
|
+
app.deprecators[:mime_actor] = MimeActor.deprecator if ActiveSupport.version >= "7.1"
|
9
9
|
end
|
10
10
|
end
|
11
11
|
end
|
data/lib/mime_actor/rescue.rb
CHANGED
@@ -76,12 +76,12 @@ module MimeActor
|
|
76
76
|
return if visited.include?(error)
|
77
77
|
|
78
78
|
visited << error
|
79
|
-
rescuer = find_rescuer(error, format
|
79
|
+
rescuer = find_rescuer(error, format: format, action: action)
|
80
80
|
if (dispatch = MimeActor::Dispatcher.build(rescuer, error, format, action))
|
81
81
|
dispatch.call(self)
|
82
82
|
error
|
83
83
|
elsif error&.cause
|
84
|
-
rescue_actor(error.cause, format
|
84
|
+
rescue_actor(error.cause, format: format, action: action, visited: visited)
|
85
85
|
end
|
86
86
|
end
|
87
87
|
|
data/lib/mime_actor/scene.rb
CHANGED
@@ -5,9 +5,9 @@
|
|
5
5
|
require "mime_actor/errors"
|
6
6
|
require "mime_actor/validator"
|
7
7
|
|
8
|
-
require "active_support/code_generator"
|
9
8
|
require "active_support/concern"
|
10
9
|
require "active_support/core_ext/module/attribute_accessors"
|
10
|
+
require "active_support/version"
|
11
11
|
|
12
12
|
module MimeActor
|
13
13
|
# # MimeActor Scene
|
@@ -100,7 +100,7 @@ module MimeActor
|
|
100
100
|
end
|
101
101
|
end
|
102
102
|
|
103
|
-
generate_action_methods(actions)
|
103
|
+
ActiveSupport.version >= "7.2" ? generate_action_methods(actions) : eval_action_methods(actions)
|
104
104
|
end
|
105
105
|
|
106
106
|
private
|
@@ -109,7 +109,26 @@ module MimeActor
|
|
109
109
|
@generated_action_methods ||= Module.new.tap { |mod| prepend mod }
|
110
110
|
end
|
111
111
|
|
112
|
+
def eval_action_methods(actions)
|
113
|
+
generated_action_methods.module_eval(<<-RUBY, __FILE__, __LINE__ + 1)
|
114
|
+
# def index
|
115
|
+
# if respond_to?(:start_scene)
|
116
|
+
# start_scene do
|
117
|
+
# raise MimeActor::ActionNotImplemented, :index unless defined?(super)
|
118
|
+
# super
|
119
|
+
# end
|
120
|
+
# else
|
121
|
+
# raise MimeActor::ActionNotImplemented}, :index unless defined?(super)
|
122
|
+
# super
|
123
|
+
# end
|
124
|
+
# end
|
125
|
+
#
|
126
|
+
#{actions.each.map { |action| action_method_template(action) }.join(";")}
|
127
|
+
RUBY
|
128
|
+
end
|
129
|
+
|
112
130
|
def generate_action_methods(actions)
|
131
|
+
require "active_support/code_generator"
|
113
132
|
ActiveSupport::CodeGenerator.batch(generated_action_methods, __FILE__, __LINE__) do |owner|
|
114
133
|
actions.each do |action|
|
115
134
|
owner.define_cached_method(action, namespace: :mime_scene) do |batch|
|
data/lib/mime_actor/stage.rb
CHANGED
@@ -40,7 +40,7 @@ module MimeActor
|
|
40
40
|
|
41
41
|
self.class.validate!(:format, format)
|
42
42
|
|
43
|
-
run_act_callbacks(action
|
43
|
+
run_act_callbacks(action: action, format: format) do
|
44
44
|
result = dispatcher.call(self)
|
45
45
|
block_given? ? yield(result) : result
|
46
46
|
end
|
@@ -48,7 +48,7 @@ module MimeActor
|
|
48
48
|
logger.error { "actor error, cause: #{e.inspect}" } unless raise_on_actor_error
|
49
49
|
raise e if raise_on_actor_error
|
50
50
|
rescue StandardError => e
|
51
|
-
rescued = rescue_actor(e, action
|
51
|
+
rescued = rescue_actor(e, action: action, format: format)
|
52
52
|
rescued || raise
|
53
53
|
end
|
54
54
|
end
|
data/lib/mime_actor/version.rb
CHANGED
metadata
CHANGED
@@ -1,43 +1,43 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: mime_actor
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 1.0.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ryan Chang
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2024-
|
11
|
+
date: 2024-10-03 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: actionpack
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
|
-
- - "
|
17
|
+
- - ">="
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: '
|
19
|
+
version: '6.1'
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
|
-
- - "
|
24
|
+
- - ">="
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: '
|
26
|
+
version: '6.1'
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: activesupport
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
|
-
- - "
|
31
|
+
- - ">="
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: '
|
33
|
+
version: '6.1'
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
|
-
- - "
|
38
|
+
- - ">="
|
39
39
|
- !ruby/object:Gem::Version
|
40
|
-
version: '
|
40
|
+
version: '6.1'
|
41
41
|
description: ''
|
42
42
|
email:
|
43
43
|
- ryancyq@gmail.com
|
@@ -77,16 +77,16 @@ require_paths:
|
|
77
77
|
- lib
|
78
78
|
required_ruby_version: !ruby/object:Gem::Requirement
|
79
79
|
requirements:
|
80
|
-
- - "
|
80
|
+
- - ">="
|
81
81
|
- !ruby/object:Gem::Version
|
82
|
-
version: '
|
82
|
+
version: '2.5'
|
83
83
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
84
84
|
requirements:
|
85
85
|
- - ">="
|
86
86
|
- !ruby/object:Gem::Version
|
87
87
|
version: '0'
|
88
88
|
requirements: []
|
89
|
-
rubygems_version: 3.5.
|
89
|
+
rubygems_version: 3.5.16
|
90
90
|
signing_key:
|
91
91
|
specification_version: 4
|
92
92
|
summary: Action processing with Callback + Rescue handlers for different MIME types
|