RubyGems - alchemy_cms - Versions diffs - 3.5.0 → 3.6.0 - Mend

alchemy_cms 3.5.0 → 3.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (118) hide show

checksums.yaml +4 -4
data/.rubocop.yml +82 -26
data/.travis.yml +1 -1
data/CHANGELOG.md +23 -1
data/README.md +14 -5
data/Rakefile +0 -1
data/alchemy_cms.gemspec +2 -5
data/app/assets/images/alchemy/alchemy-logo.png +0 -0
data/app/assets/javascripts/alchemy/admin.js +1 -1
data/app/assets/javascripts/alchemy/alchemy.base.js.coffee +4 -8
data/app/assets/javascripts/alchemy/alchemy.buttons.js.coffee +2 -2
data/app/assets/javascripts/alchemy/alchemy.datepicker.js.coffee +18 -27
data/app/assets/javascripts/alchemy/alchemy.dialog.js.coffee +1 -1
data/app/assets/javascripts/alchemy/alchemy.element_editors.js.coffee +3 -8
data/app/assets/javascripts/alchemy/alchemy.elements_window.js.coffee +1 -1
data/app/assets/javascripts/alchemy/alchemy.gui.js.coffee +0 -1
data/app/assets/javascripts/alchemy/alchemy.page_sorter.js +22 -46
data/app/assets/javascripts/alchemy/alchemy.preview_window.js.coffee +1 -1
data/app/assets/javascripts/alchemy/alchemy.sitemap.js.coffee +2 -2
data/app/assets/javascripts/alchemy/alchemy.spinner.js +32 -0
data/app/assets/javascripts/alchemy/alchemy.tinymce.js.coffee +1 -1
data/app/assets/javascripts/alchemy/templates/index.js +1 -0
data/app/assets/javascripts/alchemy/templates/spinner.hbs +7 -0
data/app/assets/stylesheets/alchemy/_extends.scss +1 -0
data/app/assets/stylesheets/alchemy/admin.scss +1 -0
data/app/assets/stylesheets/alchemy/base.scss +1 -7
data/app/assets/stylesheets/alchemy/buttons.scss +1 -5
data/app/assets/stylesheets/alchemy/dialogs.scss +0 -4
data/app/assets/stylesheets/alchemy/elements.scss +2 -6
data/app/assets/stylesheets/alchemy/frame.scss +0 -5
data/app/assets/stylesheets/alchemy/image_library.scss +0 -13
data/app/assets/stylesheets/alchemy/sitemap.scss +5 -34
data/app/assets/stylesheets/alchemy/spinner.scss +52 -0
data/app/controllers/alchemy/admin/attachments_controller.rb +12 -11
data/app/controllers/alchemy/admin/base_controller.rb +3 -7
data/app/controllers/alchemy/admin/essence_pictures_controller.rb +2 -1
data/app/controllers/alchemy/admin/languages_controller.rb +3 -8
data/app/controllers/alchemy/admin/pictures_controller.rb +11 -7
data/app/controllers/alchemy/admin/resources_controller.rb +1 -1
data/app/controllers/alchemy/attachments_controller.rb +2 -0
data/app/controllers/alchemy/base_controller.rb +4 -5
data/app/controllers/concerns/alchemy/admin/uploader_responses.rb +1 -1
data/app/helpers/alchemy/admin/base_helper.rb +17 -8
data/app/helpers/alchemy/admin/tags_helper.rb +31 -18
data/app/helpers/alchemy/base_helper.rb +1 -1
data/app/helpers/alchemy/pages_helper.rb +4 -7
data/app/models/alchemy/attachment.rb +4 -0
data/app/models/alchemy/cell.rb +1 -1
data/app/models/alchemy/element.rb +6 -12
data/app/models/alchemy/element/definitions.rb +2 -2
data/app/models/alchemy/element/element_contents.rb +1 -1
data/app/models/alchemy/essence_picture_view.rb +14 -2
data/app/models/alchemy/language.rb +4 -4
data/app/models/alchemy/page.rb +25 -28
data/app/models/alchemy/page/page_elements.rb +1 -1
data/app/models/alchemy/page/page_natures.rb +1 -1
data/app/models/alchemy/picture.rb +5 -1
data/app/models/alchemy/site.rb +27 -12
data/app/views/alchemy/admin/attachments/_tag_list.html.erb +14 -13
data/app/views/alchemy/admin/dashboard/info.html.erb +1 -1
data/app/views/alchemy/admin/layoutpages/edit.html.erb +1 -1
data/app/views/alchemy/admin/pages/_create_language_form.html.erb +1 -1
data/app/views/alchemy/admin/pages/_form.html.erb +1 -1
data/app/views/alchemy/admin/pages/_new_page_form.html.erb +1 -1
data/app/views/alchemy/admin/pages/_page.html.erb +1 -1
data/app/views/alchemy/admin/pages/_sitemap.html.erb +2 -2
data/app/views/alchemy/admin/pages/configure_external.html.erb +1 -1
data/app/views/alchemy/admin/pages/index.html.erb +5 -7
data/app/views/alchemy/admin/pages/sort.html.erb +19 -0
data/app/views/alchemy/admin/pages/update.js.erb +1 -1
data/app/views/alchemy/admin/pictures/_archive.html.erb +19 -19
data/app/views/alchemy/admin/pictures/_tag_list.html.erb +3 -4
data/app/views/alchemy/admin/resources/_tag_list.html.erb +3 -4
data/app/views/alchemy/admin/resources/edit.html.erb +1 -1
data/app/views/alchemy/admin/resources/new.html.erb +1 -1
data/app/views/alchemy/pages/_meta_data.html.erb +1 -1
data/app/views/alchemy/pages/show.rss.builder +0 -2
data/app/views/alchemy/welcome.html.erb +1 -1
data/app/views/layouts/alchemy/admin.html.erb +1 -1
data/config/locales/alchemy.de.yml +4 -4
data/config/locales/alchemy.en.yml +4 -4
data/config/locales/alchemy.es.yml +3 -3
data/config/locales/alchemy.fr.yml +4 -4
data/config/locales/alchemy.it.yml +3 -3
data/config/locales/alchemy.nl.yml +4 -4
data/config/locales/alchemy.ru.yml +3 -3
data/lib/alchemy/auth_accessors.rb +6 -6
data/lib/alchemy/cache_digests/template_tracker.rb +5 -5
data/lib/alchemy/controller_actions.rb +1 -6
data/lib/alchemy/engine.rb +0 -53
data/lib/alchemy/errors.rb +12 -3
data/lib/alchemy/i18n.rb +1 -1
data/lib/alchemy/logger.rb +1 -1
data/lib/alchemy/page_layout.rb +5 -5
data/lib/alchemy/seeder.rb +16 -49
data/lib/alchemy/tasks/helpers.rb +1 -1
data/lib/alchemy/test_support/config_stubbing.rb +28 -0
data/lib/alchemy/test_support/essence_shared_examples.rb +6 -6
data/lib/alchemy/test_support/factories/language_factory.rb +1 -1
data/lib/alchemy/test_support/factories/page_factory.rb +7 -0
data/lib/alchemy/test_support/factories/site_factory.rb +6 -0
data/lib/alchemy/test_support/shared_contexts.rb +14 -0
data/lib/alchemy/test_support/shared_uploader_examples.rb +10 -0
data/lib/alchemy/touching.rb +1 -1
data/lib/alchemy/version.rb +1 -1
data/lib/alchemy_cms.rb +56 -1
data/lib/{alchemy/kaminari → kaminari}/scoped_pagination_url_helper.rb +0 -0
data/lib/rails/generators/alchemy/base.rb +1 -1
data/lib/rails/generators/alchemy/elements/elements_generator.rb +2 -1
data/lib/rails/generators/alchemy/page_layouts/page_layouts_generator.rb +2 -1
data/lib/rails/generators/alchemy/site_layouts/site_layouts_generator.rb +2 -1
data/lib/tasks/alchemy/tidy.rake +91 -89
data/lib/tasks/alchemy/upgrade.rake +15 -15
metadata +29 -14
data/app/assets/javascripts/alchemy/alchemy.spinner.js.coffee +0 -49
data/app/views/alchemy/admin/pages/sort.js.erb +0 -4
data/vendor/assets/javascripts/handlebars.js +0 -4608
data/vendor/assets/javascripts/spin.min.js +0 -1

