alchemy_cms 4.6.7 → 5.0.0.beta1

data/config/routes.rb

@@ -1,17 +1,18 @@
-require 'alchemy/routing_constraints'
+# frozen_string_literal: true
+require "alchemy/routing_constraints"
 
 Alchemy::Engine.routes.draw do
-  root to: 'pages#index'
+  root to: "pages#index"
 
-  get '/sitemap.xml' => 'pages#sitemap', format: 'xml'
+  get "/sitemap.xml" => "pages#sitemap", format: "xml"
 
   scope Alchemy.admin_path, {constraints: Alchemy.admin_constraints} do
-    get '/' => redirect("#{Alchemy.admin_path}/dashboard"), as: :admin
-    get '/dashboard' => 'admin/dashboard#index', as: :admin_dashboard
-    get '/dashboard/info' => 'admin/dashboard#info', as: :dashboard_info
-    get '/help' => 'admin/dashboard#help', as: :help
-    get '/dashboard/update_check' => 'admin/dashboard#update_check', as: :update_check
-    get '/leave' => 'admin/base#leave', as: :leave_admin
+    get "/" => redirect("#{Alchemy.admin_path}/dashboard"), as: :admin
+    get "/dashboard" => "admin/dashboard#index", as: :admin_dashboard
+    get "/dashboard/info" => "admin/dashboard#info", as: :dashboard_info
+    get "/help" => "admin/dashboard#help", as: :help
+    get "/dashboard/update_check" => "admin/dashboard#update_check", as: :update_check
+    get "/leave" => "admin/base#leave", as: :leave_admin
   end
 
   namespace :admin, {path: Alchemy.admin_path, constraints: Alchemy.admin_constraints} do
@@ -94,7 +95,7 @@ Alchemy::Engine.routes.draw do
       end
     end
 
-    resource :clipboard, only: :index, controller: 'clipboard' do
+    resource :clipboard, only: :index, controller: "clipboard" do
       collection do
         get :index
         delete :clear
@@ -103,7 +104,7 @@ Alchemy::Engine.routes.draw do
       end
     end
 
-    resource :trash, only: :index, controller: 'trash' do
+    resource :trash, only: :index, controller: "trash" do
       collection do
         get :index
         delete :clear
@@ -118,38 +119,38 @@ Alchemy::Engine.routes.draw do
 
     resources :sites
 
-    get '/styleguide' => 'styleguide#index'
+    get "/styleguide" => "styleguide#index"
   end
 
-  get '/attachment/:id/download(/:name)' => 'attachments#download',
+  get "/attachment/:id/download(/:name)" => "attachments#download",
       as: :download_attachment
-  get '/attachment/:id/show' => 'attachments#show',
+  get "/attachment/:id/show" => "attachments#show",
       as: :show_attachment
 
   resources :messages, only: [:index, :new, :create]
   resources :elements, only: :show
   resources :contents, only: :show
 
-  namespace :api, defaults: {format: 'json'} do
+  namespace :api, defaults: {format: "json"} do
     resources :contents, only: [:index, :show]
 
     resources :elements, only: [:index, :show] do
-      get '/contents' => 'contents#index', as: 'contents'
-      get '/contents/:name' => 'contents#show', as: 'content'
+      get "/contents" => "contents#index", as: "contents"
+      get "/contents/:name" => "contents#show", as: "content"
     end
 
     resources :pages, only: [:index] do
-      get 'elements' => 'elements#index', as: 'elements'
-      get 'elements/:named' => 'elements#index', as: 'named_elements'
+      get "elements" => "elements#index", as: "elements"
+      get "elements/:named" => "elements#index", as: "named_elements"
       collection do
         get :nested
       end
     end
 
-    get '/pages/*urlname(.:format)' => 'pages#show', as: 'page'
-    get '/admin/pages/:id(.:format)' => 'pages#show', as: 'preview_page'
+    get "/pages/*urlname(.:format)" => "pages#show", as: "page"
+    get "/admin/pages/:id(.:format)" => "pages#show", as: "preview_page"
 
-    resources :nodes, only: [] do
+    resources :nodes, only: [:index] do
       member do
         patch :move
         patch :toggle_folded
@@ -157,13 +158,13 @@ Alchemy::Engine.routes.draw do
     end
   end
 
