alchemy_cms 2.5.0.b5 → 2.5.0.b9

data/config/locales/alchemy.en.yml

@@ -72,7 +72,22 @@ en:
       contactform:
         success_page: 'Followup page'
 
+    # Translations for content validations
+    #
+    content_validations:
+      contactform:
+        success_page:
+          blank: 'Please choose a follow up page'
+      errors:
+        blank: "%{field} can't be blank"
+        invalid: '%{field} has wrong format'
+        taken: '%{field} has already been taken'
+
     # == Translations for the build in full text search.
+    search_form:
+      placeholder: 'Search query'
+      submit: 'Search'
+
     search_result_page:
       result_page: Page
       no_results: "Your search for '%{query}' offers no result"
@@ -177,7 +192,7 @@ en:
     assign_file: "Assign a file"
     assign_file_from_archive: "assign a file from your archive"
     assign_image: "Assign an image"
-    attachment_filename_notice: "*) Please do not use any special characters for the filename."
+    attachment_filename_notice: "* Please do not use any special characters for the filename."
     auto_play: "Play movie after load"
     big_thumbnails: "Big thumbnails"
     cannot_delete_picture_notice: "Cannot delete Picture %{name}, because it's still in use."
@@ -191,6 +206,7 @@ en:
     confirm_to_delete_images_from_server: "Do you really want to delete these images from the server?"
     confirm_to_delete_user: "Do you really want to delete this user?"
     contactform_body: "Message Template"
+    content_description_missing: "Warning: Content is missing its description. Please check the elements.yml"
     content_essence_not_found: "Content essence not found"
     content_not_found: "Field for content not present."
     content_validations_headline: "Please check marked fields below"
@@ -225,6 +241,7 @@ en:
     edit_page_properties: "Edit the page´s properties."
     edit_selected_pictures: "Edit selected pictures"
     edit_user: "Edit the user´s properties."
+    element_description_missing: "WARNING! Missing description. Please check your elements.yml file."
     element_dirty_notice: "This element has unsaved changes. Do you really want to fold it?"
     element_dirty_close_window_notice: "You have unsaved elements. Do you really want to close the elements window?"
     element_dirty_page_leave_warning: "You have unsaved elements on this page. Do you really want to continue?"
@@ -304,16 +321,24 @@ en:
     page_for_links:
       choose_page: "Choose %{name}"
     page_layout_changed_notice: "Page type was changed. Elements not usable anymore have been moved into the trash."
-    page_locked: "This page is locked by another user."
     page_properties: "Page properties"
     page_public: "published"
     page_published: "Published page"
     page_restricted: "restricted"
+    page_states:
+      visible:
+        "true": "Page is visible in navigation."
+        "false": "Page is not visible in navigation."
+      public:
+        "true": "Page is published."
+        "false": "Page is unpublished."
+      locked:
+        "true": "Page is being edited at the moment."
+        "false": ""
+      restricted:
+        "true": "Page is restricted."
+        "false": ""
     page_status: "Status"
-    page_status_invisible_public: "Page is invisible in navigation but public."
-    page_status_invisible_unpublic: "Page is invisible in navigation and unpublic."
-    page_status_visible_public: "Page is visible in navigation and public."
-    page_status_visible_unpublic: "Page is visible in navigation but unpublic."
     page_title: "Title"
     page_type: "Type"
     page_visible_in_navigation: "visible in the navigation"

data/db/migrate/{20121026100815_alchemy_two_point_three.rb → 20121118000000_alchemy_two_point_four.rb}

@@ -1,11 +1,11 @@
-# This is a compressed migration for creating all Alchemy 2.3 tables at once.
+# This is a compressed migration for creating all Alchemy 2.4 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 AlchemyTwoPointThree < ActiveRecord::Migration
+class AlchemyTwoPointFour < ActiveRecord::Migration
   def up
     # Do not run if Alchemy tables are already present
     return if table_exists?(:alchemy_pages)
@@ -17,8 +17,9 @@ class AlchemyTwoPointThree < ActiveRecord::Migration
       t.integer  "size"
       t.integer  "creator_id"
       t.integer  "updater_id"
-      t.datetime "created_at",   :null => false
-      t.datetime "updated_at",   :null => false
+      t.datetime "created_at",      :null => false
+      t.datetime "updated_at",      :null => false
+      t.text     "cached_tag_list"
     end
 
     create_table "alchemy_cells", :force => true do |t|
@@ -46,14 +47,15 @@ class AlchemyTwoPointThree < ActiveRecord::Migration
       t.string   "name"
       t.integer  "position"
       t.integer  "page_id"
-      t.boolean  "public",     :default => true
-      t.boolean  "folded",     :default => false
-      t.boolean  "unique",     :default => false
-      t.datetime "created_at",                    :null => false
-      t.datetime "updated_at",                    :null => false
+      t.boolean  "public",          :default => true
+      t.boolean  "folded",          :default => false
+      t.boolean  "unique",          :default => false
+      t.datetime "created_at",                         :null => false
+      t.datetime "updated_at",                         :null => false
       t.integer  "creator_id"
       t.integer  "updater_id"
       t.integer  "cell_id"
