alchemy_cms 2.1.beta1 → 2.1.beta5

data/lib/alchemy/modules.rb

@@ -0,0 +1,38 @@
+module Alchemy
+	module Modules
+
+		@@alchemy_modules = YAML.load_file(File.join(File.dirname(__FILE__), '../..', 'config/alchemy', 'modules.yml'))
+
+		def self.included(base)
+			base.send :helper_method, :alchemy_modules, :module_definition_for
+		end
+
+		def alchemy_modules
+			@@alchemy_modules
+		end
+
+		def module_definition_for(name)
+			if name.is_a? String
+				alchemy_modules.detect{ |p| p["name"] == name }
+			elsif name.is_a? Hash
+				alchemy_modules.detect do |alchemy_module|
+					alchemy_module.stringify_keys!
+					name.symbolize_keys!
+					module_navi = alchemy_module["navigation"].stringify_keys
+					if module_navi["sub_navigation"]
+						module_navi["sub_navigation"].map(&:stringify_keys).detect do |subnavi|
+							subnavi["controller"].gsub(/^\//, '') == name[:controller] && subnavi["action"] == name[:action]
+						end
+					end
+				end
+			else
+				raise "Could not find module definition for #{name}"
+			end
+		end
+
+		def self.register_module(module_definition)
+			@@alchemy_modules << module_definition.stringify_keys
+		end
+
+	end
+end

data/lib/alchemy/page_layout.rb

@@ -1,67 +1,109 @@
 module Alchemy
-  class PageLayout
-    
-    def self.element_names_for(page_layout)
-      layout_description = get(page_layout)
-      if layout_description.blank?
-        puts "\n+++ Warning: No Layout Description for #{page_layout} found! in page_layouts.yml\n"
-        return []
-      else
-        layout_description["elements"]
-      end
-    end
-    
-    # Returns the page_layout.yml file. Tries to first load from config/alchemy and if not found from vendor/plugins/alchemy/config/alchemy.
-    def self.get_layouts
+	class PageLayout
+
+		def self.included(base)
+			@@definitions = read_layouts_file
+		end
+
+		def self.element_names_for(page_layout)
+			layout_description = get(page_layout)
+			if layout_description.blank?
+				puts "\n+++ Warning: No Layout Description for #{page_layout} found! in page_layouts.yml\n"
+				return []
+			else
+				layout_description["elements"]
+			end
+		end
+
+		# Returns the page_layout.yml file. Tries to first load from config/alchemy and if not found from vendor/plugins/alchemy/config/alchemy.
+		def self.get_layouts
+			@@definitions = read_layouts_file
+		end
+
+		# Add additional pagelayout definitions. I.E. from your module.
+		# Call +Alchemy::PageLayout.add(your_layout_definition)+ in your engine.rb file.
+		# You can pass a single layout definition as Hash, or a collection of pagelayouts as Array.
+		# Example Pagelayout definitions can be found in the +page_layouts.yml+ from the standard set.
+		def self.add(page_layout)
+			@@definitions = read_layouts_file
+			if page_layout.is_a?(Array)
+				@@definitions += page_layout
+			elsif page_layout.is_a?(Hash)
+				@@definitions << page_layout
+			else
+				raise TypeError
+			end
+		end
+
+		# Returns the page_layout description found by name in page_layouts.yml
+		def self.get(name)
+			return {} if name.blank?
+			@@definitions = read_layouts_file
+			@@definitions.detect{ |a| a["name"].downcase == name.downcase }
+		end
+
+		def self.get_all_by_attributes(attributes)
+			return [] if attributes.blank?
+			if attributes.class.name == 'Hash'
+				all_definitions = read_layouts_file
+				layouts = []
+				attributes.each do |key, value|
+					result = all_definitions.select{ |a| a[key.to_s].to_s.downcase == value.to_s.downcase if a.has_key?(key.to_s) }
+					layouts += result unless result.empty?
+				end
+				return layouts
+			else
+				return []
+			end
+		end
+
+		# Returns page layouts ready for Rails' select form helper.
+		def self.get_layouts_for_select(language_id, layoutpage = false)
+			layouts_for_select = [ [ Alchemy::I18n.t("Please choose"), "" ] ]
+			selectable_layouts(language_id, layoutpage).each do |layout|
+				display_name = Alchemy::I18n.t("alchemy.page_layout_names.#{layout['name']}", :default => layout['name'].camelize)
+				layouts_for_select << [display_name, layout["name"]]
+			end
+			layouts_for_select
+		end
+
+		def self.selectable_layouts(language_id, layoutpage = false)
+			@@definitions.select do |layout|
+				used = layout["unique"] && has_a_page_this_layout?(layout["name"], language_id)
+				if layoutpage
+					layout["layoutpage"] == true && !used && layout["newsletter"] != true
+				else
+					layout["layoutpage"] != true && !used && layout["newsletter"] != true
+				end
+			end
+		end
+
+		def self.get_page_layout_names
+			a = []
+			@@definitions.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
+
+		# Reads the layout definitions from +config/alchemy/page_layouts.yml+.
+		# If this can not be found, it takes the default one from Alchemys standard set.
+		def self.read_layouts_file
 			if File.exists? "#{Rails.root}/config/alchemy/page_layouts.yml"
-				layouts = YAML.load_file( "#{Rails.root}/config/alchemy/page_layouts.yml" )
+				layouts = YAML.load_file "#{Rails.root}/config/alchemy/page_layouts.yml"
 			end
 			if !layouts
-				if File.exists?(File.join(File.dirname(__FILE__), "../../config/alchemy/page_layouts.yml"))
-					layouts = YAML.load_file( File.join(File.dirname(__FILE__), "../../config/alchemy/page_layouts.yml") )
+				if File.exists? File.join(File.dirname(__FILE__), "../../config/alchemy/page_layouts.yml")
+					layouts = YAML.load_file File.join(File.dirname(__FILE__), "../../config/alchemy/page_layouts.yml")
 				end
 			end
 			if !layouts
 				raise LoadError, "Could not find page_layouts.yml file! Please run: rails generate alchemy:scaffold"
 			end
 			layouts
-    end
-   
-    # Returns the page_layout description found by name in page_layouts.yml
-    def self.get(name = "")
-      self.get_layouts.detect{ |a| a["name"].downcase == name.downcase }
-    end
-    
-    # Returns page layouts ready for Rails' select form helper.
-    def self.get_layouts_for_select(language_id, layoutpage = false)
-      layouts_for_select = [ [ _("Please choose"), "" ] ]
-      self.selectable_layouts(language_id, layoutpage).each do |layout|
-        display_name = I18n.t("alchemy.page_layout_names.#{layout['name']}", :default => layout['name'].camelize)
-        layouts_for_select << [display_name, layout["name"]]
-      end
-      layouts_for_select
-    end
-    
-    def self.selectable_layouts(language_id, layoutpage = false)
-      self.get_layouts.select do |layout|
-        used = layout["unique"] && self.has_another_page_this_layout?(layout["name"], language_id)
-        if layoutpage
-          layout["layoutpage"] == true && !used && layout["newsletter"] != true
-        else
-          layout["layoutpage"] != true && !used && layout["newsletter"] != true
-        end
-      end
-    end
-    
-    def self.get_page_layout_names
-      a = []
-      self.get_layouts.each{ |l| a << l.keys.first }
-      a
-    end
-    
-    def self.has_another_page_this_layout?(layout, language_id)
-      Page.where({:page_layout => layout, :language_id => language_id}).any?
-    end
-    
-  end
+		end
+
+	end
 end

data/lib/alchemy/seeder.rb

@@ -1,112 +1,62 @@
+require 'yaml'
+
 module Alchemy
-  class Seeder
-    require 'yaml'
-    
-    # This seed builds the necessary page structure for alchemy in your db.
-    # Put Alchemy::Seeder.seed! inside your db/seeds.rb file and run it with rake db:seed.
-    def self.seed!
-      FastGettext.add_text_domain 'alchemy', :path => File.join(File.dirname(__FILE__), '../../locale')
-      FastGettext.text_domain = 'alchemy'
-      FastGettext.available_locales = ['de', 'en']
-      FastGettext.locale = Alchemy::Config.get(:default_translation)
-      
-      errors = []
-      notices = []
-      
-      default_language = Alchemy::Config.get(:default_language)
-      
-      lang = Language.find_or_initialize_by_code(
-        :name => default_language['name'],
-        :code => default_language['code'],
-        :frontpage_name => default_language['frontpage_name'],
-        :page_layout => default_language['page_layout'],
-        :public => true,
-        :default => true
-      )
-      if lang.new_record?
-        if lang.save
-          puts "== Created language #{lang.name}"
-        else
-          errors << "Errors creating language #{lang.name}: #{lang.errors.full_messages}"
-        end
-      else
-        notices << "== Skipping! Language #{lang.name} was already present"
-      end
-      
-      root = Page.find_or_initialize_by_name(
-        :name => 'Root',
-        :page_layout => "rootpage",
-        :do_not_autogenerate => true,
-        :do_not_sweep => true,
-        :language => lang
-      )
-      if root.new_record?
-        if root.save
-          # We have to remove the language, because active record validates its presence on create.
-          root.language = nil
-          root.save
-          puts "== Created page #{root.name}"
-        else
-          errors << "Errors creating page #{root.name}: #{root.errors.full_messages}"
-        end
-      else
-        notices << "== Skipping! Page #{root.name} was already present"
-      end
-      
-      if errors.blank?
-        puts "Success!"
-        notices.map{ |note| puts note }
-      else
-        puts "WARNING! Some pages could not be created:"
-        errors.map{ |error| puts error }
-      end
-    end
-    
-    # This method is for running after upgrading an old Alchemy version without Language Model (pre v1.5).
-    # Put Alchemy::Seeder.upgrade! inside your db/seeds.rb file and run it with rake db:seed.
-    def self.upgrade!
-      seed!
-      Page.all.each do |page|
-        if !page.language_code.blank? && page.language.nil?
-          root = page.get_language_root
-          lang = Language.find_or_create_by_code(
-            :name => page.language_code.capitalize,
-            :code => page.language_code,
-            :frontpage_name => root.name,
-            :page_layout => root.page_layout,
-            :public => true
-          )
-          page.language = lang
-          if page.save(false)
-            puts "== Set language for page #{page.name} to #{lang.name}"
-          end
-        else
-          puts "== Skipping! Language for page #{page.name} already set."
-        end
-      end
-      default_language = Language.get_default
-      Page.layoutpages.each do |page|
-        if page.language.class == String || page.language.nil?
-          page.language = default_language
-          if page.save(false)
-            puts "== Set language for page #{page.name} to #{default_language.name}"
-          end
-        else
-          puts "== Skipping! Language for page #{page.name} already set."
-        end
-      end
-      (EssencePicture.all + EssenceText.all).each do |essence|
-        case essence.link_target
-        when '1'
-          if essence.update_attribute(:link_target, 'blank')
-            puts "== Updated #{essence.preview_text} link target to #{essence.link_target}."
-          end
-        when '0'
-          essence.update_attribute(:link_target, nil)
-          puts "== Updated #{essence.preview_text} link target to #{essence.link_target.inspect}."
-        end
-      end
-    end
-    
-  end
+	class Seeder
+
+		# This seed builds the necessary page structure for alchemy in your db.
+		# Put Alchemy::Seeder.seed! inside your db/seeds.rb file and run it with rake db:seed.
+		def self.seed!
+			errors = []
+			notices = []
+			
+			default_language = Alchemy::Config.get(:default_language)
+			
+			lang = Language.find_or_initialize_by_code(
+				:name => default_language['name'],
+				:code => default_language['code'],
+				:frontpage_name => default_language['frontpage_name'],
+				:page_layout => default_language['page_layout'],
+				:public => true,
+				:default => true
+			)
+			if lang.new_record?
+				if lang.save
+					puts "== Created language #{lang.name}"
+				else
+					errors << "Errors creating language #{lang.name}: #{lang.errors.full_messages}"
+				end
+			else
+				notices << "== Skipping! Language #{lang.name} was already present"
+			end
+			
+			root = Page.find_or_initialize_by_name(
+				:name => 'Root',
+				:page_layout => "rootpage",
+				:do_not_autogenerate => true,
+				:do_not_sweep => true,
+				:language => lang
+			)
+			if root.new_record?
+				if root.save
+					# We have to remove the language, because active record validates its presence on create.
+					root.language = nil
+					root.save
+					puts "== Created page #{root.name}"
+				else
+					errors << "Errors creating page #{root.name}: #{root.errors.full_messages}"
+				end
+			else
+				notices << "== Skipping! Page #{root.name} was already present"
+			end
+			
+			if errors.blank?
+				puts "Success!"
+				notices.map{ |note| puts note }
+			else
+				puts "WARNING! Some pages could not be created:"
+				errors.map{ |error| puts error }
+			end
+		end
+
+	end
 end

data/lib/alchemy/tinymce.rb

@@ -39,8 +39,8 @@ module Alchemy
 			:entity_encoding => "raw"
 		}
 
