alchemy_cms 2.5.3.1 → 2.6.0.rc5

data/config/locales/alchemy.en.yml

@@ -120,12 +120,7 @@ en:
     mailer:
       # The mail the user gets after registering for alchemy
       new_user_mail:
-        subject: 'Your credentials for my site'
-        welcome: 'Welcome to my site'
-        login_url_explanation: 'To login just click this link'
-        username: 'Your username is'
-        password_notice: "(For security reasons we do not show your password here. If you forgot your password or this is your first login, please goto: %{url})"
-        greeting: 'Have a nice day'
+        subject: 'Your user credentials'
 
     # == Translated language names for translation select
     translations:
@@ -231,6 +226,7 @@ en:
     delete_user: "Delete this user"
     document: "File"
     documents: "Files"
+    download_csv: "Download CSV"
     download_file: "Download file '%{filename}'"
     "Drag an element over to the element window to restore it": "Drag an element over to the element window to restore it."
     drag_to_sort: "Drag'n'Drop to sort images"
@@ -345,10 +341,6 @@ en:
     pages:
       update:
         comma_seperated: "Separate by comma"
-    pagination:
-      next_page: "next page »"
-      previous_page: "« previous page"
-      truncate: '...'
     password: "Password"
     picture_gallery_editor: 'Pictures'
     "Picture uploaded succesfully": "Picture %{name} uploaded succesfully"
@@ -375,6 +367,9 @@ en:
       '1024': '1024px (iPad - Landscape)'
       '1280': '1280px (Desktop)'
     rename_file: "Rename this file."
+    resources:
+      relation_select:
+        blank: '- none -'
     robot_follow: "robot may follow links."
     robot_index: "allow robot to index."
     saved_link: "Link saved."
@@ -608,6 +603,9 @@ en:
   activerecord:
 
     models:
+      acts_as_taggable_on/tag:
+        one: Tag
+        other: Tags
 
       alchemy/attachment:
         one: File
@@ -683,3 +681,10 @@ en:
 
     errors:
       <<: *errors
+
+  views:
+    pagination:
+      first: "First Page"
+      previous_page: "Previous Page"
+      next_page: "Next Page"
+      last: "Last Page"

data/config/locales/devise.de.yml

@@ -29,6 +29,7 @@ de:
       updated: 'Ihr Passwort wurde geändert. Sie sind jetzt angemeldet.'
       updated_not_active: 'Ihr Passwort wurde geändert.'
       send_paranoid_instructions: "Falls Ihre E-Mail-Adresse in unserer Datenbank existiert erhalten Sie in wenigen Minuten eine E-Mail mit der Anleitung, wie Sie Ihr Passwort zurücksetzen können."
+      no_token: "Es wurde nicht alle benötigten Parameter übergeben. Bitte überprüfen Sie, ob die komplette URL aus der E-Mail benutzt wurde."
     confirmations:
       send_instructions: 'Sie erhalten in wenigen Minuten eine E-Mail, mit der Sie Ihre Registrierung bestätigen können.'
       send_paranoid_instructions: 'Falls Ihre E-Mail-Adresse in unserer Datenbank existiert erhalten Sie in wenigen Minuten eine E-Mail mit der die Sie Ihre Registrierung bestätigen können.'

data/config/routes.rb

@@ -20,7 +20,7 @@ Alchemy::Engine.routes.draw do
     get '/admin/dashboard' => 'admin/dashboard#index', :as => :user_root
     get '/admin/leave' => 'user_sessions#leave', :as => :leave_admin
     get '/admin/passwords' => 'passwords#new', :as => :new_password
-    get '/admin/passwords/:id/edit' => 'passwords#edit', :as => :edit_password
+    get '/admin/passwords/:id/edit/:reset_password_token' => 'passwords#edit', :as => :edit_password
     post '/admin/passwords' => 'passwords#create', :as => :password
     put '/admin/passwords' => 'passwords#update', :as => :password
   end
@@ -110,7 +110,7 @@ Alchemy::Engine.routes.draw do
         get :edit_multiple
       end
       member do
-        get :show_in_window, :info
+        get :info
         delete :remove
       end
     end
