alchemy_cms 2.1.beta1 → 2.1.beta5

data/config/routes.rb

@@ -1,143 +1,145 @@
-Rails.application.routes.draw do
-  
-  root :to => 'pages#show'
-  
-  resources :messages, :only => [:index, :new, :create]
-  
-  match '/admin' => 'admin#index',
-    :as => :admin
-  match '/admin/login' => 'admin#login',
-    :as => :login
-  match '/admin/signup' => 'admin#signup',
-    :as => :signup
-  match '/admin/leave' => 'admin#leave',
-    :as => :leave_admin
-  match '/admin/logout' => 'admin#logout',
-    :as => :logout
-  match '/attachment/:id/download(/:name)(.:suffix)' => 'attachments#download',
-    :as => :download_attachment
-  match '/attachment/:id/show' => 'attachments#show',
-    :as => :show_attachment
-  match '/pictures/show/:id/:size/:crop_from/:crop_size/:name.:format' => 'pictures#show',
-    :as => :show_cropped_picture
-  match '/pictures/show/:id/:size/:crop/:name.:format' => 'pictures#show',
-    :as => :show_picture_with_crop
-  match '/pictures/show/:id/:size/:name.:format' => 'pictures#show',
-    :as => :show_picture
-  match '/pictures/zoom/:id/picture.:format' => 'pictures#zoom',
-    :as => :zoom_picture
-  match  '/pictures/thumbnails/:id/:size(/:crop_from)(/:crop_size)/thumbnail.png' => 'pictures#thumbnail',
-    :as => :thumbnail, :defaults => { :format => 'png' }
-  match '/:lang' => 'pages#show',
-    :constraints => {:lang => /[a-z]{2}/},
-    :as => :show_language_root
-  match '(/:lang)/:urlname(.:format)' => 'pages#show',
-    :constraints => {:lang => /[a-z]{2}/},
-    :as => :show_page
-  match '/wa_files/download/:id' => 'attachments#download'
-  match '/uploads/files/0000/:id/:name(.:suffix)' => 'attachments#download'
-
-  resources :user_sessions
-  resources :elements, :only => :show
-
-  namespace :admin do 
-  
-    resources :users
-    
-    resources :contents do
-      collection do 
-        post :order
-      end
-    end
-    
-    resources :pages do 
-      resources :elements
-      collection do 
-        post :order
-        post :flush
-        post :copy_language
-        get :switch_language
-        get :create_language
-        get :link
-        get :sort
-      end
-      member do 
-        post :unlock
-        post :publish
-        post :fold
-        post :visit
-        get :configure
-        get :preview
-      end
-    end
-    
-    resources :elements do 
-      resources :contents
-      collection do 
-        get :list
-        post :order
-      end
-      member do
-        post :fold
-        delete :trash
-      end
-    end
-    
-    resources :layoutpages, :only => :index
-    
-    resources :pictures do 
-      collection do 
-        post :flush
-      end
-      member do 
-        get :show_in_window
-        delete :remove
-      end
-    end
-    
-    resources :attachments do 
-      member do 
-        get :download
-      end
-    end
-    
-    resources :essence_pictures, :except => [:show, :new, :create] do 
-      collection do
-        put :assign
-      end
-      member do 
-        get :crop
-      end
-    end
-    
-    resources :essence_files, :only => [:edit, :update] do
-      collection do
-        put :assign
-      end
-    end
-    
-    resources :essence_videos
-    
-    resources :languages
-    
-    # OHOHOH lovely Rails! Why, oh why I always have to hack thou?
-    resource :clipboard, :only => :index, :controller => 'clipboard' do
-      collection do
-        get :index
-        delete :clear
-        delete :remove
-        post :insert
-      end
-    end
-    
-    # OHOHOH lovely Rails! Why, oh why I always have to hack thou?
-    resource :trash, :only => :index, :controller => 'trash' do
-      collection do
-        get :index
-        delete :clear
-      end
-    end
-    
-  end
-  
+Alchemy::Engine.routes.draw do
+
+	root :to => 'pages#show'
+
+	match '/admin' => redirect("/admin/dashboard")
+	match '/admin/login' => 'user_sessions#login',
+		:as => :login
+	match '/admin/signup' => 'user_sessions#signup',
+		:as => :signup
+	match '/admin/leave' => 'user_sessions#leave',
+		:as => :leave_admin
+	match '/admin/logout' => 'user_sessions#logout',
+		:as => :logout
+	match '/admin/dashboard' => 'admin/dashboard#index',
+		:as => :admin_dashboard
+	match '/attachment/:id/download(/:name)(.:suffix)' => 'attachments#download',
+		:as => :download_attachment
+	match '/attachment/:id/show' => 'attachments#show',
+		:as => :show_attachment
+	match '/pictures/show/:id/:size/:crop_from/:crop_size/:name.:format' => 'pictures#show',
+		:as => :show_cropped_picture
+	match '/pictures/show/:id/:size/:crop/:name.:format' => 'pictures#show',
+		:as => :show_picture_with_crop
+	match '/pictures/show/:id/:size/:name.:format' => 'pictures#show',
+		:as => :show_picture
+	match '/pictures/zoom/:id/picture.:format' => 'pictures#zoom',
+		:as => :zoom_picture
+	match  '/pictures/thumbnails/:id/:size(/:crop_from)(/:crop_size)/thumbnail.png' => 'pictures#thumbnail',
+		:as => :thumbnail, :defaults => { :format => 'png' }
+	match '/:lang' => 'pages#show',
+		:constraints => {:lang => /[a-z]{2}/},
+		:as => :show_language_root
+	match '(/:lang)/:urlname(.:format)' => 'pages#show',
+		:constraints => {:lang => /[a-z]{2}/},
+		:as => :show_page
+	# catching legacy download urls
+	match '/wa_files/download/:id' => 'attachments#download'
+	match '/uploads/files/0000/:id/:name(.:suffix)' => 'attachments#download'
+
+	resources :messages, :only => [:index, :new, :create]
+
+	resources :user_sessions
+	resources :elements, :only => :show
+
+	namespace :admin do
+
+		resources :users
+
+		resources :contents do
+			collection do
+				post :order
+			end
+		end
+
+		resources :pages do
+			resources :elements
+			collection do
+				post :order
+				post :flush
+				post :copy_language_tree
+				get :switch_language
+				get :create_language
+				get :link
+				get :sort
+			end
+			member do
+				post :unlock
+				post :publish
+				post :fold
+				post :visit
+				get :configure
+				get :preview
+			end
+		end
+
+		resources :elements do
+			resources :contents
+			collection do
+				get :list
+				post :order
+			end
+			member do
+				post :fold
+				delete :trash
+			end
+		end
+
+		resources :layoutpages, :only => :index
+
+		resources :pictures do
+			collection do
+				post :flush
+			end
+			member do
+				get :show_in_window
+				delete :remove
+			end
+		end
+
+		resources :attachments do
+			member do
+				get :download
+			end
+		end
+
+		resources :essence_pictures, :except => [:show, :new, :create] do 
+			collection do
+				put :assign
+			end
+			member do 
+				get :crop
+			end
+		end
+
+		resources :essence_files, :only => [:edit, :update] do
+			collection do
+				put :assign
+			end
+		end
+
+		resources :essence_videos
+
+		resources :languages
+
+		# OHOHOH lovely Rails! Why, oh why I always have to hack thou?
+		resource :clipboard, :only => :index, :controller => 'clipboard' do
+			collection do
+				get :index
+				delete :clear
+				delete :remove
+				post :insert
+			end
+		end
+
+		# OHOHOH lovely Rails! Why, oh why I always have to hack thou?
+		resource :trash, :only => :index, :controller => 'trash' do
+			collection do
+				get :index
+				delete :clear
+			end
+		end
+
+	end
+
 end

