eac_ruby_utils 0.34.0 → 0.35.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/lib/eac_ruby_utils/configs.rb +4 -12
- data/lib/eac_ruby_utils/console/configs.rb +1 -1
- data/lib/eac_ruby_utils/console/docopt_runner/_class_methods.rb +1 -1
- data/lib/eac_ruby_utils/console/speaker.rb +1 -1
- data/lib/eac_ruby_utils/patches/object/if_present.rb +1 -1
- data/lib/eac_ruby_utils/paths_hash.rb +1 -3
- data/lib/eac_ruby_utils/require_sub.rb +6 -1
- data/lib/eac_ruby_utils/version.rb +1 -1
- data/lib/eac_ruby_utils/yaml.rb +85 -2
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 3edd773afcebdd9c7f6af74230428101cfd4afc0e18c2311ace07c45764db8ce
|
4
|
+
data.tar.gz: fee5141ecfb6aa6d457d842b0cbafe42abbcb2da5a88cdc873dce82f647459e7
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 94629883aff72c800948b4de4f102434a642771a18603971b689311eae89fba38c5729601a1075c8bdb949fd0c85540be846a6b1745fa7247092432e244b111d
|
7
|
+
data.tar.gz: 91b1694cde13eaa0621f0ccc847267d3ad7e6656d927cdcdd5b4f21673a1398f99929ed06e368d4b1e49e6d4738ab86139d032436e6bd6a706fcc821cbf27526
|
@@ -20,17 +20,11 @@ module EacRubyUtils
|
|
20
20
|
load
|
21
21
|
end
|
22
22
|
|
23
|
-
|
24
|
-
file.clear
|
25
|
-
end
|
23
|
+
delegate :clear, to: :file
|
26
24
|
|
27
|
-
|
28
|
-
file.save
|
29
|
-
end
|
25
|
+
delegate :save, to: :file
|
30
26
|
|
31
|
-
|
32
|
-
file.load
|
33
|
-
end
|
27
|
+
delegate :load, to: :file
|
34
28
|
|
35
29
|
def []=(entry_key, entry_value)
|
36
30
|
write_entry(entry_key, entry_value)
|
@@ -48,9 +42,7 @@ module EacRubyUtils
|
|
48
42
|
file.read(entry_key)
|
49
43
|
end
|
50
44
|
|
51
|
-
|
52
|
-
file.autosave?
|
53
|
-
end
|
45
|
+
delegate :autosave?, to: :file
|
54
46
|
|
55
47
|
private
|
56
48
|
|
@@ -85,7 +85,7 @@ module EacRubyUtils
|
|
85
85
|
def looped_entry_value_from_input(entry_key, options)
|
86
86
|
loop do
|
87
87
|
entry_value = entry_value_from_input(entry_key, options)
|
88
|
-
next
|
88
|
+
next if entry_value.blank?
|
89
89
|
next if options[:validator] && !options[:validator].call(entry_value)
|
90
90
|
|
91
91
|
return entry_value
|
@@ -5,7 +5,7 @@ require 'active_support/core_ext/object/blank'
|
|
5
5
|
class Object
|
6
6
|
# @return +block.call(self)+ if +self+ is present, +default_value+ otherwise.
|
7
7
|
def if_present(default_value = nil)
|
8
|
-
return default_value
|
8
|
+
return default_value if blank?
|
9
9
|
|
10
10
|
block_given? ? yield(self) : self
|
11
11
|
end
|
@@ -10,6 +10,7 @@ module EacRubyUtils
|
|
10
10
|
class RequireSub
|
11
11
|
BASE_OPTION_KEY = :base
|
12
12
|
INCLUDE_MODULES_OPTION_KEY = :include_modules
|
13
|
+
REQUIRE_DEPENDENCY_OPTION_KEY = :require_dependency
|
13
14
|
|
14
15
|
attr_reader :file, :options
|
15
16
|
|
@@ -42,7 +43,11 @@ module EacRubyUtils
|
|
42
43
|
|
43
44
|
def require_sub_files
|
44
45
|
Dir["#{File.dirname(file)}/#{::File.basename(file, '.*')}/*.rb"].sort.each do |path|
|
45
|
-
|
46
|
+
if options[REQUIRE_DEPENDENCY_OPTION_KEY]
|
47
|
+
require_dependency path
|
48
|
+
else
|
49
|
+
require path
|
50
|
+
end
|
46
51
|
end
|
47
52
|
end
|
48
53
|
end
|
data/lib/eac_ruby_utils/yaml.rb
CHANGED
@@ -3,10 +3,93 @@
|
|
3
3
|
require 'yaml'
|
4
4
|
|
5
5
|
module EacRubyUtils
|
6
|
+
# A safe YAML loader/dumper with common types included.
|
6
7
|
class Yaml
|
7
8
|
class << self
|
8
|
-
|
9
|
-
|
9
|
+
DEFAULT_PERMITTED_CLASSES = [::Array, ::Date, ::FalseClass, ::Hash, ::NilClass, ::Numeric,
|
10
|
+
::String, ::Symbol, ::Time, ::TrueClass].freeze
|
11
|
+
|
12
|
+
def dump(object)
|
13
|
+
::YAML.dump(sanitize(object))
|
14
|
+
end
|
15
|
+
|
16
|
+
def load(string)
|
17
|
+
::YAML.safe_load(string, permitted_classes)
|
18
|
+
end
|
19
|
+
|
20
|
+
def permitted_classes
|
21
|
+
DEFAULT_PERMITTED_CLASSES
|
22
|
+
end
|
23
|
+
|
24
|
+
def sanitize(object)
|
25
|
+
Sanitizer.new(object).result
|
26
|
+
end
|
27
|
+
|
28
|
+
def yaml?(object)
|
29
|
+
return false unless object.is_a?(::String)
|
30
|
+
return false unless object.start_with?('---')
|
31
|
+
|
32
|
+
load(object)
|
33
|
+
true
|
34
|
+
rescue ::Psych::SyntaxError
|
35
|
+
false
|
36
|
+
end
|
37
|
+
|
38
|
+
class Sanitizer
|
39
|
+
attr_reader :source
|
40
|
+
|
41
|
+
RESULT_TYPES = %w[permitted enumerableable hashable].freeze
|
42
|
+
|
43
|
+
def initialize(source)
|
44
|
+
@source = source
|
45
|
+
end
|
46
|
+
|
47
|
+
def result
|
48
|
+
RESULT_TYPES.each do |type|
|
49
|
+
return send("result_#{type}") if send("result_#{type}?")
|
50
|
+
end
|
51
|
+
|
52
|
+
source.to_s
|
53
|
+
end
|
54
|
+
|
55
|
+
private
|
56
|
+
|
57
|
+
def result_enumerableable?
|
58
|
+
source.respond_to?(:to_a) && !source.is_a?(::Hash)
|
59
|
+
end
|
60
|
+
|
61
|
+
def result_enumerableable
|
62
|
+
source.to_a.map { |child| sanitize_value(child) }
|
63
|
+
end
|
64
|
+
|
65
|
+
def result_hashable?
|
66
|
+
source.respond_to?(:to_h)
|
67
|
+
end
|
68
|
+
|
69
|
+
def result_hashable
|
70
|
+
source.to_h.map { |k, v| [k.to_sym, sanitize_value(v)] }.to_h
|
71
|
+
end
|
72
|
+
|
73
|
+
def result_nil?
|
74
|
+
source.nil?
|
75
|
+
end
|
76
|
+
|
77
|
+
def result_nil
|
78
|
+
nil
|
79
|
+
end
|
80
|
+
|
81
|
+
def result_permitted?
|
82
|
+
(::EacRubyUtils::Yaml.permitted_classes - [::Array, ::Hash])
|
83
|
+
.any? { |klass| source.is_a?(klass) }
|
84
|
+
end
|
85
|
+
|
86
|
+
def result_permitted
|
87
|
+
source
|
88
|
+
end
|
89
|
+
|
90
|
+
def sanitize_value(value)
|
91
|
+
self.class.new(value).result
|
92
|
+
end
|
10
93
|
end
|
11
94
|
end
|
12
95
|
end
|