alchemy_cms 4.5.1 → 4.6.0

data/app/models/alchemy/node.rb

@@ -4,12 +4,12 @@ module Alchemy
   class Node < BaseRecord
     VALID_URL_REGEX = /\A(\/|\D[a-z\+\d\.\-]+:)/
 
-    acts_as_nested_set scope: 'language_id', touch: true
-    stampable stamper_class_name: Alchemy.user_class.name
+    acts_as_nested_set scope: "language_id", touch: true
+    stampable stamper_class_name: Alchemy.user_class_name
 
-    belongs_to :site, class_name: 'Alchemy::Site'
-    belongs_to :language, class_name: 'Alchemy::Language'
-    belongs_to :page, class_name: 'Alchemy::Page', optional: true, inverse_of: :nodes
+    belongs_to :site, class_name: "Alchemy::Site"
+    belongs_to :language, class_name: "Alchemy::Language"
+    belongs_to :page, class_name: "Alchemy::Page", optional: true, inverse_of: :nodes
 
     validates :name, presence: true, if: -> { page.nil? }
     validates :url, format: { with: VALID_URL_REGEX }, unless: -> { url.nil? }
@@ -25,7 +25,8 @@ module Alchemy
     class << self
       # Returns all root nodes for current language
       def language_root_nodes
-        raise 'No language found' if Language.current.nil?
+        raise "No language found" if Language.current.nil?
+
         roots.where(language_id: Language.current.id)
       end
 
@@ -48,7 +49,7 @@ module Alchemy
       # Returns the +menus.yml+ file path
       #
       def definitions_file_path
-        Rails.root.join 'config/alchemy/menus.yml'
+        Rails.root.join "config/alchemy/menus.yml"
       end
     end
 
@@ -57,7 +58,7 @@ module Alchemy
     # Either the value is stored in the database, aka. an external url.
     # Or, if attached, the values comes from a page.
     def url
-      page && "/#{page.urlname}" || read_attribute(:url).presence
+      page&.url_path || read_attribute(:url).presence
     end
 
     def to_partial_path

data/app/models/alchemy/page/url_path.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class Page
+    # = The url_path for this page
+    #
+    # Use this to build relative links to this page
+    #
+    # It takes several circumstances into account:
+    #
+    # 1. It returns just a slash for language root pages of the default langauge
+    # 2. It returns a url path with a leading slash for regular pages
+    # 3. It returns a url path with a leading slash and language code prefix for pages not having the default language
+    # 4. It returns a url path with a leading slash and the language code for language root pages of a non-default language
+    #
+    # == Examples
+    #
+    # Using Rails' link_to helper
+    #
+    #     link_to page.url
+    #
+    class UrlPath
+      ROOT_PATH = "/"
+
+      def initialize(page)
+        @page = page
+        @language = @page.language
+        @site = @language.site
+      end
+
+      def call
+        return @page.urlname if @page.definition["redirects_to_external"]
+
+        if @page.language_root?
+          language_root_path
+        elsif @site.languages.select(&:public?).length > 1
+          page_path_with_language_prefix
+        else
+          page_path_with_leading_slash
+        end
+      end
+
+      private
+
+      def language_root_path
+        @language.default? ? ROOT_PATH : language_path
+      end
+
+      def page_path_with_language_prefix
+        @language.default? ? page_path : language_path + page_path
+      end
+
+      def page_path_with_leading_slash
+        @page.language_root? ? ROOT_PATH : page_path
+      end
+
+      def language_path
+        "/#{@page.language_code}"
+      end
+
+      def page_path
+        "/#{@page.urlname}"
+      end
+    end
+  end
+end

data/app/models/alchemy/page.rb

@@ -85,7 +85,7 @@ module Alchemy
 
     acts_as_nested_set(dependent: :destroy)
 
-    stampable stamper_class_name: Alchemy.user_class.name
+    stampable stamper_class_name: Alchemy.user_class_name
 
     belongs_to :language, optional: true
 
@@ -161,6 +161,10 @@ module Alchemy
 
     attr_accessor :menu_id
 
+    deprecate visible: "Page slugs will be visible in URLs of child pages all the time. " \
+      "Please use Menus and Tags instead to re-organize your pages if your page tree does not reflect the URL hierarchy.",
+      deprecator: Alchemy::Deprecation
+
     # Class methods
     #
     class << self
