alchemy_cms 3.2.1 → 3.3.0.rc1

data/lib/rails/generators/alchemy/base.rb

@@ -3,7 +3,7 @@ require 'rails'
 module Alchemy
   module Generators
     class Base < ::Rails::Generators::Base
-      class_option :template_engine, :type => :string, :aliases => '-e', :desc => 'Template engine for the views. Available options are "erb", "haml", and "slim".'
+      class_option :template_engine, type: :string, aliases: '-e', desc: 'Template engine for the views. Available options are "erb", "haml", and "slim".'
 
       private
 

data/lib/rails/generators/alchemy/elements/elements_generator.rb

@@ -15,13 +15,7 @@ module Alchemy
         @elements = load_alchemy_yaml('elements.yml')
         @elements.each do |element|
           @element = element
-          contents = element["contents"] || []
-          if @element['available_contents']
-            @available_contents_names = @element['available_contents'].collect { |c| c['name'] }
-            @contents = contents.delete_if { |c| @available_contents_names.include?(c['name']) } or []
-          else
-            @contents = contents
-          end
+          @contents = element["contents"] || []
           if element["name"] =~ /\A[a-z0-9_-]+\z/
             @element_name = element["name"].underscore
           else

data/lib/rails/generators/alchemy/elements/templates/editor.html.erb

@@ -1,14 +1,12 @@
+<%- if @contents.any? || @element['picture_gallery'] -%>
 <%%= element_editor_for(element) do |el| -%>
 <%- if @element['picture_gallery'] -%>
   <%%= render_picture_gallery_editor(element, max_images: nil, crop: true) %>
 <%- end -%>
-<% @contents.each do |content| -%>
+<%- @contents.each do |content| -%>
   <%%= el.edit :<%= content["name"] %> %>
-<% end -%>
-<%- if @element['available_contents'] -%>
-  <%% element.contents.where(name: ['<%= @available_contents_names.join("', '") %>']).each do |content| %>
-    <%%= render_essence_editor content %>
-  <%% end %>
-  <p><%%= render_new_content_link(element) %></p>
 <%- end -%>
 <%%- end -%>
+<%- else -%>
+<%%= element_editor_for(element) -%>
+<%- end -%>

data/lib/rails/generators/alchemy/elements/templates/editor.html.haml

@@ -1,13 +1,11 @@
+<%- if @contents.any? || @element['picture_gallery'] -%>
 = element_editor_for(element) do |el|
 <%- if @element['picture_gallery'] -%>
   = render_picture_gallery_editor(element, max_images: nil, crop: true)
 <%- end -%>
-<% @contents.each do |content| -%>
+<%- @contents.each do |content| -%>
   = el.edit :<%= content["name"] %>
-<% end -%>
-<%- if @element['available_contents'] -%>
-  - element.contents.where(name: ['<%= @available_contents_names.join("', '") %>']).each do |content|
-    = render_essence_editor content
-  %p
-    = render_new_content_link(element)
-<% end -%>
+<%- end -%>
+<%- else -%>
+= element_editor_for(element)
+<%- end -%>

data/lib/rails/generators/alchemy/elements/templates/editor.html.slim

@@ -1,12 +1,11 @@
+<%- if @contents.any? || @element['picture_gallery'] -%>
 = element_editor_for(element) do |el|
 <%- if @element['picture_gallery'] -%>
   = render_picture_gallery_editor(element, max_images: nil, crop: true)
 <%- end -%>
-<% @contents.each do |content| -%>
+<%- @contents.each do |content| -%>
   = el.edit :<%= content["name"] %>
-<% end -%>
-<%- if @element['available_contents'] -%>
-  - element.contents.where(name: ['<%= @available_contents_names.join("', '") %>']).each do |content|
-    = render_essence_editor content
-  p = render_new_content_link(element)
-<% end -%>
+<%- end -%>
+<%- else -%>
+= element_editor_for(element)
+<%- end -%>

data/lib/rails/generators/alchemy/elements/templates/view.html.erb

@@ -18,10 +18,10 @@
     <%%= el.render :<%= content["name"] %> %>
     <%- end -%>
   <%- end -%>
-  <%- if @element['available_contents'] -%>
-    <%%- element.contents.where(name: ['<%= @available_contents_names.join("', '") %>']).each do |content| -%>
-      <%%= render_essence_view(content) %>
-    <%%- end -%>
+  <%- if @element['nestable_elements'].present? -%>
+    <%% element.nested_elements.available.each do |nested_element| %>
+      <%%= render_element(nested_element) %>
+    <%% end %>
   <%- end -%>
   <%%- end -%>
 <%%- end -%>

