Remove implicit Site and Language creation

app/controllers/alchemy/admin/base_controller.rb

@@ -144,7 +144,7 @@ def current_alchemy_site
         @current_alchemy_site ||= begin
           site_id = params[:site_id] || session[:alchemy_site_id]
           site = Site.find_by(id: site_id) || super
-          session[:alchemy_site_id] = site.id
+          session[:alchemy_site_id] = site&.id
           site
         end
       end

app/controllers/alchemy/admin/languages_controller.rb

@@ -3,6 +3,11 @@
 module Alchemy
   module Admin
     class LanguagesController < ResourcesController
+      before_action unless: -> { Alchemy::Site.any? } do
+        flash[:warning] = Alchemy.t('Please create a site first.')
+        redirect_to admin_sites_path
+      end
+
       def index
         @query = Language.on_current_site.ransack(search_filter_params[:q])
         @query.sorts = default_sort_order if @query.sorts.empty?

app/controllers/alchemy/admin/layoutpages_controller.rb

@@ -4,6 +4,9 @@ module Alchemy
   module Admin
     class LayoutpagesController < Alchemy::Admin::BaseController
       authorize_resource class: :alchemy_admin_layoutpages
+
+      include Alchemy::Admin::LanguageNeededRedirect
+
       helper Alchemy::Admin::PagesHelper
 
       def index

app/controllers/alchemy/admin/nodes_controller.rb

@@ -3,6 +3,8 @@
 module Alchemy
   module Admin
     class NodesController < Admin::ResourcesController
+      include Alchemy::Admin::LanguageNeededRedirect
+
       def index
         @root_nodes = Node.language_root_nodes
       end

app/controllers/alchemy/admin/pages_controller.rb

@@ -7,25 +7,27 @@ class PagesController < Alchemy::Admin::BaseController
 
       helper 'alchemy/pages'
 
+      before_action :load_page, except: [:index, :flush, :new, :order, :create, :copy_language_tree, :link, :sort]
+
+      authorize_resource class: Alchemy::Page, except: [:index, :tree]
+
+      before_action only: [:index, :tree, :flush, :new, :order, :create, :copy_language_tree] do
+        authorize! :index, :alchemy_admin_pages
+      end
+
+      include Alchemy::Admin::LanguageNeededRedirect
+
       before_action :set_translation,
         except: [:show]
 
-      before_action :load_page,
-        only: [:show, :info, :unlock, :visit, :publish, :configure, :edit, :update, :destroy, :fold,
-               :tree]
-
       before_action :set_root_page,
         only: [:index, :show, :sort, :order]
 
-      authorize_resource class: Alchemy::Page, except: [:index, :tree]
-
       before_action :run_on_page_layout_callbacks,
         if: :run_on_page_layout_callbacks?,
         only: [:show]
 
       def index
-        authorize! :index, :alchemy_admin_pages
-
         if !@page_root
           @language = Language.current
           @languages_with_page_tree = Language.on_current_site.with_root_page
@@ -36,8 +38,6 @@ def index
       # Returns all pages as a tree from the root given by the id parameter
       #
       def tree
-        authorize! :tree, :alchemy_admin_pages
-
         render json: serialized_page_tree
       end
 
@@ -56,10 +56,10 @@ def info
       end
 
       def new
-        @page = Page.new(layoutpage: params[:layoutpage] == 'true', parent_id: params[:parent_id])
-        @page_layouts = PageLayout.layouts_for_select(Language.current.id, @page.layoutpage?)
+        @page ||= Page.new(layoutpage: params[:layoutpage] == 'true', parent_id: params[:parent_id])
+        @page_layouts = PageLayout.layouts_for_select(Language.current&.id, @page.layoutpage?)
         @clipboard = get_clipboard('pages')
-        @clipboard_items = Page.all_from_clipboard_for_select(@clipboard, Language.current.id, @page.layoutpage?)
+        @clipboard_items = Page.all_from_clipboard_for_select(@clipboard, Language.current&.id, @page.layoutpage?)
       end
 
       def create
@@ -68,9 +68,7 @@ def create
           flash[:notice] = Alchemy.t("Page created", name: @page.name)
           do_redirect_to(redirect_path_after_create_page)
         else
-          @page_layouts = PageLayout.layouts_for_select(Language.current.id, @page.layoutpage?)
-          @clipboard = get_clipboard('pages')
-          @clipboard_items = Page.all_from_clipboard_for_select(@clipboard, Language.current.id, @page.layoutpage?)
+          new
           render :new
         end
       end