-  get '/:locale' => 'pages#index',
+  get "/:locale" => "pages#index",
     constraints: {locale: Alchemy::RoutingConstraints::LOCALE_REGEXP},
     as: :show_language_root
 
   # The page show action has to be last route
   constraints(locale: Alchemy::RoutingConstraints::LOCALE_REGEXP) do
-    get '(/:locale)/*urlname(.:format)' => 'pages#show',
+    get "(/:locale)/*urlname(.:format)" => "pages#show",
       constraints: Alchemy::RoutingConstraints.new,
       as: :show_page
   end

data/config/spring.rb

@@ -1,2 +1,3 @@
-Spring.application_root = './spec/dummy'
-Spring.watch 'lib/**/*'
+# frozen_string_literal: true
+Spring.application_root = "./spec/dummy"
+Spring.watch "lib/**/*"

data/db/migrate/20200226213334_alchemy_four_point_four.rb

@@ -0,0 +1,313 @@
+# frozen_string_literal: true
+
+class AlchemyFourPointFour < ActiveRecord::Migration[5.2]
+  def up
+    unless table_exists?("alchemy_attachments")
+      create_table "alchemy_attachments", force: :cascade do |t|
+        t.string "name"
+        t.string "file_name"
+        t.string "file_mime_type"
+        t.integer "file_size"
+        t.references "creator"
+        t.references "updater"
+        t.timestamps null: false
+        t.string "file_uid"
+        t.index ["file_uid"], name: "index_alchemy_attachments_on_file_uid"
+      end
+    end
+
+    unless table_exists?("alchemy_contents")
+      create_table "alchemy_contents", force: :cascade do |t|
+        t.string "name"
+        t.references "essence", null: false, polymorphic: true, index: { unique: true }
+        t.references "element", null: false
+      end
+    end
+
+    unless table_exists?("alchemy_elements")
+      create_table "alchemy_elements", force: :cascade do |t|
+        t.string "name"
+        t.integer "position"
+        t.references "page", null: false, index: false
+        t.boolean "public", default: true
+        t.boolean "folded", default: false
+        t.boolean "unique", default: false
+        t.timestamps null: false
+        t.references "creator"
+        t.references "updater"
+        t.references "parent_element", index: false
+        t.boolean "fixed", default: false, null: false
+        t.index ["fixed"], name: "index_alchemy_elements_on_fixed"
+        t.index ["page_id", "parent_element_id"], name: "index_alchemy_elements_on_page_id_and_parent_element_id"
+        t.index ["page_id", "position"], name: "index_elements_on_page_id_and_position"
+      end
+    end
+
+    unless table_exists?("alchemy_elements_alchemy_pages")
+      create_table "alchemy_elements_alchemy_pages", id: false, force: :cascade do |t|
+        t.references "element"
+        t.references "page"
+      end
+    end
+
+    unless table_exists?("alchemy_essence_booleans")
+      create_table "alchemy_essence_booleans", force: :cascade do |t|
+        t.boolean "value"
+        t.index ["value"], name: "index_alchemy_essence_booleans_on_value"
+      end
+    end
+
+    unless table_exists?("alchemy_essence_dates")
+      create_table "alchemy_essence_dates", force: :cascade do |t|
+        t.datetime "date"
+      end
+    end
+
+    unless table_exists?("alchemy_essence_files")
+      create_table "alchemy_essence_files", force: :cascade do |t|
+        t.references "attachment"
+        t.string "title"
+        t.string "css_class"
+        t.string "link_text"
+      end
+    end
+
+    unless table_exists?("alchemy_essence_htmls")
+      create_table "alchemy_essence_htmls", force: :cascade do |t|
+        t.text "source"
+      end
+    end
+
+    unless table_exists?("alchemy_essence_links")
+      create_table "alchemy_essence_links", force: :cascade do |t|
+        t.string "link"
+        t.string "link_title"
+        t.string "link_target"
+        t.string "link_class_name"
+      end
+    end
+
+    unless table_exists?("alchemy_essence_pages")
+      create_table "alchemy_essence_pages", force: :cascade do |t|
+        t.references "page"
+      end
+    end
+
+    unless table_exists?("alchemy_essence_pictures")
+      create_table "alchemy_essence_pictures", force: :cascade do |t|
+        t.references "picture"
+        t.string "caption"
+        t.string "title"
+        t.string "alt_tag"
+        t.string "link"
+        t.string "link_class_name"
+        t.string "link_title"
+        t.string "css_class"
+        t.string "link_target"
+        t.string "crop_from"
+        t.string "crop_size"
+        t.string "render_size"
+      end
+    end
+
+    unless table_exists?("alchemy_essence_richtexts")
+      create_table "alchemy_essence_richtexts", force: :cascade do |t|
+        t.text "body"
+        t.text "stripped_body"
+        t.boolean "public"
+      end
+    end
+
+    unless table_exists?("alchemy_essence_selects")
+      create_table "alchemy_essence_selects", force: :cascade do |t|
+        t.string "value"
+        t.index ["value"], name: "index_alchemy_essence_selects_on_value"
+      end
+    end
+
+    unless table_exists?("alchemy_essence_texts")
+      create_table "alchemy_essence_texts", force: :cascade do |t|
+        t.text "body"
+        t.string "link"
+        t.string "link_title"
+        t.string "link_class_name"
+        t.boolean "public", default: false
+        t.string "link_target"
+      end
+    end
+
+    unless table_exists?("alchemy_folded_pages")
+      create_table "alchemy_folded_pages", force: :cascade do |t|
+        t.references "page", null: false, index: false
+        t.references "user", null: false, index: false
+        t.boolean "folded", default: false
+        t.index ["page_id", "user_id"], name: "index_alchemy_folded_pages_on_page_id_and_user_id", unique: true
+      end
+    end
+
+    unless table_exists?("alchemy_languages")
+      create_table "alchemy_languages", force: :cascade do |t|
+        t.string "name"
+        t.string "language_code"
+        t.string "frontpage_name"
+        t.string "page_layout", default: "intro"
+        t.boolean "public", default: false
+        t.timestamps null: false
+        t.references "creator"
+        t.references "updater"
+        t.boolean "default", default: false
+        t.string "country_code", default: "", null: false
+        t.references "site", null: false
+        t.string "locale"
+        t.index ["language_code", "country_code"], name: "index_alchemy_languages_on_language_code_and_country_code"
+        t.index ["language_code"], name: "index_alchemy_languages_on_language_code"
+      end
+    end
+
+    unless table_exists?("alchemy_legacy_page_urls")
+      create_table "alchemy_legacy_page_urls", force: :cascade do |t|
+        t.string "urlname", null: false
+        t.references "page", null: false
+        t.timestamps null: false
+        t.index ["urlname"], name: "index_alchemy_legacy_page_urls_on_urlname"
+      end
+    end
+
+    unless table_exists?("alchemy_nodes")
+      create_table "alchemy_nodes", force: :cascade do |t|
+        t.string "name"
+        t.string "title"
+        t.string "url"
+        t.boolean "nofollow", default: false, null: false
+        t.boolean "external", default: false, null: false
+        t.boolean "folded", default: false, null: false
+        t.references "parent"
+        t.integer "lft", null: false
+        t.integer "rgt", null: false
+        t.integer "depth", default: 0, null: false
+        t.references "page"
+        t.references "language", null: false
+        t.references "creator"
+        t.references "updater"
+        t.timestamps null: false
+        t.references "site", null: false
+        t.index ["lft"], name: "index_alchemy_nodes_on_lft"
+        t.index ["rgt"], name: "index_alchemy_nodes_on_rgt"
+      end
+    end
+
+    unless table_exists?("alchemy_pages")
+      create_table "alchemy_pages", force: :cascade do |t|
+        t.string "name"
+        t.string "urlname"
+        t.string "title"
+        t.string "language_code"
+        t.boolean "language_root"
+        t.string "page_layout"
+        t.text "meta_keywords"
+        t.text "meta_description"
+        t.integer "lft"
+        t.integer "rgt"
+        t.references "parent", index: false
+        t.integer "depth"
+        t.boolean "visible", default: false
+        t.integer "locked_by"
+        t.boolean "restricted", default: false
+        t.boolean "robot_index", default: true
+        t.boolean "robot_follow", default: true
+        t.boolean "sitemap", default: true
+        t.boolean "layoutpage", default: false
+        t.timestamps null: false
+        t.references "creator"
+        t.references "updater"
+        t.references "language"
+        t.datetime "published_at"
+        t.datetime "public_on"
+        t.datetime "public_until"
+        t.datetime "locked_at"
+        t.index ["locked_at", "locked_by"], name: "index_alchemy_pages_on_locked_at_and_locked_by"
+        t.index ["parent_id", "lft"], name: "index_pages_on_parent_id_and_lft"
+        t.index ["public_on", "public_until"], name: "index_alchemy_pages_on_public_on_and_public_until"
+        t.index ["rgt"], name: "index_alchemy_pages_on_rgt"
+        t.index ["urlname"], name: "index_pages_on_urlname"
+      end
+    end
+
+    unless table_exists?("alchemy_pictures")
+      create_table "alchemy_pictures", force: :cascade do |t|
+        t.string "name"
+        t.string "image_file_name"
+        t.integer "image_file_width"
+        t.integer "image_file_height"
+        t.timestamps null: false
+        t.references "creator"
+        t.references "updater"
+        t.string "upload_hash"
+        t.string "image_file_uid"
+        t.integer "image_file_size"
+        t.string "image_file_format"
+      end
+    end
+
+    unless table_exists?("alchemy_sites")
+      create_table "alchemy_sites", force: :cascade do |t|
+        t.string "host"
+        t.string "name"
+        t.timestamps null: false
+        t.boolean "public", default: false
+        t.text "aliases"
+        t.boolean "redirect_to_primary_host"
+        t.index ["host", "public"], name: "alchemy_sites_public_hosts_idx"
+        t.index ["host"], name: "index_alchemy_sites_on_host"
+      end
+    end
+
+    unless foreign_key_exists?("alchemy_contents", column: "element_id")
+      add_foreign_key "alchemy_contents", "alchemy_elements", column: "element_id", on_update: :cascade, on_delete: :cascade
+    end
+
+    unless foreign_key_exists?("alchemy_elements", column: "page_id")
+      add_foreign_key "alchemy_elements", "alchemy_pages", column: "page_id", on_update: :cascade, on_delete: :cascade
+    end
+
+    unless foreign_key_exists?("alchemy_essence_pages", column: "page_id")
+      add_foreign_key "alchemy_essence_pages", "alchemy_pages", column: "page_id"
+    end
+
+    unless foreign_key_exists?("alchemy_nodes", column: "language_id")
+      add_foreign_key "alchemy_nodes", "alchemy_languages", column: "language_id"
+    end
+
+    unless foreign_key_exists?("alchemy_nodes", column: "page_id")
+      add_foreign_key "alchemy_nodes", "alchemy_pages", column: "page_id", on_delete: :cascade
+    end
+
+    unless foreign_key_exists?("alchemy_nodes", column: "site_id")
+      add_foreign_key "alchemy_nodes", "alchemy_sites", column: "site_id", on_delete: :cascade
+    end
+  end
+
+  def down
+    drop_table "alchemy_attachments" if table_exists?("alchemy_attachments")
+    drop_table "alchemy_contents" if table_exists?("alchemy_contents")
+    drop_table "alchemy_elements" if table_exists?("alchemy_elements")
+    drop_table "alchemy_elements_alchemy_pages" if table_exists?("alchemy_elements_alchemy_pages")
+    drop_table "alchemy_essence_booleans" if table_exists?("alchemy_essence_booleans")
+    drop_table "alchemy_essence_dates" if table_exists?("alchemy_essence_dates")
+    drop_table "alchemy_essence_files" if table_exists?("alchemy_essence_files")
+    drop_table "alchemy_essence_htmls" if table_exists?("alchemy_essence_htmls")
+    drop_table "alchemy_essence_links" if table_exists?("alchemy_essence_links")
+    drop_table "alchemy_essence_pages" if table_exists?("alchemy_essence_pages")
+    drop_table "alchemy_essence_pictures" if table_exists?("alchemy_essence_pictures")
+    drop_table "alchemy_essence_richtexts" if table_exists?("alchemy_essence_richtexts")
+    drop_table "alchemy_essence_selects" if table_exists?("alchemy_essence_selects")
+    drop_table "alchemy_essence_texts" if table_exists?("alchemy_essence_texts")
+    drop_table "alchemy_folded_pages" if table_exists?("alchemy_folded_pages")
+    drop_table "alchemy_languages" if table_exists?("alchemy_languages")
+    drop_table "alchemy_legacy_page_urls" if table_exists?("alchemy_legacy_page_urls")
+    drop_table "alchemy_nodes" if table_exists?("alchemy_nodes")
+    drop_table "alchemy_pages" if table_exists?("alchemy_pages")
+    drop_table "alchemy_pictures" if table_exists?("alchemy_pictures")
+    drop_table "alchemy_sites" if table_exists?("alchemy_sites")
+  end
+end

