alchemy_cms 2.6.1 → 2.6.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5cd8a76bd94ec8a9ce8224cc3c4717e2586f19bb
+  data.tar.gz: 061556fac26ed8fded1fee1744928741d11e2daa
+SHA512:
+  metadata.gz: ede2710502558c4be7ec68064ab6b35cce31e9158c49ecd73440c797ff8d6f76ce3bf6d43d6564c661ff014568d02cdb5b9e16fec451eddf697305e3537bde2a
+  data.tar.gz: 6fd48a42acc533c9bb05238cd6dbf8206c95b765602f84ca2dd679ad08c34065269d8113c74a5cef31bb1b80967494a00f38f2ec6a146a263d882848c25e5e55

data/app/controllers/alchemy/admin/pictures_controller.rb

@@ -150,7 +150,7 @@ module Alchemy
 
       def flush
         # FileUtils.rm_rf only takes arrays of folders...
-        FileUtils.rm_rf Dir.glob(Rails.root.join('public', Alchemy.mount_point, 'pictures', '*'))
+        FileUtils.rm_rf Dir.glob(Rails.root.join('public', Alchemy::MountPoint.get, 'pictures', '*'))
         @notice = _t('Picture cache flushed')
       end
 

data/app/helpers/alchemy/pages_helper.rb

@@ -417,7 +417,7 @@ module Alchemy
             try {
               Alchemy.loadAlchemyMenuBar({
                 page_id: #{@page.id},
-                route: '#{Alchemy.mount_point}',
+                route: '#{Alchemy::MountPoint.get}',
                 locale: '#{current_user.language || ::I18n.default_locale}'
               });
             } catch(e) {

data/app/mailers/alchemy/notifications.rb

@@ -1,14 +1,14 @@
 module Alchemy
   class Notifications < ActionMailer::Base
 
-    default :from => Alchemy::Config.get(:mailer)['mail_from']
+    default(from: Config.get(:mailer)['mail_from'])
 
     def registered_user_created(user)
       @user = user
       @url = login_url
       mail(
-        :to => user.email,
-        :subject => Alchemy::I18n.t("alchemy.mailer.new_user_mail.subject")
+        to: user.email,
+        subject: I18n.t("Your user credentials")
       )
     end
 
@@ -16,14 +16,17 @@ module Alchemy
       @user = user
       @url = admin_url
       mail(
-        :to => user.email,
-        :subject => Alchemy::I18n.t("Your Alchemy Login")
+        to: user.email,
+        subject: I18n.t("Your Alchemy Login")
       )
     end
 
     def reset_password_instructions(user, opts={})
       @user = user
-      mail :to => user.email, :subject => Alchemy::I18n.t("Reset password instructions")
+      mail(
+        to: user.email,
+        subject: I18n.t("Reset password instructions")
+      )
     end
 
   end

data/app/sweepers/alchemy/pictures_sweeper.rb

@@ -14,7 +14,7 @@ module Alchemy
 
     def expire_cache_for(picture)
       # Removing all variants of the picture with FileUtils.
-      FileUtils.rm_rf(Rails.root.join('public', Alchemy.mount_point, 'pictures', picture.id.to_s))
+      FileUtils.rm_rf(Rails.root.join('public', Alchemy::MountPoint.get, 'pictures', picture.id.to_s))
     end
 
   end

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

@@ -4,8 +4,10 @@
 <%= link_to(
   content.ingredient,
   url_for(content.essence.link),
-  :title => content.essence.link_title,
-  :target => (content.essence.link_target == "blank" ? "_blank" : nil),
-  'data-link-target' => content.essence.link_target
+  {
+    title: content.essence.link_title,
+    target: (content.essence.link_target == "blank" ? "_blank" : nil),
+    'data-link-target' => content.essence.link_target
+  }.merge(html_options)
 ) %>
 <%- end -%>

data/app/views/alchemy/notifications/registered_user_created.de.text.erb

@@ -8,6 +8,6 @@ Es wurde ein Zufallspasswort generiert. Aus Sicherheitsgründen wird dieses hier
 
 Klicken Sie bitte daher auf den folgenden Link (*), um sich ein neues Passwort zu vergeben:
 
-<%= alchemy.new_password_url(@user, email: @user.email) %>
+<%= alchemy.new_password_url(email: @user.email) %>
 
 *) Sollte dies nicht funktionieren, so kopieren Sie Sich bitte diesen Link und tragen Sie ihn in die Adresszeile Ihres Webbrowsers ein.

