alchemy_cms 2.1.12 → 2.2.rc1

data/db/migrate/20100607193638_create_essence_pictures.rb

@@ -1,5 +1,5 @@
 class CreateEssencePictures < ActiveRecord::Migration
-  
+
   def self.up
     create_table :essence_pictures do |t|
       t.integer :picture_id
@@ -15,9 +15,9 @@ class CreateEssencePictures < ActiveRecord::Migration
       t.timestamps
     end
   end
-  
+
   def self.down
     drop_table :essence_pictures
   end
-  
+
 end

data/db/migrate/20101109150312_alter_pages_visible_column_default.rb

@@ -2,7 +2,7 @@ class AlterPagesVisibleColumnDefault < ActiveRecord::Migration
   def self.up
     change_column_default :pages, :visible, true
   end
-  
+
   def self.down
     change_column_default :pages, :visible, false
   end

data/db/migrate/20101109151812_create_languages.rb

@@ -1,5 +1,5 @@
 class CreateLanguages < ActiveRecord::Migration
-  
+
   def self.up
     create_table :languages do |t|
       t.string :name
@@ -11,9 +11,9 @@ class CreateLanguages < ActiveRecord::Migration
       t.userstamps
     end
   end
-  
+
   def self.down
     drop_table :languages
   end
-  
+
 end

data/db/migrate/20110115123343_remove_css_class_default_from_essence_pictures.rb

@@ -1,11 +1,11 @@
 class RemoveCssClassDefaultFromEssencePictures < ActiveRecord::Migration
-  
+
   def self.up
     change_column_default :essence_pictures, :css_class, nil
   end
-  
+
   def self.down
     change_column_default :essence_pictures, :css_class, "no_float"
   end
-  
+
 end

data/db/migrate/20110224105120_change_pages_visible_default.rb

@@ -1,11 +1,11 @@
 class ChangePagesVisibleDefault < ActiveRecord::Migration
-  
+
   def self.up
     change_column_default :pages, :visible, false
   end
-  
+
   def self.down
     change_column_default :pages, :visible, true
   end
-  
+
 end

data/db/migrate/20110228182659_remove_default_page_layout_from_pages.rb

@@ -1,5 +1,5 @@
 class RemoveDefaultPageLayoutFromPages < ActiveRecord::Migration
-  
+
   def self.up
     change_column_default :pages, :page_layout, nil
   end
@@ -7,5 +7,5 @@ class RemoveDefaultPageLayoutFromPages < ActiveRecord::Migration
   def self.down
     change_column_default :pages, :page_layout, 'standard'
   end
-  
+
 end

data/db/migrate/20110414163140_remove_display_name_from_elements.rb

@@ -1,11 +1,11 @@
 class RemoveDisplayNameFromElements < ActiveRecord::Migration
-  
+
   def self.up
     remove_column :elements, :display_name
   end
-  
+
   def self.down
     add_column :elements, :display_name, :string
   end
-  
+
 end

data/db/migrate/20110511100516_rename_essence_texts_title_to_link_title.rb

@@ -1,9 +1,9 @@
 class RenameEssenceTextsTitleToLinkTitle < ActiveRecord::Migration
   def self.up
-		rename_column :essence_texts, :title, :link_title
+    rename_column :essence_texts, :title, :link_title
   end
 
   def self.down
-		rename_column :essence_texts, :link_title, :title
+    rename_column :essence_texts, :link_title, :title
   end
 end

data/db/migrate/20110529130500_add_cell_id_to_elements.rb

@@ -1,11 +1,11 @@
 class AddCellIdToElements < ActiveRecord::Migration
-  
+
   def self.up
     add_column :elements, :cell_id, :integer
   end
-  
+
   def self.down
     remove_column :elements, :cell_id
   end
-  
+
 end

data/db/migrate/20110530102804_change_pages_page_layout_column.rb

@@ -1,11 +1,11 @@
 class ChangePagesPageLayoutColumn < ActiveRecord::Migration
-  
+
   def self.up
     change_column :pages, :page_layout, :string, :null => true
   end
