ree 1.0.30 → 1.0.32
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/lib/ree/dsl/object_dsl.rb +7 -39
- data/lib/ree/facades/packages_facade.rb +5 -0
- data/lib/ree/templates/init/ree.setup.rb +0 -7
- data/lib/ree/version.rb +1 -1
- data/lib/ree.rb +0 -13
- metadata +2 -3
- data/lib/ree/dsl/error_builder.rb +0 -39
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f2836e04cba8e6942d7b1d6660fdd872f0a9b6233919bad3e87592673321fc6c
|
4
|
+
data.tar.gz: fda73fb60e710b25658b616fbfa98d7bd80e82ef5c9d51a765ee764b22b79abd
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2e45e344621a2063e3cc7c5353c5188dd656dae7104d7ab05b96042e5373a932d873fd501fe4992b942d11300f7f653c5f24d47f9147a3ff1e5130c4e71a2801
|
7
|
+
data.tar.gz: d454e90199e1f9e7a6907645b2c2e7760b08a1b504259969bbd8309a867e32828c32d2df13f7d36f11d84dd911c2514aaa9e5b67e46795209f0b1299f2a979c9
|
data/Gemfile.lock
CHANGED
data/lib/ree/dsl/object_dsl.rb
CHANGED
@@ -117,40 +117,6 @@ class Ree::ObjectDsl
|
|
117
117
|
@object.set_freeze(flag)
|
118
118
|
end
|
119
119
|
|
120
|
-
# @param [Nilor[Symbol]] code Global error code
|
121
|
-
# @param [Proc] proc Error DSL proc
|
122
|
-
def def_error(code = nil, &proc)
|
123
|
-
check_arg(code, :code, Symbol) if code
|
124
|
-
|
125
|
-
if !block_given?
|
126
|
-
raise_error("def_error should accept block with error class definition")
|
127
|
-
end
|
128
|
-
|
129
|
-
if code && !Ree.error_types.include?(code)
|
130
|
-
raise_error("Invalid error code :#{code}. Did you forget to setup it with Ree.add_error_types(*args)?")
|
131
|
-
end
|
132
|
-
|
133
|
-
class_name = begin
|
134
|
-
Ree::ErrorBuilder
|
135
|
-
.new(@packages_facade)
|
136
|
-
.build(
|
137
|
-
@object,
|
138
|
-
code,
|
139
|
-
&proc
|
140
|
-
)
|
141
|
-
rescue Ree::Error
|
142
|
-
raise_error("invalid def_error usage. Valid examples: def_error { InvalidDomainErr } or def_error(:validation) { EmailTakenErr['email taken'] }")
|
143
|
-
end
|
144
|
-
|
145
|
-
@object.add_const_list([class_name])
|
146
|
-
|
147
|
-
@object.errors.push(
|
148
|
-
Ree::ObjectError.new(
|
149
|
-
class_name
|
150
|
-
)
|
151
|
-
)
|
152
|
-
end
|
153
|
-
|
154
120
|
# @param [String] path Relative package file path ('accounts/entities/user')
|
155
121
|
# @param [Proc] proc Import constants proc
|
156
122
|
def link_file(path, import_proc = nil)
|
@@ -227,12 +193,14 @@ class Ree::ObjectDsl
|
|
227
193
|
raise Ree::Error.new("Mount as should be one of #{MOUNT_AS.inspect}", :invalid_dsl_usage)
|
228
194
|
end
|
229
195
|
|
230
|
-
|
231
|
-
File.
|
232
|
-
|
196
|
+
if !Ree.irb_mode?
|
197
|
+
object_name_from_path = if File.exist?(path)
|
198
|
+
File.basename(path, ".*").to_sym
|
199
|
+
end
|
233
200
|
|
234
|
-
|
235
|
-
|
201
|
+
if object_name_from_path && object_name != object_name_from_path
|
202
|
+
raise Ree::Error.new("Object name does not correspond to a file name (#{object_name}, #{object_name_from_path}.rb). Fix object name or rename object file", :invalid_dsl_usage)
|
203
|
+
end
|
236
204
|
end
|
237
205
|
|
238
206
|
class_name = klass.to_s
|
@@ -142,6 +142,11 @@ class Ree::PackagesFacade
|
|
142
142
|
# @return nil
|
143
143
|
def load_package_entry(package_name)
|
144
144
|
package = @packages_store.get(package_name)
|
145
|
+
|
146
|
+
if package.nil?
|
147
|
+
raise Ree::Error.new("package :#{package_name} not found in Packages.schema.json")
|
148
|
+
end
|
149
|
+
|
145
150
|
return if package.loaded?
|
146
151
|
|
147
152
|
Ree.logger.debug("load_package_entry(:#{package_name})")
|
data/lib/ree/version.rb
CHANGED
data/lib/ree.rb
CHANGED
@@ -13,7 +13,6 @@ module Ree
|
|
13
13
|
autoload :Contracts, 'ree/contracts'
|
14
14
|
autoload :DomainError, 'ree/dsl/domain_error'
|
15
15
|
autoload :Error, 'ree/error'
|
16
|
-
autoload :ErrorBuilder, 'ree/dsl/error_builder'
|
17
16
|
autoload :ErrorDsl, 'ree/dsl/error_dsl'
|
18
17
|
autoload :FnDSL, 'ree/fn_dsl'
|
19
18
|
autoload :Gen, 'ree/gen'
|
@@ -262,18 +261,6 @@ module Ree
|
|
262
261
|
end
|
263
262
|
end
|
264
263
|
end
|
265
|
-
|
266
|
-
def error_types
|
267
|
-
@error_types ||= []
|
268
|
-
end
|
269
|
-
|
270
|
-
def add_error_types(*args)
|
271
|
-
args.each do |arg|
|
272
|
-
check_arg(arg, :error, Symbol)
|
273
|
-
end
|
274
|
-
|
275
|
-
@error_types = (error_types + args).uniq
|
276
|
-
end
|
277
264
|
end
|
278
265
|
end
|
279
266
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ree
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.
|
4
|
+
version: 1.0.32
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ruslan Gatiyatov
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2023-08-
|
11
|
+
date: 2023-08-30 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: commander
|
@@ -143,7 +143,6 @@ files:
|
|
143
143
|
- lib/ree/core/path_helper.rb
|
144
144
|
- lib/ree/dsl/build_package_dsl.rb
|
145
145
|
- lib/ree/dsl/domain_error.rb
|
146
|
-
- lib/ree/dsl/error_builder.rb
|
147
146
|
- lib/ree/dsl/error_dsl.rb
|
148
147
|
- lib/ree/dsl/import_dsl.rb
|
149
148
|
- lib/ree/dsl/link_import_builder.rb
|
@@ -1,39 +0,0 @@
|
|
1
|
-
# frozen_string_literal = true
|
2
|
-
|
3
|
-
class Ree::ErrorBuilder
|
4
|
-
def initialize(packages_facade)
|
5
|
-
@packages_facade = packages_facade
|
6
|
-
end
|
7
|
-
|
8
|
-
def build(object, code, &proc)
|
9
|
-
result = Ree::ErrorDsl.new.execute(object.klass, &proc)
|
10
|
-
|
11
|
-
if result.is_a?(Ree::DomainError)
|
12
|
-
object.klass.send(:remove_const, result.name) rescue nil
|
13
|
-
result = Ree::ErrorDsl.new.execute(object.klass, &proc)
|
14
|
-
end
|
15
|
-
|
16
|
-
if !result.is_a?(Ree::ErrorDsl::ClassConstant)
|
17
|
-
raise Ree::Error.new("invalid def_error usage", :invalid_dsl_usage)
|
18
|
-
end
|
19
|
-
|
20
|
-
object.klass.send(:remove_const, result.name) rescue nil
|
21
|
-
|
22
|
-
object.klass.class_eval <<-ruby_eval, __FILE__, __LINE__ + 1
|
23
|
-
class #{result.name} < Ree::DomainError
|
24
|
-
attr_reader :code, :extra_code, :error_code, :package_name, :object_name
|
25
|
-
|
26
|
-
def initialize(msg = nil, extra_code = nil)
|
27
|
-
@code = #{code.inspect}
|
28
|
-
@extra_code = extra_code
|
29
|
-
@error_code = :#{Ree::StringUtils.underscore(result.name)}
|
30
|
-
@package_name = :#{object.package_name}
|
31
|
-
@object_name = :#{object.name}
|
32
|
-
super(msg || #{result.message.inspect})
|
33
|
-
end
|
34
|
-
end
|
35
|
-
ruby_eval
|
36
|
-
|
37
|
-
result.name
|
38
|
-
end
|
39
|
-
end
|