hanami 2.0.0.alpha7 → 2.0.0.beta1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +456 -235
- data/FEATURES.md +30 -9
- data/README.md +1 -3
- data/hanami.gemspec +21 -11
- data/lib/hanami/app.rb +141 -0
- data/lib/hanami/assets/application_configuration.rb +10 -4
- data/lib/hanami/configuration/actions/content_security_policy.rb +118 -0
- data/lib/hanami/configuration/actions/cookies.rb +29 -0
- data/lib/hanami/configuration/actions/sessions.rb +46 -0
- data/lib/hanami/configuration/actions.rb +23 -12
- data/lib/hanami/configuration/logger.rb +13 -10
- data/lib/hanami/configuration/router.rb +2 -6
- data/lib/hanami/configuration/sessions.rb +1 -1
- data/lib/hanami/configuration/views.rb +86 -0
- data/lib/hanami/configuration.rb +139 -82
- data/lib/hanami/constants.rb +30 -2
- data/lib/hanami/errors.rb +4 -1
- data/lib/hanami/extensions/action/slice_configured_action.rb +103 -0
- data/lib/hanami/extensions/action.rb +79 -0
- data/lib/hanami/extensions/view/context.rb +106 -0
- data/lib/hanami/extensions/view/slice_configured_context.rb +71 -0
- data/lib/hanami/extensions/view/slice_configured_view.rb +107 -0
- data/lib/hanami/extensions/view.rb +33 -0
- data/lib/hanami/extensions.rb +10 -0
- data/lib/hanami/providers/inflector.rb +13 -0
- data/lib/hanami/providers/logger.rb +13 -0
- data/lib/hanami/providers/rack.rb +27 -0
- data/lib/hanami/providers/routes.rb +33 -0
- data/lib/hanami/providers/settings.rb +23 -0
- data/lib/hanami/rake_tasks.rb +61 -0
- data/lib/hanami/routes.rb +51 -0
- data/lib/hanami/server.rb +1 -1
- data/lib/hanami/settings/dotenv_store.rb +58 -0
- data/lib/hanami/settings.rb +90 -0
- data/lib/hanami/setup.rb +4 -2
- data/lib/hanami/{application → slice}/router.rb +18 -13
- data/lib/hanami/slice/routes_helper.rb +37 -0
- data/lib/hanami/{application → slice}/routing/middleware/stack.rb +43 -5
- data/lib/hanami/slice/routing/resolver.rb +97 -0
- data/lib/hanami/slice/view_name_inferrer.rb +63 -0
- data/lib/hanami/slice.rb +252 -82
- data/lib/hanami/slice_configurable.rb +62 -0
- data/lib/hanami/slice_name.rb +111 -0
- data/lib/hanami/slice_registrar.rb +119 -0
- data/lib/hanami/version.rb +1 -1
- data/lib/hanami/web/rack_logger.rb +1 -1
- data/lib/hanami.rb +34 -26
- data/spec/integration/application_middleware_stack_spec.rb +84 -0
- data/spec/integration/assets/cdn_spec.rb +48 -0
- data/spec/integration/assets/fingerprint_spec.rb +42 -0
- data/spec/integration/assets/helpers_spec.rb +50 -0
- data/spec/integration/assets/serve_spec.rb +70 -0
- data/spec/integration/assets/subresource_integrity_spec.rb +54 -0
- data/spec/integration/body_parsers_spec.rb +50 -0
- data/spec/integration/cli/assets/precompile_spec.rb +147 -0
- data/spec/integration/cli/assets_spec.rb +14 -0
- data/spec/integration/cli/console_spec.rb +105 -0
- data/spec/integration/cli/db/apply_spec.rb +74 -0
- data/spec/integration/cli/db/console_spec.rb +40 -0
- data/spec/integration/cli/db/create_spec.rb +50 -0
- data/spec/integration/cli/db/drop_spec.rb +54 -0
- data/spec/integration/cli/db/migrate_spec.rb +108 -0
- data/spec/integration/cli/db/prepare_spec.rb +36 -0
- data/spec/integration/cli/db/rollback_spec.rb +96 -0
- data/spec/integration/cli/db/version_spec.rb +38 -0
- data/spec/integration/cli/db_spec.rb +21 -0
- data/spec/integration/cli/destroy/action_spec.rb +143 -0
- data/spec/integration/cli/destroy/app_spec.rb +118 -0
- data/spec/integration/cli/destroy/mailer_spec.rb +74 -0
- data/spec/integration/cli/destroy/migration_spec.rb +70 -0
- data/spec/integration/cli/destroy/model_spec.rb +113 -0
- data/spec/integration/cli/destroy_spec.rb +18 -0
- data/spec/integration/cli/generate/action_spec.rb +469 -0
- data/spec/integration/cli/generate/app_spec.rb +215 -0
- data/spec/integration/cli/generate/mailer_spec.rb +189 -0
- data/spec/integration/cli/generate/migration_spec.rb +72 -0
- data/spec/integration/cli/generate/model_spec.rb +290 -0
- data/spec/integration/cli/generate/secret_spec.rb +56 -0
- data/spec/integration/cli/generate_spec.rb +19 -0
- data/spec/integration/cli/new/database_spec.rb +235 -0
- data/spec/integration/cli/new/hanami_head_spec.rb +27 -0
- data/spec/integration/cli/new/template_spec.rb +118 -0
- data/spec/integration/cli/new/test_spec.rb +274 -0
- data/spec/integration/cli/new_spec.rb +970 -0
- data/spec/integration/cli/plugins_spec.rb +39 -0
- data/spec/integration/cli/routes_spec.rb +49 -0
- data/spec/integration/cli/server_spec.rb +626 -0
- data/spec/integration/cli/version_spec.rb +85 -0
- data/spec/integration/early_hints_spec.rb +35 -0
- data/spec/integration/handle_exceptions_spec.rb +244 -0
- data/spec/integration/head_spec.rb +89 -0
- data/spec/integration/http_headers_spec.rb +29 -0
- data/spec/integration/mailer_spec.rb +32 -0
- data/spec/integration/middleware_spec.rb +81 -0
- data/spec/integration/mount_applications_spec.rb +88 -0
- data/spec/integration/project_initializers_spec.rb +40 -0
- data/spec/integration/rackup_spec.rb +35 -0
- data/spec/integration/rake/with_minitest_spec.rb +67 -0
- data/spec/integration/rake/with_rspec_spec.rb +69 -0
- data/spec/integration/routing_helpers_spec.rb +61 -0
- data/spec/integration/security/content_security_policy_spec.rb +46 -0
- data/spec/integration/security/csrf_protection_spec.rb +42 -0
- data/spec/integration/security/force_ssl_spec.rb +29 -0
- data/spec/integration/security/x_content_type_options_spec.rb +46 -0
- data/spec/integration/security/x_frame_options_spec.rb +46 -0
- data/spec/integration/security/x_xss_protection_spec.rb +46 -0
- data/spec/integration/send_file_spec.rb +51 -0
- data/spec/integration/sessions_spec.rb +247 -0
- data/spec/integration/static_middleware_spec.rb +21 -0
- data/spec/integration/streaming_spec.rb +41 -0
- data/spec/integration/unsafe_send_file_spec.rb +52 -0
- data/spec/isolation/hanami/application/already_configured_spec.rb +19 -0
- data/spec/isolation/hanami/application/inherit_anonymous_class_spec.rb +10 -0
- data/spec/isolation/hanami/application/inherit_concrete_class_spec.rb +14 -0
- data/spec/isolation/hanami/application/not_configured_spec.rb +9 -0
- data/spec/isolation/hanami/application/routes/configured_spec.rb +44 -0
- data/spec/isolation/hanami/application/routes/not_configured_spec.rb +16 -0
- data/spec/isolation/hanami/boot/success_spec.rb +50 -0
- data/spec/new_integration/action/configuration_spec.rb +26 -0
- data/spec/new_integration/action/cookies_spec.rb +58 -0
- data/spec/new_integration/action/csrf_protection_spec.rb +54 -0
- data/spec/new_integration/action/routes_spec.rb +73 -0
- data/spec/new_integration/action/sessions_spec.rb +50 -0
- data/spec/new_integration/action/view_integration_spec.rb +165 -0
- data/spec/new_integration/action/view_rendering/automatic_rendering_spec.rb +247 -0
- data/spec/new_integration/action/view_rendering/paired_view_inference_spec.rb +115 -0
- data/spec/new_integration/action/view_rendering_spec.rb +107 -0
- data/spec/new_integration/code_loading/loading_from_app_spec.rb +152 -0
- data/spec/new_integration/code_loading/loading_from_slice_spec.rb +165 -0
- data/spec/new_integration/container/application_routes_helper_spec.rb +48 -0
- data/spec/new_integration/container/auto_injection_spec.rb +53 -0
- data/spec/new_integration/container/auto_registration_spec.rb +86 -0
- data/spec/new_integration/container/autoloader_spec.rb +80 -0
- data/spec/new_integration/container/imports_spec.rb +253 -0
- data/spec/new_integration/container/prepare_container_spec.rb +123 -0
- data/spec/new_integration/container/shutdown_spec.rb +91 -0
- data/spec/new_integration/container/standard_bootable_components_spec.rb +124 -0
- data/spec/new_integration/rack_app/middleware_spec.rb +215 -0
- data/spec/new_integration/rack_app/non_booted_rack_app_spec.rb +105 -0
- data/spec/new_integration/rack_app/rack_app_spec.rb +524 -0
- data/spec/new_integration/settings_spec.rb +115 -0
- data/spec/new_integration/slices/external_slice_spec.rb +92 -0
- data/spec/new_integration/slices/slice_configuration_spec.rb +40 -0
- data/spec/new_integration/slices/slice_routing_spec.rb +226 -0
- data/spec/new_integration/slices/slice_settings_spec.rb +141 -0
- data/spec/new_integration/slices_spec.rb +101 -0
- data/spec/new_integration/view/configuration_spec.rb +49 -0
- data/spec/new_integration/view/context/assets_spec.rb +67 -0
- data/spec/new_integration/view/context/inflector_spec.rb +48 -0
- data/spec/new_integration/view/context/request_spec.rb +61 -0
- data/spec/new_integration/view/context/routes_spec.rb +86 -0
- data/spec/new_integration/view/context/settings_spec.rb +50 -0
- data/spec/new_integration/view/inflector_spec.rb +57 -0
- data/spec/new_integration/view/part_namespace_spec.rb +96 -0
- data/spec/new_integration/view/path_spec.rb +56 -0
- data/spec/new_integration/view/template_spec.rb +68 -0
- data/spec/new_integration/view/views_spec.rb +103 -0
- data/spec/spec_helper.rb +16 -0
- data/spec/support/app_integration.rb +91 -0
- data/spec/support/coverage.rb +1 -0
- data/spec/support/fixtures/hanami-plugin/Gemfile +8 -0
- data/spec/support/fixtures/hanami-plugin/README.md +35 -0
- data/spec/support/fixtures/hanami-plugin/Rakefile +4 -0
- data/spec/support/fixtures/hanami-plugin/bin/console +15 -0
- data/spec/support/fixtures/hanami-plugin/bin/setup +8 -0
- data/spec/support/fixtures/hanami-plugin/hanami-plugin.gemspec +28 -0
- data/spec/support/fixtures/hanami-plugin/lib/hanami/plugin/cli.rb +19 -0
- data/spec/support/fixtures/hanami-plugin/lib/hanami/plugin/version.rb +7 -0
- data/spec/support/fixtures/hanami-plugin/lib/hanami/plugin.rb +8 -0
- data/spec/support/rspec.rb +27 -0
- data/spec/support/shared_examples/cli/generate/app.rb +494 -0
- data/spec/support/shared_examples/cli/generate/migration.rb +32 -0
- data/spec/support/shared_examples/cli/generate/model.rb +81 -0
- data/spec/support/shared_examples/cli/new.rb +97 -0
- data/spec/unit/hanami/configuration/actions/content_security_policy_spec.rb +102 -0
- data/spec/unit/hanami/configuration/actions/cookies_spec.rb +46 -0
- data/spec/unit/hanami/configuration/actions/csrf_protection_spec.rb +57 -0
- data/spec/unit/hanami/configuration/actions/default_values_spec.rb +52 -0
- data/spec/unit/hanami/configuration/actions/sessions_spec.rb +50 -0
- data/spec/unit/hanami/configuration/actions_spec.rb +78 -0
- data/spec/unit/hanami/configuration/base_url_spec.rb +25 -0
- data/spec/unit/hanami/configuration/inflector_spec.rb +35 -0
- data/spec/unit/hanami/configuration/logger_spec.rb +203 -0
- data/spec/unit/hanami/configuration/views_spec.rb +120 -0
- data/spec/unit/hanami/configuration_spec.rb +43 -0
- data/spec/unit/hanami/env_spec.rb +54 -0
- data/spec/unit/hanami/routes_spec.rb +25 -0
- data/spec/unit/hanami/settings/dotenv_store_spec.rb +119 -0
- data/spec/unit/hanami/settings_spec.rb +56 -0
- data/spec/unit/hanami/slice_configurable_spec.rb +104 -0
- data/spec/unit/hanami/slice_name_spec.rb +47 -0
- data/spec/unit/hanami/slice_spec.rb +17 -0
- data/spec/unit/hanami/version_spec.rb +7 -0
- data/spec/unit/hanami/web/rack_logger_spec.rb +78 -0
- metadata +358 -50
- data/lib/hanami/application/container/providers/inflector.rb +0 -7
- data/lib/hanami/application/container/providers/logger.rb +0 -7
- data/lib/hanami/application/container/providers/rack_logger.rb +0 -15
- data/lib/hanami/application/container/providers/rack_monitor.rb +0 -12
- data/lib/hanami/application/container/providers/routes_helper.rb +0 -9
- data/lib/hanami/application/container/providers/settings.rb +0 -7
- data/lib/hanami/application/routes.rb +0 -55
- data/lib/hanami/application/routes_helper.rb +0 -34
- data/lib/hanami/application/routing/resolver/node.rb +0 -50
- data/lib/hanami/application/routing/resolver/trie.rb +0 -59
- data/lib/hanami/application/routing/resolver.rb +0 -87
- data/lib/hanami/application/routing/router.rb +0 -36
- data/lib/hanami/application/settings/dotenv_store.rb +0 -60
- data/lib/hanami/application/settings.rb +0 -93
- data/lib/hanami/application/slice_registrar.rb +0 -107
- data/lib/hanami/application.rb +0 -299
- data/lib/hanami/boot/source_dirs.rb +0 -44
- data/lib/hanami/cli/application/cli.rb +0 -40
- data/lib/hanami/cli/application/command.rb +0 -47
- data/lib/hanami/cli/application/commands/console.rb +0 -81
- data/lib/hanami/cli/application/commands.rb +0 -16
- data/lib/hanami/cli/base_command.rb +0 -48
- data/lib/hanami/cli/commands/command.rb +0 -171
- data/lib/hanami/cli/commands/server.rb +0 -88
- data/lib/hanami/cli/commands.rb +0 -65
- data/lib/hanami/configuration/middleware.rb +0 -20
- data/lib/hanami/configuration/source_dirs.rb +0 -42
@@ -1,50 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Hanami
|
4
|
-
class Application
|
5
|
-
module Routing
|
6
|
-
class Resolver
|
7
|
-
# Endpoint resolver node to register slices in a tree
|
8
|
-
#
|
9
|
-
# @api private
|
10
|
-
# @since 2.0.0
|
11
|
-
class Node
|
12
|
-
# @api private
|
13
|
-
# @since 2.0.0
|
14
|
-
attr_reader :slice
|
15
|
-
|
16
|
-
# @api private
|
17
|
-
# @since 2.0.0
|
18
|
-
def initialize
|
19
|
-
@slice = nil
|
20
|
-
@children = {}
|
21
|
-
end
|
22
|
-
|
23
|
-
# @api private
|
24
|
-
# @since 2.0.0
|
25
|
-
def put(segment)
|
26
|
-
@children[segment] ||= self.class.new
|
27
|
-
end
|
28
|
-
|
29
|
-
# @api private
|
30
|
-
# @since 2.0.0
|
31
|
-
def get(segment)
|
32
|
-
@children.fetch(segment) { self if leaf? }
|
33
|
-
end
|
34
|
-
|
35
|
-
# @api private
|
36
|
-
# @since 2.0.0
|
37
|
-
def leaf!(slice)
|
38
|
-
@slice = slice
|
39
|
-
end
|
40
|
-
|
41
|
-
# @api private
|
42
|
-
# @since 2.0.0
|
43
|
-
def leaf?
|
44
|
-
@slice
|
45
|
-
end
|
46
|
-
end
|
47
|
-
end
|
48
|
-
end
|
49
|
-
end
|
50
|
-
end
|
@@ -1,59 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
require "hanami/application/routing/resolver/node"
|
4
|
-
|
5
|
-
module Hanami
|
6
|
-
class Application
|
7
|
-
module Routing
|
8
|
-
class Resolver
|
9
|
-
# Endpoint resolver trie to register slices
|
10
|
-
#
|
11
|
-
# @api private
|
12
|
-
# @since 2.0.0
|
13
|
-
class Trie
|
14
|
-
# @api private
|
15
|
-
# @since 2.0.0
|
16
|
-
def initialize
|
17
|
-
@root = Node.new
|
18
|
-
end
|
19
|
-
|
20
|
-
# @api private
|
21
|
-
# @since 2.0.0
|
22
|
-
def add(path, name)
|
23
|
-
node = @root
|
24
|
-
for_each_segment(path) do |segment|
|
25
|
-
node = node.put(segment)
|
26
|
-
end
|
27
|
-
|
28
|
-
node.leaf!(name)
|
29
|
-
end
|
30
|
-
|
31
|
-
# @api private
|
32
|
-
# @since 2.0.0
|
33
|
-
def find(path)
|
34
|
-
node = @root
|
35
|
-
|
36
|
-
for_each_segment(path) do |segment|
|
37
|
-
break unless node
|
38
|
-
|
39
|
-
node = node.get(segment)
|
40
|
-
end
|
41
|
-
|
42
|
-
return node.slice if node&.leaf?
|
43
|
-
|
44
|
-
nil
|
45
|
-
end
|
46
|
-
|
47
|
-
private
|
48
|
-
|
49
|
-
# @api private
|
50
|
-
# @since 2.0.0
|
51
|
-
def for_each_segment(path, &blk)
|
52
|
-
_, *segments = path.split(/\//)
|
53
|
-
segments.each(&blk)
|
54
|
-
end
|
55
|
-
end
|
56
|
-
end
|
57
|
-
end
|
58
|
-
end
|
59
|
-
end
|
@@ -1,87 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Hanami
|
4
|
-
class Application
|
5
|
-
module Routing
|
6
|
-
# Hanami application router endpoint resolver
|
7
|
-
#
|
8
|
-
# @since 2.0.0
|
9
|
-
class Resolver
|
10
|
-
ENDPOINT_KEY_NAMESPACE = "actions"
|
11
|
-
|
12
|
-
require_relative "resolver/trie"
|
13
|
-
|
14
|
-
# @since 2.0.0
|
15
|
-
class NotCallableEndpointError < StandardError
|
16
|
-
def initialize(endpoint)
|
17
|
-
super("#{endpoint.inspect} is not compatible with Rack. Please make sure it implements #call.")
|
18
|
-
end
|
19
|
-
end
|
20
|
-
|
21
|
-
# @api private
|
22
|
-
# @since 2.0.0
|
23
|
-
def initialize(slices:, inflector:)
|
24
|
-
@slices = slices
|
25
|
-
@inflector = inflector
|
26
|
-
@slice_registry = Trie.new
|
27
|
-
end
|
28
|
-
|
29
|
-
# @api private
|
30
|
-
# @since 2.0.0
|
31
|
-
#
|
32
|
-
# rubocop:disable Metrics/MethodLength
|
33
|
-
def call(path, identifier)
|
34
|
-
endpoint =
|
35
|
-
case identifier
|
36
|
-
when String
|
37
|
-
resolve_string_identifier(path, identifier)
|
38
|
-
when Class
|
39
|
-
identifier.respond_to?(:call) ? identifier : identifier.new
|
40
|
-
else
|
41
|
-
identifier
|
42
|
-
end
|
43
|
-
|
44
|
-
unless endpoint.respond_to?(:call) # rubocop:disable Style/IfUnlessModifier
|
45
|
-
raise NotCallableEndpointError.new(endpoint)
|
46
|
-
end
|
47
|
-
|
48
|
-
endpoint
|
49
|
-
end
|
50
|
-
# rubocop:enable Metrics/MethodLength
|
51
|
-
|
52
|
-
# @api private
|
53
|
-
# @since 2.0.0
|
54
|
-
def register_slice_at_path(name, path)
|
55
|
-
slice_registry.add(path, name)
|
56
|
-
end
|
57
|
-
|
58
|
-
private
|
59
|
-
|
60
|
-
# @api private
|
61
|
-
# @since 2.0.0
|
62
|
-
attr_reader :slices
|
63
|
-
|
64
|
-
# @api private
|
65
|
-
# @since 2.0.0
|
66
|
-
attr_reader :inflector
|
67
|
-
|
68
|
-
# @api private
|
69
|
-
# @since 2.0.0
|
70
|
-
attr_reader :slice_registry
|
71
|
-
|
72
|
-
# @api private
|
73
|
-
# @since 2.0.0
|
74
|
-
def resolve_string_identifier(path, identifier)
|
75
|
-
slice_name = slice_registry.find(path) or raise "missing slice for #{path.inspect} (#{identifier.inspect})"
|
76
|
-
slice = slices[slice_name]
|
77
|
-
endpoint_key = "#{ENDPOINT_KEY_NAMESPACE}.#{identifier}"
|
78
|
-
|
79
|
-
# Lazily resolve endpoint from the slice to reduce router initialization time,
|
80
|
-
# and break potential endless loops from the resolved endpoint itself requiring
|
81
|
-
# access to router-related concerns
|
82
|
-
-> (*args) { slice[endpoint_key].call(*args) }
|
83
|
-
end
|
84
|
-
end
|
85
|
-
end
|
86
|
-
end
|
87
|
-
end
|
@@ -1,36 +0,0 @@
|
|
1
|
-
# # frozen_string_literal: true
|
2
|
-
|
3
|
-
# require "hanami/application/router"
|
4
|
-
|
5
|
-
# Hanami.application.register_provider :router do
|
6
|
-
# start do
|
7
|
-
# configuration = Hanami.application.configuration
|
8
|
-
|
9
|
-
# routes = begin
|
10
|
-
# require File.join(configuration.root, configuration.router.routes_path)
|
11
|
-
# routes_class = Hanami.application.send(:autodiscover_application_constant, configuration.router.routes_class_name) # WIP private
|
12
|
-
# routes_class.routes
|
13
|
-
# rescue LoadError
|
14
|
-
# proc {}
|
15
|
-
# end
|
16
|
-
|
17
|
-
# resolver = configuration.router.resolver.new(
|
18
|
-
# slices: Hanami.application.slices,
|
19
|
-
# inflector: Hanami.application.inflector # TODO: use container[:inflector]?
|
20
|
-
# )
|
21
|
-
|
22
|
-
# router = Hanami::Application::Router.new(
|
23
|
-
# routes: routes,
|
24
|
-
# resolver: resolver,
|
25
|
-
# **configuration.router.options,
|
26
|
-
# ) do
|
27
|
-
# use Hanami.application[:rack_monitor]
|
28
|
-
|
29
|
-
# Hanami.application.config.for_each_middleware do |m, *args, &block|
|
30
|
-
# use(m, *args, &block)
|
31
|
-
# end
|
32
|
-
# end
|
33
|
-
|
34
|
-
# register :router, router
|
35
|
-
# end
|
36
|
-
# end
|
@@ -1,60 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
require "dry/core/constants"
|
4
|
-
|
5
|
-
module Hanami
|
6
|
-
class Application
|
7
|
-
class Settings
|
8
|
-
# Default application settings store.
|
9
|
-
#
|
10
|
-
# Uses [dotenv](https://github.com/bkeepers/dotenv) (if available) to load
|
11
|
-
# .env files and then loads settings from ENV. For a given `HANAMI_ENV`
|
12
|
-
# environment, the following `.env` files are looked up in the following order:
|
13
|
-
#
|
14
|
-
# - .env.{environment}.local
|
15
|
-
# - .env.local (except if the environment is `test`)
|
16
|
-
# - .env.{environment}
|
17
|
-
# - .env
|
18
|
-
#
|
19
|
-
# @since 2.0.0
|
20
|
-
# @api private
|
21
|
-
class DotenvStore
|
22
|
-
Undefined = Dry::Core::Constants::Undefined
|
23
|
-
|
24
|
-
attr_reader :store,
|
25
|
-
:hanami_env
|
26
|
-
|
27
|
-
def initialize(store: ENV, hanami_env: Hanami.env)
|
28
|
-
@store = store
|
29
|
-
@hanami_env = hanami_env
|
30
|
-
end
|
31
|
-
|
32
|
-
def fetch(name, default_value = Undefined, &block)
|
33
|
-
name = name.to_s.upcase
|
34
|
-
args = (default_value == Undefined) ? [name] : [name, default_value]
|
35
|
-
|
36
|
-
store.fetch(*args, &block)
|
37
|
-
end
|
38
|
-
|
39
|
-
def with_dotenv_loaded
|
40
|
-
require "dotenv"
|
41
|
-
Dotenv.load(*dotenv_files) if defined?(Dotenv)
|
42
|
-
self
|
43
|
-
rescue LoadError
|
44
|
-
self
|
45
|
-
end
|
46
|
-
|
47
|
-
private
|
48
|
-
|
49
|
-
def dotenv_files
|
50
|
-
[
|
51
|
-
".env.#{hanami_env}.local",
|
52
|
-
(".env.local" unless hanami_env == :test),
|
53
|
-
".env.#{hanami_env}",
|
54
|
-
".env"
|
55
|
-
].compact
|
56
|
-
end
|
57
|
-
end
|
58
|
-
end
|
59
|
-
end
|
60
|
-
end
|
@@ -1,93 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
require "dry/configurable"
|
4
|
-
require "dry/core/constants"
|
5
|
-
|
6
|
-
module Hanami
|
7
|
-
class Application
|
8
|
-
# Application settings
|
9
|
-
#
|
10
|
-
# Users are expected to inherit from this class to define their application
|
11
|
-
# settings.
|
12
|
-
#
|
13
|
-
# @example
|
14
|
-
# # config/settings.rb
|
15
|
-
# # frozen_string_literal: true
|
16
|
-
#
|
17
|
-
# require "hanami/application/settings"
|
18
|
-
# require "my_app/types"
|
19
|
-
#
|
20
|
-
# module MyApp
|
21
|
-
# class Settings < Hanami::Application::Settings
|
22
|
-
# setting :database_url
|
23
|
-
# setting :feature_flag, default: false, constructor: Types::Params::Bool
|
24
|
-
# end
|
25
|
-
# end
|
26
|
-
#
|
27
|
-
# Settings are defined with
|
28
|
-
# [dry-configurable](https://dry-rb.org/gems/dry-configurable/), so you can
|
29
|
-
# take a look there to see the supported syntax.
|
30
|
-
#
|
31
|
-
# Users work with an instance of this class made available within the
|
32
|
-
# `settings` key in the container. The instance gets its settings populated
|
33
|
-
# from a configurable store, which defaults to
|
34
|
-
# {Hanami::Application::Settings::DotenvStore}.
|
35
|
-
#
|
36
|
-
# A different store can be set through the `settings_store` Hanami
|
37
|
-
# configuration option. All it needs to do is implementing a `#fetch` method
|
38
|
-
# with the same signature as `Hash#fetch`.
|
39
|
-
#
|
40
|
-
# @see Hanami::Application::Settings::DotenvStore
|
41
|
-
# @since 2.0.0
|
42
|
-
class Settings
|
43
|
-
# Exception for errors in the definition of settings.
|
44
|
-
#
|
45
|
-
# Its message collects all the individual errors that can be raised for
|
46
|
-
# each setting.
|
47
|
-
InvalidSettingsError = Class.new(StandardError) do
|
48
|
-
def initialize(errors)
|
49
|
-
@errors = errors
|
50
|
-
end
|
51
|
-
|
52
|
-
def to_s
|
53
|
-
<<~STR.strip
|
54
|
-
Could not initialize settings. The following settings were invalid:
|
55
|
-
|
56
|
-
#{@errors.map { |setting, message| "#{setting}: #{message}" }.join("\n")}
|
57
|
-
STR
|
58
|
-
end
|
59
|
-
end
|
60
|
-
|
61
|
-
# @api private
|
62
|
-
EMPTY_STORE = Dry::Core::Constants::EMPTY_HASH
|
63
|
-
|
64
|
-
include Dry::Configurable
|
65
|
-
|
66
|
-
# @api private
|
67
|
-
def initialize(store = EMPTY_STORE)
|
68
|
-
errors = config._settings.map(&:name).reduce({}) do |errs, name|
|
69
|
-
public_send("#{name}=", store.fetch(name) { Dry::Core::Constants::Undefined })
|
70
|
-
errs
|
71
|
-
rescue => e # rubocop:disable Style/RescueStandardError
|
72
|
-
errs.merge(name => e)
|
73
|
-
end
|
74
|
-
|
75
|
-
raise InvalidSettingsError, errors if errors.any?
|
76
|
-
end
|
77
|
-
|
78
|
-
private
|
79
|
-
|
80
|
-
def method_missing(name, *args, &block)
|
81
|
-
if config.respond_to?(name)
|
82
|
-
config.send(name, *args, &block)
|
83
|
-
else
|
84
|
-
super
|
85
|
-
end
|
86
|
-
end
|
87
|
-
|
88
|
-
def respond_to_missing?(name, _include_all = false)
|
89
|
-
config.respond_to?(name) || super
|
90
|
-
end
|
91
|
-
end
|
92
|
-
end
|
93
|
-
end
|
@@ -1,107 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
require_relative "../constants"
|
4
|
-
require_relative "../slice"
|
5
|
-
|
6
|
-
module Hanami
|
7
|
-
class Application
|
8
|
-
# @api private
|
9
|
-
class SliceRegistrar
|
10
|
-
attr_reader :application, :slices
|
11
|
-
private :application, :slices
|
12
|
-
|
13
|
-
def initialize(application)
|
14
|
-
@application = application
|
15
|
-
@slices = {}
|
16
|
-
end
|
17
|
-
|
18
|
-
def register(name, slice_class = nil, &block)
|
19
|
-
if slices.key?(name.to_sym)
|
20
|
-
raise SliceLoadError, "Slice '#{name}' is already registered"
|
21
|
-
end
|
22
|
-
|
23
|
-
# TODO: raise error unless name meets format (i.e. single level depth only)
|
24
|
-
|
25
|
-
slices[name.to_sym] = slice_class || build_slice(name, &block)
|
26
|
-
end
|
27
|
-
|
28
|
-
def [](name)
|
29
|
-
slices.fetch(name) do
|
30
|
-
raise SliceLoadError, "Slice '#{name}' not found"
|
31
|
-
end
|
32
|
-
end
|
33
|
-
|
34
|
-
def freeze
|
35
|
-
slices.freeze
|
36
|
-
super
|
37
|
-
end
|
38
|
-
|
39
|
-
def load_slices
|
40
|
-
slice_configs = Dir[root.join(CONFIG_DIR, "slices", "*#{RB_EXT}")]
|
41
|
-
.map { |file| File.basename(file, RB_EXT) }
|
42
|
-
|
43
|
-
slice_dirs = Dir[File.join(root, SLICES_DIR, "*")]
|
44
|
-
.select { |path| File.directory?(path) }
|
45
|
-
.map { |path| File.basename(path) }
|
46
|
-
|
47
|
-
(slice_dirs + slice_configs).uniq.sort.each do |slice_name|
|
48
|
-
load_slice(slice_name)
|
49
|
-
end
|
50
|
-
|
51
|
-
self
|
52
|
-
end
|
53
|
-
|
54
|
-
def each(&block)
|
55
|
-
slices.each_value(&block)
|
56
|
-
end
|
57
|
-
|
58
|
-
def to_a
|
59
|
-
slices.values
|
60
|
-
end
|
61
|
-
|
62
|
-
private
|
63
|
-
|
64
|
-
# Attempts to load a slice class defined in `config/slices/[slice_name].rb`, then
|
65
|
-
# registers the slice with the matching class, if found.
|
66
|
-
def load_slice(slice_name)
|
67
|
-
slice_const_name = inflector.camelize(slice_name)
|
68
|
-
slice_require_path = root.join("config", "slices", slice_name).to_s
|
69
|
-
|
70
|
-
begin
|
71
|
-
require(slice_require_path)
|
72
|
-
rescue LoadError => e
|
73
|
-
raise e unless e.path == slice_require_path
|
74
|
-
end
|
75
|
-
|
76
|
-
slice_class =
|
77
|
-
begin
|
78
|
-
inflector.constantize("#{slice_const_name}::Slice")
|
79
|
-
rescue NameError => e
|
80
|
-
raise e unless e.name == :Slice
|
81
|
-
end
|
82
|
-
|
83
|
-
register(slice_name, slice_class)
|
84
|
-
end
|
85
|
-
|
86
|
-
def build_slice(slice_name, &block)
|
87
|
-
slice_module =
|
88
|
-
begin
|
89
|
-
slice_module_name = inflector.camelize(slice_name.to_s)
|
90
|
-
inflector.constantize(slice_module_name)
|
91
|
-
rescue NameError
|
92
|
-
Object.const_set(inflector.camelize(slice_module_name), Module.new)
|
93
|
-
end
|
94
|
-
|
95
|
-
slice_module.const_set(:Slice, Class.new(Hanami::Slice, &block))
|
96
|
-
end
|
97
|
-
|
98
|
-
def root
|
99
|
-
application.root
|
100
|
-
end
|
101
|
-
|
102
|
-
def inflector
|
103
|
-
application.inflector
|
104
|
-
end
|
105
|
-
end
|
106
|
-
end
|
107
|
-
end
|