hanami 2.0.0.beta1.1 → 2.0.0.beta3

data/spec/{new_integration → integration}/rack_app/middleware_spec.rb

@@ -64,10 +64,8 @@ RSpec.describe "Hanami web app", :app_integration do
 
       module TestApp
         class Routes < Hanami::Routes
-          define do
-            slice :main, at: "/" do
-              root to: "home.index"
-            end
+          slice :main, at: "/" do
+            root to: "home.index"
           end
         end
       end
@@ -113,14 +111,12 @@ RSpec.describe "Hanami web app", :app_integration do
 
       module TestApp
         class Routes < Hanami::Routes
-          define do
-            slice :main, at: "/" do
-              use TestApp::Middlewares::AppendOne
-              use TestApp::Middlewares::Prepare, before: TestApp::Middlewares::AppendOne
-              use TestApp::Middlewares::AppendTwo, after: TestApp::Middlewares::AppendOne
+          slice :main, at: "/" do
+            use TestApp::Middlewares::AppendOne
+            use TestApp::Middlewares::Prepare, before: TestApp::Middlewares::AppendOne
+            use TestApp::Middlewares::AppendTwo, after: TestApp::Middlewares::AppendOne
 
-              root to: "home.index"
-            end
+            root to: "home.index"
           end
         end
       end
@@ -180,10 +176,8 @@ RSpec.describe "Hanami web app", :app_integration do
 
       module TestApp
         class Routes < Hanami::Routes
-          define do
-            slice :main, at: "/" do
-              root to: "home.index"
-            end
+          slice :main, at: "/" do
+            root to: "home.index"
           end
         end
       end

data/spec/{new_integration → integration}/rack_app/non_booted_rack_app_spec.rb

@@ -24,11 +24,9 @@ RSpec.describe "Running a Rack app for a non-booted app", :app_integration do
 
         module TestApp
           class Routes < Hanami::Routes
-            define do
-              slice :main, at: "/" do
-                root to: "home.show"
-                get "/articles", to: "articles.index"
-              end
+            slice :main, at: "/" do
+              root to: "home.show"
+              get "/articles", to: "articles.index"
             end
           end
         end

data/spec/{new_integration → integration}/rack_app/rack_app_spec.rb

@@ -21,9 +21,7 @@ RSpec.describe "Hanami web app", :app_integration do
       write "config/routes.rb", <<~RUBY
         module TestApp
           class Routes < Hanami::Routes
-            define do
-              root to: ->(env) { [200, {}, ["OK"]] }
-            end
+            root to: ->(env) { [200, {}, ["OK"]] }
           end
         end
       RUBY
@@ -51,8 +49,7 @@ RSpec.describe "Hanami web app", :app_integration do
       write "config/routes.rb", <<~RUBY
         module TestApp
           class Routes < Hanami::Routes
-            define do
-            end
+            root to: ->(env) { [200, {}, ["OK"]] }
           end
         end
       RUBY
@@ -65,7 +62,7 @@ RSpec.describe "Hanami web app", :app_integration do
 
       logs = -> { Pathname(dir).join("test.log").realpath.read }
 
-      expect(logs.()).to match %r{GET 404 \d+ms 127.0.0.1 /}
+      expect(logs.()).to match %r{GET 200 \d+ms 127.0.0.1 /}
     end
   end
 
@@ -89,8 +86,7 @@ RSpec.describe "Hanami web app", :app_integration do
         write "slices/main/config/routes.rb", <<~RUBY
           module Main
             class Routes < Hanami::Routes
-              define do
-              end
+              root to: ->(env) { [200, {}, ["OK"]] }
             end
           end
         RUBY
@@ -101,7 +97,7 @@ RSpec.describe "Hanami web app", :app_integration do
 
         logs = -> { Pathname(dir).join("test.log").realpath.read }
 
-        expect(logs.()).to match %r{GET 404 \d+ms 127.0.0.1 /}
+        expect(logs.()).to match %r{GET 200 \d+ms 127.0.0.1 /}
       end
     end
   end