data/db/migrate/20111116125112_namespace_models.rb

@@ -0,0 +1,23 @@
+class NamespaceModels < 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
+end

data/lib/alchemy/auth_engine.rb

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

data/lib/alchemy/capistrano.rb

@@ -1,12 +1,15 @@
 # This recipe contains Capistrano recipes for handling the uploads, ferret index and picture cache files while deploying your application.
 # It also contains a ferret:rebuild_index task to rebuild the index after deploying your application.
+require "rails"
 
 Capistrano::Configuration.instance(:must_exist).load do
   
   after "deploy:setup", "alchemy:shared_folders:create"
   after "deploy:symlink", "alchemy:shared_folders:symlink"
   
-  before "deploy:restart", "alchemy:files:copy"
+	if Rails.version < '3.1'
+		before "deploy:restart", "alchemy:files:copy"
+	end
   
   namespace :alchemy do
 

data/lib/alchemy/engine.rb

@@ -1,29 +1,43 @@
 require File.join(File.dirname(__FILE__), '../middleware/flash_session_cookie')
 
 module Alchemy
-  class Engine < Rails::Engine
-
-    # Config defaults
-    #config.widget_factory_name = "Alchemy"
-    config.mount_at = '/'
-
-    # Check the gem config
-    initializer "check config" do |app|
-      # make sure mount_at ends with trailing slash
-      config.mount_at += '/'  unless config.mount_at.last == '/'
-    end
-
-    initializer :flash_cookie do |config|
-      config.middleware.insert_after(
-        'ActionDispatch::Cookies',
-        Alchemy::Middleware::FlashSessionCookie,
-        ::Rails.configuration.session_options[:key]
-      )
-    end
-
-    initializer "static assets" do |app|
-      app.middleware.use ::ActionDispatch::Static, "#{root}/public"
-    end
-
-  end
+	class Engine < Rails::Engine
+
+		isolate_namespace Alchemy
+
+		engine_name 'alchemy'
+
+		config.mount_at = '/'
+
+		# Enabling assets precompiling
+		initializer 'alchemy.assets' do |app|
+			app.config.assets.precompile += [
+				"alchemy/alchemy.js",
+				"alchemy/preview.js",
+				"alchemy/alchemy.css",
+				"alchemy/print.css",
+				"alchemy/tinymce_content.css",
+				"alchemy/tinymce_dialog.css",
+				"tiny_mce/*"
+			]
+		end
+
+		initializer 'alchemy.flash_cookie' do |config|
+			config.middleware.insert_after(
+				'ActionDispatch::Cookies',
+				Alchemy::Middleware::FlashSessionCookie,
+				::Rails.configuration.session_options[:key]
+			)
+		end
+
+		# filter sensitive information during logging
+		initializer "alchemy.params.filter" do |app|
+			app.config.filter_parameters += [:password, :password_confirmation]
+		end
+
+		initializer "alchemy.add_authorization_rules" do
+			Alchemy::AuthEngine.get_instance.load(File.join(File.dirname(__FILE__), '../..', 'config/authorization_rules.rb'))
+		end
+
+	end
 end