data/db/migrate/20200423073425_create_alchemy_essence_nodes.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class CreateAlchemyEssenceNodes < ActiveRecord::Migration[5.2]
+  def change
+    create_table :alchemy_essence_nodes do |t|
+      t.references "node"
+      t.timestamps
+    end
+    add_foreign_key "alchemy_essence_nodes", "alchemy_nodes", column: "node_id"
+  end
+end

data/db/migrate/20200504210159_remove_site_id_from_nodes.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+class RemoveSiteIdFromNodes < ActiveRecord::Migration[5.2]
+  def up
+    remove_foreign_key :alchemy_nodes, :alchemy_sites
+    remove_index :alchemy_nodes, :site_id
+    remove_column :alchemy_nodes, :site_id, :integer, null: false
+  end
+
+  def down
+    add_column :alchemy_nodes, :site_id, :integer, null: true
+    sql = <<~SQL
+      UPDATE alchemy_nodes
+      SET site_id = (
+        SELECT alchemy_languages.site_id FROM alchemy_languages WHERE alchemy_nodes.language_id = alchemy_languages.id
+      ) WHERE
+      EXISTS (
+        SELECT *
+        FROM alchemy_languages
+        WHERE alchemy_languages.id = alchemy_nodes.language_id
+      );
+    SQL
+
+    connection.execute(sql)
+    change_column :alchemy_nodes, :site_id, :integer, null: false
+    add_index :alchemy_nodes, :site_id
+    add_foreign_key :alchemy_nodes, :alchemy_sites, column: :site_id
+  end
+end