@@ -121,20 +117,18 @@ RSpec.describe "Hanami web app", :app_integration do
       write "config/routes.rb", <<~RUBY
         module TestApp
           class Routes < Hanami::Routes
-            define do
-              get "/health", to: "health.show"
+            get "/health", to: "health.show"
 
-              get "/inline" do
-                "Inline"
-              end
+            get "/inline" do
+              "Inline"
+            end
 
-              slice :main, at: "/" do
-                root to: "home.index"
-              end
+            slice :main, at: "/" do
+              root to: "home.index"
+            end
 
-              slice :admin, at: "/admin" do
-                get "/dashboard", to: "dashboard.show"
-              end
+            slice :admin, at: "/admin" do
+              get "/dashboard", to: "dashboard.show"
             end
           end
         end
@@ -228,12 +222,10 @@ RSpec.describe "Hanami web app", :app_integration do
       write "config/routes.rb", <<~RUBY
         module TestApp
           class Routes < Hanami::Routes
-            define do
-              root to: "home.index"
+            root to: "home.index"
 
-              slice :main, at: "/" do
-                root to: "home.index"
-              end
+            slice :main, at: "/" do
+              root to: "home.index"
             end
           end
         end
@@ -295,12 +287,10 @@ RSpec.describe "Hanami web app", :app_integration do
       write "config/routes.rb", <<~RUBY
         module TestApp
           class Routes < Hanami::Routes
-            define do
-              get "/feedbacks", to: "feedbacks.index"
+            get "/feedbacks", to: "feedbacks.index"
 
-              slice :api, at: "/api" do
-                get "/people", to: "people.index"
-              end
+            slice :api, at: "/api" do
+              get "/people", to: "people.index"
             end
           end
         end
@@ -374,9 +364,7 @@ RSpec.describe "Hanami web app", :app_integration do
       write "config/routes.rb", <<~RUBY
         module TestApp
           class Routes < Hanami::Routes
-            define do
-              get "/missing", to: "missing.action"
-            end
+            get "/missing", to: "missing.action"
           end
         end
       RUBY
@@ -405,10 +393,8 @@ RSpec.describe "Hanami web app", :app_integration do
       write "config/routes.rb", <<~RUBY
         module TestApp
           class Routes < Hanami::Routes
-            define do
-              slice :admin, at: "/admin" do
-                get "/missing", to: "missing.action"
-              end
+            slice :admin, at: "/admin" do
+              get "/missing", to: "missing.action"
             end
           end
         end
@@ -437,9 +423,7 @@ RSpec.describe "Hanami web app", :app_integration do
       write "config/routes.rb", <<~RUBY
         module TestApp
           class Routes < Hanami::Routes
-            define do
-              get "/missing", to: "missing.action"
-            end
+            get "/missing", to: "missing.action"
           end
         end
       RUBY
@@ -470,10 +454,8 @@ RSpec.describe "Hanami web app", :app_integration do
       write "config/routes.rb", <<~RUBY
         module TestApp
           class Routes < Hanami::Routes
-            define do
-              slice :admin, at: "/admin" do
-                get "/missing", to: "missing.action"
-              end
+            slice :admin, at: "/admin" do
+              get "/missing", to: "missing.action"
             end
           end
         end
@@ -504,10 +486,8 @@ RSpec.describe "Hanami web app", :app_integration do
       write "config/routes.rb", <<~RUBY
         module TestApp
           class Routes < Hanami::Routes
-            define do
-              slice :foo, at: "/foo" do
-                get "/bar", to: "bar.index"
-              end
+            slice :foo, at: "/foo" do
+              get "/bar", to: "bar.index"
             end
           end
         end

data/spec/integration/settings/access_to_constants_spec.rb