data/app/views/alchemy/admin/pictures/_tag_list.html.erb CHANGED

@@ -1,14 +1,13 @@
-<% p = params.dup %>
 <% if Alchemy::Picture.tag_counts.any? %>
   <h2><%= Alchemy.t("Filter by tag") %></h2>
   <%= js_filter_field '.tag-list li' %>
   <ul>
-    <%= render_tag_list('Alchemy::Picture', p) %>
+    <%= render_tag_list('Alchemy::Picture') %>
   </ul>
-  <% if p[:tagged_with].present? %>
+  <% if params[:tagged_with].present? %>
     <%= link_to(
       render_icon('delete-small') + Alchemy.t('Remove tag filter'),
-      url_for(p.delete_if { |k, v| k == "tagged_with" }.merge(action: 'index')),
+      url_for(tag_list_params.delete_if { |k, v| k == "tagged_with" }.merge(action: 'index')),
       remote: request.xhr?,
       class: 'button small with_icon please_wait'
     ) %>

data/app/views/alchemy/admin/resources/_tag_list.html.erb CHANGED

@@ -1,14 +1,13 @@
 <div class="<%= params[:tagged_with].present? ? 'tag-list filtered' : 'tag-list' %>">
-  <% p = params.dup %>
   <h2><%= Alchemy.t("Filter by tag") %></h2>
   <%= js_filter_field '.tag-list li' %>
   <ul>