data/lib/alchemy/essence.rb

@@ -142,7 +142,7 @@ module Alchemy #:nodoc:
       
       # Returns the Content Essence is in
       def content
-        Content.find_by_essence_type_and_essence_id(acts_as_essence_class.to_s, self.id)
+        Alchemy::Content.find_by_essence_type_and_essence_id(acts_as_essence_class.to_s, self.id)
       end
       
       # Returns the Element Essence is in
@@ -171,6 +171,10 @@ module Alchemy #:nodoc:
         respond_to?(:link_target) && link_target == 'blank'
       end
       
+			def partial_name
+				self.class.name.split('::').last.underscore
+			end
+
     end
     
   end

data/lib/alchemy/i18n.rb

@@ -0,0 +1,47 @@
+module Alchemy
+	class I18n
+
+		## Thanks Typus for this I18n hack!
+		# 
+		# Instead of having to translate strings and defining a default value:
+		#
+		#     AlchemyAlchemy::I18n.t("Hello World!", :default => 'Hello World!')
+		#
+		# We define this method to define the value only once:
+		#
+		#     AlchemyAlchemy::I18n.t("Hello World!")
+		#
+		# Note that interpolation still works:
+		#
+		#     AlchemyAlchemy::I18n.t("Hello %{world}!", :world => @world)
+		#
+		# Notes:
+		# -----
+		# 
+		# Already scoped to alchemy namespace!
+		# 
+		def self.t(msg, *args)
+			options = args.extract_options!
+			options[:default] = options[:default] ? options[:default] : msg.humanize
+			scope = ['alchemy']
+			case options[:scope].class.name
+				when "Array"
+					scope += options[:scope]
+				when "String"
+					scope << options[:scope]
+				when "Symbol"
+					scope << options[:scope] unless options[:scope] == :alchemy
+			end
+			::I18n.t(msg, options.merge(:scope => scope))
+		end
+
+		def self.available_locales
+			translation_files.collect { |f| f.match(/.{2}\.yml$/).to_s.gsub(/\.yml/, '') }.uniq
+		end
+
+		def self.translation_files
+			Rails.application.config.i18n.load_path.select { |p| p.split('/').last.match(/alchemy/) }
+		end
+
+	end
+end