alchemy_cms 2.2.4 → 2.3.rc5

data/config/locales/alchemy.en.yml

@@ -74,10 +74,10 @@ en:
 
     # == Translations for the build in full text search.
     search_result_page:
-      no_results: 'No results found'
+      result_page: Page
+      no_results: "Your search for '%{query}' offers no result"
       result_heading: "Your search for '%{query}'"
       result_count:
-        zero: 'Offers no results'
         one: 'Offers one result'
         other: 'Offers %{count} results'
 
@@ -177,6 +177,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."
     auto_play: "Play movie after load"
     big_thumbnails: "Big thumbnails"
     choose_element_as_target: "Please choose an element as target"
@@ -186,6 +187,7 @@ en:
     confirm_to_delete_file: "Do you really want to delete this file from the server?"
     confirm_to_delete_image: "Do you really want to delete this image from server?"
     confirm_to_delete_image_from_server: "Do you really want to delete this image from the server?"
+    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_essence_not_found: "Content essence not found"
@@ -194,6 +196,7 @@ en:
     copy_element: "Copy this element"
     copy_language_tree_heading: "Copy page tree"
     copy_page: "Copy page"
+    "Could not delete Pictures": "Could not delete Pictures"
     country_code_placeholder: 'i.e. us (optional)'
     country_code_foot_note: "You only need to set a country code if you want to provide each country with an individual language."
     "Create language": "Create a new language"
@@ -218,6 +221,7 @@ en:
     edit_language: "Edit language"
     edit_page: "Edit this page"
     edit_page_properties: "Edit the page´s properties."
+    edit_selected_pictures: "Edit selected pictures"
     edit_user: "Edit the user´s properties."
     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?"
@@ -317,7 +321,15 @@ en:
     picture_gallery_editor: 'Pictures'
     "Picture uploaded succesfully": "Picture %{name} uploaded succesfully"
     "Picture renamed successfully": "Picture renamed successfully from %{from} to %{to}"
-    "Picture deleted successfully": "Picture %{name} deleted"
+    "Picture deleted successfully": "Picture %{name} successfully deleted"
+    picture_updated_successfully: "Picture %{name} successfully updated"
+    picture_update_failed: "Failed to update picture %{name}"
+    "Pictures deleted successfully": "Pictures %{names} successfully deleted"
+    pictures_deleted_successfully: "Pictures %{name} deleted"
+    picture_library:
+      filter:
+        last_upload: "Showing only pictures from last upload"
+        recent: "Showing only recently uploaded pictures"
     place_link: "Link text"
     player_version: "Flashplayer Version"
     "please enter subject and mail address": "Please enter recipient and subject."
@@ -481,7 +493,61 @@ en:
         one:  "over 1 year"
         many: "over %{count} years"
 
+  errors: &errors
+    template:
+      header: "Validation failed"
+      body: "Please review the form and check the errors."
+
+    messages:
+      inclusion: "is not included in the list"
+      exclusion: "is reserved"
+      invalid: "is invalid"
+      confirmation: "doesn't match confirmation"
+      accepted: "must be accepted"
+      empty: "can't be empty"
+      blank: "can't be blank"
+      too_long: "is too long (maximum is %{count} characters)"
+      too_short: "is too short (minimum is %{count} characters)"
+      wrong_length: "is the wrong length (should be %{count} characters)"
+      taken: "has already been taken"
+      not_a_number: "is not a number"
+      greater_than: "must be greater than %{count}"
+      greater_than_or_equal_to: "must be greater than or equal to %{count}"
+      equal_to: "must be equal to %{count}"
+      less_than: "must be less than %{count}"
+      less_than_or_equal_to: "must be less than or equal to %{count}"
+      odd: "must be odd"
+      even: "must be even"
+    models:
+      alchemy/content:
+        attributes:
+          essence:
+            validation_failed: 'Validation failed.'
+      alchemy/element:
+        attributes:
+          name:
+            blank: "^Please choose an element."
+      alchemy/language:
+        attributes:
+          code:
+            invalid: '^Format of languagecode is not valid. Please use exactly two lowercase characters.'
+      alchemy/page:
+        attributes:
+          name:
+            blank: "^Please enter a name."
+          page_layout:
+            blank: "^Please choose a page layout."
+          urlname:
+            too_short: "^The pages urlname is too short (minimum of 3 characters)."
+            taken: "^URL-Name already taken."
+            exclusion: "^URL-Name reserved."
+
   activemodel:
+    models:
+      alchemy/message:
+        one: Message
+        other: Messages
+
     attributes:
       alchemy/message:
         salutation: 'Salutation'
@@ -493,6 +559,9 @@ en:
         email: 'Email'
         message: 'Message'
 
+    errors:
+      <<: *errors
+
   # Translations for active record database models and error messages.
   activerecord:
 
@@ -566,53 +635,7 @@ en:
         role: "Userrole"
 
     errors:
-      template:
-        header: "Validation failed"
-        body: ""
-
-      messages:
-        inclusion: "is not included in the list"
-        exclusion: "is reserved"
-        invalid: "is invalid"
-        confirmation: "doesn't match confirmation"
-        accepted: "must be accepted"
-        empty: "can't be empty"
-        blank: "can't be blank"
-        too_long: "is too long (maximum is %{count} characters)"
-        too_short: "is too short (minimum is %{count} characters)"
-        wrong_length: "is the wrong length (should be %{count} characters)"
-        taken: "has already been taken"
-        not_a_number: "is not a number"
-        greater_than: "must be greater than %{count}"
-        greater_than_or_equal_to: "must be greater than or equal to %{count}"
-        equal_to: "must be equal to %{count}"
-        less_than: "must be less than %{count}"
-        less_than_or_equal_to: "must be less than or equal to %{count}"
-        odd: "must be odd"
-        even: "must be even"
-      models:
-        alchemy/content:
-          attributes:
-            essence:
-              validation_failed: 'Validation failed.'
-        alchemy/element:
-          attributes:
-            name:
-              blank: "^Please choose an element."
-        alchemy/language:
-          attributes:
-            code:
-              invalid: '^Format of languagecode is not valid. Please use exactly two lowercase characters.'
-        alchemy/page:
-          attributes:
-            name:
-              blank: "^Please enter a name."
-            page_layout:
-              blank: "^Please choose a page layout."
-            urlname:
-              too_short: "^The pages urlname is too short (minimum of 3 characters)."
-              taken: "^URL-Name already taken."
-              exclusion: "^URL-Name reserved."
+      <<: *errors
 
   # Translations for the authentication system used in alchemy.
   authlogic:

data/config/routes.rb

@@ -85,7 +85,9 @@ Alchemy::Engine.routes.draw do
 
     resources :pictures do
       collection do
-        post :flush
+        post :flush, :update_multiple
+        delete :delete_multiple
+        get :edit_multiple
       end
       member do
         get :show_in_window

data/db/migrate/20120704181529_add_upload_hash_to_alchemy_picture.rb

@@ -0,0 +1,5 @@
+class AddUploadHashToAlchemyPicture < ActiveRecord::Migration
+  def change
+    add_column :alchemy_pictures, :upload_hash, :string
+  end
+end

data/db/migrate/20120705214247_acts_as_taggable_on_migration.rb

@@ -0,0 +1,28 @@
+class ActsAsTaggableOnMigration < ActiveRecord::Migration
+  def self.up
+    create_table :tags do |t|
+      t.string :name
+    end
+
+    create_table :taggings do |t|
+      t.references :tag
+
+      # You should make sure that the column created is
+      # long enough to store the required class names.
+      t.references :taggable, :polymorphic => true
+      t.references :tagger, :polymorphic => true
+
+      t.string :context
+
+      t.datetime :created_at
+    end
+
+    add_index :taggings, :tag_id
+    add_index :taggings, [:taggable_id, :taggable_type, :context]
+  end
+
+  def self.down
+    drop_table :taggings
+    drop_table :tags
+  end
+end

data/db/migrate/20120728185830_add_cached_tag_list_to_alchemy_pictures.rb

@@ -0,0 +1,5 @@
+class AddCachedTagListToAlchemyPictures < ActiveRecord::Migration
+  def change
+    add_column :alchemy_pictures, :cached_tag_list, :string
+  end
+end

data/db/migrate/20120831135441_set_alchemy_languages_country_code_default_to_empty_string.rb