data/db/migrate/20200505215518_add_language_id_foreign_key_to_alchemy_pages.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddLanguageIdForeignKeyToAlchemyPages < ActiveRecord::Migration[5.2]
+  def change
+    add_foreign_key :alchemy_pages, :alchemy_languages, column: :language_id
+    change_column_null :alchemy_pages, :language_id, false, Alchemy::Language.default&.id
+  end
+end

data/db/migrate/20200511113603_add_menu_type_to_alchemy_nodes.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+class AddMenuTypeToAlchemyNodes < ActiveRecord::Migration[5.2]
+  class LocalNode < ActiveRecord::Base
+    self.table_name = :alchemy_nodes
+    acts_as_nested_set scope: :language_id
+
+    def self.root_for(node)
+      return node if node.parent_id.nil?
+
+      root_for(node.parent)
+    end
+  end
+
+  def up
+    add_column :alchemy_nodes, :menu_type, :string
+    LocalNode.all.each do |node|
+      root = LocalNode.root_for(node)
+      menu_type = root.name.parameterize.underscore
+      node.update(menu_type: menu_type)
+    end
+    change_column_null :alchemy_nodes, :menu_type, false
+  end
+
+  def down
+    remove_column :alchemy_nodes, :menu_type
+  end
+end

data/db/migrate/20200514091507_make_page_layoutpage_null_false.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+class MakePageLayoutpageNullFalse < ActiveRecord::Migration[5.2]
+  def change
+    change_column_null :alchemy_pages, :layoutpage, false, false
+  end
+end