-  
+
   def self.down
     change_column :pages, :page_layout, :string, :null => false
   end
-  
+
 end

data/db/migrate/20110711142057_change_open_link_in_new_window_to_link_target.rb

@@ -7,7 +7,7 @@ class ChangeOpenLinkInNewWindowToLinkTarget < ActiveRecord::Migration
     change_column_default :essence_pictures, :link_target, nil
     change_column_default :essence_texts, :link_target, nil
   end
-  
+
   def self.down
     change_column_default :essence_texts, :link_target, 0
     change_column_default :essence_pictures, :link_target, 0

data/db/migrate/20111116125112_namespace_alchemy_models.rb

@@ -1,23 +1,23 @@
 class NamespaceAlchemyModels < ActiveRecord::Migration
-	def change
-		rename_table :attachments,					:alchemy_attachments
-		rename_table :cells,								:alchemy_cells
-		rename_table :contents,							:alchemy_contents
-		rename_table :elements,							:alchemy_elements
-		rename_table :elements_pages, 			:alchemy_elements_alchemy_pages
-		rename_table :essence_audios, 			:alchemy_essence_audios
-		rename_table :essence_dates,				:alchemy_essence_dates
-		rename_table :essence_files,				:alchemy_essence_files
-		rename_table :essence_flashes,			:alchemy_essence_flashes
-		rename_table :essence_htmls,				:alchemy_essence_htmls
-		rename_table :essence_pictures,			:alchemy_essence_pictures
-		rename_table :essence_richtexts,		:alchemy_essence_richtexts
-		rename_table :essence_texts,				:alchemy_essence_texts
-		rename_table :essence_videos,				:alchemy_essence_videos
-		rename_table :folded_pages,					:alchemy_folded_pages
-		rename_table :languages,						:alchemy_languages
-		rename_table :pages,								:alchemy_pages
-		rename_table :pictures, 						:alchemy_pictures
-		rename_table :users,								:alchemy_users
-	end
+  def change
+    rename_table :attachments, :alchemy_attachments
+    rename_table :cells, :alchemy_cells
+    rename_table :contents, :alchemy_contents
+    rename_table :elements, :alchemy_elements
+    rename_table :elements_pages, :alchemy_elements_alchemy_pages
+    rename_table :essence_audios, :alchemy_essence_audios
+    rename_table :essence_dates, :alchemy_essence_dates
+    rename_table :essence_files, :alchemy_essence_files
+    rename_table :essence_flashes, :alchemy_essence_flashes
+    rename_table :essence_htmls, :alchemy_essence_htmls
+    rename_table :essence_pictures, :alchemy_essence_pictures
+    rename_table :essence_richtexts, :alchemy_essence_richtexts
+    rename_table :essence_texts, :alchemy_essence_texts
+    rename_table :essence_videos, :alchemy_essence_videos
+    rename_table :folded_pages, :alchemy_folded_pages
+    rename_table :languages, :alchemy_languages
+    rename_table :pages, :alchemy_pages
+    rename_table :pictures, :alchemy_pictures
+    rename_table :users, :alchemy_users
+  end
 end

data/lib/alchemy/auth_engine.rb

@@ -1,7 +1,7 @@
 module Alchemy
-	module AuthEngine
-		def self.get_instance
-			Authorization::Engine.instance
-		end
-	end
+  module AuthEngine
+    def self.get_instance
+      Authorization::Engine.instance
+    end
+  end
 end

data/lib/alchemy/capistrano.rb

@@ -2,47 +2,47 @@
 # It also contains a ferret:rebuild_index task to rebuild the index after deploying your application.
 Capistrano::Configuration.instance(:must_exist).load do
 