-		def self.init= js
-		  @@init = js
+		def self.init=(settings)
+			@@init = @@init.merge(settings)
 		end
 
 		def self.init

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
-  
-  VERSION = "2.1.beta1"
-  
+
+	VERSION = "2.1.beta5"
+
 end

data/lib/alchemy_cms.rb

@@ -1,32 +1,32 @@
 if defined?(Rails) && Rails::VERSION::MAJOR == 3
-  require 'acts_as_list'
-  require 'attachment_magic'
-  require 'authlogic'
-  require 'awesome_nested_set'
-  require 'dynamic_form'
-  require 'fleximage'
-  require 'gettext_i18n_rails'
-	if Rails.version >= '3.1'
-		require 'jquery-rails'
+	require 'acts_as_list'
+	require 'attachment_magic'
+	require 'authlogic'
+	require 'awesome_nested_set'
+	require 'dynamic_form'
+	require 'fleximage'
+	require 'jquery-rails'
+	require 'userstamp'
+	require 'will_paginate'
+	require 'yaml'
+	require 'sass-rails'
+	require 'declarative_authorization'
+	require 'extensions/hash'
+	require 'extensions/array'
+	require 'extensions/action_view'
+	require 'alchemy/version'
+	require 'alchemy/auth_engine'
+	require 'alchemy/engine'
+	%w(config essence page_layout modules remote_pagination_link_renderer tinymce i18n).each do |class_name|
+		require File.join(File.dirname(__FILE__), "alchemy", class_name)
 	end
-  require 'userstamp'
-  require 'will_paginate'
-  require 'yaml'
-  require 'extensions/hash'
-  require 'extensions/array'
-  require 'extensions/action_view'
-  require 'alchemy/version'
-  require 'alchemy/engine'
-  %w(config essence page_layout controller remote_pagination_link_renderer tinymce).each do |class_name|
-    require File.join(File.dirname(__FILE__), "alchemy", class_name)
-  end
-  require File.join(File.dirname(__FILE__), "alchemy", "seeder")
+	require File.join(File.dirname(__FILE__), "alchemy", "seeder")
 else
-  raise "Alchemy 2.0 needs Rails 3.0 or higher. You are currently using Rails #{Rails::VERSION::MAJOR}"
+	raise "Alchemy 2.0 needs Rails 3.0 or higher. You are currently using Rails #{Rails::VERSION::MAJOR}"
 end
 
 module Alchemy
   
-  class EssenceError < StandardError; end
+	class EssenceError < StandardError; end
   
 end