data/app/views/alchemy/notifications/registered_user_created.en.text.erb

@@ -8,6 +8,6 @@ The password was randomly created. For security reasons it is not displayed here
 
 Please follow this link (*) to reset your password:
 
-<%= alchemy.new_password_url(@user, email: @user.email) %>
+<%= alchemy.new_password_url(email: @user.email) %>
 
 *) If this does not work, please copy the url and paste it into the address bar of your web browser.

data/config/locales/alchemy.de.yml

@@ -130,12 +130,6 @@ de:
       messages:
         success: 'Ihre Nachricht wurde erfolgreich übermittelt.'
 
-    # == Translations for the mailer templates
-    mailer:
-      # The mail the user gets after registering for alchemy
-      new_user_mail:
-        subject: 'Ihre Zugangsdaten'
-
     # == Translated language names for translation select
     translations:
       de: 'Deutsch'
@@ -282,6 +276,7 @@ de:
     "Remove tag filter": "Filter entfernen"
     "Remove this content": "Diesen Inhalt entfernen"
     "Reset Imagemask": "Bildmaske zurücksetzen"
+    "Reset password instructions": "Anweisungen um Ihr Passwort zurückzusetzen"
     "Select all": "Alle auswählen"
     "Select an content": "Wählen Sie einen Inhalt aus"
     "Select style": "Stilvorlage"
@@ -329,6 +324,7 @@ de:
     "You may upload files with following extensions": "Sie können %{file_types_description} mit folgenden Endungen hochladen: %{file_types}"
     "You may upload any file": "Sie können jede Art von Datei hochladen."
     "Your last login was on %{time}": "Sie waren zuletzt angemeldet am %{time}."
+    "Your user credentials": "Ihre Zugangsdaten"
     "Your Alchemy Login": "Ihre Alchemy Zugangsdaten"
     "Your last updated pages": "Ihre zuletzt bearbeiteten Seiten"
     "Your trash is empty": "Der Papierkorb ist leer"

data/config/locales/alchemy.en.yml

@@ -116,12 +116,6 @@ en:
       messages:
         success: 'Your message was delivered succesfully.'
 
-    # == Translations for the mailer templates
-    mailer:
-      # The mail the user gets after registering for alchemy
-      new_user_mail:
-        subject: 'Your user credentials'
-
     # == Translated language names for translation select
     translations:
       de: 'German'

data/config/routes.rb

@@ -3,7 +3,7 @@ Alchemy::Engine.routes.draw do
   root :to => 'pages#show'
 
   get '/admin' => redirect(
-    "#{Alchemy.mount_point}/admin/dashboard"
+    "#{Alchemy::MountPoint.get}/admin/dashboard"
   )
 
   get '/admin/dashboard' => 'admin/dashboard#index',

data/lib/alchemy/mount_point.rb

@@ -1,16 +1,41 @@
 module Alchemy
+  # Utitlities for Alchemy's mount point in the host rails app.
+  #
+  class MountPoint
 
