servactory 2.5.0.rc4 → 2.5.0.rc6

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: '03950ff6fd385cfe8ba4506f2eb4dc7c2dc94dcf838d2a10b783e25e6b290af6'
4
- data.tar.gz: 64182d91fa7a9042cefb99ec422d3710761f8ab412a8b00184c324bae23debfb
3
+ metadata.gz: fe966e4418033cec85b4d0f335a4cbfaefc5fe65e2c510bfec9a755601a088c7
4
+ data.tar.gz: b6bf04ea33fc1e3f5307406ea848fb2fb65117ec697339c99b581796ff4f568e
5
5
  SHA512:
6
- metadata.gz: f85e47114458349c416a1a64d69098d29a67b8d837025acff53acc91885225c9ecab6036422fcd269793f5cdd22a90fe6ba0b8899074dde10837a6e0989b0cc3
7
- data.tar.gz: 96bfba7a9fdc2c763ed8ab4b355a966053fa2a1f0e7bd365bbaa7f51dda089edc30ed00a61566e25252fa12df07eac7e327fb814d5dcb6b77d474f5e3718e1e7
6
+ metadata.gz: '0847386548d522669a7faf2ad1fc86a41a10cec8d19b1f7c1263b8b842210b236f0c84f1fc9e1bedbd196594031b0e79e20cbaece5e5b5b2bde6efcd458ae14c'
7
+ data.tar.gz: d8bf8ebff755faebe4d7ccdefe9ab412a79e33b6b9ab888537d1a0cae7b19e78fa57b36d4e387cccdc451c37f1a2443ef5d09b6eb79118526145a8b1491581f8
@@ -55,6 +55,8 @@ module ApplicationService
55
55
  # action_shortcuts %i[assign build create save]
56
56
 
57
57
  # action_aliases %i[do_it!]
58
+
59
+ # predicate_methods_enabled false
58
60
  end
59
61
  end
60
62
  end
@@ -29,6 +29,8 @@ module Servactory
29
29
  child.config.action_aliases = config.action_aliases
30
30
  child.config.action_shortcuts = config.action_shortcuts
31
31
  child.config.action_rescue_handlers = config.action_rescue_handlers
32
+
33
+ child.config.predicate_methods_enabled = config.predicate_methods_enabled
32
34
  end
33
35
 
34
36
  def config
@@ -97,6 +97,12 @@ module Servactory
97
97
  @config.action_shortcuts.merge(action_shortcuts)
98
98
  end
99
99
 
100
+ def predicate_methods_enabled(flag)
101
+ return @config.predicate_methods_enabled = flag if boolean?(flag)
102
+
103
+ raise_error_about_wrong_predicate_methods_enabled_with(:predicate_methods_enabled, flag)
104
+ end
105
+
100
106
  private
101
107
 
102
108
  # def action_rescue_handlers(action_rescue_handlers)
@@ -111,6 +117,10 @@ module Servactory
111
117
  value.is_a?(Class) && value <= Servactory::Result
112
118
  end
113
119
 
120
+ def boolean?(value)
121
+ value.is_a?(TrueClass) || value.is_a?(FalseClass)
122
+ end
123
+
114
124
  ##########################################################################
115
125
 
116
126
  def raise_error_about_wrong_exception_class_with(config_name, value)
@@ -126,6 +136,13 @@ module Servactory
126
136
  "The `#{value}` value must be a subclass of `Servactory::Result`. " \
127
137
  "See configuration example here: https://servactory.com/guide/configuration"
128
138
  end
139
+
140
+ def raise_error_about_wrong_predicate_methods_enabled_with(config_name, value)
141
+ raise ArgumentError,
142
+ "Error in `#{config_name}` configuration. " \
143
+ "The `#{value}` value must be `TrueClass` or `FalseClass`. " \
144
+ "See configuration example here: https://servactory.com/guide/configuration"
145
+ end
129
146
  end
130
147
  end
131
148
  end
@@ -16,7 +16,8 @@ module Servactory
16
16
  :output_option_helpers,
17
17
  :action_aliases,
18
18
  :action_shortcuts,
19
- :action_rescue_handlers
19
+ :action_rescue_handlers,
20
+ :predicate_methods_enabled
20
21
 
21
22
  def initialize # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
22
23
  @input_exception_class = Servactory::Exceptions::Input
@@ -46,6 +47,12 @@ module Servactory
46
47
  @action_aliases = Servactory::Actions::Aliases::Collection.new
47
48
  @action_shortcuts = Servactory::Actions::Shortcuts::Collection.new
48
49
  @action_rescue_handlers = Servactory::Actions::RescueHandlers::Collection.new
50
+
51
+ @predicate_methods_enabled = true
52
+ end
53
+
54
+ def predicate_methods_enabled?
55
+ @predicate_methods_enabled
49
56
  end
50
57
 
51
58
  private
@@ -43,7 +43,8 @@ module Servactory
43
43
 
44
44
  # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Lint/UnusedMethodArgument
45
45
  def getter_with(name:, &block)