+      t.text     "cached_tag_list"
     end
 
     add_index "alchemy_elements", ["page_id", "position"], :name => "index_elements_on_page_id_and_position"
@@ -99,6 +101,17 @@ class AlchemyTwoPointThree < ActiveRecord::Migration
       t.datetime "updated_at", :null => false
     end
 
+    create_table "alchemy_essence_links", :force => true do |t|
+      t.string   "link"
+      t.string   "link_title"
+      t.string   "link_target"
+      t.string   "link_class_name"
+      t.datetime "created_at",      :null => false
+      t.datetime "updated_at",      :null => false
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+    end
+
     create_table "alchemy_essence_pictures", :force => true do |t|
       t.integer  "picture_id"
       t.string   "caption"
@@ -203,6 +216,7 @@ class AlchemyTwoPointThree < ActiveRecord::Migration
       t.integer  "creator_id"
       t.integer  "updater_id"
       t.integer  "language_id"
+      t.text     "cached_tag_list"
     end
 
     add_index "alchemy_pages", ["language_id"], :name => "index_pages_on_language_id"
@@ -219,7 +233,7 @@ class AlchemyTwoPointThree < ActiveRecord::Migration
       t.integer  "creator_id"
       t.integer  "updater_id"
       t.string   "upload_hash"
-      t.string   "cached_tag_list"
+      t.text     "cached_tag_list"
     end
 
     create_table "alchemy_users", :force => true do |t|
@@ -246,31 +260,40 @@ class AlchemyTwoPointThree < ActiveRecord::Migration
       t.datetime "updated_at",                                                   :null => false
       t.integer  "creator_id"
       t.integer  "updater_id"
+      t.text     "cached_tag_list"
     end
 
     add_index "alchemy_users", ["perishable_token"], :name => "index_users_on_perishable_token"
 
-    # Skip migrations for acts-as-taggable-on, if the tables are already present
-    unless table_exists?(:taggings)
-      create_table "taggings", :force => true do |t|
-        t.integer  "tag_id"
-        t.integer  "taggable_id"
-        t.string   "taggable_type"
-        t.integer  "tagger_id"
-        t.string   "tagger_type"
-        t.string   "context"
-        t.datetime "created_at"
-      end
-
-      add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
-      add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context"
+    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
 
-    unless table_exists?(:tags)
-      create_table "tags", :force => true do |t|
-        t.string "name"
-      end
+    create_table "taggings", :force => true do |t|
+      t.integer  "tag_id"
+      t.integer  "taggable_id"
+      t.string   "taggable_type"
+      t.integer  "tagger_id"
+      t.string   "tagger_type"
+      t.string   "context"
+      t.datetime "created_at"
     end
 
+    add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
+    add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context"
+
+    create_table "tags", :force => true do |t|
+      t.string "name"
+    end
   end
 end

data/db/migrate/20130110212411_create_alchemy_legacy_page_urls.rb

@@ -0,0 +1,11 @@
+class CreateAlchemyLegacyPageUrls < ActiveRecord::Migration
+  def change
+    create_table :alchemy_legacy_page_urls do |t|
+      t.string  :urlname, null: false
+      t.integer :page_id, null: false
+
+      t.timestamps
+    end
+    add_index :alchemy_legacy_page_urls, :urlname
+  end
+end

data/lib/alchemy/capistrano.rb

@@ -98,48 +98,40 @@ EOF
       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}"
+      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"
+        sql_stream = "ssh -p #{fetch(:port, 22)} #{user}@#{server} '#{dump_cmd}'"
+        mysql_credentials = ["--user='#{database_config['username']}'"]
+        if database_config['password']
+          mysql_credentials << "--password='#{database_config['password']}'"
+        end
+        system "#{sql_stream} | mysql #{mysql_credentials.join(' ')} #{database_config['database']}"
       end
 
-      desc "Imports attachments into your local machine."
+      desc "Imports attachments into your local machine using rsync."
       task :attachments, :roles => [:app] do
-        filename = zip_files('attachments')
-        FileUtils.mkdir_p "./uploads"
-        download "#{shared_path}/uploads/#{filename}", "./uploads/#{filename}"
-        unzip_files('attachments', filename)
+        get_files :attachments
       end
 
-      desc "Imports pictures into your local machine."
+      desc "Imports pictures into your local machine using rsync."
       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
+        get_files :pictures
       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}"
+      def get_files(type)
+        FileUtils.mkdir_p "./uploads"
+        server = find_servers_for_task(current_task).first
+        if server
+          system "rsync --progress -rue 'ssh -p #{fetch(:port, 22)}' #{user}@#{server}:#{shared_path}/uploads/#{type} ./uploads/"
+        else
+          raise "No server found"
+        end
       end
 
       def database_config
         raise "database.yml not found!" if !File.exists?("./config/database.yml")