-	after "deploy:setup", "alchemy:shared_folders:create"
-	after "deploy:finalize_update", "alchemy:shared_folders:symlink"
-	before "deploy:start", "alchemy:db:seed"
-
-	namespace :alchemy do
-
-		namespace :shared_folders do
-
-			# This task creates the shared folders for uploads, picture cache and ferret index while setting up your server.
-			# Call after deploy:setup like +after "deploy:setup", "alchemy:create_shared_folders"+ in your +deploy.rb+.
-			desc "Creates the uploads and picture cache directory in the shared folder. Call after deploy:setup"
-			task :create, :roles => :app 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')}"
-			end
-
-			# This task sets the symlinks for uploads, picture cache and ferret index folder.
-			# Call after deploy:symlink like +after "deploy:symlink", "alchemy:symlink_folders"+ in your +deploy.rb+.
-			desc "Sets the symlinks for uploads, picture cache and ferret index folder. Call after deploy:symlink"
-			task :symlink, :roles => :app do
-				run "rm -rf #{release_path}/uploads"
-				run "ln -nfs #{shared_path}/uploads #{release_path}/"
-				run "ln -nfs #{shared_path}/cache/* #{release_path}/public/"
-				run "rm -rf #{release_path}/index"
-				run "ln -nfs #{shared_path}/index #{release_path}/"
-			end
-
-		end
-
-		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"
-		end
-
-		namespace :database_yml do
-
-			desc "Creates the database.yml file"
-			task :create do
-				db_config = ERB.new <<-EOF
+  after "deploy:setup", "alchemy:shared_folders:create"
+  after "deploy:finalize_update", "alchemy:shared_folders:symlink"
+  before "deploy:start", "alchemy:db:seed"
+
+  namespace :alchemy do
+
+    namespace :shared_folders do
+
+      # This task creates the shared folders for uploads, picture cache and ferret index while setting up your server.
+      # Call after deploy:setup like +after "deploy:setup", "alchemy:create_shared_folders"+ in your +deploy.rb+.
+      desc "Creates the uploads and picture cache directory in the shared folder. Call after deploy:setup"
+      task :create, :roles => :app 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')}"
+      end
+
+      # This task sets the symlinks for uploads, picture cache and ferret index folder.
+      # Call after deploy:symlink like +after "deploy:symlink", "alchemy:symlink_folders"+ in your +deploy.rb+.
+      desc "Sets the symlinks for uploads, picture cache and ferret index folder. Call after deploy:symlink"
+      task :symlink, :roles => :app do
+        run "rm -rf #{release_path}/uploads"
+        run "ln -nfs #{shared_path}/uploads #{release_path}/"
+        run "ln -nfs #{shared_path}/cache/* #{release_path}/public/"
+        run "rm -rf #{release_path}/index"
+        run "ln -nfs #{shared_path}/index #{release_path}/"
+      end
+
+    end
+
+    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"
+    end
+
+    namespace :database_yml do
+
+      desc "Creates the database.yml file"
+      task :create do
+        db_config = ERB.new <<-EOF
 production:
   adapter: mysql2
   encoding: utf8
@@ -54,38 +54,38 @@ production:
   socket: #{ Capistrano::CLI.ui.ask("Database socket: ") }
   host: #{ Capistrano::CLI.ui.ask("Database host: ") }
 EOF
-				run "mkdir -p #{shared_path}/config"
-				put db_config.result, "#{shared_path}/config/database.yml"
-			end
+        run "mkdir -p #{shared_path}/config"
+        put db_config.result, "#{shared_path}/config/database.yml"
+      end
 
-			desc "[internal] Symlinks the database.yml file from shared folder into config folder"
-			task :symlink, :except => { :no_release => true } do
-				run "ln -nfs #{shared_path}/config/database.yml #{release_path}/config/database.yml" 
-			end
+      desc "[internal] Symlinks the database.yml file from shared folder into config folder"
+      task :symlink, :except => {:no_release => true} do
+        run "ln -nfs #{shared_path}/config/database.yml #{release_path}/config/database.yml"
+      end
 
-		end
+    end
 
-		namespace :db do
+    namespace :db do
 
-			desc "Seeds the database with essential data."
-			task :seed, :roles => :app do
-				run "cd #{current_path} && RAILS_ENV=#{fetch(:rails_env, 'production')} #{rake} alchemy:db:seed"
-			end
+      desc "Seeds the database with essential data."
+      task :seed, :roles => :app do
+        run "cd #{current_path} && RAILS_ENV=#{fetch(:rails_env, 'production')} #{rake} alchemy:db:seed"
+      end
 