@@ -169,7 +169,7 @@ Alchemy::Engine.routes.draw do
         :as => :show_language_root
 
   # The page show action has to be last route
-  match '(/:lang)(/:level1(/:level2(/:level3)))/:urlname(.:format)' => 'pages#show',
+  match '(/:lang)/*urlname(.:format)' => 'pages#show',
         :constraints => {:lang => /[a-z]{2}(-[a-z]{2})?/},
         :as => :show_page
 

data/{spec/dummy/db/migrate/20121118000000_alchemy_two_point_four.rb → db/migrate/20130214233001_alchemy_two_point_five.rb}

@@ -1,11 +1,11 @@
-# This is a compressed migration for creating all Alchemy 2.4 tables at once.
+# This is a compressed migration for creating all Alchemy 2.5 tables at once.
 #
 # === Notice
 #
 # In order to upgrade from an old version of Alchemy, you have to run all migrations from
 # each version you missed up to the version you want to upgrade to, before running this migration.
 #
-class AlchemyTwoPointFour < ActiveRecord::Migration
+class AlchemyTwoPointFive < ActiveRecord::Migration
   def up
     # Do not run if Alchemy tables are already present
     return if table_exists?(:alchemy_pages)
@@ -184,10 +184,21 @@ class AlchemyTwoPointFour < ActiveRecord::Migration
       t.integer  "updater_id"
       t.boolean  "default",        :default => false
       t.string   "country_code",   :default => "",      :null => false
+      t.integer  "site_id"
     end
 
     add_index "alchemy_languages", ["language_code", "country_code"], :name => "index_alchemy_languages_on_language_code_and_country_code"
     add_index "alchemy_languages", ["language_code"], :name => "index_alchemy_languages_on_language_code"
+    add_index "alchemy_languages", ["site_id"], :name => "index_alchemy_languages_on_site_id"
+
+    create_table "alchemy_legacy_page_urls", :force => true do |t|
+      t.string   "urlname",    :null => false
+      t.integer  "page_id",    :null => false
+      t.datetime "created_at", :null => false
+      t.datetime "updated_at", :null => false
+    end
+
+    add_index "alchemy_legacy_page_urls", ["urlname"], :name => "index_alchemy_legacy_page_urls_on_urlname"
 
     create_table "alchemy_pages", :force => true do |t|
       t.string   "name"
@@ -225,59 +236,61 @@ class AlchemyTwoPointFour < ActiveRecord::Migration
 
     create_table "alchemy_pictures", :force => true do |t|
       t.string   "name"
-      t.string   "image_filename"
-      t.integer  "image_width"
-      t.integer  "image_height"
-      t.datetime "created_at",      :null => false
-      t.datetime "updated_at",      :null => false
+      t.string   "image_file_name"
+      t.integer  "image_file_width"
+      t.integer  "image_file_height"
+      t.datetime "created_at",        :null => false
+      t.datetime "updated_at",        :null => false
       t.integer  "creator_id"
       t.integer  "updater_id"
       t.string   "upload_hash"
       t.text     "cached_tag_list"
+      t.string   "image_file_uid"
+      t.integer  "image_file_size"
     end
 
+    create_table "alchemy_sites", :force => true do |t|
+      t.string   "host"
+      t.string   "name"
+      t.datetime "created_at",                                  :null => false
+      t.datetime "updated_at",                                  :null => false
+      t.boolean  "public",                   :default => false
+      t.text     "aliases"
+      t.boolean  "redirect_to_primary_host"
+    end
+
+    add_index "alchemy_sites", ["host", "public"], :name => "alchemy_sites_public_hosts_idx"
+    add_index "alchemy_sites", ["host"], :name => "index_alchemy_sites_on_host"
+
     create_table "alchemy_users", :force => true do |t|
       t.string   "firstname"
       t.string   "lastname"
       t.string   "login"
       t.string   "email"
       t.string   "gender"
-      t.string   "role",                               :default => "registered"
+      t.string   "role",                                  :default => "registered"
       t.string   "language"