data/db/migrate/20200519073500_remove_visible_from_alchemy_pages.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+class RemoveVisibleFromAlchemyPages < ActiveRecord::Migration[5.2]
+  class LocalPage < ActiveRecord::Base
+    self.table_name = "alchemy_pages"
+
+    scope :invisible, -> { where(visible: [false, nil]) }
+    scope :contentpages, -> { where(layoutpage: [false, nil]) }
+  end
+
+  def up
+    if LocalPage.invisible.contentpages.where.not(parent_id: nil).any?
+      abort "You have invisible pages in your database! " \
+            "Please re-structure your page tree before running this migration. " \
+            "You might also downgrade to Alchemy 4.6 and " \
+            "run the `alchemy:upgrade:4.6:restructure_page_tree` rake task."
+    end
+
+    remove_column :alchemy_pages, :visible
+  end
+
+  def down
+    add_column :alchemy_pages, :visible, :boolean, default: false
+  end
+end

data/lib/alchemy/admin/locale.rb

@@ -47,6 +47,7 @@ module Alchemy
       # Try to get the locale from user settings.
       def locale_from_user
         return if !current_alchemy_user
+
         if user_has_preferred_language?
           current_alchemy_user.language
         end
@@ -55,6 +56,7 @@ module Alchemy
       # Checks if the +current_alchemy_user+ has a preferred language set or not.
       def user_has_preferred_language?
         return if !current_alchemy_user