@@ -0,0 +1,169 @@
+# frozen_string_literal: true
+
+RSpec.describe "Settings / Access to constants", :app_integration do
+  before do
+    @env = ENV.to_h
+  end
+
+  after do
+    ENV.replace(@env)
+  end
+
+  describe "Settings can access autoloadable constants" do
+    describe "settings for app" do
+      specify "constant defined in app directory" do
+        with_directory(make_tmp_directory) do
+          write "config/app.rb", <<~'RUBY'
+            require "hanami"
+
+            module TestApp
+              class App < Hanami::App
+              end
+            end
+          RUBY
+
+          write ".env", <<~'TEXT'
+            SOME_FLAG=true
+          TEXT
+
+          write "config/settings.rb", <<~'RUBY'
+            module TestApp
+              class Settings < Hanami::Settings
+                setting :some_flag, constructor: Types::Params::Bool
+              end
+            end
+          RUBY
+
+          write "app/types.rb", <<~'RUBY'
+            # auto_register: false
+
+            require "dry/types"
+
+            module TestApp
+              Types = Dry.Types()
+            end
+          RUBY
+
+          require "hanami/prepare"
+
+          expect(Hanami.app[:settings].some_flag).to be true
+        end
+      end
+
+      specify "constant defined in root lib directory" do
+        with_directory(make_tmp_directory) do
+          write "config/app.rb", <<~'RUBY'
+            require "hanami"
+
+            module TestApp
+              class App < Hanami::App
+              end
+            end
+          RUBY
+
+          write ".env", <<~'TEXT'
+            SOME_FLAG=true
+          TEXT
+
+          write "config/settings.rb", <<~'RUBY'
+            module TestApp
+              class Settings < Hanami::Settings
+                setting :some_flag, constructor: Types::Params::Bool
+              end
+            end
+          RUBY
+
+          write "lib/test_app/types.rb", <<~'RUBY'
+            require "dry/types"
+
+            module TestApp
+              Types = Dry.Types()
+            end
+          RUBY
+
+          require "hanami/prepare"
+
+          expect(Hanami.app[:settings].some_flag).to be true
+        end
+      end
+    end
+
+    describe "settings for slice" do
+      specify "constant defined in slice directory" do
+        with_directory(make_tmp_directory) do
+          write "config/app.rb", <<~'RUBY'
+            require "hanami"
+
+            module TestApp
+              class App < Hanami::App
+              end
+            end
+          RUBY
+
+          write ".env", <<~'TEXT'
+            SOME_FLAG=true
+          TEXT
+
+          write "slices/main/config/settings.rb", <<~'RUBY'
+            module Main
+              class Settings < Hanami::Settings
+                setting :some_flag, constructor: Types::Params::Bool
+              end
+            end
+          RUBY
+
+          write "slices/main/types.rb", <<~'RUBY'
+            # auto_register: false
+
+            require "dry/types"
+
+            module Main
+              Types = Dry.Types()
+            end
+          RUBY
+
+          require "hanami/prepare"
+
+          expect(Main::Slice[:settings].some_flag).to be true
+        end
+      end
+
+      specify "constant defined in root lib directory" do
+        with_directory(make_tmp_directory) do
+          write "config/app.rb", <<~'RUBY'
+            require "hanami"
+
+            module TestApp
+              class App < Hanami::App
+              end
+            end
+          RUBY
+
+          write ".env", <<~'TEXT'
+            SOME_FLAG=true
+          TEXT
+
+          write "slices/main/config/settings.rb", <<~'RUBY'
+            module Main
+              class Settings < Hanami::Settings
+                setting :some_flag, constructor: TestApp::Types::Params::Bool
+              end
+            end
+          RUBY
+
+          write "lib/test_app/types.rb", <<~'RUBY'
+            require "dry/types"
+
+            module TestApp
+              Types = Dry.Types()
+            end
+          RUBY
+
+          require "hanami/prepare"
+
+          expect(Main::Slice[:settings].some_flag).to be true
+        end
+      end
+    end
+  end
+end

data/spec/integration/settings/loading_from_env_spec.rb