-    <%= render_tag_list(resource_model.name, p) %>
+    <%= render_tag_list(resource_model.name) %>
   </ul>
-  <% if p[:tagged_with].present? %>
+  <% if params[:tagged_with].present? %>
     <%= link_to(
       render_icon('delete-small') + Alchemy.t('Remove tag filter'),
-      url_for(p.delete_if { |k, v| k == "tagged_with" }.merge(action: 'index')),
+      url_for(tag_list_params.delete_if { |k, v| k == "tagged_with" }.merge(action: 'index')),
       remote: request.xhr?,
       class: 'button small with_icon please_wait'
     ) %>

data/app/views/alchemy/admin/resources/edit.html.erb CHANGED

	@@ -1 +1 @@
1	- <%= render ~~:partial =>~~ 'form' %>
1	+ <%= render 'form' %>

data/app/views/alchemy/admin/resources/new.html.erb CHANGED

	@@ -1 +1 @@
1	- <%= render ~~:partial =>~~ 'form' %>
1	+ <%= render 'form' %>

data/app/views/alchemy/pages/_meta_data.html.erb CHANGED

@@ -1,5 +1,5 @@
 <% if @page %>
-  <meta charset="utf8">
+  <meta charset="utf-8">
   <title><%= page_title prefix: local_assigns.fetch(:title_prefix, nil), separator: local_assigns.fetch(:title_separator, nil) %></title>
   <%= tag(:meta, name: 'created', content: @page.updated_at) %>
   <%= tag(:meta, name: 'robots', content: meta_robots) %>

data/app/views/alchemy/pages/show.rss.builder CHANGED

@@ -1,8 +1,6 @@
 xml.instruct! :xml, version: "1.0"
 xml.rss version: "2.0" do
   xml.channel do
     xml.title @page.title
     xml.description @page.meta_description
     xml.link show_alchemy_page_url(@page)

data/app/views/alchemy/welcome.html.erb CHANGED

@@ -12,7 +12,7 @@
   <body>
     <div class="container">
       <%= image_tag 'alchemy/alchemy-logo.svg' %>
-      <h3>You have succesfully installed AlchemyCMS!</h3>
+      <h3>You have successfully installed AlchemyCMS!</h3>
       <p>
         Thank you for using Alchemy. We hope you enjoy using it as much as we do.
       </p>

data/app/views/layouts/alchemy/admin.html.erb CHANGED

@@ -90,7 +90,7 @@
       </div>
     </div>
     <% end %>
-    <%= render :partial => 'alchemy/admin/partials/flash_notices' %>
+    <%= render 'alchemy/admin/partials/flash_notices' %>
     <div id="main_content">
       <%= yield %>
     </div>

data/config/locales/alchemy.de.yml CHANGED

@@ -99,7 +99,7 @@ de:
         message: 'Nachricht'
         send: 'absenden'
         mandatory_fields: '*Pflichtfelder. Bitte füllen Sie diese Felder aus.'
