hanami 2.0.0.beta2 → 2.0.0.beta4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +30 -1
- data/hanami.gemspec +5 -5
- data/lib/hanami/app.rb +4 -4
- data/lib/hanami/assets/{app_configuration.rb → app_config.rb} +10 -10
- data/lib/hanami/assets/{configuration.rb → config.rb} +4 -4
- data/lib/hanami/{configuration → config}/actions/content_security_policy.rb +2 -2
- data/lib/hanami/{configuration → config}/actions/cookies.rb +6 -5
- data/lib/hanami/{configuration → config}/actions/sessions.rb +2 -2
- data/lib/hanami/{configuration → config}/actions.rb +11 -12
- data/lib/hanami/{configuration → config}/logger.rb +2 -2
- data/lib/hanami/config/null_config.rb +14 -0
- data/lib/hanami/{configuration → config}/router.rb +8 -8
- data/lib/hanami/{configuration → config}/sessions.rb +2 -2
- data/lib/hanami/{configuration → config}/views.rb +10 -10
- data/lib/hanami/{configuration.rb → config.rb} +30 -30
- data/lib/hanami/errors.rb +3 -0
- data/lib/hanami/extensions/action/slice_configured_action.rb +1 -1
- data/lib/hanami/providers/inflector.rb +0 -2
- data/lib/hanami/providers/logger.rb +1 -3
- data/lib/hanami/providers/rack.rb +0 -2
- data/lib/hanami/providers/routes.rb +0 -2
- data/lib/hanami/routes.rb +48 -21
- data/lib/hanami/settings/env_store.rb +3 -3
- data/lib/hanami/settings.rb +87 -5
- data/lib/hanami/slice/routing/middleware/stack.rb +45 -1
- data/lib/hanami/slice.rb +52 -37
- data/lib/hanami/slice_configurable.rb +1 -1
- data/lib/hanami/slice_registrar.rb +6 -0
- data/lib/hanami/version.rb +1 -1
- data/lib/hanami.rb +0 -1
- data/spec/{new_integration → integration}/action/cookies_spec.rb +0 -0
- data/spec/{new_integration → integration}/action/csrf_protection_spec.rb +0 -0
- data/spec/{new_integration → integration}/action/routes_spec.rb +3 -5
- data/spec/{new_integration → integration}/action/sessions_spec.rb +0 -0
- data/spec/{new_integration → integration}/action/slice_configuration_spec.rb +0 -0
- data/spec/{new_integration → integration}/action/view_integration_spec.rb +0 -0
- data/spec/{new_integration → integration}/action/view_rendering/automatic_rendering_spec.rb +0 -0
- data/spec/{new_integration → integration}/action/view_rendering/paired_view_inference_spec.rb +0 -0
- data/spec/{new_integration → integration}/action/view_rendering_spec.rb +0 -0
- data/spec/{new_integration → integration}/code_loading/loading_from_app_spec.rb +0 -0
- data/spec/{new_integration → integration}/code_loading/loading_from_lib_spec.rb +0 -0
- data/spec/{new_integration → integration}/code_loading/loading_from_slice_spec.rb +0 -0
- data/spec/{new_integration → integration}/container/application_routes_helper_spec.rb +1 -3
- data/spec/{new_integration → integration}/container/auto_injection_spec.rb +0 -0
- data/spec/{new_integration → integration}/container/auto_registration_spec.rb +0 -0
- data/spec/{new_integration → integration}/container/autoloader_spec.rb +0 -0
- data/spec/{new_integration → integration}/container/imports_spec.rb +0 -0
- data/spec/{new_integration → integration}/container/prepare_container_spec.rb +2 -0
- data/spec/{new_integration → integration}/container/shutdown_spec.rb +0 -0
- data/spec/{new_integration → integration}/container/standard_bootable_components_spec.rb +0 -0
- data/spec/{new_integration → integration}/dotenv_loading_spec.rb +0 -0
- data/spec/integration/rack_app/body_parser_spec.rb +108 -0
- data/spec/{new_integration → integration}/rack_app/middleware_spec.rb +37 -15
- data/spec/{new_integration → integration}/rack_app/non_booted_rack_app_spec.rb +3 -5
- data/spec/{new_integration → integration}/rack_app/rack_app_spec.rb +28 -48
- data/spec/integration/settings/access_in_slice_class_body_spec.rb +82 -0
- data/spec/integration/settings/access_to_constants_spec.rb +46 -0
- data/spec/{new_integration → integration}/settings/loading_from_env_spec.rb +0 -0
- data/spec/{new_integration → integration}/settings/settings_component_loading_spec.rb +0 -0
- data/spec/{new_integration/slices/slice_settings_spec.rb → integration/settings/slice_registration_spec.rb} +5 -1
- data/spec/{new_integration → integration}/settings/using_types_spec.rb +4 -11
- data/spec/{new_integration → integration}/setup_spec.rb +20 -0
- data/spec/{new_integration → integration}/slices/external_slice_spec.rb +2 -4
- data/spec/{new_integration → integration}/slices/slice_configuration_spec.rb +0 -0
- data/spec/{new_integration → integration}/slices/slice_loading_spec.rb +0 -0
- data/spec/{new_integration → integration}/slices/slice_routing_spec.rb +5 -13
- data/spec/{new_integration → integration}/slices_spec.rb +0 -0
- data/spec/{new_integration → integration}/view/context/assets_spec.rb +0 -0
- data/spec/{new_integration → integration}/view/context/inflector_spec.rb +0 -0
- data/spec/{new_integration → integration}/view/context/request_spec.rb +0 -0
- data/spec/{new_integration → integration}/view/context/routes_spec.rb +1 -3
- data/spec/{new_integration → integration}/view/context/settings_spec.rb +0 -0
- data/spec/{new_integration → integration}/view/inflector_spec.rb +0 -0
- data/spec/{new_integration → integration}/view/part_namespace_spec.rb +0 -0
- data/spec/{new_integration → integration}/view/path_spec.rb +0 -0
- data/spec/{new_integration → integration}/view/slice_configuration_spec.rb +0 -0
- data/spec/{new_integration → integration}/view/template_spec.rb +0 -0
- data/spec/{new_integration → integration}/view/views_spec.rb +0 -0
- data/spec/support/app_integration.rb +18 -15
- data/spec/unit/hanami/{configuration → config}/actions/content_security_policy_spec.rb +10 -10
- data/spec/unit/hanami/{configuration → config}/actions/cookies_spec.rb +6 -6
- data/spec/unit/hanami/{configuration → config}/actions/csrf_protection_spec.rb +12 -12
- data/spec/unit/hanami/config/actions/default_values_spec.rb +54 -0
- data/spec/unit/hanami/{configuration → config}/actions/sessions_spec.rb +5 -5
- data/spec/unit/hanami/{configuration → config}/actions_spec.rb +13 -25
- data/spec/unit/hanami/{configuration → config}/base_url_spec.rb +2 -2
- data/spec/unit/hanami/{configuration → config}/inflector_spec.rb +2 -2
- data/spec/unit/hanami/{configuration → config}/logger_spec.rb +4 -4
- data/spec/unit/hanami/config/router_spec.rb +44 -0
- data/spec/unit/hanami/{configuration → config}/slices_spec.rb +2 -2
- data/spec/unit/hanami/{configuration → config}/views_spec.rb +15 -27
- data/spec/unit/hanami/{configuration_spec.rb → config_spec.rb} +3 -3
- data/spec/unit/hanami/settings_spec.rb +65 -10
- data/spec/unit/hanami/slice_configurable_spec.rb +21 -2
- data/spec/unit/hanami/version_spec.rb +1 -1
- metadata +162 -294
- data/lib/hanami/configuration/null_configuration.rb +0 -14
- data/lib/hanami/providers/settings.rb +0 -98
- data/lib/hanami/server.rb +0 -29
- data/spec/integration/application_middleware_stack_spec.rb +0 -84
- data/spec/integration/assets/cdn_spec.rb +0 -48
- data/spec/integration/assets/fingerprint_spec.rb +0 -42
- data/spec/integration/assets/helpers_spec.rb +0 -50
- data/spec/integration/assets/serve_spec.rb +0 -70
- data/spec/integration/assets/subresource_integrity_spec.rb +0 -54
- data/spec/integration/body_parsers_spec.rb +0 -50
- data/spec/integration/cli/assets/precompile_spec.rb +0 -147
- data/spec/integration/cli/assets_spec.rb +0 -14
- data/spec/integration/cli/console_spec.rb +0 -105
- data/spec/integration/cli/db/apply_spec.rb +0 -74
- data/spec/integration/cli/db/console_spec.rb +0 -40
- data/spec/integration/cli/db/create_spec.rb +0 -50
- data/spec/integration/cli/db/drop_spec.rb +0 -54
- data/spec/integration/cli/db/migrate_spec.rb +0 -108
- data/spec/integration/cli/db/prepare_spec.rb +0 -36
- data/spec/integration/cli/db/rollback_spec.rb +0 -96
- data/spec/integration/cli/db/version_spec.rb +0 -38
- data/spec/integration/cli/db_spec.rb +0 -21
- data/spec/integration/cli/destroy/action_spec.rb +0 -143
- data/spec/integration/cli/destroy/app_spec.rb +0 -118
- data/spec/integration/cli/destroy/mailer_spec.rb +0 -74
- data/spec/integration/cli/destroy/migration_spec.rb +0 -70
- data/spec/integration/cli/destroy/model_spec.rb +0 -113
- data/spec/integration/cli/destroy_spec.rb +0 -18
- data/spec/integration/cli/generate/action_spec.rb +0 -469
- data/spec/integration/cli/generate/app_spec.rb +0 -215
- data/spec/integration/cli/generate/mailer_spec.rb +0 -189
- data/spec/integration/cli/generate/migration_spec.rb +0 -72
- data/spec/integration/cli/generate/model_spec.rb +0 -290
- data/spec/integration/cli/generate/secret_spec.rb +0 -56
- data/spec/integration/cli/generate_spec.rb +0 -19
- data/spec/integration/cli/new/database_spec.rb +0 -235
- data/spec/integration/cli/new/hanami_head_spec.rb +0 -27
- data/spec/integration/cli/new/template_spec.rb +0 -118
- data/spec/integration/cli/new/test_spec.rb +0 -274
- data/spec/integration/cli/new_spec.rb +0 -970
- data/spec/integration/cli/plugins_spec.rb +0 -39
- data/spec/integration/cli/routes_spec.rb +0 -49
- data/spec/integration/cli/server_spec.rb +0 -626
- data/spec/integration/cli/version_spec.rb +0 -85
- data/spec/integration/early_hints_spec.rb +0 -35
- data/spec/integration/handle_exceptions_spec.rb +0 -244
- data/spec/integration/head_spec.rb +0 -89
- data/spec/integration/http_headers_spec.rb +0 -29
- data/spec/integration/mailer_spec.rb +0 -32
- data/spec/integration/middleware_spec.rb +0 -81
- data/spec/integration/mount_applications_spec.rb +0 -88
- data/spec/integration/project_initializers_spec.rb +0 -40
- data/spec/integration/rackup_spec.rb +0 -35
- data/spec/integration/rake/with_minitest_spec.rb +0 -67
- data/spec/integration/rake/with_rspec_spec.rb +0 -69
- data/spec/integration/routing_helpers_spec.rb +0 -61
- data/spec/integration/security/content_security_policy_spec.rb +0 -46
- data/spec/integration/security/csrf_protection_spec.rb +0 -42
- data/spec/integration/security/force_ssl_spec.rb +0 -29
- data/spec/integration/security/x_content_type_options_spec.rb +0 -46
- data/spec/integration/security/x_frame_options_spec.rb +0 -46
- data/spec/integration/security/x_xss_protection_spec.rb +0 -46
- data/spec/integration/send_file_spec.rb +0 -51
- data/spec/integration/sessions_spec.rb +0 -247
- data/spec/integration/static_middleware_spec.rb +0 -21
- data/spec/integration/streaming_spec.rb +0 -41
- data/spec/integration/unsafe_send_file_spec.rb +0 -52
- data/spec/new_integration/settings/access_to_constants_spec.rb +0 -169
- data/spec/support/fixtures/hanami-plugin/Gemfile +0 -8
- data/spec/support/fixtures/hanami-plugin/README.md +0 -35
- data/spec/support/fixtures/hanami-plugin/Rakefile +0 -4
- data/spec/support/fixtures/hanami-plugin/bin/console +0 -15
- data/spec/support/fixtures/hanami-plugin/bin/setup +0 -8
- data/spec/support/fixtures/hanami-plugin/hanami-plugin.gemspec +0 -28
- data/spec/support/fixtures/hanami-plugin/lib/hanami/plugin/cli.rb +0 -19
- data/spec/support/fixtures/hanami-plugin/lib/hanami/plugin/version.rb +0 -7
- data/spec/support/fixtures/hanami-plugin/lib/hanami/plugin.rb +0 -8
- data/spec/unit/hanami/configuration/actions/default_values_spec.rb +0 -52
- data/spec/unit/hanami/routes_spec.rb +0 -25
@@ -5,51 +5,106 @@ require "hanami/settings"
|
|
5
5
|
RSpec.describe Hanami::Settings do
|
6
6
|
describe "#initialize" do
|
7
7
|
it "uses values from the store when present" do
|
8
|
-
|
8
|
+
settings_class = Class.new(described_class) do
|
9
9
|
setting :database_url, default: "postgres://localhost/test_app_development"
|
10
10
|
end
|
11
|
-
store = { database_url: "mysql://localhost/test_app_development" }.freeze
|
12
11
|
|
13
|
-
|
12
|
+
store = {database_url: "mysql://localhost/test_app_development"}.freeze
|
13
|
+
|
14
|
+
instance = settings_class.new(store)
|
14
15
|
|
15
16
|
expect(instance.config.database_url).to eq("mysql://localhost/test_app_development")
|
16
17
|
end
|
17
18
|
|
18
19
|
it "uses defaults when values are not present in the store" do
|
19
|
-
|
20
|
+
settings_class = Class.new(described_class) do
|
20
21
|
setting :database_url, default: "postgres://localhost/test_app_development"
|
21
22
|
end
|
23
|
+
|
22
24
|
store = {}.freeze
|
23
25
|
|
24
|
-
instance =
|
26
|
+
instance = settings_class.new(store)
|
25
27
|
|
26
28
|
expect(instance.config.database_url).to eq("postgres://localhost/test_app_development")
|
27
29
|
end
|
28
30
|
|
29
|
-
it "collects error for all
|
30
|
-
|
31
|
+
it "collects error for all setting values failing their constructors" do
|
32
|
+
settings_class = Class.new(described_class) do
|
31
33
|
setting :database_url, constructor: ->(_v) { raise "nope to database" }
|
32
34
|
setting :redis_url, constructor: ->(_v) { raise "nope to redis" }
|
33
35
|
end
|
36
|
+
|
34
37
|
store = {
|
35
38
|
database_url: "postgres://localhost/test_app_development",
|
36
39
|
redis_url: "redis://localhost:6379"
|
37
40
|
}.freeze
|
38
41
|
|
39
|
-
expect {
|
42
|
+
expect { settings_class.new(store) }.to raise_error(
|
40
43
|
described_class::InvalidSettingsError,
|
41
44
|
/(database_url: nope to database).*(redis_url: nope to redis)/m,
|
42
45
|
)
|
43
46
|
end
|
47
|
+
|
48
|
+
it "collects errors for missing settings failing their constructors" do
|
49
|
+
settings_class = Class.new(described_class) do
|
50
|
+
setting :database_url, constructor: ->(_v) { raise "nope to database" }
|
51
|
+
end
|
52
|
+
|
53
|
+
store = {}
|
54
|
+
|
55
|
+
expect { settings_class.new(store) }.to raise_error(
|
56
|
+
described_class::InvalidSettingsError,
|
57
|
+
/database_url: nope to database/m,
|
58
|
+
)
|
59
|
+
end
|
60
|
+
|
61
|
+
it "finalizes the config" do
|
62
|
+
settings_class = Class.new(described_class) do
|
63
|
+
setting :database_url
|
64
|
+
end
|
65
|
+
|
66
|
+
store = {database_url: "postgres://localhost/test_app_development"}
|
67
|
+
|
68
|
+
settings = settings_class.new(store)
|
69
|
+
|
70
|
+
expect(settings.config).to be_frozen
|
71
|
+
expect { settings.database_url = "new" }.to raise_error(Dry::Configurable::FrozenConfig)
|
72
|
+
end
|
73
|
+
end
|
74
|
+
|
75
|
+
describe "#inspect" do
|
76
|
+
it "shows keys" do
|
77
|
+
settings_class = Class.new(described_class) do
|
78
|
+
setting :password, default: "dont_tell_anybody"
|
79
|
+
setting :passphrase, default: "shhhh"
|
80
|
+
end
|
81
|
+
|
82
|
+
expect(settings_class.new.inspect).to eq(
|
83
|
+
"#<#{settings_class.to_s} [password, passphrase]>"
|
84
|
+
)
|
85
|
+
end
|
86
|
+
end
|
87
|
+
|
88
|
+
describe "#inspect_values" do
|
89
|
+
it "shows keys & values" do
|
90
|
+
settings_class = Class.new(described_class) do
|
91
|
+
setting :password, default: "dont_tell_anybody"
|
92
|
+
setting :passphrase, default: "shhh"
|
93
|
+
end
|
94
|
+
|
95
|
+
expect(settings_class.new.inspect_values).to eq(
|
96
|
+
"#<#{settings_class.to_s} password=\"dont_tell_anybody\" passphrase=\"shhh\">"
|
97
|
+
)
|
98
|
+
end
|
44
99
|
end
|
45
100
|
|
46
101
|
it "delegates unknown methods to config" do
|
47
|
-
|
102
|
+
settings_class = Class.new(described_class) do
|
48
103
|
setting :foo, default: "bar"
|
49
104
|
end
|
50
105
|
store = {}.freeze
|
51
106
|
|
52
|
-
instance =
|
107
|
+
instance = settings_class.new(store)
|
53
108
|
|
54
109
|
expect(instance.foo).to eq("bar")
|
55
110
|
end
|
@@ -28,8 +28,6 @@ RSpec.describe Hanami::SliceConfigurable, :app_integration do
|
|
28
28
|
end
|
29
29
|
end
|
30
30
|
end
|
31
|
-
|
32
|
-
Hanami.app.prepare
|
33
31
|
end
|
34
32
|
|
35
33
|
context "subclass inside slice namespace" do
|
@@ -101,4 +99,25 @@ RSpec.describe Hanami::SliceConfigurable, :app_integration do
|
|
101
99
|
end
|
102
100
|
end
|
103
101
|
end
|
102
|
+
|
103
|
+
context "subclass inside nested slice namespace" do
|
104
|
+
before do
|
105
|
+
module Main
|
106
|
+
class Slice
|
107
|
+
register_slice :nested
|
108
|
+
end
|
109
|
+
end
|
110
|
+
|
111
|
+
module Nested
|
112
|
+
class MySubclass < TestApp::BaseClass
|
113
|
+
end
|
114
|
+
end
|
115
|
+
end
|
116
|
+
|
117
|
+
subject(:subclass) { Nested::MySubclass }
|
118
|
+
|
119
|
+
it "calls `configure_for_slice` with the nested slice" do
|
120
|
+
expect(subclass.traces).to eq [Nested::Slice]
|
121
|
+
end
|
122
|
+
end
|
104
123
|
end
|