alchemy_cms 2.4.rc2 → 2.4.rc4

data/app/views/alchemy/admin/clipboard/insert.js.erb

@@ -3,7 +3,7 @@
 <%- if params[:remove] -%>
   $(".element_editor[data-element-id='<%= @item.id -%>']").remove();
 <%- if @item.class.to_s == 'Element' -%>
-  $('#element_area').sortable('refresh');
+  $('#element_area .sortable_cell').sortable('refresh');
 <%- end -%>
   Alchemy.growl('<%= escape_javascript t("item moved to clipboard", :name => @item.class.to_s == "Alchemy::Element" ? @item.display_name_with_preview_text : @item.name) -%>');
 <%- else -%>

data/app/views/alchemy/admin/elements/create.js.erb

@@ -18,7 +18,12 @@ $element_area.prepend(element_html);
 $element_area.append(element_html);
 <% end %>
 
-$element_area.sortable('refresh');
+if ($element_area.find('.element_editor').length > 0) {
+  Alchemy.SortableElements(<%= @page.id %>, '<%= form_authenticity_token %>', $element_area);
+} else {
+  $element_area.sortable('refresh');
+}
+
 Alchemy.growl('<%= t("successfully_added_element") -%>');
 Alchemy.closeCurrentWindow();
 

data/app/views/alchemy/admin/elements/trash.js.erb

@@ -1,14 +1,12 @@
 $('#element_<%= @element.id %>').hide(200, function() {
   $(this).remove();
   Alchemy.growl('<%= escape_javascript(t("Element trashed")) %>');
-  $('#element_area').sortable('refresh');
+  $('#element_area .sortable_cell').sortable('refresh');
   Alchemy.refreshTrashWindow(<%= @page.id %>);
   $('#element_trash_button .icon').addClass('full');
   Alchemy.PreviewWindow.refresh();
-
   <% @element.contents.essence_richtexts.each do |content| %>
   tinymce.get('contents_content_<%= content.id %>_body').remove();
   <% end %>
-
   <%=raw update_elements_with_essence_selects(@page, @element) %>
 });

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

@@ -1,5 +1,13 @@
 <%= form_for resource_instance_variable, :url => resource_path(resource_instance_variable), :remote => true do |f| %>
-  <div id="errors"></div>
+  <% if resource_instance_variable.errors.any? %>
+  <div id="errors">
+    <ul>
+    <% resource_instance_variable.errors.full_messages.each do |error| %>
+      <li><%= error %></li>
+    <% end %>
+    </ul>
+  </div>
+  <% end %>
   <table>
     <%- resource_handler.attributes.each do |attribute| -%>
     <tr>
@@ -10,7 +18,11 @@
         <%= f.send :label, attribute[:name] %>
       </td>
       <%- elsif attribute[:type] == :text -%>
+      <td class="label"><%= f.send :label, attribute[:name] %></td>
       <td class="input"><%= f.send :text_area, attribute[:name] -%></td>
+      <%- elsif attribute[:type] == :datetime -%>
+      <td class="label"><%= f.send :label, attribute[:name] %></td>
+      <td class="input"><%= f.send :text_field, attribute[:name], :type => :date -%></td>
       <%- else -%>
       <td class="label"><%= f.send :label, attribute[:name] %></td>
 

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

@@ -11,7 +11,7 @@
   </div>
   <div id="trash_items">
     <%- @elements.each do |element| -%>
-    <%= render :partial => 'alchemy/admin/elements/element', :object => element, :locals => {:draggable => !@allowed_elements.detect { |e| e['name'] == element.name }.nil? } %>
+    <%= render :partial => 'alchemy/admin/elements/element', :object => element, :locals => {:draggable => !@allowed_elements.detect { |e| e['name'] == element.name }.nil? } rescue "" %>
     <%- end -%>
   </div>
   <p>

data/app/views/alchemy/base/remote_errors.js.erb