-      # The flash message shown after succesfully sending the message.
+      # The flash message shown after successfully sending the message.
       messages:
         success: 'Ihre Nachricht wurde erfolgreich übermittelt.'
@@ -589,9 +589,9 @@ de:
     "Edit": "Bearbeiten"
     "Delete": "Löschen"
     "Show error details": Fehlerdetails anzeigen
-    "Succesfully created": "Erfolgreich erstellt"
-    "Succesfully updated": "Erfolgreich aktualisiert"
-    "Succesfully removed": "Erfolgreich gelöscht"
+    "Successfully created": "Erfolgreich erstellt"
+    "Successfully updated": "Erfolgreich aktualisiert"
+    "Successfully removed": "Erfolgreich gelöscht"
     "Nothing found": "Keine Einträge gefunden."
     complete: 'Abgeschlossen'
     "Update available": 'Es ist ein Update verfügbar'

data/config/locales/alchemy.en.yml CHANGED

@@ -554,7 +554,7 @@ en:
     uploader:
       alchemy/attachment:
         button_label: Upload file(s)
-        upload_success: "File %{name} succesfully uploaded"
+        upload_success: "File %{name} successfully uploaded"
         upload_failure: "File %{name} upload error: %{error}"
       alchemy/picture:
         button_label: Upload image(s)
@@ -582,9 +582,9 @@ en:
     "Create": "Create"
     "Edit": "Edit"
     "Delete": "Delete"
-    "Succesfully created": "Succesfully created"
-    "Succesfully updated": "Succesfully updated"
-    "Succesfully removed": "Succesfully removed"
+    "Successfully created": "Successfully created"
+    "Successfully updated": "Successfully updated"
+    "Successfully removed": "Successfully removed"
     "Nothing found": "Nothing found."
     complete: 'Abgeschlossen'
     "Update available": 'Update available'

data/config/locales/alchemy.es.yml CHANGED

@@ -583,9 +583,9 @@ es:
     "Create": "Crear"
     "Edit": "Editar"
     "Delete": "Eliminar"
-    "Succesfully created": "Creado correctamente"
-    "Succesfully updated": "Actualizado correctamente"
-    "Succesfully removed": "Eliminado correctamente"
+    "Successfully created": "Creado correctamente"
+    "Successfully updated": "Actualizado correctamente"
+    "Successfully removed": "Eliminado correctamente"
     "Nothing found": "No se encontró nada."
     complete: 'Completado'
     "Update available": 'Actualización disponible'

data/config/locales/alchemy.fr.yml CHANGED

@@ -114,7 +114,7 @@ fr:
         message: 'Message'
         send: 'envoyer'
         mandatory_fields: "*Obligatoire. S'il vous plaît remplir ces champs."
-      # The flash message shown after succesfully sending the message.
+      # The flash message shown after successfully sending the message.
       messages:
         success: 'Votre message a été envoyé avec succès.'
@@ -602,9 +602,9 @@ fr:
     "Create": "ajouter"
     "Edit": "Modifier"
     "Delete": "supprimer"
-    "Succesfully created": "créé avec succès"
-    "Succesfully updated": "correctement mis à jour"
-    "Succesfully removed": "supprimé avec succès"
+    "Successfully created": "créé avec succès"
+    "Successfully updated": "correctement mis à jour"
+    "Successfully removed": "supprimé avec succès"
     "Nothing found": "Aucun article trouvé."
     "Now drop the files": "Lacher les fichiers maintenant"
     "Queued x files": "x Fichiers dans la file d'attente."

data/config/locales/alchemy.it.yml CHANGED

@@ -582,9 +582,9 @@ it:
     "Create": "Crea"
     "Edit": "Modifica"
     "Delete": "Elimina"
-    "Succesfully created": "Creato con successo"
-    "Succesfully updated": "Aggiornato con successo"
-    "Succesfully removed": "Rimosso con successo"
+    "Successfully created": "Creato con successo"
+    "Successfully updated": "Aggiornato con successo"
+    "Successfully removed": "Rimosso con successo"
     "Nothing found": "Non è stato trovato nulla."
     complete: 'Completato'
     "Update available": 'Aggiornamento disponibile'