@@ -347,6 +351,13 @@ module Alchemy
       finder.elements(page: self)
     end
 
+    # = The url_path for this page
+    #
+    # @see Alchemy::Page::UrlPath#call
+    def url_path
+      Alchemy::Page::UrlPath.new(self).call
+    end
+
     # The page's view partial is dependent from its page layout
     #
     # == Define page layouts

data/app/models/alchemy/picture.rb

@@ -74,7 +74,7 @@ module Alchemy
       case_sensitive: false,
       message: Alchemy.t("not a valid image")
 
-    stampable stamper_class_name: Alchemy.user_class.name
+    stampable stamper_class_name: Alchemy.user_class_name
 
     scope :named, ->(name) {
       where("#{table_name}.name LIKE ?", "%#{name}%")

data/app/serializers/alchemy/page_serializer.rb

@@ -13,7 +13,8 @@ module Alchemy
       :tag_list,
       :created_at,
       :updated_at,
-      :status
+      :status,
+      :url_path
 
     has_many :elements
   end

data/app/serializers/alchemy/page_tree_serializer.rb

@@ -9,7 +9,7 @@ module Alchemy
     def pages
       tree = []
       path = [{id: object.parent_id, children: tree}]
-      page_list = object.self_and_descendants
+      page_list = object.self_and_descendants.includes({ language: :site }, :locker)
       base_level = object.level - 1
       # Load folded pages in advance
       folded_user_pages = FoldedPage.folded_for_user(opts[:user]).pluck(:page_id)
@@ -60,9 +60,10 @@ module Alchemy
         redirects_to_external: page.definition['redirects_to_external'],
         urlname: page.urlname,
         external_urlname: page.definition['redirects_to_external'] ? page.external_urlname : nil,
+        url_path: page.url_path,
         level: level,
-        root: level == 1,
-        root_or_leaf: level == 1 || !has_children,
+        root: page.depth == 1,
+        root_or_leaf: page.depth == 1 || !has_children,
         children: []
       }
 

data/app/views/alchemy/admin/layoutpages/index.html.erb

@@ -30,6 +30,10 @@
 </div>
 <% end %>
 
-<ul class="list" id="layoutpages">
+<h4 id="sitemap_heading">
+  <span class="page_name"><%= Alchemy::Page.human_attribute_name(:name) %></span>
+</h4>
+
+<ul class="list" id="sitemap">
   <%= render partial: "layoutpage", collection: @layout_root.children %>
 </ul>

data/app/views/alchemy/admin/nodes/_form.html.erb

@@ -30,7 +30,7 @@
     initialSelection: {
       id: <%= node.page_id %>,
       text: "<%= node.page.name %>",
-      url: "/<%= node.page.urlname %>"
+      url_path: "<%= node.page.url_path %>"
     }
     <% end %>
   }).on('change', function(e) {
@@ -39,7 +39,7 @@
       $('#node_url').val('').prop('disabled', false)
     } else {
       $('#node_name').attr('placeholder', e.added.name)
-      $('#node_url').val('/' + e.added.urlname).prop('disabled', true)
+      $('#node_url').val(e.added.url_path).prop('disabled', true)
     }
   })
 </script>

data/app/views/alchemy/admin/pages/_form.html.erb

@@ -18,7 +18,7 @@
   </div>
 
   <%= f.input :name, autofocus: true %>
-  <%= f.input :urlname, as: 'string', input_html: {value: @page.slug} %>
+  <%= f.input :urlname, as: 'string', input_html: {value: @page.slug}, label: Alchemy::Page.human_attribute_name(:slug) %>
   <%= f.input :title,
     input_html: {'data-alchemy-char-counter' => 60} %>
 

data/app/views/alchemy/admin/pages/_menu_fields.html.erb