-      t.string   "crypted_password",    :limit => 128, :default => "",           :null => false
-      t.string   "password_salt",       :limit => 128, :default => "",           :null => false
-      t.integer  "login_count",                        :default => 0,            :null => false
-      t.integer  "failed_login_count",                 :default => 0,            :null => false
+      t.string   "encrypted_password",     :limit => 128, :default => "",           :null => false
+      t.string   "password_salt",          :limit => 128, :default => "",           :null => false
+      t.integer  "sign_in_count",                         :default => 0,            :null => false
+      t.integer  "failed_attempts",                       :default => 0,            :null => false
       t.datetime "last_request_at"
-      t.datetime "current_login_at"
-      t.datetime "last_login_at"
-      t.string   "current_login_ip"
-      t.string   "last_login_ip"
-      t.string   "persistence_token",                                            :null => false
-      t.string   "single_access_token",                                          :null => false
-      t.string   "perishable_token",                                             :null => false
-      t.datetime "created_at",                                                   :null => false
-      t.datetime "updated_at",                                                   :null => false
+      t.datetime "current_sign_in_at"
+      t.datetime "last_sign_in_at"
+      t.string   "current_sign_in_ip"
+      t.string   "last_sign_in_ip"
+      t.datetime "created_at",                                                      :null => false
+      t.datetime "updated_at",                                                      :null => false
       t.integer  "creator_id"
       t.integer  "updater_id"
       t.text     "cached_tag_list"
+      t.string   "reset_password_token"
+      t.datetime "reset_password_sent_at"
     end
 
-    add_index "alchemy_users", ["perishable_token"], :name => "index_users_on_perishable_token"
-
-    create_table "events", :force => true do |t|
-      t.string   "name"
-      t.string   "hidden_name"
-      t.datetime "starts_at"
-      t.datetime "ends_at"
-      t.text     "description"
-      t.decimal  "entrance_fee", :precision => 6, :scale => 2
-      t.boolean  "published"
-      t.integer  "location_id"
-      t.integer  "organizer_id"
-      t.datetime "created_at",                                 :null => false
-      t.datetime "updated_at",                                 :null => false
-    end
+    add_index "alchemy_users", ["email"], :name => "index_alchemy_users_on_email", :unique => true
+    add_index "alchemy_users", ["login"], :name => "index_alchemy_users_on_login", :unique => true
+    add_index "alchemy_users", ["reset_password_token"], :name => "index_alchemy_users_on_reset_password_token", :unique => true
 
     create_table "taggings", :force => true do |t|
       t.integer  "tag_id"
@@ -295,5 +308,6 @@ class AlchemyTwoPointFour < ActiveRecord::Migration
     create_table "tags", :force => true do |t|
       t.string "name"
     end
+
   end
 end

data/db/migrate/20130221200514_migrate_attachments_to_dragonfly.rb

@@ -0,0 +1,21 @@
+class MigrateAttachmentsToDragonfly < ActiveRecord::Migration
+  def up
+    change_table :alchemy_attachments do |t|
+      t.string :file_uid
+      t.index :file_uid
+      t.rename :filename, :file_name
+      t.rename :content_type, :file_mime_type
+      t.rename :size, :file_size
+    end
+  end
+
+  def down
+    change_table :alchemy_attachments do |t|
+      t.remove :file_uid
+      t.rename :file_name, :filename
+      t.rename :file_mime_type, :content_type
+      t.rename :file_size, :size
+      t.remove_index :file_uid
+    end
+  end
+end

data/db/migrate/20130312205327_change_alchemy_users_role_to_roles.rb

@@ -0,0 +1,11 @@
+class ChangeAlchemyUsersRoleToRoles < ActiveRecord::Migration
+  def up
+    rename_column :alchemy_users, :role, :roles
+    add_index :alchemy_users, :roles
+  end
+
+  def down
+    remove_index :alchemy_users, :roles
+    rename_column :alchemy_users, :roles, :role
+  end
+end

data/lib/alchemy/capistrano.rb

@@ -37,23 +37,25 @@ require 'fileutils'
 
     desc "Upgrades production database to current Alchemy CMS version"
     task :upgrade do