@@ -0,0 +1,9 @@
+class SetAlchemyLanguagesCountryCodeDefaultToEmptyString < ActiveRecord::Migration
+  def up
+    change_column :alchemy_languages, :country_code, :string, :default => '', :null => false
+  end
+
+  def down
+    change_column :alchemy_languages, :country_code, :string, :default => nil, :null => true
+  end
+end

data/lib/alchemy/capistrano.rb

@@ -17,7 +17,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         run "mkdir -p #{shared_path}/index"
         run "mkdir -p #{shared_path}/uploads/pictures"
         run "mkdir -p #{shared_path}/uploads/attachments"
-        run "mkdir -p #{File.join(shared_path, 'cache', Capistrano::CLI.ui.ask("Where is Alchemy CMS mounted at? ('/')"), 'pictures')}"
+        run "mkdir -p #{File.join(shared_path, 'cache', Capistrano::CLI.ui.ask("\nWhere is Alchemy CMS mounted at? ('/'): "), 'pictures')}"
       end
 
       # This task sets the symlinks for uploads, picture cache and ferret index folder.
@@ -42,7 +42,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
       desc "Creates the database.yml file"
       task :create do
-        db_adapter       = Capistrano::CLI.ui.ask("Please enter database adapter (Options: mysql2, or postgresql. Default mysql2): ")
+        db_adapter       = Capistrano::CLI.ui.ask("\nPlease 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: ")

data/lib/alchemy/essence.rb

@@ -31,6 +31,8 @@ module Alchemy #:nodoc:
           stampable(:stamper_class_name => 'Alchemy::User')
           validate :essence_validations, :on => :update
           has_many :contents, :as => :essence
+          has_many :elements, :through => :contents
+          has_many :pages, :through => :elements
 
           def acts_as_essence_class
             #{self.name}
@@ -132,6 +134,18 @@ module Alchemy #:nodoc:
         end
       end
 
+      # Returns the value stored from the database column that is configured as ingredient column.
+      def ingredient=(value)
+        if self.respond_to?(ingredient_setter_method)
+          self.send(ingredient_setter_method, value)
+        end
+      end
+
+      # Returns the setter method for ingredient column
+      def ingredient_setter_method
+        ingredient_column.to_s + '='
+      end
+
       # Essence description from config/elements.yml
       def description
         return {} if element.nil? or element.content_descriptions.nil?

data/lib/alchemy/page_layout.rb

@@ -77,12 +77,6 @@ module Alchemy
       end
     end
 
-    def self.get_page_layout_names
-      a = []
-      get_layouts.each { |l| a << l.keys.first }
-      a
-    end
-
     def self.has_a_page_this_layout?(layout, language_id)
       Page.where({:page_layout => layout, :language_id => language_id}).any?
     end

data/lib/alchemy/resource.rb

@@ -1,16 +1,18 @@
 require 'active_support/inflector'
+require 'active_support/core_ext'
 
 module Alchemy
   class Resource
 
-    attr_accessor :skip_attributes
+    attr_accessor :skip_attributes, :resource_relations
 
     DEFAULT_SKIPPED_ATTRIBUTES = %W[id updated_at created_at creator_id updater_id]
 
     def initialize(controller_path, module_definition=nil)
       @controller_path = controller_path
       @module_definition = module_definition
-      self.skip_attributes = DEFAULT_SKIPPED_ATTRIBUTES
+      self.skip_attributes = model.respond_to?(:skip_attributes) ? model.skip_attributes : DEFAULT_SKIPPED_ATTRIBUTES
+      self.resource_relations = model.resource_relations if model.respond_to?(:resource_relations)
     end
 
     def model_array
@@ -43,7 +45,7 @@ module Alchemy
     end
 
     def attributes
-      self.model.columns.collect do |col|
+      @_attributes ||= self.model.columns.collect do |col|
         {:name => (resource_relation_name(col.name) || col.name), :type => (resource_relation_type(col.name) || col.type)} unless self.skip_attributes.include?(col.name)
       end.compact
     end
@@ -67,7 +69,7 @@ module Alchemy
       @module_definition and @module_definition['engine_name']
     end
 
-  protected
+    protected
 
     def controller_path_array
       @controller_path.split('/')
@@ -78,23 +80,15 @@ module Alchemy
     end
 
     def resource_relation_name(column_name)