-		end
+    end
 
   end
 
-	namespace :ferret do
+  namespace :ferret do
 
-		# This task rebuilds the ferret index for the EssenceText and EssenceRichtext Models.
-		# Call it before deploy:restart like +before "deploy:restart", "alchemy:rebuild_index"+ in your +deploy.rb+.
-		# 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"
-		end
+    # This task rebuilds the ferret index for the EssenceText and EssenceRichtext Models.
+    # Call it before deploy:restart like +before "deploy:restart", "alchemy:rebuild_index"+ in your +deploy.rb+.
+    # 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"
+    end
 
-	end
+  end
 
 end

data/lib/alchemy/config.rb

@@ -1,51 +1,54 @@
 module Alchemy
-  module Config
-  
-    def self.parameter(name)
-      show[name.to_s]
-    end
-    
-    # Returns the configuration for given parameter name from config/alchemy/config.yml file
-    def self.get(name)
-      parameter(name)
-    end
-    
-    def self.show
-      read_files
-    end
-    
-  private
-    
-    def self.read_files
-      # Looking for any Rails Environment specific configuration
-      if File.exists? "#{Rails.root.to_s}/config/alchemy/config_#{Rails.env}.yml"
-        config_1 = YAML.load_file( "#{Rails.root.to_s}/config/alchemy/config_#{Rails.env}.yml" )
-      else
-        config_1 = {}
-      end
-      
-      # Looking for Application specific configuration
-      if File.exists? "#{Rails.root.to_s}/config/alchemy/config.yml"
-        config_2 = YAML.load_file( "#{Rails.root.to_s}/config/alchemy/config.yml" )
-      else
-        config_2 = {}
+  class Config
+
+    class << self
+
+      # Returns the configuration for given parameter name from +config/alchemy/config.yml+ file.
+      def get(name)
+        show[name.to_s]
       end
-      
-      # Reading Alchemy standard configuration
-      if File.exists? File.join(File.dirname(__FILE__), '..', '..', 'config/alchemy/config.yml')
-        config_3 = YAML.load_file( File.join(File.dirname(__FILE__), '..', '..', 'config/alchemy/config.yml') )
-      else
-        config_3 = {}
+
+      alias_method :parameter, :get
+
+      # Returns the complete configuration from +config/alchemy/config.yml+ file.
+      def show
+        @@config ||= read_files
       end
-      
-      # Mergin all together
-      if config_1.blank? && config_3.blank? && config_3.blank?
-        raise LoadError, 'No Alchemy config file found!'
-      else
-        [config_1, config_2, config_3].map(&:stringify_keys!)
-        return config_3.merge(config_2.merge(config_1))
+
+      private
+
+      def read_files
+        # Looking for any Rails Environment specific configuration
+        if File.exists? "#{Rails.root.to_s}/config/alchemy/config_#{Rails.env}.yml"
+          config_1 = YAML.load_file("#{Rails.root.to_s}/config/alchemy/config_#{Rails.env}.yml")
+        else
+          config_1 = {}
+        end
+
+        # Looking for Application specific configuration
+        if File.exists? "#{Rails.root.to_s}/config/alchemy/config.yml"
+          config_2 = YAML.load_file("#{Rails.root.to_s}/config/alchemy/config.yml")
+        else
+          config_2 = {}
+        end
+
+        # Reading Alchemy standard configuration
+        if File.exists? File.join(File.dirname(__FILE__), '..', '..', 'config/alchemy/config.yml')
+          config_3 = YAML.load_file(File.join(File.dirname(__FILE__), '..', '..', 'config/alchemy/config.yml'))
+        else
+          config_3 = {}
+        end
+
+        # Mergin all together
+        if config_1.blank? && config_3.blank? && config_3.blank?
+          raise LoadError, 'No Alchemy config file found!'
+        else
+          [config_1, config_2, config_3].map(&:stringify_keys!)
+          return config_3.merge(config_2.merge(config_1))
+        end
       end
+
     end
-    
+
   end
 end