-      run "cd #{current_path} && RAILS_ENV=#{fetch(:rails_env, 'production')} #{rake} alchemy:upgrade"
+      run "cd #{current_path} && #{rake} RAILS_ENV=#{fetch(:rails_env, 'production')} alchemy:upgrade"
     end
 
     namespace :database_yml do
 
       desc "Creates the database.yml file"
       task :create do
-        db_adapter       = Capistrano::CLI.ui.ask("\nPlease enter database adapter (Options: mysql2, or postgresql. Default mysql2): ")
+        environment      = Capistrano::CLI.ui.ask("\nPlease enter the environment (Default: #{fetch(:rails_env, 'production')})")
+        environment      = fetch(:rails_env, 'production') if environment.empty?
+        db_adapter       = Capistrano::CLI.ui.ask("Please enter database adapter (Options: mysql2, or postgresql. Default mysql2): ")
         db_adapter       = db_adapter.empty? ? 'mysql2' : db_adapter.gsub(/^mysql$/, 'mysql2')
         db_name          = Capistrano::CLI.ui.ask("Please enter database name: ")
         db_username      = Capistrano::CLI.ui.ask("Please enter database username: ")
-        db_password      = Capistrano::CLI.ui.ask("Please enter database password: ")
+        db_password      = Capistrano::CLI.password_prompt("Please enter database password: ")
         default_db_host  = db_adapter == 'mysql2' ? 'localhost' : '127.0.0.1'
         db_host          = Capistrano::CLI.ui.ask("Please enter database host (Default: #{default_db_host}): ")
         db_host          = db_host.empty? ? default_db_host : db_host
         db_config        = ERB.new <<-EOF
-production:
+#{environment}:
   adapter: #{ db_adapter }
   encoding: utf8
   reconnect: false
@@ -78,12 +80,12 @@ EOF
 
       desc "Seeds the database with essential data."
       task :seed, :roles => :db do
-        run "cd #{current_path} && RAILS_ENV=#{fetch(:rails_env, 'production')} #{rake} alchemy:db:seed"
+        run "cd #{current_path} && #{rake} RAILS_ENV=#{fetch(:rails_env, 'production')} alchemy:db:seed"
       end
 
       desc "Dumps the database into 'db/dumps'"
       task :dump, :roles => :db do
-        run "cd #{current_path} && RAILS_ENV=#{fetch(:rails_env, 'production')} #{rake} alchemy:db:dump"
+        run "cd #{current_path} && #{rake} RAILS_ENV=#{fetch(:rails_env, 'production')} alchemy:db:dump"
       end
 
     end
@@ -100,7 +102,7 @@ EOF
       desc "Imports the database into your local development machine."
       task :database, :roles => [:db], :only => {:primary => true} do
         server = find_servers_for_task(current_task).first
-        dump_cmd = "cd #{current_path} && RAILS_ENV=#{fetch(:rails_env, 'production')} #{rake} alchemy:db:dump"
+        dump_cmd = "cd #{current_path} && #{rake} RAILS_ENV=#{fetch(:rails_env, 'production')} alchemy:db:dump"
         sql_stream = "ssh -p #{fetch(:port, 22)} #{user}@#{server} '#{dump_cmd}'"
         mysql_credentials = ["--user='#{database_config['username']}'"]
         if database_config['password']
@@ -148,7 +150,7 @@ EOF
     # It uses the +alchemy:rebuild_index+ rake task found in +vendor/plugins/alchemy/lib/tasks+.
     desc "Rebuild the ferret index. Call before deploy:restart"
     task :rebuild_index, :roles => :app do
-      run "cd #{current_path} && RAILS_ENV=#{fetch(:rails_env, 'production')} #{rake} ferret:rebuild_index"
+      run "cd #{current_path} && #{rake} RAILS_ENV=#{fetch(:rails_env, 'production')} ferret:rebuild_index"
     end
 
   end

data/lib/alchemy/errors.rb

@@ -49,4 +49,11 @@ module Alchemy
     end
   end
 
+  class MissingActiveRecordAssociation < StandardError
+    # Raised if a resource_relation is defined without proper ActiveRecord association
+    def message
+      "You need to define proper ActiveRecord associations, if you want to use resource_relations."
+    end
+  end
+
 end