data/lib/rails/generators/alchemy/elements/templates/view.html.haml

@@ -14,7 +14,7 @@
     = el.render :<%= content["name"] %>
     <%- end -%>
   <%- end -%>
-  <%- if @element['available_contents'] -%>
-    - element.contents.where(name: ['<%= @available_contents_names.join("', '") %>']).each do |content|
-      = render_essence_view(content)
+  <%- if @element['nestable_elements'].present? -%>
+    - element.nested_elements.available.each do |nested_element|
+      = render_element(nested_element)
   <%- end -%>

data/lib/rails/generators/alchemy/elements/templates/view.html.slim

@@ -14,7 +14,7 @@
     = el.render :<%= content["name"] %>
     <%- end -%>
   <%- end -%>
-  <%- if @element['available_contents'] -%>
-    - element.contents.where(name: ['<%= @available_contents_names.join("', '") %>']).each do |content|
-      = render_essence_view(content)
+  <%- if @element['nestable_elements'].present? -%>
+    - element.nested_elements.available.each do |nested_element|
+      = render_element(nested_element)
   <%- end -%>

data/lib/rails/generators/alchemy/essence/essence_generator.rb

@@ -4,11 +4,11 @@ module Alchemy
   module Generators
     class EssenceGenerator < ::Rails::Generators::Base
       desc "This generator generates an Alchemy essence for you."
-      argument :essence_name, :banner => "YourEssenceName"
+      argument :essence_name, banner: "YourEssenceName"
       source_root File.expand_path('templates', File.dirname(__FILE__))
 
       def init
-        @essence_name = Alchemy::Content.normalize_essence_type(essence_name).underscore
+        @essence_name = essence_name.underscore
         @essence_view_path = Rails.root.join('app/views/alchemy/essences')
       end
 
@@ -46,7 +46,6 @@ CLASSMETHOD
         say "Then run 'rake db:migrate' to update your database."
         say "Also check the generated view files and alter them to fit your needs."
       end
-
     end
   end
 end

data/lib/rails/generators/alchemy/essence/templates/editor.html.erb

@@ -7,7 +7,7 @@
 %>
 <%% cache(content) do %>
 <div class="content_editor <%= @essence_name.classify.demodulize.underscore %>" id="<%%= content.dom_id %>" data-content-id="<%%= content.id %>">