@@ -1,33 +1,37 @@
-<% if @page.menus.any? %>
-  <label class="checkbox">
-    <input type="checkbox" disabled checked>
-    <%= Alchemy.t(:attached_to) %>
-  </label>
-  <% @page.menus.each do |menu| %>
-    <span class="page-menu-name label">
-      <%= menu.name %>
-    </span>
+<% if Alchemy::Node.roots.where(language: @page.language).any? %>
+  <% unless @page.language_root %>
+    <%= page_status_checkbox(@page, :visible, label: Alchemy.t("show in url of child pages")) %>
+  <% end %>
+  <% if @page.menus.any? %>
+    <label style="vertical-align: middle">
+      <%= Alchemy.t(:attached_to) %>
+    </label>
+    <% @page.menus.each do |menu| %>
+      <span class="page-menu-name label">
+        <%= I18n.t(menu.name, scope: [:alchemy, :menu_names]) %>
+      </span>
+    <% end %>
+  <% else %>
+    <a class="button small" id="attach-page"><%= Alchemy.t("attach to a menu") %></a>
+    <%= f.input :menu_id, collection: Alchemy::Node.roots.map { |n|
+        [I18n.t(n.name, scope: [:alchemy, :menu_names]), n.id]
+      },
+      prompt: Alchemy.t("Please choose a menu"),
+      input_html: { class: "alchemy_selectbox" },
+      wrapper_html: { class: "hidden" },
+      label: false %>
+    <script>
+      (function() {
+        var wrapper = document.querySelector(".input.page_menu_id")
+        document.querySelector("#attach-page").addEventListener("click", function() {
+          var select = wrapper.querySelector("select")
+          this.classList.toggle("active")
+          wrapper.classList.toggle("hidden")
+          $(select).select2("val", "")
+        })
+      })()
+    </script>
   <% end %>
-<% elsif Alchemy::Node.roots.any? %>
-  <%= page_status_checkbox(@page, :visible) %>
-  <%= f.input :menu_id, collection: Alchemy::Node.roots.map { |n| [n.name, n.id] },
-    prompt: Alchemy.t('Please choose a menu'),
-    input_html: { class: 'alchemy_selectbox' },
-    wrapper_html: { style: @page.visible? ? 'display: block' : 'display: none' },
-    label: false %>
-  <script>
-    (function() {
-      var $wrapper = $('.input.page_menu_id')
-      $('#page_visible').click(function() {
-        if ($(this).is(':checked')) {
-          $wrapper.show()
-        } else {
-          $wrapper.find('select').val('')
-          $wrapper.hide()
-        }
-      })
-    })()
-  </script>
 <% else %>
   <%= page_status_checkbox(@page, :visible) %>
 <% end %>

data/app/views/alchemy/admin/pages/_page.html.erb

@@ -159,12 +159,9 @@
         <span class="hint-bubble">{{status_titles.restricted}}</span>
       </span>
     </div>