data/lib/alchemy/filetypes.rb

@@ -0,0 +1,33 @@
+module Alchemy
+  module Filetypes
+
+    ARCHIVE_FILE_TYPES = ["application/zip", "application/x-rar"]
+
+    AUDIO_FILE_TYPES = [
+      "audio/mpeg",
+      "audio/mp4",
+      "audio/wav",
+      "audio/x-wav"
+    ]
+
+    IMAGE_FILE_TYPES = [
+      "image/gif",
+      "image/jpeg",
+      "image/png",
+      "image/tiff"
+    ]
+
+    VCARD_FILE_TYPES = ["text/x-vcard", "application/vcard"]
+
+    VIDEO_FILE_TYPES = [
+      "application/x-flash-video",
+      "video/x-flv",
+      "video/mp4",
+      "video/mpeg",
+      "video/quicktime",
+      "video/x-msvideo",
+      "video/x-ms-wmv"
+    ]
+
+  end
+end

data/lib/alchemy/i18n.rb

@@ -31,7 +31,7 @@ module Alchemy
     #
     def self.t(msg, *args)
       options = args.extract_options!
-      options[:default] = options[:default] ? options[:default] : msg.to_s.humanize
+      humanize_default_string!(msg, options)
       scope = ['alchemy']
       case options[:scope].class.name
       when "Array"
@@ -52,5 +52,13 @@ module Alchemy
       Dir.glob(File.join(File.dirname(__FILE__), '../../config/locales/alchemy.*.yml'))
     end
 
+  private
+
+    def self.humanize_default_string!(msg, options)
+      if options[:default].blank?
+        options[:default] = msg.is_a?(Symbol) ? msg.to_s.humanize : msg
+      end
+    end
+
   end
 end

data/lib/alchemy/name_conversions.rb

@@ -0,0 +1,28 @@
+# encoding: utf-8
+
+module Alchemy
+  # Provides methods for converting names into urlnames and vice versa.
+  #
+  module NameConversions
+
+    # Converts a given name into url save and readable urlanme.
+    # Uses rails parameterize, but converts german umlauts before.
+    #
+    # @returns String
+    def convert_to_urlname(name)
+      name
+        .gsub(/[äÄ]/, 'ae')
+        .gsub(/[üÜ]/, 'ue')
+        .gsub(/[öÖ]/, 'oe')
+        .gsub(/[ß]/, 'ss')
+        .parameterize
+    end
+
+    # Converts a filename and suffix into a human readable name.
+    #
+    def convert_to_humanized_name(name, suffix)
+      name.gsub(/\.#{::Regexp.quote(suffix)}$/i, '').gsub(/_/, ' ').strip
+    end
+
+  end
+end

data/lib/alchemy/page_layout.rb

@@ -54,13 +54,15 @@ module Alchemy
 
       # Returns page layouts ready for Rails' select form helper.
       def layouts_for_select(language_id, layoutpage = false)
-        map_layouts(selectable_layouts(language_id, layoutpage), [[I18n.t("Please choose"), ""]])
+        map_layouts(selectable_layouts(language_id, layoutpage), [[I18n.t('Please choose'), '']])
       end
 
       def layouts_with_own_for_select(own_layout, language_id, layoutpage)
         layouts = selectable_layouts(language_id, layoutpage)
         if layouts.detect { |l| l['name'] == own_layout } == nil
-          map_array = [[I18n.t(own_layout, :scope => 'page_layout_names'), own_layout]]
+          map_array = [
+            [I18n.t(own_layout, scope: 'page_layout_names', default: own_layout.to_s.humanize), own_layout]
+          ]
         else
           map_array = []
         end
@@ -71,7 +73,7 @@ module Alchemy
       def map_layouts(layouts, map_array = [])
         layouts.each do |layout|
           map_array << [
-            I18n.t(layout['name'], :scope => 'page_layout_names'),
+            I18n.t(layout['name'], scope: 'page_layout_names', default: layout['name'].to_s.humanize),
             layout["name"]
           ]
         end