-      resource_relation(column_name)['attr_method'].to_s if resource_relation(column_name).present?
+      resource_relation(column_name).try(:[], :attr_method)
     end
 
     def resource_relation_type(column_name)
-      resource_relation(column_name)['attr_type'].to_sym if resource_relation(column_name).present?
-    end
-
-    def self.resource_relations
-      Config.get(:resource_relations)
-    end
-
-    def resource_relations
-      self.class.resource_relations[model_name.to_s] if self.class.resource_relations
+      resource_relation(column_name).try(:[], :attr_type)
     end
 
     def resource_relation(column_name)
-      resource_relations[column_name.to_s] if resource_relations
+      resource_relations[column_name.to_sym] if resource_relations
     end
 
   end

data/lib/alchemy/upgrader.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module Alchemy
   class Upgrader < Alchemy::Seeder
 
@@ -14,6 +16,7 @@ module Alchemy
         upgrade_to_namespaced_essence_type
         convert_essence_texts_displayed_as_select_into_essence_selects
         convert_essence_texts_displayed_as_checkbox_into_essence_booleans
+        copy_new_config_file
 
         display_todos
       end
@@ -71,11 +74,11 @@ module Alchemy
           essences.each do |essence|
             case essence.link_target
             when '1'
-              if essence.update_attribute(:link_target, 'blank')
+              if essence.update_column(:link_target, 'blank')
                 log("Updated #{essence.preview_text} link target to #{essence.link_target}.")
               end
             when '0'
-              essence.update_attribute(:link_target, nil)
+              essence.update_column(:link_target, nil)
               log("Updated #{essence.preview_text} link target to #{essence.link_target.inspect}.")
             else
               log("#{essence.preview_text} already upgraded.", :skip)
@@ -94,7 +97,7 @@ module Alchemy
           success = 0
           errors = []
           depricated_contents.each do |c|
-            if c.update_attribute(:essence_type, c.essence_type.gsub(/^Essence/, 'Alchemy::Essence'))
+            if c.update_column(:essence_type, c.essence_type.gsub(/^Essence/, 'Alchemy::Essence'))
               success += 1
             else
               errors << c.errors.full_messages
@@ -176,6 +179,18 @@ module Alchemy
         end
       end
 
+      def copy_new_config_file
+        desc "Copy config file"
+        old_config_file = Rails.root.join('config/alchemy/config.yml')
+        if File.exist?(old_config_file)
+          FileUtils.mv old_config_file, Rails.root.join('config/alchemy/config.yml.old')
+          log "Backed up old config file"
+        end
+        FileUtils.cp File.join(File.dirname(__FILE__), '../../config/alchemy/config.yml'), old_config_file
+        log "Copied new config file"
+        todo "Check the config/alchemy/config.yml.old file for custom configuration options and insert them into the new config file."
+      end
+
     end
 
   end

data/lib/alchemy/version.rb

@@ -1,5 +1,9 @@
 module Alchemy
 
-  VERSION = "2.2.4"
+  VERSION = "2.3.rc5"
+
+  def self.version
+    VERSION
+  end
 
 end

data/lib/alchemy_cms.rb

@@ -1,5 +1,6 @@
 if defined?(Rails) && Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR == 2
   require 'acts_as_list'
+  require 'acts-as-taggable-on'
   require 'attachment_magic'
   require 'authlogic'
   require 'awesome_nested_set'
@@ -10,7 +11,9 @@ if defined?(Rails) && Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR == 2
   require 'userstamp'
   require 'yaml'
   require 'sass-rails'
+  require 'compass-rails'
   require 'coffee-rails'
+  require 'sassy-buttons'
   require 'declarative_authorization'
   require 'extensions/hash'
   require 'extensions/array'
@@ -24,7 +27,7 @@ if defined?(Rails) && Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR == 2
   end
   require File.join(File.dirname(__FILE__), "alchemy", "seeder")
 else
-  raise "Alchemy 2.2 needs Rails 3.2 or higher. You are currently using Rails #{Rails::VERSION::STRING}"
+  raise "Alchemy 2.3 needs Rails 3.2 or higher. You are currently using Rails #{Rails::VERSION::STRING}"
 end
 
 module Alchemy