@@ -0,0 +1,187 @@
+# frozen_string_literal: true
+
+RSpec.describe "Settings / Access to constants", :app_integration do
+  before do
+    @env = ENV.to_h
+  end
+
+  after do
+    ENV.replace(@env)
+  end
+
+  specify "settings are loaded from ENV" do
+    with_tmp_directory(Dir.mktmpdir) do
+      write "config/app.rb", <<~'RUBY'
+        require "hanami"
+
+        module TestApp
+          class App < Hanami::App
+          end
+        end
+      RUBY
+
+      write "config/settings.rb", <<~'RUBY'
+        module TestApp
+          class Settings < Hanami::Settings
+            setting :database_url
+          end
+        end
+      RUBY
+
+      ENV["DATABASE_URL"] = "postgres://localhost/database"
+
+      require "hanami/prepare"
+
+      expect(Hanami.app["settings"].database_url).to eq "postgres://localhost/database"
+    end
+  end
+
+  describe "settings are loaded from .env files" do
+    context "hanami env is development" do
+      it "loads settings from .env.development.local, .env.local, .env.development and .env (in this order)" do
+        with_tmp_directory(Dir.mktmpdir) do
+          write "config/app.rb", <<~'RUBY'
+            require "hanami"
+
+            module TestApp
+              class App < Hanami::App
+              end
+            end
+          RUBY
+
+          write "config/settings.rb", <<~'RUBY'
+            module TestApp
+              class Settings < Hanami::Settings
+                setting :from_specific_env_local
+                setting :from_base_local
+                setting :from_specific_env
+                setting :from_base
+              end
+            end
+          RUBY
+
+          write ".env.development.local", <<~'TEXT'
+            FROM_SPECIFIC_ENV_LOCAL="from .env.development.local"
+          TEXT
+
+          write ".env.local", <<~'TEXT'
+            FROM_BASE_LOCAL="from .env.local"
+
+            FROM_SPECIFIC_ENV_LOCAL=nope
+          TEXT
+
+          write ".env.development", <<~'TEXT'
+            FROM_SPECIFIC_ENV="from .env.development"
+
+            FROM_SPECIFIC_ENV_LOCAL=nope
+            FROM_BASE_LOCAL=nope
+          TEXT
+
+          write ".env", <<~'TEXT'
+            FROM_BASE="from .env"
+
+            FROM_SPECIFIC_ENV_LOCAL=nope
+            FROM_BASE_LOCAL=nope
+            FROM_SPECIFIC_ENV=nope
+          TEXT
+
+          ENV["HANAMI_ENV"] = "development"
+
+          require "hanami/prepare"
+
+          expect(Hanami.app["settings"].from_specific_env_local).to eq "from .env.development.local"
+          expect(Hanami.app["settings"].from_base_local).to eq "from .env.local"
+          expect(Hanami.app["settings"].from_specific_env).to eq "from .env.development"
+          expect(Hanami.app["settings"].from_base).to eq "from .env"
+        end
+      end
+
+      context "hanami env is test" do
+        it "loads settings from .env.development.local, .env.development and .env (in this order)" do
+          with_tmp_directory(Dir.mktmpdir) do
+            write "config/app.rb", <<~'RUBY'
+              require "hanami"
+
+              module TestApp
+                class App < Hanami::App
+                end
+              end
+            RUBY
+
+            write "config/settings.rb", <<~'RUBY'
+              module TestApp
+                class Settings < Hanami::Settings
+                  setting :from_specific_env_local
+                  setting :from_base_local
+                  setting :from_specific_env
+                  setting :from_base
+                end
+              end
+            RUBY
+
+            write ".env.test.local", <<~'TEXT'
+              FROM_SPECIFIC_ENV_LOCAL="from .env.test.local"
+            TEXT
+
+            write ".env.local", <<~'TEXT'
+              FROM_BASE_LOCAL="from .env.local"
+            TEXT
+
+            write ".env.test", <<~'TEXT'
+              FROM_SPECIFIC_ENV="from .env.test"
+
+              FROM_SPECIFIC_ENV_LOCAL=nope
+            TEXT
+
+            write ".env", <<~'TEXT'
+              FROM_BASE="from .env"
+
+              FROM_SPECIFIC_ENV_LOCAL=nope
+              FROM_SPECIFIC_ENV=nope
+            TEXT
+
+            ENV["HANAMI_ENV"] = "test"
+
+            require "hanami/prepare"
+
+            expect(Hanami.app["settings"].from_specific_env_local).to eq "from .env.test.local"
+            expect(Hanami.app["settings"].from_base_local).to be nil
+            expect(Hanami.app["settings"].from_specific_env).to eq "from .env.test"
+            expect(Hanami.app["settings"].from_base).to eq "from .env"
+          end
+        end
+      end
+    end
+  end
+
+  it "prefers ENV values are preferred over .env files" do
+    with_tmp_directory(Dir.mktmpdir) do
+      write "config/app.rb", <<~'RUBY'
+        require "hanami"
+
+        module TestApp
+          class App < Hanami::App
+          end
+        end
+      RUBY
+
+      write "config/settings.rb", <<~'RUBY'
+        module TestApp
+          class Settings < Hanami::Settings
+            setting :database_url
+          end
+        end
+      RUBY
+
+      write ".env", <<~'TEXT'
+        DATABASE_URL=nope
+      TEXT
+
+      ENV["DATABASE_URL"] = "postgres://localhost/database"
+
+      require "hanami/prepare"
+
+      expect(Hanami.app["settings"].database_url).to eq "postgres://localhost/database"
+    end
+  end
+end