data/config/locales/alchemy.nl.yml CHANGED

@@ -99,7 +99,7 @@ nl:
         message: 'Bericht'
         send: 'Verzenden'
         mandatory_fields: '*Verplichte velden.'
-      # The flash message shown after succesfully sending the message.
+      # The flash message shown after successfully sending the message.
       messages:
         success: 'Het bericht is verzonden.'
@@ -576,9 +576,9 @@ nl:
     "Create": "Aanmaken"
     "Edit": "Aanpassen"
     "Delete": "Verwijderen"
-    "Succesfully created": "Aangemaakt"
-    "Succesfully updated": "Aangepast"
-    "Succesfully removed": "Verwijderd"
+    "Successfully created": "Aangemaakt"
+    "Successfully updated": "Aangepast"
+    "Successfully removed": "Verwijderd"
     "Nothing found": "Niets gevonden"
     complete: 'Compleet'
     "Update available": "Er is een update verkrijgbaar"

data/config/locales/alchemy.ru.yml CHANGED

@@ -578,9 +578,9 @@ ru:
     "Create": "Создать"
     "Edit": "Редактировать"
     "Delete": "Удалить"
-    "Succesfully created": "Успешно создано"
-    "Succesfully updated": "Успешно обновлено"
-    "Succesfully removed": "Успешно удалено"
+    "Successfully created": "Успешно создано"
+    "Successfully updated": "Успешно обновлено"
+    "Successfully removed": "Успешно удалено"
     "Nothing found": "Ничег не найдено."
     complete: 'Завершить'
     "Update available": 'Доступно обновление'

data/lib/alchemy/auth_accessors.rb CHANGED

@@ -71,15 +71,15 @@ module Alchemy
     end
   rescue NameError => e
     if e.message =~ /#{Regexp.escape(@@user_class_name)}/
-      abort <<-MSG
+      abort <<-MSG.strip_heredoc
-AlchemyCMS cannot find any user class!
+        AlchemyCMS cannot find any user class!
-Please add a user class and tell Alchemy about it or, if you don't want
-to create your own class, add the `alchemy-devise` gem to your Gemfile.
+        Please add a user class and tell Alchemy about it or, if you don't want
+        to create your own class, add the `alchemy-devise` gem to your Gemfile.
-gem 'alchemy-devise', '~> 2.1.0'
-MSG
+        gem 'alchemy-devise', '~> 2.1.0'
+      MSG
     else
       raise e
     end

data/lib/alchemy/cache_digests/template_tracker.rb CHANGED

@@ -12,20 +12,20 @@ module Alchemy
       def dependencies
         case @name.to_s
         when /^alchemy\/pages\/show/
-          return PageLayout.all.collect { |p| "alchemy/page_layouts/_#{p['name']}" }
+          PageLayout.all.collect { |p| "alchemy/page_layouts/_#{p['name']}" }
         when /^alchemy\/page_layouts\/_(.+)/
           page_layout = page_layout($1)
-          return element_templates(page_layout) +
-                 page_layout.fetch('cells', []).map { |name| "alchemy/cells/_#{name}" }
+          element_templates(page_layout) +
+            page_layout.fetch('cells', []).map { |name| "alchemy/cells/_#{name}" }
         when /^alchemy\/cells\/_(.+)/
-          return element_templates cell_definition($1)
+          element_templates cell_definition($1)
         when /alchemy\/elements\/_(.+)_view/
           essences = essence_types($1)
           element = element_definition($1)
           if element && element['picture_gallery']
             essences += ['EssencePicture']
           end
-          return essences.map { |name| "alchemy/essences/_#{name.underscore}_view" }.uniq
+          essences.map { |name| "alchemy/essences/_#{name.underscore}_view" }.uniq
         else
           ActionView::DependencyTracker::ERBTracker.call(@name, @template)
         end

data/lib/alchemy/controller_actions.rb CHANGED

@@ -65,7 +65,7 @@ module Alchemy
         # find the best language and remember it for later
         @language = load_alchemy_language_from_params ||
                     load_alchemy_language_from_session ||
-                    load_default_alchemy_language
+                    Language.default
       end
       store_current_alchemy_language(@language)
     end
@@ -89,11 +89,6 @@ module Alchemy
         Language.find_by_code(id_or_code)
     end