+
         current_alchemy_user.respond_to?(:language) &&
           current_alchemy_user.language.present? &&
           current_alchemy_user.language.respond_to?(:to_sym)
@@ -62,7 +64,7 @@ module Alchemy
 
       # Try to get the locale from browser headers.
       def locale_from_browser
-        request.env['HTTP_ACCEPT_LANGUAGE'].try(:scan, /\A[a-z]{2}/).try(:first)
+        request.env["HTTP_ACCEPT_LANGUAGE"].try(:scan, /\A[a-z]{2}/).try(:first)
       end
     end
   end

data/lib/alchemy/admin/preview_url.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+require "uri"
+
+module Alchemy
+  module Admin
+    # = Preview window URL configuration
+    #
+    # By default Alchemy uses its internal page preview renderer,
+    # but you can configure it to be any URL instead.
+    #
+    # Basic Auth is supported.
+    #
+    # == Example config/alchemy/config.yml
+    #
+    #     preview:
+    #       host: https://www.my-static-site.com
+    #       auth:
+    #         username: <%= ENV["BASIC_AUTH_USERNAME"] %>
+    #         password: <%= ENV["BASIC_AUTH_PASSWORD"] %>
+    #
+    class PreviewUrl
+      class MissingProtocolError < StandardError; end
+
+      def initialize(routes:)
+        @routes = routes.url_helpers
+        @preview_config = Alchemy::Config.get(:preview)
+      end
+
+      def url_for(page)
+        if preview_config
+          uri_class.build(
+            host: uri.host,
+            path: "/#{page.urlname}",
+            userinfo: userinfo,
+          ).to_s
+        else
+          routes.admin_page_path(page)
+        end
+      end
+
+      private
+
+      attr_reader :preview_config, :routes
+
+      def uri
+        URI(preview_config["host"])
+      end
+
+      def uri_class
+        if uri.class == URI::Generic
+          raise MissingProtocolError, "Please provide the protocol with preview['host']"
+        else
+          uri.class
+        end
+      end
+
+      def userinfo
+        auth = preview_config["auth"]
+        auth ? "#{auth["username"]}:#{auth["password"]}" : nil
+      end
+    end
+  end
+end

data/lib/alchemy/auth_accessors.rb

@@ -53,13 +53,13 @@ module Alchemy
 
   # Defaults
   #
-  @@user_class_name = 'User'
+  @@user_class_name = "User"
   @@user_class_primary_key = :id
-  @@current_user_method = 'current_user'
-  @@signup_path = '/signup'
-  @@login_path = '/login'
-  @@logout_path = '/logout'
-  @@logout_method = 'delete'
+  @@current_user_method = "current_user"
+  @@signup_path = "/signup"
+  @@login_path = "/login"
+  @@logout_path = "/logout"
+  @@logout_method = "delete"
 
   # Returns the user class
   #
@@ -76,8 +76,9 @@ module Alchemy
   # Prefix with :: when getting to avoid constant name conflicts
   def self.user_class_name
     if !@@user_class_name.is_a?(String)
-      raise TypeError, 'Alchemy.user_class_name must be a String, not a Class.'
+      raise TypeError, "Alchemy.user_class_name must be a String, not a Class."
     end
+
     "::#{@@user_class_name}"
   end