-    {{#if redirects_to_external}}
-      <div class="redirect_url" title="{{urlname}}">
-        &raquo; <%= Alchemy.t('Redirects to') %>:
-        {{ external_urlname }}
-      </div>
-    {{/if}}
+    <div class="sitemap_url" title="{{url_path}}">
+      {{ url_path }}
+    </div>
     <div class="sitemap_sitename">
       {{#if redirects_to_external}}
         <span class="sitemap_pagename_link inactive">{{ name }}</span>

data/app/views/alchemy/admin/pages/_sitemap.html.erb

@@ -1,4 +1,10 @@
 <div id="sitemap-wrapper">
+  <h4 id="sitemap_heading">
+    <span class="page_name"><%= Alchemy::Page.human_attribute_name(:name) %></span>
+    <span class="page_urlname"><%= Alchemy::Page.human_attribute_name(:urlname) %></span>
+    <span class="page_status"><%= Alchemy.t(:page_status) %></span>
+  </h4>
+
   <p class="loading"></p>
 </div>
 

data/app/views/alchemy/admin/pages/info.html.erb

@@ -18,7 +18,7 @@
     <label><%= Alchemy::Page.human_attribute_name(:urlname) %></label>
     <p><%= @page.urlname %></p>
   <% else %>
-    <label><%= Alchemy::LegacyPageUrl.human_attribute_name(:urlname) %></label>
+    <label><%= Alchemy::Page.human_attribute_name(:urlname) %></label>
     <p><%= "/#{@page.urlname}" %></p>
   <% end %>
   </div>

data/config/alchemy/config.yml

@@ -1,12 +1,6 @@
 # == This is the global Alchemy configuration file
 #
 
-# === Require SSL for login form and all admin modules
-#
-# NOTE: You have to create a SSL certificate on your server to make this work
-#
-require_ssl: false
-
 # === Auto Log Out Time
 #
 # The amount of time of inactivity in minutes after which the user is kicked out of his current session.

data/config/locales/alchemy.en.yml

@@ -573,7 +573,6 @@ en:
         button_label: Upload image(s)
         upload_success: "Picture %{name} uploaded successfully"
         upload_failure: "Error while uploading %{name}: %{error}"
-    url_name: "URL-Name"
     visible: "visible"
     want_to_create_new_language: "Do you want to create a new empty language tree?"
     want_to_make_copy_of_existing_language: "Do you want to copy an existing language tree?"
@@ -670,9 +669,9 @@ en:
           page_layout:
             blank: "^Please choose a page layout."
           urlname:
-            too_short: "^The pages urlname is too short (minimum of 3 characters)."
-            taken: "^URL-Name already taken."
-            exclusion: "^URL-Name reserved."
+            too_short: "^URL-Path is too short (minimum of 3 characters)."
+            taken: "^URL-Path already taken."
+            exclusion: "^URL-Path reserved."
       alchemy/picture:
         attributes:
           image_file:
@@ -780,7 +779,7 @@ en:
         locale: Localization
         code: ISO Code
       alchemy/legacy_page_url:
-        urlname: "URL path"
+        urlname: "URL-Path"
       alchemy/node:
         name: "Name"
         title: "Title"
@@ -805,7 +804,8 @@ en:
         tag_list: Tags
         title: "Title"
         updated_at: "Updated at"
-        urlname: "Urlname"
+        urlname: "URL-Path"
+        slug: "Slug"
         visible: "visible in navigation"
       alchemy/picture:
         image_file_name: "Filename"

data/lib/alchemy/config.rb

@@ -8,8 +8,10 @@ module Alchemy
       # @param name [String]
       #
       def get(name)
+        check_deprecation(name)
         show[name.to_s]
       end
+
       alias_method :parameter, :get
 
       # Returns a merged configuration of the following files
@@ -25,11 +27,22 @@ module Alchemy
         @config ||= merge_configs!(alchemy_config, main_app_config, env_specific_config)
       end
 
+      # A list of deprecated configurations
+      # a value of nil means there is no new default
+      # any not nil value is the new default
+      def deprecated_configs
+        {
+          url_nesting: true,
+          require_ssl: nil,
+          auto_logout_time: nil,
+        }
+      end
+
       private
 
       # Alchemy default configuration
       def alchemy_config
-        read_file(File.join(File.dirname(__FILE__), '..', '..', 'config/alchemy/config.yml'))
+        read_file(File.join(File.dirname(__FILE__), "..", "..", "config/alchemy/config.yml"))
       end
 
       # Application specific configuration
@@ -54,11 +67,26 @@ module Alchemy
       # Merges all given configs together
       #
       def merge_configs!(*config_files)
-        raise LoadError, 'No Alchemy config file found!' if config_files.map(&:blank?).all?
+        raise LoadError, "No Alchemy config file found!" if config_files.map(&:blank?).all?
+
         config = {}
         config_files.each { |h| config.merge!(h.stringify_keys!) }
         config
       end
+
+      def check_deprecation(name)
+        if deprecated_configs.key?(name.to_sym)
+          config = deprecated_configs[name.to_sym]
+          if config.nil?
+            Alchemy::Deprecation.warn("#{name} configuration is deprecated and will be removed from Alchemy 5.0")
+          else
+            value = show[name.to_s]
+            if value != config
+              Alchemy::Deprecation.warn("Setting #{name} configuration to #{value} is deprecated and will be always #{config} in Alchemy 5.0")
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/alchemy/essence.rb

@@ -48,7 +48,7 @@ module Alchemy #:nodoc:
         class_eval <<-RUBY, __FILE__, __LINE__ + 1
           attr_writer :validation_errors
           include Alchemy::Essence::InstanceMethods
-          stampable stamper_class_name: Alchemy.user_class.name
+          stampable stamper_class_name: Alchemy.user_class_name
           validate :validate_ingredient, on: :update, if: -> { validations.any? }
 
           has_one :content, as: :essence, class_name: "Alchemy::Content", inverse_of: :essence

data/lib/alchemy/resource.rb

@@ -131,23 +131,21 @@ module Alchemy
     end
 
     def namespaced_resource_name
-      @_namespaced_resource_name ||= begin
-        namespaced_resources_name.to_s.singularize
-      end.to_sym # Rails >= 6.0.3.7 needs symbols in polymorphic routes
+      @_namespaced_resource_name ||= namespaced_resources_name.singularize
     end
 
     def namespaced_resources_name
       @_namespaced_resources_name ||= begin
         resource_name_array = resource_array.dup
         resource_name_array.delete(engine_name) if in_engine?
-        resource_name_array.join("_")
-      end.to_sym # Rails >= 6.0.3.7 needs symbols in polymorphic routes
+        resource_name_array.join('_')
+      end
     end
 
     def namespace_for_scope
       namespace_array = namespace_diff
       namespace_array.delete(engine_name) if in_engine?
-      namespace_array.map(&:to_sym) # Rails >= 6.0.3.7 needs symbols in polymorphic routes
+      namespace_array
     end
 
     # Returns an array of underscored association names

data/lib/alchemy/ssl_protection.rb

@@ -26,7 +26,9 @@ module Alchemy
 
     # Redirects current request to https.
     def enforce_ssl
-      redirect_to url_for(request.params.merge(protocol: 'https'))
+      redirect_to url_for(request.params.merge(protocol: "https"))
     end
+
+    deprecate :enforce_ssl, deprecator: Alchemy::Deprecation
   end
 end

data/lib/alchemy/upgrader/four_point_six.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class Upgrader::FourPointSix < Upgrader
+    class << self
+      def todos
+        notice = <<-NOTE.strip_heredoc
+
+          ℹ️  Page visible attribute is deprecated
+          ----------------------------------------
+
+          Page slugs will be visible in URLs of child pages all the time in the future.
+          Please use Menus and Tags instead to re-organize your pages if your page tree does not reflect the URL hierarchy.
+
+          A rake task to help with the migration is available.
+
+              bin/rake alchemy:upgrade:4.6:restructure_page_tree
+
+        NOTE
+        todo notice, "Alchemy v4.6 TODO"
+      end
+
+      def restructure_page_tree
+        desc "Move child pages of invisible pages to visible parent."
+        Alchemy::Deprecation.silence do
+          # All leaves can safely be marked visible
+          Alchemy::Page.leaves.update_all(visible: true)
+          Alchemy::Page.language_roots.each do |root_page|
+            # Root pages are always visible
+            root_page.update!(visible: true)
+            remove_invisible_children(root_page)
+          end
+          Alchemy::Page.update_all(visible: true)
+        end
+      end
+
+      private
+
+      def remove_invisible_children(page)
+        page.children.each { |child| remove_invisible_children(child) }
+        if !page.visible
+          page.children.reload.reverse.each do |child|
+            puts "Moving #{child.urlname} to right of #{page.urlname}"
+            child.move_to_right_of(page)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/alchemy/upgrader/four_point_two.rb

@@ -1,6 +1,5 @@
 require_relative 'tasks/picture_gallery_upgrader'
 require_relative 'tasks/picture_gallery_migration'
-require_relative 'tasks/fixed_element_name_finder'
 require_relative 'tasks/cells_upgrader'
 require_relative 'tasks/cells_migration'
 require_relative 'tasks/element_partial_name_variable_updater'

data/lib/alchemy/upgrader/tasks/cells_migration.rb

@@ -8,7 +8,6 @@ module Alchemy::Upgrader::Tasks
     def migrate_cells
       if ActiveRecord::Base.connection.data_source_exists?('alchemy_cells')
         cells = Cell.all
-        @fixed_element_name_finder = FixedElementNameFinder.new
 
         if cells.any?
           cells.each do |cell|
@@ -27,7 +26,7 @@ module Alchemy::Upgrader::Tasks
     def migrate_cell!(cell)
       # bust element definitions insta cache
       Alchemy::Element.instance_variable_set('@definitions', nil)
-      fixed_element = Alchemy::Element.find_or_initialize_by(fixed: true, name: @fixed_element_name_finder.call(cell.name), page: cell.page)
+      fixed_element = Alchemy::Element.find_or_initialize_by(fixed: true, name: cell.name, page: cell.page)
       elements = Alchemy::Element.where(cell_id: cell.id).order(position: :asc)
 
       if fixed_element.new_record?

data/lib/alchemy/upgrader/tasks/cells_upgrader.rb

@@ -72,13 +72,12 @@ module Alchemy::Upgrader::Tasks
 
     def convert_cell_config
       puts '-- Converting cells into unique fixed nestable elements.'
-      fixed_element_name_finder = FixedElementNameFinder.new
 
       YAML.load_file(cells_config_file).each do |cell|
         append_to_file Rails.root.join('config', 'alchemy', 'elements.yml') do
           <<-CELL.strip_heredoc
 
-            - name: #{fixed_element_name_finder.call(cell['name'])}
+            - name: #{cell['name']}
               fixed: true
               unique: true
               nestable_elements: [#{cell['elements'].join(', ')}]
@@ -129,25 +128,8 @@ module Alchemy::Upgrader::Tasks
       puts "-- Update render_cell calls"
       Dir.glob("#{alchemy_views_folder}/**/*").each do |view|
         next if File.directory?(view)
-        # <%= render_cell 'test' %>
-        # <%= render_cell('test') %>
-        # <%= render_cell("test", options: true) %>
-        content = File.binread(view)
-        content.gsub!(/render_cell([\s(]+)(['":])(\w+)([^\w])(.*?)/) do
-          element_name = CellNameMigrator.call($3)
-          "render_elements#{$1}only: #{$2}#{element_name}#{$4}, fixed: true#{$5}"
-        end
-        
-        # <%= render_elements from_cell: 'page_intro' %>
-        # <%= render_elements testing: 'blubb',     from_cell: :page_intro %>
-        # <%= render_elements from_cell: "page_intro", testing: 'blubb' %>
-        # <%= render_elements(from_cell: "page_intro", testing: 'blubb') %>
-        # <%= render_elements(testing: 'blubb', from_cell: "page_intro") %>
-        content.gsub!(/render_elements(.*?)from_cell[:\s=>]+([:'"])(\w+)(['"]?)(.*)/) do
-          element_name = CellNameMigrator.call($3)
-          "render_elements#{$1}only: #{$2}#{element_name}#{$4}, fixed: true#{$5}"
-        end
-        File.open(view, "wb") { |file| file.write(content) }
+        gsub_file(view, /render_cell[\(\s]?([:'"]?[a-z_]+['"]?)\)?/, 'render_elements(only: \1, fixed: true)')
+        gsub_file(view, /render_elements[\(\s](.*):?from_cell:?\s?(=>)?\s?(['"][a-z_]+['"])\)?/, 'render_elements(\1only: \3, fixed: true)')
       end
     end
 

data/lib/alchemy/upgrader/tasks/element_partial_name_variable_updater.rb

@@ -11,14 +11,10 @@ module Alchemy::Upgrader::Tasks
         puts "-- Update element views local variable to partial name"
         Dir.glob("#{elements_view_folder}/*_view.*").each do |view|
           variable_name = File.basename(view).gsub(/^_([\w-]*)\..*$/, '\1')
-          %w[
-            cache
-            render_essence_view_by_name
-            element_view_for
-          ].each do |method_name|
-            gsub_file(view, /#{method_name}([\s(]+)element([^\w])/, "#{method_name}\\1#{variable_name}\\2")
-          end
-          gsub_file(view, /([\s(%={]+)element([^\w:"'])/, "\\1#{variable_name}\\2")
+          gsub_file(view, /cache\(?element([,\s\w:\-,=>'"\?\/]*)\)?/, "cache(#{variable_name}\\1)")
+          gsub_file(view, /render_essence_view_by_name\(?element([,\s\w:\-,=>'"\?\/]*)\)?/, "render_essence_view_by_name(#{variable_name}\\1)")
+          gsub_file(view, /element_view_for\(?element([,\s\w:\-,=>'"\?\/]*)\)?/, "element_view_for(#{variable_name}\\1)")
+          gsub_file(view, /element\.([\w\?]+)/, "#{variable_name}.\\1")
         end
       end
     end

data/lib/alchemy/userstamp.rb

@@ -7,6 +7,6 @@
 if Alchemy.user_class < ActiveRecord::Base
   Alchemy.user_class.class_eval do
     model_stamper
-    stampable stamper_class_name: Alchemy.user_class.name
+    stampable stamper_class_name: Alchemy.user_class_name
   end
 end