-    # Load the default language from current site.
-    def load_default_alchemy_language
-      Language.default || raise(DefaultLanguageNotFoundError)
-    end
     # Stores language's id in the session.
     #
     # Also stores language in +Language.current+

data/lib/alchemy/engine.rb CHANGED

@@ -1,56 +1,3 @@
-# Require globally used external libraries
-require 'acts_as_list'
-require 'acts-as-taggable-on'
-require 'action_view/dependency_tracker'
-require 'active_model_serializers'
-require 'awesome_nested_set'
-require 'bourbon'
-require 'cancan'
-require 'dragonfly'
-require 'jquery-rails'
-require 'jquery-ui-rails'
-require 'kaminari'
-require 'non-stupid-digest-assets'
-require 'ransack'
-require 'request_store'
-require 'responders'
-require 'simple_form'
-require 'select2-rails'
-require 'turbolinks'
-require 'userstamp'
-# Require globally used Alchemy mixins
-require_relative './ability_helper'
-require_relative './admin/locale'
-require_relative './auth_accessors'
-require_relative './cache_digests/template_tracker'
-require_relative './config'
-require_relative './configuration_methods'
-require_relative './controller_actions'
-require_relative './errors'
-require_relative './essence'
-require_relative './filetypes'
-require_relative './forms/builder'
-require_relative './hints'
-require_relative './i18n'
-require_relative './logger'
-require_relative './modules'
-require_relative './name_conversions'
-require_relative './on_page_layout'
-require_relative './on_page_layout/callbacks_runner'
-require_relative './page_layout'
-require_relative './paths'
-require_relative './permissions'
-require_relative './picture_attributes'
-require_relative './sass_support'
-require_relative './ssl_protection'
-require_relative './resource'
-require_relative './tinymce'
-require_relative './touching'
-# Require hacks
-require_relative './kaminari/scoped_pagination_url_helper'
 module Alchemy
   class Engine < Rails::Engine
     isolate_namespace Alchemy

data/lib/alchemy/errors.rb CHANGED

@@ -10,9 +10,18 @@ module Alchemy
   end
   class DefaultLanguageNotFoundError < StandardError
-    # Raised if no default language can be found.
+    # Raised if no default language configuration can be found.
     def message
-      "No default language found! Please run the `bin/rake db:seed` task."
+      "No default language configuration found!" \
+        " Please ensure that you have a 'default_language' defined in Alchemy configuration file."
+    end
+  end
+  class DefaultSiteNotFoundError < StandardError
+    # Raised if no default site configuration can be found.
+    def message
+      "No default site configuration found!" \
+        " Please ensure that you have a 'default_site' defined in Alchemy configuration file."
     end
   end
@@ -66,7 +75,7 @@ module Alchemy
   class TinymceError < StandardError; end
   class UpdateServiceUnavailable < StandardError
-    # Raised it no succesful connection to GitHub was possible
+    # Raised if no successful connection to GitHub was possible
     def message
       "The update service is temporarily unavailable!"
     end

data/lib/alchemy/i18n.rb CHANGED

@@ -82,7 +82,7 @@ module Alchemy
         default_scope = ['alchemy']
         case options[:scope]
         when Array
-          default_scope += options[:scope]
+          default_scope + options[:scope]
         when String
           default_scope << options[:scope]
         when Symbol

data/lib/alchemy/logger.rb CHANGED

@@ -7,7 +7,7 @@ module Alchemy
     end
     def log_warning(message)
-      Alchemy::Logger.warn(message, caller.first)
+      Alchemy::Logger.warn(message, caller(0..0))
     end
   end
 end

data/lib/alchemy/page_layout.rb CHANGED

@@ -35,7 +35,7 @@ module Alchemy
       #
       def get(name)
         return {} if name.blank?
-        all.detect { |a| a['name'].casecmp(name) == 0 }
+        all.detect { |a| a['name'].casecmp(name).zero? }
       end
       def get_all_by_attributes(attributes)
@@ -44,7 +44,7 @@ module Alchemy
         if attributes.is_a? Hash
           layouts = []
           attributes.stringify_keys.each do |key, value|