46
- input_name = name.to_s.chomp("?").to_sym
46
+ input_name = @context.class.config.predicate_methods_enabled? ? name.to_s.chomp("?").to_sym : name
47
+
47
48
  input = @collection_of_inputs.find_by(name: input_name)
48
49
 
49
50
  return yield if input.nil?
@@ -58,7 +59,7 @@ module Servactory
58
59
  input_prepare = input.prepare.fetch(:in, nil)
59
60
  input_value = input_prepare.call(value: input_value) if input_prepare.present?
60
61
 
61
- if name.to_s.end_with?("?")
62
+ if name.to_s.end_with?("?") && @context.class.config.predicate_methods_enabled?
62
63
  Servactory::Utils.query_attribute(input_value)
63
64
  else
64
65
  input_value
@@ -53,15 +53,15 @@ module Servactory
53
53
  @context.send(:servactory_service_store).assign_internal(internal.name, value)
54
54
  end
55
55
 
56
- def getter_with(name:, &block) # rubocop:disable Lint/UnusedMethodArgument
57
- internal_name = name.to_s.chomp("?").to_sym
56
+ def getter_with(name:, &block) # rubocop:disable Metrics/AbcSize, Lint/UnusedMethodArgument
57
+ internal_name = @context.class.config.predicate_methods_enabled? ? name.to_s.chomp("?").to_sym : name
58
58
  internal = @collection_of_internals.find_by(name: internal_name)
59
59
 
60
60
  return yield if internal.nil?
61
61
 
62
62
  internal_value = @context.send(:servactory_service_store).fetch_internal(internal.name)
63
63
 
64
- if name.to_s.end_with?("?")
64
+ if name.to_s.end_with?("?") && @context.class.config.predicate_methods_enabled?
65
65
  Servactory::Utils.query_attribute(internal_value)
66
66
  else
67
67
  internal_value
@@ -53,15 +53,15 @@ module Servactory
53
53
  @context.send(:servactory_service_store).assign_output(output.name, value)
54
54
  end
55
55
 
56
- def getter_with(name:, &block) # rubocop:disable Lint/UnusedMethodArgument
57
- output_name = name.to_s.chomp("?").to_sym
56
+ def getter_with(name:, &block) # rubocop:disable Metrics/AbcSize, Lint/UnusedMethodArgument
57
+ output_name = @context.class.config.predicate_methods_enabled? ? name.to_s.chomp("?").to_sym : name
58
58
  output = @collection_of_outputs.find_by(name: output_name)
59
59
 
60
60
  return yield if output.nil?
61
61
 
62
62
  output_value = @context.send(:servactory_service_store).fetch_output(output.name)
63
63
 
64
- if name.to_s.end_with?("?")
64
+ if name.to_s.end_with?("?") && @context.class.config.predicate_methods_enabled?
65
65
  Servactory::Utils.query_attribute(output_value)
66
66
  else
67
67
  output_value
@@ -227,9 +227,6 @@ module Servactory
227
227
  define_conflicts: [
228
228
  Servactory::Maintenance::Attributes::DefineConflict.new(
229
229
  content: -> { :prepare_vs_inclusion if @attribute.prepare_present? && @attribute.inclusion_present? }
230
- ),
231
- Servactory::Maintenance::Attributes::DefineConflict.new(
232
- content: -> { :prepare_vs_must if @attribute.prepare_present? && @attribute.must_present? }
233
230
  )
234
231
  ],
235
232
  need_for_checks: false,
@@ -3,9 +3,9 @@
3
3
  module Servactory
4
4
  class Result
5
5
  class Outputs
6
- def initialize(outputs)
6
+ def initialize(outputs:, predicate_methods_enabled:)
7
7
  outputs.each_pair do |key, value|
8
- define_singleton_method(:"#{key}?") { Servactory::Utils.query_attribute(value) }
8
+ define_singleton_method(:"#{key}?") { Servactory::Utils.query_attribute(value) } if predicate_methods_enabled
9
9
  define_singleton_method(key) { value }
10
10
  end
11
11
  end
@@ -104,7 +104,14 @@ module Servactory
104
104
  end
105
105
 
106
106
  def outputs
107
- @outputs ||= Outputs.new(@context.send(:servactory_service_store).outputs)
107
+ @outputs ||= Outputs.new(
108
+ outputs: @context.send(:servactory_service_store).outputs,
109
+ predicate_methods_enabled: if @context.is_a?(Servactory::TestKit::Result)
110
+ true
111
+ else
112
+ @context.class.config.predicate_methods_enabled?
113
+ end
114
+ )
108
115
  end
109
116
 
110
117
  ########################################################################
@@ -5,7 +5,7 @@ module Servactory
5
5
  MAJOR = 2
6
6
  MINOR = 5
7
7
  PATCH = 0
8
- PRE = "rc4"
8
+ PRE = "rc6"
9
9
 
10
10
  STRING = [MAJOR, MINOR, PATCH, PRE].compact.join(".")
11
11
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: servactory
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.5.0.rc4
4
+ version: 2.5.0.rc6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Anton Sokolov