@@ -1,2 +1,6 @@
-jQuery('<%= @error_div_id %>').html('<%= escape_javascript(@errors) %>').show();
+$('<%= @error_div_id %>').html('<%= escape_javascript(@errors) %>').show();
+$('label, input, select').removeClass('with_error');
+<% @error_fields.each do |field| %>
+$('label[for="<%= field %>"], input#<%= field %>, #<%= field %>SelectBoxIt').addClass('with_error');
+<% end %>
 Alchemy.Buttons.enable();

data/app/views/alchemy/essences/_essence_link_view.html.erb

@@ -0,0 +1,2 @@
+<%- options[:text] ||= content.ingredient %>
+<%= link_to options[:text], content.ingredient, html_options %>

data/app/views/alchemy/essences/_essence_richtext_editor.html.erb

@@ -1,7 +1,7 @@
 <% cache(content) do -%>
 <div class="content_editor content_rtf_editor" id="<%= content_dom_id(content) %>">
   <%= label_and_remove_link(content) %>
-  <div style="position: relative">
+  <div class="tinymce_container">
     <% if content.has_custom_tinymce_config? && content.settings[:tinymce] -%>
     <div class="essence_richtext_loader">
       <%= image_tag('alchemy/ajax_loader.gif') %>

data/config/locales/alchemy.de.yml

@@ -84,6 +84,10 @@ de:
         blank: '%{field} darf nicht leer sein.'
         wrong_format: '%{field} hat das falsche Format.'
 
+    default_content_texts:
+      lorem: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+      corporate_lorem: "Appropriately enable sustainable growth strategies vis-a-vis holistic materials. Energistically orchestrate open-source e-tailers vis-a-vis plug-and-play best practices. Uniquely plagiarize client-centric opportunities whereas plug-and-play ideas. Distinctively reconceptualize backward-compatible partnerships vis-a-vis reliable total linkage. Interactively fabricate highly efficient networks for clicks-and-mortar content. Collaboratively reconceptualize holistic markets via 2.0 architectures."
+
     essence_pictures:
       css_classes:
         left: 'Links vom Text'
@@ -751,6 +755,12 @@ de:
             too_short: "^Der URL-Name der Seite ist zu kurz (min. 3 Zeichen)"
             taken: "^Der URL-Name ist bereits vergeben."
             exclusion: "^Der URL-Name der Seite kann nicht benutzt werden."
+      alchemy/user:
+        attributes:
+          login:
+            invalid: "darf nur aus Buchstaben, Zahlen, Leerzeichen und .-_@ bestehen."
+          email:
+            invalid: "entspricht nicht dem Format einer E-Mail-Adresse."
 
   activemodel:
 
@@ -881,7 +891,7 @@ de:
         tag_list: Schlagworte
 
       alchemy/user:
-        email: "Email"
+        email: "E-Mail"
         firstname: "Vorname"
         gender: "Anrede"
         language: "Sprache"
@@ -905,15 +915,12 @@ de:
       login_not_found: "^Dieser Benutzername existiert nicht."
       general_credentials_error: "Die Kombination aus Benutzername und Passwort ist nicht gültig."
       consecutive_failed_logins_limit_exceeded: "Zu viele Fehlversuche! Dieser Account ist aus Sicherheitsgründen gesperrt worden. Bitte wenden Sie sich an den Administrator."
-      email_invalid: "Die Email-Adresse entspricht nicht dem Format einer Email-Adresse."
       password_blank: "^Bitte ein Passwort angegeben."
       password_invalid: "^Das Passwort ist nicht richtig."
       not_active: "Dieser Account wurde noch nicht aktiviert."
       not_confirmed: "Dieser Account wurde noch nicht bestätigt."
       not_approved: "Dieser Account wurde noch nicht freigeschaltet."
       no_authentication_details: 'Sie haben keinen Benutzernamen und/oder Passwort eingegeben.'
-      login_not_valid: "^Der Benutzername darf nur aus Buchstaben, Zahlen, Leerzeichen und .-_@ bestehen."
-      login_too_short: "^Der Benutzername ist zu kurz. Bitte mindestens 3 Zeichen verwenden."
 
     models:
       alchemy/user_session: 'Sitzung'