-  # Returns alchemys mount point in current rails app.
-  # Pass false to not return a leading slash on empty mount point.
-  def self.mount_point(remove_leading_slash_if_blank = true)
-    alchemy_routes = Rails.application.routes.named_routes[:alchemy]
-    raise "Alchemy not mounted! Please mount Alchemy::Engine in your config/routes.rb file." if alchemy_routes.nil?
-    mount_point = alchemy_routes.path.spec.to_s
-    if remove_leading_slash_if_blank && mount_point == "/"
-      mount_point.gsub(/^\/$/, '')
-    else
-      mount_point
+    # Returns the path of Alchemy's mount point in current rails app.
+    #
+    # @param [Boolean] remove_leading_slash_if_blank
+    #   Pass false to not return a leading slash on empty mount point.
+    #
+    def self.get(remove_leading_slash_if_blank = true)
+      if self.mount_point == "/" && remove_leading_slash_if_blank
+        self.mount_point.gsub(/^\/$/, '')
+      else
+        self.mount_point
+      end
+    end
+
+    # Returns the routes object from Alchemy in the host app.
+    #
+    def self.routes
+      ::Rails.application.routes.named_routes[:alchemy]
     end
-  end
 
+    # Returns the raw mount point path from the Rails app routes.
+    #
+    # If Alchemy is not mounted in the main app, it falls back to root path.
+    #
+    def self.mount_point
+      if self.routes.nil?
+        ::Rails.logger.warn <<-WARN
+Alchemy is not mounted! Falling back to root path (/).
+If you want to change Alchemy's mount point, please mount Alchemy::Engine in your config/routes.rb file.
+WARN
+        return '/'
+      end
+      routes.path.spec.to_s
+    end
+
+  end
 end

data/lib/alchemy/seeder.rb

@@ -1,8 +1,10 @@
-require 'thor/shell/color'
+require "#{File.dirname(__FILE__)}/shell"
 
 module Alchemy
   class Seeder
 
+    extend Shell
+
     class << self
 
       # This seed builds the necessary page structure for alchemy in your database.
@@ -14,36 +16,6 @@ module Alchemy
 
     private
 
-      def color(name)
-        case name
-        when :green
-          Thor::Shell::Color::GREEN
-        when :red
-          Thor::Shell::Color::RED
-        when :yellow
-          Thor::Shell::Color::YELLOW
-        when :black
-          Thor::Shell::Color::BLACK
-        when :clear
-          Thor::Shell::Color::CLEAR
-        else
-          ""
-        end
-      end
-
-      def log(message, type=nil)
-        case type
-        when :skip
-          puts "#{color(:yellow)}== Skipping! #{message}#{color(:clear)}"
-        when :error
-          puts "#{color(:red)}!! ERROR: #{message}#{color(:clear)}"
-        when :message
-          puts "#{color(:clear)}#{message}"
-        else
-          puts "#{color(:green)}== #{message}#{color(:clear)}"
-        end
-      end
-
       def desc(message)
         puts "\n#{message}"
         puts "#{'-' * message.length}\n"
@@ -76,11 +48,11 @@ module Alchemy
 
       def create_default_site
         desc "Creating default site"
-        site = Alchemy::Site.find_or_initialize_by_host(
-          :name => 'Default Site',
-          :host => '*'
-        )
-        if site.new_record?
+        if Alchemy::Site.count == 0
+          site = Alchemy::Site.new(
+            name: 'Default Site',
+            host: '*'
+          )
           if Alchemy::Language.any?
             site.languages = Alchemy::Language.all
           end

data/lib/alchemy/shell.rb