-            result = all.select { |l| l.key?(key) && l[key].to_s.casecmp(value.to_s) == 0 }
+            result = all.select { |l| l.key?(key) && l[key].to_s.casecmp(value.to_s).zero? }
             layouts += result unless result.empty?
           end
           layouts
@@ -56,7 +56,7 @@ module Alchemy
       # Returns page layouts ready for Rails' select form helper.
       #
       def layouts_for_select(language_id, only_layoutpages = false)
-        @map_array = [[Alchemy.t('Please choose'), '']]
+        @map_array = []
         mapped_layouts_for_select(selectable_layouts(language_id, only_layoutpages))
       end
@@ -99,7 +99,7 @@ module Alchemy
           definition.fetch('elements', [])
         else
           Rails.logger.warn "\n+++ Warning: No layout definition for #{page_layout} found! in page_layouts.yml\n"
-          return []
+          []
         end
       end
@@ -157,7 +157,7 @@ module Alchemy
       #
       def read_definitions_file
         if File.exist?(layouts_file_path)
-          YAML.load(ERB.new(File.read(layouts_file_path)).result) || []
+          YAML.safe_load(ERB.new(File.read(layouts_file_path)).result, [Date], [], true) || []
         else
           raise LoadError, "Could not find page_layouts.yml file! Please run `rails generate alchemy:scaffold`"
         end

data/lib/alchemy/seeder.rb CHANGED

@@ -1,62 +1,33 @@
 require "alchemy/shell"
 module Alchemy
+  # This seeder builds Alchemy pages in your database.
+  #
+  # Create a +db/seeds/alchemy/pages.yml+ and +db/seeds/alchemy/users.yml+ files
+  # and put +Alchemy::Seeder.seed!+ into your +db/seeds.rb+ file.
+  #
+  # Then run +rake db:seed+
+  #
   class Seeder
     extend Alchemy::Shell
     class << self
-      # This seed builds the necessary page structure for Alchemy in your database.
-      #
-      # Call this from your +db/seeds.rb+ file with the `rake db:seed task'.
+      # Put +Alchemy::Seeder.seed!+ into your +db/seeds.rb+ file and run +rake db:seed+.
       #
       def seed!
-        create_default_site
-        if create_root_page
-          try_seed_pages
-        elsif page_seeds_file.file?
-          desc "Seeding Alchemy pages"
-          log "There are already pages present in your database. " \
-              "Please use `rake db:reset' if you want to rebuild your database.", :skip
-        end
+        try_seed_pages
         seed_users if user_seeds_file.file?
       end
       protected
-      def create_default_site
-        desc "Creating default Alchemy site"
-        if Alchemy::Site.count == 0
-          site = Alchemy::Site.new(
-            name: site_config['name'],
-            host: site_config['host']
-          )
-          if Alchemy::Language.any?
-            site.languages = Alchemy::Language.all
-          end
-          site.save!
-          log "Created default Alchemy site with default language."
-        else
-          log "Default Alchemy site was already present.", :skip
-        end
-      end
-      def create_root_page
-        desc "Creating Alchemy root page"
-        root = Alchemy::Page.find_or_initialize_by(name: 'Root')
-        root.do_not_sweep = true
-        if root.new_record?
-          if root.save!
-            log "Created Alchemy root page."
-            return true
-          end
-        else
-          log "Alchemy root page was already present.", :skip
-          return false
-        end
-      end
       def try_seed_pages
-        if page_seeds_file.file?
+        return unless page_seeds_file.file?
+        if Alchemy::Page.exists?
+          desc "Seeding Alchemy pages"
+          log "There are already pages present in your database. " \
+              "Please use `rake db:reset' if you want to rebuild your database.", :skip
+        else
           seed_pages if contentpages.present?
           seed_layoutpages if layoutpages.present?
         end
@@ -107,10 +78,6 @@ module Alchemy
       private
-      def site_config
-        @_site_config ||= Alchemy::Config.get(:default_site)
-      end
       def page_seeds_file
         @_page_seeds_file ||= Rails.root.join('db', 'seeds', 'alchemy', 'pages.yml')
       end
@@ -120,7 +87,7 @@ module Alchemy
       end
       def contentpages
-        page_yml.select { |p| !p['layoutpage'] }
+        page_yml.reject { |p| p['layoutpage'] }
       end
       def layoutpages