data/lib/alchemy/capistrano.rb

@@ -1,6 +1,8 @@
 # This recipe contains Capistrano recipes for handling the uploads, ferret index and picture cache files while deploying your application.
 # It also contains a ferret:rebuild_index task to rebuild the index after deploying your application.
-Capistrano::Configuration.instance(:must_exist).load do
+require 'fileutils'
+
+::Capistrano::Configuration.instance(:must_exist).load do
 
   after "deploy:setup", "alchemy:shared_folders:create"
   after "deploy:finalize_update", "alchemy:shared_folders:symlink"
@@ -81,6 +83,62 @@ EOF
 
     end
 
+    namespace :import do
+
+      desc "Imports all data (Pictures, attachments and the database) into your local development machine."
+      task :all, :roles => [:app, :db] do
+        pictures
+        attachments
+        database
+      end
+
+      desc "Imports the database into your local development machine."
+      task :database, :roles => [:db] do
+        filename = "#{fetch(:application, 'dump')}-#{timestamp}.sql"
+        run "cd #{current_path} && RAILS_ENV=#{fetch(:rails_env, 'production')} DUMP_FILENAME=#{filename} #{rake} alchemy:db:dump"
+        FileUtils.mkdir_p "./db/dumps"
+        download "#{current_path}/db/dumps/#{filename}", "db/dumps/#{filename}"
+        run_locally "mysql -u#{database_config['username']}#{database_config['password'] ? ' -p"' + database_config['password'] + '"' : nil} #{database_config['database']} < ./db/dumps/#{filename}"
+      end
+
+      desc "Imports attachments into your local machine."
+      task :attachments, :roles => [:app] do
+        filename = zip_files('attachments')
+        FileUtils.mkdir_p "./uploads"
+        download "#{shared_path}/uploads/#{filename}", "./uploads/#{filename}"
+        unzip_files('attachments', filename)
+      end
+
+      desc "Imports pictures into your local machine."
+      task :pictures, :roles => [:app] do
+        filename = zip_files('pictures')
+        FileUtils.mkdir_p "./uploads"
+        download "#{shared_path}/uploads/#{filename}", "./uploads/#{filename}"
+        unzip_files('pictures', filename)
+      end
+
+      def zip_files(type)
+        filename = "#{type}-#{timestamp}.tar.gz"
+        run "cd #{shared_path}/uploads && tar cvfz #{filename} #{type}/"
+        filename
+      end
+
+      def timestamp
+        timestamp ||= Time.now.strftime('%Y-%m-%d-%H-%M')
+      end    
+
+      def unzip_files(type, filename)
+        FileUtils.rm_rf "./uploads/#{type}"
+        run_locally "cd ./uploads && tar xvzf #{filename}"
+      end
+
+      def database_config
+        raise "database.yml not found!" if !File.exists?("./config/database.yml")
+        YAML.load_file("./config/database.yml")['development']
+      end
+
+    end
+
   end
 
   namespace :ferret do

data/lib/alchemy/essence.rb

@@ -27,6 +27,7 @@ module Alchemy #:nodoc:
 
         class_eval <<-EOV
           attr_accessor :validation_errors
+          attr_accessible :ingredient
           include Alchemy::Essence::InstanceMethods
           stampable(:stamper_class_name => 'Alchemy::User')
           validate :essence_validations, :on => :update

data/lib/alchemy/seeder.rb

@@ -8,55 +8,8 @@ module Alchemy
       # This seed builds the necessary page structure for alchemy in your database.
       # Run the alchemy:db:seed rake task to seed your database.
       def seed!