app/controllers/alchemy/api/pages_controller.rb

@@ -60,6 +60,8 @@ def load_page_by_id
     end
 
     def load_page_by_urlname
+      return unless Language.current
+
       Language.current.pages.where(
         urlname: params[:urlname],
         language_code: params[:locale] || Language.current.code

app/controllers/alchemy/base_controller.rb

@@ -26,7 +26,8 @@ class BaseController < ApplicationController
     # Sets +I18n.locale+ to current Alchemy language.
     #
     def set_locale
-      ::I18n.locale = Language.current.locale
+      return unless Language.current
+      ::I18n.locale = Language.current&.locale
     end
 
     def not_found_error!(msg = "Not found \"#{request.fullpath}\"")

app/controllers/alchemy/pages_controller.rb

@@ -108,6 +108,8 @@ def load_index_page
     # @return NilClass
     #
     def load_page
+      page_not_found! unless Language.current
+
       @page ||= Language.current.pages.contentpages.find_by(
         urlname: params[:urlname],
         language_code: params[:locale] || Language.current.code

app/controllers/concerns/alchemy/admin/language_needed_redirect.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Admin
+    module LanguageNeededRedirect
+      extend ActiveSupport::Concern
+
+      included do
+        before_action unless: -> { Alchemy::Language.current }, only: :index do
+          flash[:warning] = Alchemy.t('Please create a language first.')
+          redirect_to admin_languages_path
+        end
+      end
+    end
+  end
+end

app/controllers/concerns/alchemy/site_redirects.rb

@@ -16,7 +16,7 @@ def enforce_primary_host_for_site
     end
 
     def needs_redirect_to_primary_host?
-      current_alchemy_site.redirect_to_primary_host? &&
+      current_alchemy_site&.redirect_to_primary_host? &&
         current_alchemy_site.host != '*' &&
         current_alchemy_site.host != request.host
     end

app/helpers/alchemy/base_helper.rb

@@ -71,6 +71,11 @@ def render_flash_notice(notice, style = :notice)
     # If a String is given, it tries to find the page via page_layout
     # Logs a warning if no page is given.
     def page_or_find(page)
+      unless Language.current
+        warning("No default language set up")
+        return nil
+      end
+
       if page.is_a?(String)
         page = Language.current.pages.find_by(page_layout: page)
       end

app/models/alchemy/language.rb

@@ -81,6 +81,8 @@ def current
 
       # The root page of the current language.
       def current_root_page
+        return unless current
+
         current.pages.language_roots.first
       end
 

app/models/alchemy/site.rb

@@ -25,9 +25,6 @@ class Site < BaseRecord
 
     scope :published, -> { where(public: true) }
 
-    # Callbacks
-    before_create :create_default_language!, unless: -> { languages.any? }
-
     # concerns
     include Alchemy::Site::Layout
 
@@ -64,7 +61,7 @@ def current
       end
 
       def default
-        Site.first || create_default_site!
+        Site.first
       end
 
       def find_for_host(host)
@@ -81,38 +78,6 @@ def find_in_aliases(host)
           site.aliases.split.include?(host) if site.aliases.present?
         end
       end
-
-      private
-
-      def create_default_site!
-        default_site = Alchemy::Config.get(:default_site)
-        if default_site
-          create!(name: default_site['name'], host: default_site['host'])
-        else
-          raise DefaultSiteNotFoundError
-        end
-      end
-    end
-
-    private
-
-    # If no languages are present, create a default language based
-    # on the host app's Alchemy configuration.
-    def create_default_language!
-      default_language = Alchemy::Config.get(:default_language)
-      if default_language
-        languages.build(
-          name:           default_language['name'],
-          language_code:  default_language['code'],
-          locale:         default_language['code'],
-          frontpage_name: default_language['frontpage_name'],
-          page_layout:    default_language['page_layout'],
-          public:         true,
-          default:        true
-        )
-      else
-        raise DefaultLanguageNotFoundError
-      end
     end
   end
 end

config/alchemy/config.yml

@@ -85,7 +85,7 @@ default_site:
   name: Default Site
   host: '*'
 
-# This is the default language when a new site gets created.
+# This is the default language when seeding.
 default_language:
   code: en
   name: English

lib/alchemy/configuration_methods.rb

@@ -28,7 +28,8 @@ def multi_language?
     # matches the current I18n.locale then the prefix os omitted.
     # Also, if only one published language exists.
     #
-    def prefix_locale?(locale = Language.current.code)
+    def prefix_locale?(locale = Language.current&.code)
+      return false unless locale
       multi_language? && locale != ::I18n.default_locale.to_s
     end
 

lib/alchemy/page_layout.rb

@@ -153,6 +153,7 @@ def page_with_layout_existing?(layout)
       #     page_layouts: [default_intro]
       #
       def available_on_site?(layout)
+        return false unless Alchemy::Site.current
         Alchemy::Site.current.definition.blank? ||
           Alchemy::Site.current.definition.fetch('page_layouts', []).include?(layout['name'])
       end

lib/alchemy/seeder.rb

@@ -30,6 +30,8 @@ def try_seed_pages
           log "There are already pages present in your database. " \
               "Please use `rake db:reset' if you want to rebuild your database.", :skip
         else
+          create_default_site! unless Alchemy::Site.default
+          create_default_language! unless Alchemy::Language.default
           seed_pages if contentpages.present?
           seed_layoutpages if layoutpages.present?
         end
@@ -108,6 +110,35 @@ def create_page(draft, attributes = {})
           create_page(child, parent: page)
         end
       end
+
+      # If no languages are present, create a default language based
+      # on the host app's Alchemy configuration.
+      def create_default_language!
+        default_language = Alchemy::Config.get(:default_language)
+        if default_language
+          Alchemy::Language.create!(
+            name:           default_language['name'],
+            language_code:  default_language['code'],
+            locale:         default_language['code'],
+            frontpage_name: default_language['frontpage_name'],
+            page_layout:    default_language['page_layout'],
+            public:         true,
+            default:        true,
+            site:           Alchemy::Site.default
+          )
+        else
+          raise DefaultLanguageNotFoundError
+        end
+      end
+
+      def create_default_site!
+        default_site = Alchemy::Config.get(:default_site)
+        if default_site
+          Alchemy::Site.create!(name: default_site['name'], host: default_site['host'])
+        else
+          raise DefaultSiteNotFoundError
+        end
+      end
     end
   end
 end

lib/alchemy/test_support/factories/language_factory.rb

@@ -13,7 +13,7 @@
 
     public { true }
 
-    site { Alchemy::Site.default }
+    site { Alchemy::Site.default || create(:alchemy_site, :default) }
 
     trait :klingon do
       name { 'Klingon' }

lib/alchemy/test_support/factories/node_factory.rb

@@ -6,8 +6,8 @@
 
 FactoryBot.define do
   factory :alchemy_node, class: 'Alchemy::Node' do
-    site { Alchemy::Site.default }
-    language { Alchemy::Language.default }
+    site { Alchemy::Site.default || create(:alchemy_site) }
+    language { Alchemy::Language.default || create(:alchemy_language) }
     name { 'A Node' }
 
     trait :with_page do

lib/alchemy/test_support/factories/page_factory.rb

@@ -11,7 +11,7 @@
 
     parent_id do
       (Alchemy::Page.find_by(language_root: true) ||
-        FactoryBot.create(:alchemy_page, :language_root)).id
+        FactoryBot.create(:alchemy_page, :language_root, language: language)).id
     end
 
     # This speeds up creating of pages dramatically.

spec/controllers/alchemy/admin/languages_controller_spec.rb

@@ -10,6 +10,13 @@
   end
 
   describe "#index" do
+    context 'without a site' do
+      it "redirects to the sites admin" do
+        get :index
+        expect(response).to redirect_to(admin_sites_path)
+      end
+    end
+
     context "with multiple sites" do
       let!(:default_site_language) do
         create(:alchemy_language)
@@ -31,6 +38,8 @@
     end
 
     context "editor users" do
+      let!(:site) { create(:alchemy_site) }
+
       before do
         authorize_user(:as_editor)
       end
@@ -43,10 +52,21 @@
   end
 
   describe "#new" do
-    it "has default language's page_layout set" do
-      get :new
-      expect(assigns(:language).page_layout).
-        to eq(Alchemy::Config.get(:default_language)['page_layout'])
+   context 'without a site' do
+      it "redirects to the sites admin" do
+        get :index
+        expect(response).to redirect_to(admin_sites_path)
+      end
+    end
+
+    context 'with a site' do
+      let!(:site) { create(:alchemy_site) }
+
+      it "has default language's page_layout set" do
+        get :new
+        expect(assigns(:language).page_layout).
+          to eq(Alchemy::Config.get(:default_language)['page_layout'])
+      end
     end
   end