data/spec/integration/settings/settings_component_loading_spec.rb

@@ -0,0 +1,113 @@
+# frozen_string_literal: true
+
+RSpec.describe "Settings / Component loading", :app_integration do
+  describe "Settings are loaded from a class defined in config/settings.rb" do
+    specify "in app" do
+      with_directory(make_tmp_directory) do
+        write "config/app.rb", <<~'RUBY'
+          require "hanami"
+
+          module TestApp
+            class App < Hanami::App
+            end
+          end
+        RUBY
+
+        write "config/settings.rb", <<~'RUBY'
+          module TestApp
+            class Settings < Hanami::Settings
+              setting :foo
+            end
+          end
+        RUBY
+
+        require "hanami/prepare"
+
+        expect(Hanami.app["settings"]).to be_an_instance_of TestApp::Settings
+        expect(Hanami.app["settings"]).to respond_to :foo
+      end
+    end
+
+    specify "in slice" do
+      with_directory(make_tmp_directory) do
+        write "config/app.rb", <<~'RUBY'
+          require "hanami"
+
+          module TestApp
+            class App < Hanami::App
+            end
+          end
+        RUBY
+
+        write "slices/main/config/settings.rb", <<~'RUBY'
+          module Main
+            class Settings < Hanami::Settings
+              setting :foo
+            end
+          end
+        RUBY
+
+        require "hanami/prepare"
+
+        expect(Main::Slice["settings"]).to be_an_instance_of Main::Settings
+        expect(Main::Slice["settings"]).to respond_to :foo
+      end
+    end
+  end
+
+  describe "Settings are loaded from a `Settings` class if already defined" do
+    specify "in app" do
+      with_directory(make_tmp_directory) do
+        write "config/app.rb", <<~'RUBY'
+          require "hanami"
+          require "hanami/settings"
+
+          module TestApp
+            class App < Hanami::App
+            end
+
+            class Settings < Hanami::Settings
+              setting :foo
+            end
+          end
+        RUBY
+
+        require "hanami/prepare"
+
+        expect(Hanami.app["settings"]).to be_an_instance_of TestApp::Settings
+        expect(Hanami.app["settings"]).to respond_to :foo
+      end
+    end
+
+    specify "in slice" do
+      with_directory(make_tmp_directory) do
+        write "config/app.rb", <<~'RUBY'
+          require "hanami"
+
+          module TestApp
+            class App < Hanami::App
+            end
+          end
+        RUBY
+
+        write "config/slices/main.rb", <<~'RUBY'
+          require "hanami/settings"
+
+          module Main
+            class Slice < Hanami::Slice
+            end
+
+            class Settings < Hanami::Settings
+              setting :foo
+            end
+          end
+        RUBY
+
+        require "hanami/prepare"
+
+        expect(Main::Slice["settings"]).to be_an_instance_of Main::Settings
+        expect(Main::Slice["settings"]).to respond_to :foo
+      end
+    end
+  end
+end