-        desc "Seeding your database"
-        errors = []
-        notices = []
-
-        default_language = Alchemy::Config.get(:default_language)
-
-        lang = Alchemy::Language.find_or_initialize_by_language_code(
-          :name => default_language['name'],
-          :language_code => default_language['code'],
-          :frontpage_name => default_language['frontpage_name'],
-          :page_layout => default_language['page_layout'],
-          :public => true,
-          :default => true
-        )
-        if lang.new_record?
-          if lang.save
-            log "Created language #{lang.name}."
-          else
-            errors << "Errors while creating language #{lang.name}: #{lang.errors.full_messages}"
-          end
-        else
-          notices << "Language #{lang.name} was already present."
-        end
-
-        root = Alchemy::Page.find_or_initialize_by_name(
-          :name => 'Root',
-          :do_not_sweep => true
-        )
-        if root.new_record?
-          if root.save
-            log "Created page #{root.name}."
-          else
-            errors << "Errors while creating page #{root.name}: #{root.errors.full_messages}"
-          end
-        else
-          notices << "Page #{root.name} was already present."
-        end
-
-        if errors.blank?
-          log "Successfully seeded your database!\n" if notices.blank?
-          notices.each do |note|
-            log(note, :skip)
-          end
-        else
-          log("Some pages could not be created:", :error)
-          errors.each do |error|
-            log(error, :error)
-          end
-        end
+        create_default_language
+        create_root_page
       end
 
     private
@@ -119,6 +72,43 @@ module Alchemy
         end
       end
 
+    protected
+
+      def create_default_language
+        desc "Creating default language"
+        default_language = Alchemy::Config.get(:default_language)
+        lang = Alchemy::Language.find_or_initialize_by_language_code(
+          :name => default_language['name'],
+          :language_code => default_language['code'],
+          :frontpage_name => default_language['frontpage_name'],
+          :page_layout => default_language['page_layout'],
+          :public => true,
+          :default => true
+        )
+        if lang.new_record?
+          if lang.save!
+            log "Created language #{lang.name}."
+          end
+        else
+          log "Language #{lang.name} was already present.", :skip
+        end
+      end
+
+      def create_root_page
+        desc "Creating root page"
+        root = Alchemy::Page.find_or_initialize_by_name(
+          :name => 'Root',
+          :do_not_sweep => true
+        )
+        if root.new_record?
+          if root.save!
+            log "Created page #{root.name}."
+          end
+        else
+          log "Page #{root.name} was already present.", :skip
+        end
+      end
+
     end
 
   end

data/lib/alchemy/tinymce.rb

@@ -5,7 +5,7 @@ module Alchemy
 
     @@setup = nil
 
-    @@plugins = %w(autoresize paste fullscreen inlinepopups alchemy_link)
+    @@plugins = %w(alchemy_link autoresize fullscreen inlinepopups paste table)
 
     @@languages = ['en', 'de']
 

data/lib/alchemy/version.rb

@@ -1,6 +1,6 @@
 module Alchemy
 
-  VERSION = "2.4.rc2"
+  VERSION = "2.4.rc4"
 
   def self.version
     VERSION

data/lib/rails/generators/alchemy/deploy_script/deploy_script_generator.rb

@@ -12,7 +12,7 @@ module Alchemy
       def copy_script
         @scm = options[:scm]
         @database_type = options[:db]
-
+        @app_name = ask('Please enter a name for your application:')
         @server = ask('Please enter server ip or domain:')
         if @store_credentials = yes?('Do want to store the ssh credentials? (PLEASE DO NOT STORE THEM IF THE REPOSITORY IS PUBLIC) (y/N)')
           ask_for_credentials

data/lib/rails/generators/alchemy/deploy_script/templates/deploy.rb.tt

@@ -2,6 +2,9 @@ require 'bundler/capistrano'
 require 'alchemy/capistrano'
 load 'deploy/assets'
 
+# application name
+set :application,               "<%= @app_name %>"
+
 # ssh settings
 <%- if @ssh_user.blank? || !@store_credentials -%>
 set(:user)                      { Capistrano::CLI.ui.ask('Enter your ssh username: ') }

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

@@ -2,8 +2,8 @@
 <%- if @element["picture_gallery"] -%>
   .<%= @element_name %>_images
     - element.contents.gallery_pictures.each do |image|