-  <%%= label_and_remove_link(content) %>
+  <%%= content_label(content) %>
   <%%= text_field_tag(
     content.form_field_name,
     content.ingredient,

data/lib/rails/generators/alchemy/install/files/alchemy.de.yml

@@ -18,7 +18,7 @@ de:
     # Default texts for new contents created
     default_content_texts:
       article_headline: "Willkommen auf Ihrer Alchemy Seite"
-      article_text: '<p>Als erstes sollte man sich mit der Struktur von Alchemy vertraut machen. <a class="external" href="http://guides.alchemy-cms.com/edge/alchemy_approach.html" target="_blank" data-link-target="blank">Mehr dazu in den Guidelines</a>.</p><p>Die wichtigsten beiden Dinge die man über Alchemy wissen muss sind Elemente und Seitentypen.</p><p><span style="text-decoration: underline;"><strong>Elemente:</strong></span></p><p>Mit Alchemy kann man eine Seite in Inhaltsbereiche aufteilen, Elemente. Diese Elemente werden aus verschiedenen Grundtypen (Essenzen) zusammengesetzt. Die Essenzen sind:</p><ul><li>EssenceText - <em>Eine Zeile Text</em></li><li>EssenceRichtext - <em>Ein TinyMCE basierter formatierter Textblock</em></li><li>EssencePicture - <em>Ein Verweis auf ein Bild</em></li><li>EssenceHtml - <em>HTML Code</em></li><li>EssenceSelect - <em>Eine Auswahl an Werten</em></li><li>EssenceBoolean - <em>Eine Checkbox</em></li></ul><p>Elemente werden in einer YAML Datei definiert: <strong>config/alchemy/elements.yml</strong></p><p><a class="external" href="http://guides.alchemy-cms.com/edge/elements.html" target="_blank" data-link-target="blank">Mehr über Elemente und wie sie definiert werden, kann in den Guidelines nachgelesen werden.</a></p><p><span style="text-decoration: underline;"><strong>Seitentypen:</strong></span></p><p>Es können verschiedene Seitentypen definiert werden. Diesen können Elemente zugewiesen und ihr Verhalten definiert werden.</p><p>Seitentypen werden ein einer YAML Datei definiert: <strong>config/alchemy/page_layouts.yml</strong></p><p><a class="external" href="http://guides.alchemy-cms.com/edge/page_layouts.html" target="_blank" data-link-target="blank">Mehr über das Erstellen von Seitentypen kann in den Guidelines nachgelesen werden.</a></p>'
+      article_text: '<p>Als erstes sollte man sich mit der Struktur von Alchemy vertraut machen. <a class="external" href="http://guides.alchemy-cms.com/stable/alchemy_approach.html" target="_blank" data-link-target="blank">Mehr dazu in den Guidelines</a>.</p><p>Die wichtigsten beiden Dinge die man über Alchemy wissen muss sind Elemente und Seitentypen.</p><p><span style="text-decoration: underline;"><strong>Elemente:</strong></span></p><p>Mit Alchemy kann man eine Seite in Inhaltsbereiche aufteilen, Elemente. Diese Elemente werden aus verschiedenen Grundtypen (Essenzen) zusammengesetzt. Die Essenzen sind:</p><ul><li>EssenceText - <em>Eine Zeile Text</em></li><li>EssenceRichtext - <em>Ein TinyMCE basierter formatierter Textblock</em></li><li>EssencePicture - <em>Ein Verweis auf ein Bild</em></li><li>EssenceHtml - <em>HTML Code</em></li><li>EssenceSelect - <em>Eine Auswahl an Werten</em></li><li>EssenceBoolean - <em>Eine Checkbox</em></li></ul><p>Elemente werden in einer YAML Datei definiert: <strong>config/alchemy/elements.yml</strong></p><p><a class="external" href="http://guides.alchemy-cms.com/stable/elements.html" target="_blank" data-link-target="blank">Mehr über Elemente und wie sie definiert werden, kann in den Guidelines nachgelesen werden.</a></p><p><span style="text-decoration: underline;"><strong>Seitentypen:</strong></span></p><p>Es können verschiedene Seitentypen definiert werden. Diesen können Elemente zugewiesen und ihr Verhalten definiert werden.</p><p>Seitentypen werden ein einer YAML Datei definiert: <strong>config/alchemy/page_layouts.yml</strong></p><p><a class="external" href="http://guides.alchemy-cms.com/stable/page_layouts.html" target="_blank" data-link-target="blank">Mehr über das Erstellen von Seitentypen kann in den Guidelines nachgelesen werden.</a></p>'
 
     # Hint texts for elements
     element_hints:
@@ -28,4 +28,4 @@ de:
     content_hints:
       headline: "Dies ist ein einzeiliger unformatierter Text"
       picture: "Bilder werden in der Bibliothek gespeichert. Ein Bild kann mehrfach einem Element zugewiesen werden. Auch ein Bildauswahlwerkzeug ist in Alchemy integriert."
-      text: "Dies ist ein formatierbarer Textblock. Die Einstellungen des Editors können angepasst werden. Siehe http://guides.alchemy-cms.com/edge/customize_tinymce.html"
+      text: "Dies ist ein formatierbarer Textblock. Die Einstellungen des Editors können angepasst werden. Siehe http://guides.alchemy-cms.com/stable/customize_tinymce.html"

data/lib/rails/generators/alchemy/install/files/alchemy.en.yml

@@ -18,7 +18,7 @@ en:
     # Default texts for new contents created
     default_content_texts:
       article_headline: "Welcome to your first Alchemy CMS page"
-      article_text: '<p><strong>How to get started.</strong></p><p>First of all you should read about Alchemy and its architecture in the <a class="external" href="http://guides.alchemy-cms.com/edge/alchemy_approach.html" target="_blank" data-link-target="blank">guidelines</a>.</p><p>The most important things to know about Alchemy are elements and page layouts.</p><p><span style="text-decoration: underline;"><strong>Elements:</strong></span></p><p>With Alchemy you can split pages into content parts, elements. These elements can be defined out of several base content types: essences. The basic essences are:</p><ul><li>EssenceText - <em>A single line of text</em></li><li>EssenceRichtext - <em>A TinyMCE powered formatted text block</em></li><li>EssencePicture - <em>A reference to an image</em></li><li>EssenceHtml - <em>HTML embed code</em></li><li>EssenceSelect - <em>A selection of values</em></li><li>EssenceBoolean - <em>A checkbox</em></li></ul><p>Elements get defined in a YAML file <strong>config/alchemy/elements.yml</strong></p><p><a class="external" href="http://guides.alchemy-cms.com/edge/elements.html" target="_blank" data-link-target="blank">Read more about elements and how to define them in the guidelines.</a></p><p><span style="text-decoration: underline;"><strong>Page types:</strong></span></p><p>You can define several types of pages, called page layouts. You can assign elements to page layouts and control how elements and the page of a certain layout behave.</p><p>Page layouts get defined in a YAML file <strong>config/alchemy/page_layouts.yml</strong></p><p><a class="external" href="http://guides.alchemy-cms.com/edge/page_layouts.html" target="_blank" data-link-target="blank">Read more about defining page layouts in the guidelines.</a></p>'
+      article_text: '<p><strong>How to get started.</strong></p><p>First of all you should read about Alchemy and its architecture in the <a class="external" href="http://guides.alchemy-cms.com/stable/alchemy_approach.html" target="_blank" data-link-target="blank">guidelines</a>.</p><p>The most important things to know about Alchemy are elements and page layouts.</p><p><span style="text-decoration: underline;"><strong>Elements:</strong></span></p><p>With Alchemy you can split pages into content parts, elements. These elements can be defined out of several base content types: essences. The basic essences are:</p><ul><li>EssenceText - <em>A single line of text</em></li><li>EssenceRichtext - <em>A TinyMCE powered formatted text block</em></li><li>EssencePicture - <em>A reference to an image</em></li><li>EssenceHtml - <em>HTML embed code</em></li><li>EssenceSelect - <em>A selection of values</em></li><li>EssenceBoolean - <em>A checkbox</em></li></ul><p>Elements get defined in a YAML file <strong>config/alchemy/elements.yml</strong></p><p><a class="external" href="http://guides.alchemy-cms.com/stable/elements.html" target="_blank" data-link-target="blank">Read more about elements and how to define them in the guidelines.</a></p><p><span style="text-decoration: underline;"><strong>Page types:</strong></span></p><p>You can define several types of pages, called page layouts. You can assign elements to page layouts and control how elements and the page of a certain layout behave.</p><p>Page layouts get defined in a YAML file <strong>config/alchemy/page_layouts.yml</strong></p><p><a class="external" href="http://guides.alchemy-cms.com/stable/page_layouts.html" target="_blank" data-link-target="blank">Read more about defining page layouts in the guidelines.</a></p>'
 
     # Hint texts for elements
     element_hints:
@@ -28,4 +28,4 @@ en:
     content_hints:
       headline: "This is a single line of unformatable Text"
       picture: "Pictures are stored in the library. You can assign a picture multiple times throughout your site. Alchemy has an image cropper build right in."
-      text: "This is a rich text block powered by TinyMCE editor. You can change the configuration of the editor. See http://guides.alchemy-cms.com/edge/customize_tinymce.html"
+      text: "This is a rich text block powered by TinyMCE editor. You can change the configuration of the editor. See http://guides.alchemy-cms.com/stable/customize_tinymce.html"

data/lib/rails/generators/alchemy/install/files/alchemy.es.yml

@@ -18,8 +18,8 @@ es:
     # Default texts for new contents created
     default_content_texts:
       article_headline: "Bienvenido a tu primera página de Alchemy CMS"
-      article_text: '<p><strong>Como empezar.</strong></p><p>Lo primero de todo deberías leer sobre Alchemy y su arquitectura en las <a class="external" href="http://guides.alchemy-cms.com/edge/alchemy_approach.html" target="_blank" data-link-target="blank">guías</a>.</p><p>Las cosas más importantes que debes saber sobre Alchemy son elementos (<i>elements</i>) y disposiciones de página (<i>page layouts</i>).</p><p><span style="text-decoration: underline;"><strong>Elementos:</strong></span></p><p>Con Alchemy puedes dividir las páginas en partes de contenido, elementos. Estos elementos se pueden definir mediante varios tipos de contenido básicos: esencias (<i>essences</i>). Las esencias básicas son:</p><ul><li>EssenceText - <em>Un única línea de texto</em></li><li>EssenceRichtext - <em>Un bloque de texto formateado mediante TinyMCE</em></li><li>EssencePicture - <em>Una referencia a una imagen</em></li><li>EssenceHtml - <em>Código HTML empotrado</em></li><li>EssenceSelect - <em>Una selección de valores</em></li><li>EssenceBoolean - <em>Una casilla de verificación</em></li></ul><p>Los elementos se definen en el fichero YAML <strong>config/alchemy/elements.yml</strong></p><p><a class="external" href="http://guides.alchemy-cms.com/edge/elements.html" target="_blank" data-link-target="blank">Lee más sobre elementos y cómo definirlos en las guías.</a></p><p><span style="text-decoration: underline;"><strong>Tipos de página:</strong></span></p><p>Puedes definir varios tipos de páginas, llamados disposiciones de páginas (<i>page layouts</i>). Puedes asignar elementos a las disposiciones de páginas y controlar cómo se comportan los elementos y una página con una disposición concreta.</p><p>Las disposiciones de páginas se definen en el fichero YAML <strong>config/alchemy/page_layouts.yml</strong></p><p><a class="external" href="http://guides.alchemy-cms.com/edge/page_layouts.html" target="_blank" data-link-target="blank">Lee más sobre definir disposiciones de páginas en las guías.</a></p>'
-    
+      article_text: '<p><strong>Como empezar.</strong></p><p>Lo primero de todo deberías leer sobre Alchemy y su arquitectura en las <a class="external" href="http://guides.alchemy-cms.com/stable/alchemy_approach.html" target="_blank" data-link-target="blank">guías</a>.</p><p>Las cosas más importantes que debes saber sobre Alchemy son elementos (<i>elements</i>) y disposiciones de página (<i>page layouts</i>).</p><p><span style="text-decoration: underline;"><strong>Elementos:</strong></span></p><p>Con Alchemy puedes dividir las páginas en partes de contenido, elementos. Estos elementos se pueden definir mediante varios tipos de contenido básicos: esencias (<i>essences</i>). Las esencias básicas son:</p><ul><li>EssenceText - <em>Un única línea de texto</em></li><li>EssenceRichtext - <em>Un bloque de texto formateado mediante TinyMCE</em></li><li>EssencePicture - <em>Una referencia a una imagen</em></li><li>EssenceHtml - <em>Código HTML empotrado</em></li><li>EssenceSelect - <em>Una selección de valores</em></li><li>EssenceBoolean - <em>Una casilla de verificación</em></li></ul><p>Los elementos se definen en el fichero YAML <strong>config/alchemy/elements.yml</strong></p><p><a class="external" href="http://guides.alchemy-cms.com/stable/elements.html" target="_blank" data-link-target="blank">Lee más sobre elementos y cómo definirlos en las guías.</a></p><p><span style="text-decoration: underline;"><strong>Tipos de página:</strong></span></p><p>Puedes definir varios tipos de páginas, llamados disposiciones de páginas (<i>page layouts</i>). Puedes asignar elementos a las disposiciones de páginas y controlar cómo se comportan los elementos y una página con una disposición concreta.</p><p>Las disposiciones de páginas se definen en el fichero YAML <strong>config/alchemy/page_layouts.yml</strong></p><p><a class="external" href="http://guides.alchemy-cms.com/stable/page_layouts.html" target="_blank" data-link-target="blank">Lee más sobre definir disposiciones de páginas en las guías.</a></p>'
+
     # Hint texts for elements
     element_hints:
       article: "Este es el texto de ayuda del elemento artículo. Puedes cambiar este texto en `config/locales/alchemy.en.yml`. Siéntete libre de cambiarlo a tu gusto, es tuyo."
@@ -28,4 +28,4 @@ es:
     content_hints:
       headline: "Esta es una sencilla linea de texto sin formato"
       picture: "Las imágenes se almacenan en la librería. Puedes asignar una imagen varias veces en tu sitio. Alchemy tiene una herramienta de recorte de imagen integrada."
-      text: "Este es un bloque de texto enriquecido mediante el editor TinyMCE. Puedes cambiar la configuración del editor. Ver http://guides.alchemy-cms.com/edge/customize_tinymce.html"
+      text: "Este es un bloque de texto enriquecido mediante el editor TinyMCE. Puedes cambiar la configuración del editor. Ver http://guides.alchemy-cms.com/stable/customize_tinymce.html"

data/lib/rails/generators/alchemy/install/install_generator.rb

@@ -3,7 +3,6 @@ require 'rails'
 module Alchemy
   module Generators
     class InstallGenerator < ::Rails::Generators::Base
-
       desc "Installs Alchemy into your App."
 
       class_option :skip_demo_files,

data/lib/rails/generators/alchemy/install/templates/elements.yml.tt

@@ -1,6 +1,6 @@
-# == In this configuration you setup Alchemy´s element layouts.
+# == In this configuration, you set up Alchemy's element layouts.
 #
-# For further informations please see http://guides.alchemy-cms.com/create_elements.html
+# For further information please see http://guides.alchemy-cms.com/stable/elements.html
 
 <%- unless @options[:skip_demo_files] -%>
 - name: article

data/lib/rails/generators/alchemy/install/templates/page_layouts.yml.tt

@@ -1,6 +1,6 @@
 # == This file defines the page layouts for new pages.
 #
-# For further informations please see http://guides.alchemy-cms.com/create_page_layouts.html
+# For further information please see http://guides.alchemy-cms.com/stable/page_layouts.html
 
 <%- unless @options[:skip_demo_files] -%>
 - name: <%= Alchemy::Config.get(:default_language)['page_layout'] %>

data/lib/rails/generators/alchemy/module/module_generator.rb

@@ -4,7 +4,7 @@ module Alchemy
   module Generators
     class ModuleGenerator < ::Rails::Generators::Base
       desc "This generator generates an Alchemy module for you."
-      argument :module_name, :banner => "your_module_name"
+      argument :module_name, banner: "your_module_name"
       source_root File.expand_path('templates', File.dirname(__FILE__))
 
       def init

data/lib/rails/templates/alchemy.rb

@@ -1,7 +1,7 @@
 # This rails template installs Alchemy and all depending gems.
 require File.expand_path("../../../alchemy/version", __FILE__)
 
-gem "alchemy_cms",    github: "AlchemyCMS/alchemy_cms",    branch: "3.2-stable"
-gem "alchemy-devise", github: "AlchemyCMS/alchemy-devise", branch: "3.2-stable"
+gem "alchemy_cms",    github: "AlchemyCMS/alchemy_cms",    branch: "master"
+gem "alchemy-devise", github: "AlchemyCMS/alchemy-devise", branch: "master"
 
 gem "capistrano-alchemy", github: "AlchemyCMS/capistrano-alchemy", branch: "master", group: "development"

data/lib/tasks/alchemy/convert.rake

@@ -1,10 +1,8 @@
 namespace :alchemy do
   namespace :convert do
-
     namespace :urlnames do
-
       desc "Converts the urlname of all pages to nested url paths."
-      task :to_nested => [:environment] do
+      task to_nested: [:environment] do
         unless Alchemy::Config.get(:url_nesting)
           raise "\nURL nesting is disabled! Please enable url_nesting in `config/alchemy/config.yml` first.\n\n"
         end
@@ -12,14 +10,14 @@ namespace :alchemy do
         pages = Alchemy::Page.contentpages
         count = pages.count
         pages.each_with_index do |page, n|
-          puts "Updating page #{n+1} of #{count}"
+          puts "Updating page #{n + 1} of #{count}"
           page.update_urlname!
         end
         puts "Done."
       end
 
       desc "Converts the urlname of all pages to contain the slug only."
-      task :to_slug => [:environment] do
+      task to_slug: [:environment] do
         if Alchemy::Config.get(:url_nesting)
           raise "\nURL nesting is enabled! Please disable url_nesting in `config/alchemy/config.yml` first.\n\n"
         end
@@ -27,13 +25,11 @@ namespace :alchemy do
         pages = Alchemy::Page.contentpages
         count = pages.count
         pages.each_with_index do |page, n|
-          puts "Updating page #{n+1} of #{count}"
+          puts "Updating page #{n + 1} of #{count}"
           page.update_attribute :urlname, page.slug
         end
         puts "Done."
       end
-
     end
-
   end
 end

data/lib/tasks/alchemy/db.rake

@@ -4,16 +4,15 @@ include Alchemy::Tasks::Helpers
 
 namespace :alchemy do
   namespace :db do
-
     desc "Dumps the database to STDOUT (Pass DUMP_FILENAME to store the dump into a file)."
-    task :dump => :environment do
+    task dump: :environment do
       dump_store = ENV['DUMP_FILENAME'] ? " > #{ENV['DUMP_FILENAME']}" : ""
       dump_cmd = database_dump_command(database_config['adapter'])
       system "#{dump_cmd}#{dump_store}"
     end
 
     desc "Imports the database from STDIN (Pass DUMP_FILENAME to read the dump from file)."
-    task :import => :environment do
+    task import: :environment do
       dump_store = ENV['DUMP_FILENAME'] ? "cat #{ENV['DUMP_FILENAME']}" : "echo #{Shellwords.escape(STDIN.read)}"
       import_cmd = database_import_command(database_config['adapter'])
       system "#{dump_store} | #{import_cmd}"

data/lib/tasks/alchemy/install.rake

@@ -16,8 +16,8 @@ class Alchemy::InstallTask < Thor
       code = "en" if code.empty?
       name = ask "What's the name of your site's primary language? (DEFAULT: English)"
       name = "English" if name.empty?
-      gsub_file "./config/alchemy/config.yml", /default_language:\n\s\scode:\sen\n\s\sname:\sEnglish/m do |match|
-        match = "default_language:\n  code: #{code}\n  name: #{name}"
+      gsub_file "./config/alchemy/config.yml", /default_language:\n\s\scode:\sen\n\s\sname:\sEnglish/m do
+        "default_language:\n  code: #{code}\n  name: #{name}"
       end
     end
 
@@ -28,7 +28,6 @@ class Alchemy::InstallTask < Thor
 end
 
 namespace :alchemy do
-
   desc "Installs Alchemy CMS into your app."
   task :install do
     install_helper = Alchemy::InstallTask.new
@@ -38,7 +37,7 @@ namespace :alchemy do
       puts "-----------------"
     end
     Rake::Task["alchemy:mount"].invoke
-    system("rails g alchemy:install#{ ENV['from_binary'] ? ' --force' : '' }") || exit!(1)
+    system("rails g alchemy:install#{ENV['from_binary'] ? ' --force' : ''}") || exit!(1)
     install_helper.set_primary_language
     Rake::Task["db:create"].invoke
     # We can't invoke this rake task, because Rails will use wrong engine names otherwise

data/lib/tasks/alchemy/tidy.rake

@@ -2,7 +2,6 @@ require 'alchemy/shell'
 
 namespace :alchemy do
   namespace :tidy do
-
     desc "Tidy up Alchemy database."
     task :up do
       Rake::Task['alchemy:tidy:cells'].invoke
@@ -11,7 +10,7 @@ namespace :alchemy do
     end
 
     desc "Creates missing cells for pages."
-    task :cells => :environment do
+    task cells: :environment do
       if !File.exist? Rails.root.join('config/alchemy/cells.yml')
         puts "No page cell definitions found."
       else
@@ -26,12 +25,12 @@ namespace :alchemy do
     end
 
     desc "Fixes element positions."
-    task :element_positions => [:environment] do
+    task element_positions: [:environment] do
       Alchemy::Tidy.update_element_positions
     end
 
     desc "Fixes content positions."
-    task :content_positions => [:environment] do
+    task content_positions: [:environment] do
       Alchemy::Tidy.update_content_positions
     end
   end
@@ -65,7 +64,7 @@ module Alchemy
         if page.elements.any?
           puts "\n## Updating element positions of page `#{page.name}`"
         end
-        page.elements.group_by(&:cell_id).each do |cell_id, elements|
+        page.elements.group_by(&:cell_id).each do |_cell_id, elements|
           elements.each_with_index do |element, idx|
             position = idx + 1
             if element.position != position

data/lib/tasks/alchemy/upgrade.rake

@@ -2,15 +2,14 @@ require 'alchemy/upgrader'
 require 'alchemy/version'
 
 namespace :alchemy do
-
   desc "Upgrades database content to Alchemy CMS v#{Alchemy::VERSION} (Set UPGRADE env variable to only run a specific task)."
-  task :upgrade => :environment do
+  task upgrade: :environment do
     Alchemy::Upgrader.run!
   end
 
   namespace :upgrade do
     desc "List all available upgrade tasks."
-    task :list => [:environment] do
+    task list: [:environment] do
       puts "\nAvailable upgrade tasks"
       puts "-----------------------\n"
       methods = Alchemy::Upgrader.all_upgrade_tasks
@@ -24,5 +23,4 @@ namespace :alchemy do
       end
     end
   end
-
 end

data/spec/controllers/{admin → alchemy/admin}/attachments_controller_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Alchemy
   describe Admin::AttachmentsController do
-    let(:attachment) { build_stubbed(:attachment) }
+    let(:attachment) { build_stubbed(:alchemy_attachment) }
 
     before do
       authorize_user(:as_admin)
@@ -10,7 +10,7 @@ module Alchemy
 
     describe "#index" do
       it "should always paginate the records" do
-        expect(Attachment).to receive(:find_paginated)
+        expect_any_instance_of(ActiveRecord::Relation).to receive(:page).and_call_original
         alchemy_get :index
       end
 
@@ -42,8 +42,8 @@ module Alchemy
       end
 
       describe 'only and expect options' do
-        let!(:png) { create(:attachment) }
-        let!(:jpg) { create(:attachment, file: File.new(File.expand_path('../../../../spec/fixtures/image3.jpeg', __FILE__))) }
+        let!(:png) { create(:alchemy_attachment) }
+        let!(:jpg) { create(:alchemy_attachment, file: File.new(File.expand_path('../../../../fixtures/image3.jpeg', __FILE__))) }
 
         context 'with params[:only]' do
           it 'only loads attachments with matching content type' do
@@ -74,25 +74,6 @@ module Alchemy
       end
     end
 
-    describe "#new" do
-      context "in overlay" do
-        before do
-          expect(controller).to receive(:in_overlay?).and_return(true)
-          expect(Content).to receive(:find_by).and_return(mock_model('Content'))
-        end
-
-        it "should set @while_assigning to true" do
-          alchemy_get :new
-          expect(assigns(:while_assigning)).to eq(true)
-        end
-
-        it "should set @swap to params[:swap]" do
-          alchemy_get :new, swap: 'true'
-          expect(assigns(:swap)).to eq('true')
-        end
-      end
-    end
-
     describe '#create' do
       subject { alchemy_post :create, params }
 
@@ -105,23 +86,6 @@ module Alchemy
           expect(attachment).to receive(:save).and_return(true)
         end
 
-        context 'if inside of archive overlay' do
-          let(:params)  { {attachment: {name: ''}, content_id: 1} }
-          let(:content) { mock_model('Content') }
-
-          before do
-            expect(Content).to receive(:find_by).and_return(content)
-          end
-
-          it "assigns lots of instance variables" do
-            subject
-            expect(assigns(:options)).to eq({})
-            expect(assigns(:while_assigning)).to be_truthy
-            expect(assigns(:content)).to eq(content)
-            expect(assigns(:swap)).to eq(nil)
-          end
-        end
-
         it "renders json response with success message" do
           subject
           expect(response.content_type).to eq('application/json')
@@ -147,7 +111,7 @@ module Alchemy
     describe '#update' do
       subject { alchemy_put :update, {id: 1, attachment: {name: ''}} }
 
-      let(:attachment) { build_stubbed(:attachment) }
+      let(:attachment) { build_stubbed(:alchemy_attachment) }
 
       before do
         expect(Attachment).to receive(:find).and_return(attachment)
@@ -161,6 +125,24 @@ module Alchemy
         it "redirects to index path" do
           is_expected.to redirect_to admin_attachments_path
         end
+
+        context 'with search params' do
+          let(:search_params) do
+            {
+              q: {name_cont: 'kitten'},
+              per_page: 20,
+              page: 2
+            }
+          end
+
+          subject do
+            alchemy_put :update, {id: 1, attachment: {name: ''}}.merge(search_params)
+          end
+
+          it "passes them along" do
+            is_expected.to redirect_to admin_attachments_path(search_params)
+          end
+        end
       end
 
       context 'with failing validations' do
@@ -176,7 +158,7 @@ module Alchemy
     end
 
     describe '#destroy' do
-      let(:attachment) { build_stubbed(:attachment) }
+      let(:attachment) { build_stubbed(:alchemy_attachment) }
 
       before do
         expect(Attachment).to receive(:find).and_return(attachment)
@@ -193,7 +175,7 @@ module Alchemy
 
     describe "#download" do
       before do
-        expect(Attachment).to receive(:find).with("#{attachment.id}").and_return(attachment)
+        expect(Attachment).to receive(:find).with(attachment.id.to_s).and_return(attachment)
         allow(controller).to receive(:render).and_return(nil)
       end
 
@@ -203,7 +185,7 @@ module Alchemy
       end
 
       it "should send the data to the browser" do
-        expect(controller).to receive(:send_data)
+        expect(controller).to receive(:send_file)
         alchemy_get :download, id: attachment.id
       end
     end