@@ -0,0 +1,80 @@
+# encoding: utf-8
+require 'thor/shell/color'
+
+module Alchemy
+
+  # Provides methods for collecting sentences and displaying them
+  # in a list on the shell / log 
+  #
+  module Shell
+
+    def todo(todo)
+      add_todo todo
+    end
+
+    # Adds a sentence to the todos Array
+    #
+    # @param [String] todo
+    #
+    def add_todo(todo)
+      todos << todo
+    end
+
+    # All todos
+    #
+    # @return [Array]
+    #
+    def todos
+      @@todos ||= []
+    end
+
+    # Prints out all the todos
+    #
+    def display_todos
+      if todos.length > 0
+        log "\nTODOS:", :message
+        log "------\n", :message
+        todos.each_with_index do |todo, i|
+          log "\n#{i+1}. ", :message
+          log todo, :message
+        end
+      end
+    end
+
+    # Prints out the given todo message with the color due to its type
+    #
+    # @param [String] message
+    # @param [Symbol] type
+    #
+    def log(message, type=nil)
+      case type
+      when :skip
+        puts "#{color(:yellow)}== Skipping! #{message}#{color(:clear)}"
+      when :error
+        puts "#{color(:red)}!! ERROR: #{message}#{color(:clear)}"
+      when :message
+        puts "#{color(:clear)}#{message}"
+      else
+        puts "#{color(:green)}== #{message}#{color(:clear)}"
+      end
+    end
+
+  private
+
+    # Gives the color string using Thor
+    # Used for colorizing the message on the shell
+    #
+    # @param [String] name
+    # @return [String]
+    #
+    def color(name)
+      color_const = name.to_s.upcase
+      if Thor::Shell::Color.const_defined?(color_const)
+        "Thor::Shell::Color::#{color_const}".constantize
+      else
+        ""
+      end
+    end
+
+  end
+end

data/lib/alchemy/upgrader.rb

@@ -1,54 +1,54 @@
 module Alchemy
   class Upgrader < Alchemy::Seeder
+
+    Dir["#{File.dirname(__FILE__)}/upgrader/*.rb"].each { |f| require f }
+
+    extend TwoPointSix
+    extend TwoPointFive
+    extend TwoPointFour
+    extend TwoPointThree
+    extend TwoPointTwo
+    extend TwoPointOne
+    extend TwoPointZero
+
     class << self
 
       # Runs ugrades
       #
-      # Set UPGRADE env variable to only run a specific task.
       def run!
-        if ENV['UPGRADE']
-          ENV['UPGRADE'].split(',').each do |task|
-            self.send(task)
-          end
-        else
-          run_all
+        upgrade_tasks.each do |task|
+          self.send(task)
         end
         display_todos
       end
 
-      def run_all
-        Rake::Task['alchemy:install:migrations'].invoke
-        Rake::Task['db:migrate'].invoke
-        Seeder.seed!
-        convert_attachment_storage
-        copy_new_config_file
+      # Tasks that should run.
+      #
+      # Set UPGRADE env variable to only run a specific task.
+      #
+      # Run +rake alchemy:upgrade:list+ for all available tasks
+      #
+      def upgrade_tasks
+        if ENV['UPGRADE'].present?
+          ENV['UPGRADE'].split(',')
+        else
+          all_upgrade_tasks
+        end
+      end
+
+      # All available upgrade tasks
+      # 
+      def all_upgrade_tasks
+        private_methods - Object.private_methods - superclass.private_methods
       end
 
     private
 
-      def convert_attachment_storage
-        desc "Convert the attachment storage"
-        converted_files = []
-        files = Dir.glob Rails.root.join 'uploads/attachments/**/*.*'
-        if files.blank?
-          log "No attachments found", :skip
-        else
-          files.each do |file|
-            file_uid = file.gsub(/#{Rails.root.to_s}\/uploads\/attachments\//, '')
-            file_id = file_uid.split('/')[1].to_i
-            attachment = Alchemy::Attachment.find_by_id(file_id)
-            if attachment && attachment.file_uid.blank?
-              attachment.file_uid = file_uid
-              attachment.file_size = File.new(file).size
-              attachment.file_name = attachment.sanitized_filename
-              if attachment.save!
-                log "Converted #{file_uid}"
-              end
-            else
-              log "Attachment with id #{file_id} not found or already converted.", :skip
-            end
-          end
-        end
+      # Setup task
+      def setup
+        Rake::Task['alchemy:install:migrations'].invoke
+        Rake::Task['db:migrate'].invoke
+        Seeder.seed!
       end
 
       def copy_new_config_file