-        YAML.load_file("./config/database.yml")['development']
+        YAML.load_file("./config/database.yml").fetch(ENV['RAILS_ENV'] || 'development')
       end
 
     end

data/lib/alchemy/errors.rb

@@ -0,0 +1,45 @@
+# Custom error classes.
+#
+module Alchemy
+
+  class CellDefinitionError < StandardError
+    # Raised if no cell definition can be found.
+  end
+
+  class ContentDefinitionError < StandardError
+    # Raised if no content definition can be found.
+  end
+
+  class DefaultLanguageNotFoundError < StandardError
+    # Raised if no default language can be found.
+    def message
+      "No default language found. Have you run the rake alchemy:db:seed task?"
+    end
+  end
+
+  class ElementDefinitionError < StandardError
+    # Raised if element definition can not be found.
+  end
+
+  class EssenceMissingError < StandardError
+    # Raised if a content misses its essence.
+    def message
+      "Essence not found"
+    end
+  end
+
+  class MissingImageFileError < StandardError
+    # Raised if calling +image_file+ on a Picture object returns nil.
+  end
+
+  class PageLayoutDefinitionError < StandardError
+    # Raised if page_layout definition can not be found.
+  end
+
+  class PictureInUseError < StandardError
+    # Raised if the picture is still in use and can not be deleted.
+  end
+
+  class TinymceError < StandardError; end
+
+end

data/lib/alchemy/i18n.rb

@@ -1,7 +1,7 @@
 module Alchemy
-  class I18n
+  module I18n
 
-    # A I18n Proxy for Alchemy translations
+    # Alchemy translation methods
     #
     # Instead of having to translate strings and defining a default value:
     #
@@ -15,12 +15,14 @@ module Alchemy
     #
     #     Alchemy::I18n.t("Hello %{world}!", :world => @world)
     #
+    # It offers a shortcut method and view helper called _t
+    #
     # === Notes
     #
     # All translations are scoped into the +alchemy+ namespace.
     # Even scopes are scoped into the +alchemy+ namespace.
     #
-    # So a call for t('hello', :scope => :world) has to be translated like this:
+    # So a call for _t('hello', :scope => :world) has to be translated like this:
     #
     #   de:
     #     alchemy:
@@ -43,11 +45,11 @@ module Alchemy
     end
 
     def self.available_locales
-      translation_files.collect { |f| f.match(/.{2}\.yml$/).to_s.gsub(/\.yml/, '') }.uniq
+      translation_files.collect { |f| f.match(/.{2}\.yml$/).to_s.gsub(/\.yml/, '') }
     end
 
     def self.translation_files
-      Rails.application.config.i18n.load_path.select { |p| p.split('/').last.match(/alchemy/) }
+      Dir.glob(File.join(File.dirname(__FILE__), '../../config/locales/alchemy.*.yml'))
     end
 
   end

data/lib/alchemy/logger.rb

@@ -0,0 +1,16 @@
+module Alchemy
+  module Logger
+
+    # Logs a warning to the Rails standard logger and adds some nicer formatting
+    def self.warn(message, caller_string)
+      Rails.logger.warn %(\n++++ WARNING: #{message}\nCalled from: #{caller_string}\n)
+      return nil
+    end
+
+    def warn(message)
+      Alchemy::Logger.warn(message, caller.first)
+    end
+    alias_method :warning, :warn
+
+  end
+end

data/lib/alchemy/page_layout.rb

@@ -14,7 +14,7 @@ module Alchemy
 
       # Returns all layouts defined in +config/alchemy/page_layout.yml+.
       def all
-        @@definitions ||= read_layouts_file
+        @@definitions = read_layouts_file
       end
 
       # Add additional pagelayout definitions. I.E. from your module.
@@ -100,11 +100,11 @@ module Alchemy
       def read_layouts_file
         if File.exists? "#{Rails.root}/config/alchemy/page_layouts.yml"
           layouts = YAML.load_file "#{Rails.root}/config/alchemy/page_layouts.yml"
+          # Since YAML returns false for an empty file, we have to normalize it here.
+          layouts || []
         else
           raise LoadError, "Could not find page_layouts.yml file! Please run: rails generate alchemy:scaffold"
         end
-        # Since YAML returns false for an empty file, we have to normalize it here.
-        layouts || []
       end
 
     end

data/lib/alchemy/resource.rb

@@ -69,7 +69,23 @@ module Alchemy
       @module_definition and @module_definition['engine_name']
     end
 
-    protected
+    # Returns a help text for resource's form
+    #
+    # === Example:
+    #
+    #   de:
+    #     alchemy:
+    #       resource_help_texts:
+    #         my_resource_model_name:
+    #           attribute_name: This is the fancy help text
+    #
+    def help_text_for(attribute)
+      ::I18n.translate!(attribute[:name], :scope => [:alchemy, :resource_help_texts, model_name])
+    rescue ::I18n::MissingTranslationData
+      false
+    end
+
+  protected
 
     def controller_path_array
       @controller_path.split('/')