-    .<%= @element_name %>_image<%= image.essence.css_class ? ".#{image.essence.css_class}" : '' %>
-      = render_essence_view(image, :image_size => "160x120")
+      .<%= @element_name %>_image{class: image.essence.css_class}
+        = render_essence_view(image, :image_size => "160x120")
 <%- end -%>
 <%- @contents.each do |content| -%>
   <%- if @contents.length > 1 -%>

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

@@ -2,8 +2,8 @@
 <%- if @element["picture_gallery"] -%>
   .<%= @element_name %>_images
     - element.contents.gallery_pictures.each do |image|
-    .<%= @element_name %>_image<%= image.essence.css_class ? ".#{image.essence.css_class}" : '' %>
-      = render_essence_view(image, :image_size => "160x120")
+      .<%= @element_name %>_image class=image.essence.css_class
+        = render_essence_view(image, :image_size => "160x120")
 <%- end -%>
 <%- @contents.each do |content| -%>
   <%- if @contents.length > 1 -%>

data/lib/tasks/database.rake

@@ -0,0 +1,25 @@
+namespace :alchemy do
+  namespace :db do
+
+    desc "Seeds your database with essential data for Alchemy CMS."
+    task :seed => :environment do
+      Alchemy::Seeder.seed!
+    end
+
+    desc "Dumps the database into 'db/dumps'"
+    task :dump => :environment do
+      db_conf = Rails.configuration.database_configuration.fetch(Rails.env)
+      raise "Alchemy only supports MySQL database dumping at the moment." unless db_conf['adapter'] =~ /mysql/
+      FileUtils.mkdir_p(Rails.root.join('db/dumps'))
+      `mysqldump -u#{db_conf['username']}#{db_conf['password'].present? ? " -p'#{db_conf['password']}'" : nil} #{db_conf['database']} > #{Rails.root.join('db/dumps', dump_name)}`
+    end
+
+    def dump_name
+      return ENV['DUMP_FILENAME'] if ENV['DUMP_FILENAME'].present?
+      app_name = Rails.application.class.name.underscore.split('/').first
+      timestamp = Time.now.strftime('%Y-%m-%d-%H-%M')
+      dump_name = "#{app_name}-#{timestamp}.sql"
+    end
+
+  end
+end

data/lib/tasks/install.rake

@@ -7,10 +7,10 @@ class Alchemy::RoutesInjector < Thor
 
   no_tasks do
     def inject
-      mountpoint = ask "\nWhere do you want to mount Alchemy CMS? (/)"
-      mountpoint = "/" if mountpoint.empty?
+      @mountpoint = ask "\nWhere do you want to mount Alchemy CMS? (/)"
+      @mountpoint = "/" if @mountpoint.empty?
       sentinel = /\.routes\.draw do(?:\s*\|map\|)?\s*$/
-      inject_into_file "./config/routes.rb", "\n  mount Alchemy::Engine => '#{mountpoint}'\n", { :after => sentinel, :verbose => true }
+      inject_into_file "./config/routes.rb", "\n  mount Alchemy::Engine => '#{@mountpoint}'\n", { :after => sentinel, :verbose => true }
     end
   end
 end
@@ -36,13 +36,13 @@ Now:
 
 2. Open your browser and enter the following URL:
 
-  http://localhost:3000/admin/signup
+  http://localhost:3000/#{@mountpoint == '/' ? '' : @mountpoint}/admin/signup
 
 3. Follow the instructions to complete the installation!
 
 Thank you for using Alchemy CMS!
 
-http://alchemy-cms.com
+http://alchemy-cms.com/
 
 EOF
   end
@@ -52,15 +52,6 @@ EOF
     Alchemy::RoutesInjector.new.inject
   end
 
-  namespace :db do
-
-    desc "Seeds your database with essential data for Alchemy CMS."
-    task :seed => :environment do
-      Alchemy::Seeder.seed!
-    end
-
-  end
-
   namespace :standard_set do
 
     desc "Install Alchemy CMS's standard set."