alchemy_cms 2.0.rc6 → 2.0

data/README.md

@@ -6,32 +6,20 @@ Alchemy CMS
 About
 -----
 
-Alchemy is a fully featured Content Management System (CMS) with an gorgeous Userinterface.
-
-Nearly every content management system stores the content of a page in a body column in the pages table. This is easy to develop and the user manages the content inside one of the fancy new Javascript based wysiwyg processors. Formatting, image placement, styling and positioning of the content is in the hand of the end-user.
-
-__We think this is completly wrong!__
-
-The content manager mustn‘t be able to change anything but the content and some basic text formatting. The content manager shouldn‘t care about headline formatting, image positioning or resizing. The developer should take care of this!
-
-__Alchemy is different!__
-
-We split the page into logical parts like headlines, paragraphs, images, etc. The only thing we store in  the database is text: ids of images and richtext content. Nothing else. No markup (besides basic text formatting inside the richtext elements), no styling, no layout. Pure content!
-
-This gives the webdeveloper the power and flexibility to implement any kind of layout with the insurance that the content manager is not able to break up the layout.
+Alchemy is a powerfull Content Management System (CMS) with an extremly flexible content storing architecture.
 
 Features
 --------
 
 - Highly flexible Templating:
-  - Content is stored in small parts not as a complete, monolithic page.
+  - Content is stored in small parts not as a complete, monolithic page
   - The designer chooses the template structure, not the CMS!
-  - Every Design is possible, no templating, or theming restrictions.
+  - Every Design is possible, no templating, or theming restrictions
   - Even Flash® Content Management is possible
 - Gorgious End-User centric interface:
-  - No geeky markup editors and other meta programming crap.
+  - No markup editors
 - Multilingual:
-  - Create as many (complete independent) language trees as you want.
+  - Create as many (complete independent) language trees as you want
   - URL based language switching
 - SEO
   - Every Part of SEO is manageable by the user
@@ -41,6 +29,7 @@ Features
   - Rolebased Authentification (RBAS)
   - Protect pages for restricted access
 - Fulltext Search
+- RSS Feeds
 - Contactforms
 - Attachments and downloads
 - Powerfull image rendering
@@ -54,74 +43,87 @@ Features
 - Integrates in exsiting Rails Apps
 - Caching
 - Completely free:
-  - GPLv3 License
+  - BSD License
   - No Enterprise Licences, or Community Editions
 - Hostable on any Server that supports RubyOnRails and ImageMagick ([Software Requirements](https://github.com/magiclabs/alchemy/wiki/Software-Requirements))
 
 Rails Version
 -------------
 
-This branch of Alchemy runs with Rails 3.0.10, Ruby 1.8.7 and Ruby 1.9.2.
+This version of Alchemy runs with Rails 3.0.10.
+
+If you are looking for a Rails 2 compatible version check the rails-2 branch.
+
+A Rails 3.1 compatible beta version can be found in the next_stable branch.
+
+Ruby Version
+------------
+
+Alchemy runs with REE, Ruby 1.8.7, Ruby 1.9.2 and Ruby 1.9.3.
 
 Installation
 ------------
 
 Use the installer (recommended):
 
-    gem install alchemy_cms --pre
+    gem install alchemy_cms
     alchemy new my_magicpage
 
 Start the local server:
 
     rails server
 
-Then just switch to your browser and open `http://localhost:3000`.
+Then just switch to your browser and open `http://localhost:3000`
+
+Add to existing Rails project
+-----------------------------
 
-Add to existing Rails project:
+In your Gemfile:
 
-    add gem 'alchemy_cms' to Gemfile
+    gem 'alchemy_cms'
+
+Run in terminal:
 
     bundle install
     rake alchemy:prepare
-    rake alchemy:standard_set:install (optional)
     rake db:migrate
     rake db:seed
 
-
 Tipps
 -----
 
-1. This task creates all necessary folders and files needed for creating your own pagelayouts and elements for your website
+1. This generator creates all necessary folders and files needed for creating your own page layouts and elements for your website:
 
-        rake generate alchemy:scaffold:all
+        rails generate alchemy:scaffold
 
 2. If you use the ferret full text search (enabled by default), then please add a job to your crontab that reindexes the ferret index.
 
         cd /path/to/your/alchemy && RAILS_ENV=production rake ferret:rebuild_index > /dev/null
 
-3. You can easily create your element-files (for view and editor) depending on the `elements.yml` with this generator
+3. You can easily create your element files (for view and editor) depending on the `elements.yml` with this generator:
 
         rails generate elements
 
 Resources
 ---------
 
-* Homepage: <http://alchemy-app.com>
-* Live-Demo: <http://demo.alchemy-app.com>
-* Wiki: <http://wiki.alchemy-app.com>
-* API Documentation: <http://api.alchemy-app.com>
-* Issue-Tracker: <http://issues.alchemy-app.com>
-* Sourcecode: <http://source.alchemy-app.com>
+* Homepage: <http://alchemy-cms.com>
+* Live-Demo: <http://demo.alchemy-cms.com>
+* Wiki: <http://wiki.alchemy-cms.com>
+* API Documentation: <http://api.alchemy-cms.com>
+* Issue-Tracker: <http://issues.alchemy-cms.com>
+* Sourcecode: <http://source.alchemy-cms.com>
 * User Group: <http://groups.google.com/group/alchemy-cms>
 
 Authors
 ---------
 
-* Carsten Fregin: <https://github.com/cfregin>
 * Thomas von Deyen: <https://github.com/tvdeyen>
 * Robin Böning: <https://github.com/robinboening>
+* Marc Schettke: <https://github.com/masche842>
+* Carsten Fregin: <https://github.com/cfregin>
 
 License
 -------
 
-* GPLv3: <http://www.gnu.org/licenses/gpl.html/>
+* BSD: <https://raw.github.com/magiclabs/alchemy_cms/master/LICENSE>

data/alchemy_cms.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.summary     = %q{An extremly flexbile CMS for Rails 3.}
   s.description = %q{Alchemy is an awesome Rails CMS with an extremely flexible content storing architecture.}
   s.requirements << 'ImageMagick (libmagick), v6.6 or greater.'
-  s.license = 'GPL-3'
+  s.license = 'BSD New'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/app/controllers/admin/elements_controller.rb

@@ -42,8 +42,10 @@ class Admin::ElementsController < AlchemyController
     @page = Page.find(params[:element][:page_id])
     if params[:paste_from_clipboard].blank?
       @element = Element.new_from_scratch(params[:element])
+      cell_definition = Cell.definition_for(params[:element][:name].split('#').last)
     else
-      source_element = Element.find(params[:paste_from_clipboard])
+      source_element = Element.find(params[:paste_from_clipboard].to_i)
+      cell_definition = Cell.definition_for(params[:paste_from_clipboard].split('#').last)
       if source_element.page_id == blank? # aka. move
         @element = source_element
       else
@@ -52,7 +54,6 @@ class Admin::ElementsController < AlchemyController
     end
     # if page has cells, put element in cell
     if @page.has_cells?
-      cell_definition = Cell.definition_for(params[:element][:name].split('#').last)
       if cell_definition
         @cell = @page.cells.find_or_create_by_name(cell_definition['name'])
       end

data/app/controllers/admin/pages_controller.rb

@@ -73,14 +73,14 @@ class Admin::PagesController < AlchemyController
     end
   end
   
-  def update
-    # fetching page via before filter
-    if @page.update_attributes(params[:page])
-      @notice = _("Page %{name} saved") % {:name => @page.name}
-    else
-      render_remote_errors(@page, "form#edit_page_#{@page.id} button.button")
-    end
-  end
+	def update
+		# fetching page via before filter
+		if @page.update_attributes(params[:page])
+			@notice = _("Page %{name} saved") % {:name => @page.name}
+		else
+			render_remote_errors(@page, "form#edit_page_#{@page.id} button.button")
+		end
+	end
   
   def destroy
     # fetching page via before filter
@@ -218,12 +218,8 @@ class Admin::PagesController < AlchemyController
   end
   
   def flush
-    Page.flushables(session[:language_id]).each do |page|
-      if multi_language?
-        expire_action("#{page.language_code}/#{page.urlname}")
-      else
-        expire_action("#{page.urlname}")
-      end
+		Page.with_language(session[:language_id]).flushables.each do |page|
+      expire_page(page)
     end
     respond_to do |format|
       format.js
@@ -240,4 +236,14 @@ private
     request.raw_post.split('&').map { |i| i = {i.split('=')[0].gsub(/[^0-9]/, '') => i.split('=')[1]} }
   end
 
+	def expire_page(page)
+    return if page.do_not_sweep
+    expire_action(
+      :controller => '/pages',
+      :action => :show,
+      :urlname => page.urlname_was,
+      :lang => multi_language? ? page.language_code : nil
+    )
+  end
+
 end

data/app/controllers/admin/trash_controller.rb

@@ -4,11 +4,15 @@ class Admin::TrashController < AlchemyController
   
   before_filter :set_translation
   
+  helper Admin::ElementsHelper
+  
   def index
     @elements = Element.trashed
     @page = Page.find_by_id(params[:page_id])
     @allowed_elements = Element.all_for_page(@page)
     render :layout => false
+  rescue Exception => e
+    exception_handler(e)
   end
   
   def clear

data/app/controllers/pages_controller.rb

@@ -7,12 +7,11 @@ class PagesController < AlchemyController
 
   caches_action(
     :show,
-    :layout => false,
-    :cache_path => Proc.new { |c| c.multi_language? ? "#{session[:language_code]}/#{c.params[:urlname]}" : "#{c.params[:urlname]}" },
-    :if => Proc.new { |c| 
+    :cache_path => proc { url_for(:action => :show, :urlname => params[:urlname], :lang => multi_language? ? params[:lang] : nil) },
+    :if => proc do
       if Alchemy::Config.get(:cache_pages)
         page = Page.find_by_urlname_and_language_id_and_public(
-          c.params[:urlname],
+          params[:urlname],
           session[:language_id],
           true,
           :select => 'page_layout, language_id, urlname'
@@ -24,20 +23,31 @@ class PagesController < AlchemyController
       else
         false
       end
-    }
+    end
   )
 
-  # Showing page from params[:urlname]
-  # @page is fetched via before filter
-  # @root_page is fetched via before filter
-  # @language fetched via before_filter in alchemy_controller
-  # rendering page and querying for search results if any query is present
-  def show
-    if configuration(:ferret) && !params[:query].blank?
-      perform_search
-    end
-    render :layout => params[:layout].blank? ? 'pages' : params[:layout] == 'none' ? false : params[:layout]
-  end
+	# Showing page from params[:urlname]
+	# @page is fetched via before filter
+	# @root_page is fetched via before filter
+	# @language fetched via before_filter in alchemy_controller
+	# rendering page and querying for search results if any query is present
+	def show
+		if configuration(:ferret) && !params[:query].blank?
+			perform_search
+		end
+		respond_to do |format|
+			format.html {
+				render :layout => params[:layout].blank? ? 'pages' : params[:layout] == 'none' ? false : params[:layout]
+			}
+			format.rss {
+				if @page.contains_feed?
+					render :action => "show.rss.builder", :layout => false
+				else
+					render :xml => { :error => 'Not found' }, :status => 404
+				end
+			}
+		end
+	end
 
   # Renders a Google conform sitemap in xml
   def sitemap
@@ -97,6 +107,7 @@ private
       {:limit => :all},
       {:conditions => ["public = ?", true]}
     )
+    @search_results = (@text_search_results + @rtf_search_results).sort{ |y, x| x.ferret_score <=> y.ferret_score }
   end
 
   def find_first_public(page)

data/app/helpers/admin/elements_helper.rb

@@ -56,4 +56,59 @@ module Admin::ElementsHelper
     )
   end
 
+	def clipboard_select_tag(items, html_options = {})
+    options = [[_('Please choose'), ""]]
+    items.each do |item|
+      options << [item.class.to_s == 'Element' ? item.display_name_with_preview_text : item.name, item.id]
+    end
+    select_tag(
+      'paste_from_clipboard',
+      @page.has_cells? ? grouped_elements_for_select(items, :id) : options_for_select(options),
+      {
+        :class => html_options[:class] || 'very_long',
+        :style => html_options[:style]
+      }
+    )
+  end
+  
+  # Returns all elements that could be placed on that page because of the pages layout.
+  # The elements are returned as an array to be used in alchemy_selectbox form builder.
+  def elements_for_select(elements)
+    return [] if elements.nil?
+    options = elements.collect{ |e| [I18n.t("alchemy.element_names.#{e['name']}", :default => e['name'].capitalize), e["name"]] }
+    return options_for_select(options)
+  end
+  
+  # Returns all elements that could be placed on that page because of the pages layout.
+  # The elements will be grouped by cell.
+  def grouped_elements_for_select(elements, object_method = 'name')
+    return [] if elements.nil?
+    cells_definition = Cell.definitions
+    return [] if cells_definition.blank?
+    options = {}
+    celled_elements = []
+    cells_definition.each do |cell|
+      cell_elements = elements.select { |e| cell['elements'].include?(e.class.name == 'Element' ? e.name : e['name']) }
+      celled_elements += cell_elements
+      optgroup_label = Cell.translated_label_for(cell['name'])
+      options[optgroup_label] = cell_elements.map do |e|
+				[
+					I18n.t("alchemy.element_names.#{e['name']}", :default => e['name'].capitalize),
+					(e.class.name == 'Element' ? e.send(object_method).to_s : e[object_method]) + "##{cell['name']}"
+				]
+			end
+    end
+    other_elements = elements - celled_elements
+    unless other_elements.blank?
+      optgroup_label = _('other Elements')
+      options[optgroup_label] = other_elements.map do |e|
+				[
+					I18n.t("alchemy.element_names.#{e['name']}", :default => e['name'].capitalize),
+					e.class.name == 'Element' ? e.send(object_method) : e[object_method]
+				]
+			end
+    end
+    return grouped_options_for_select(options)
+  end
+
 end

data/app/helpers/alchemy_helper.rb

@@ -101,51 +101,6 @@ module AlchemyHelper
     filter_field << "</div>"
     filter_field.html_safe
   end
-
-  def clipboard_select_tag(items, html_options = {})
-    options = [[_('Please choose'), ""]]
-    items.each do |item|
-      options << [item.class.to_s == 'Element' ? item.display_name_with_preview_text : item.name, item.id]
-    end
-    select_tag(
-      'paste_from_clipboard',
-      options_for_select(options),
-      {
-        :class => html_options[:class] || 'very_long',
-        :style => html_options[:style]
-      }
-    )
-  end
-  
-  # Returns all elements that could be placed on that page because of the pages layout.
-  # The elements are returned as an array to be used in alchemy_selectbox form builder.
-  def elements_for_select(elements)
-    return [] if elements.nil?
-    options = elements.collect{ |e| [I18n.t("alchemy.element_names.#{e['name']}", :default => e['name'].capitalize), e["name"]] }
-    return options_for_select(options)
-  end
-  
-  # Returns all elements that could be placed on that page because of the pages layout.
-  # The elements will be grouped by cell.
-  def grouped_elements_for_select(elements)
-    return [] if elements.nil?
-    cells_definition = Cell.definitions
-    return [] if cells_definition.blank?
-    options = {}
-    celled_elements = []
-    cells_definition.each do |cell|
-      cell_elements = elements.select { |e| cell['elements'].include?(e['name']) }
-      celled_elements += cell_elements
-      optgroup_label = Cell.translated_label_for(cell['name'])
-      options[optgroup_label] = cell_elements.map { |e| [I18n.t("alchemy.element_names.#{e['name']}", :default => e['name'].capitalize), e['name'] + "##{cell['name']}"] }
-    end
-    other_elements = elements - celled_elements
-    unless other_elements.blank?
-      optgroup_label = _('other Elements')
-      options[optgroup_label] = other_elements.map { |e| [I18n.t("alchemy.element_names.#{e['name']}", :default => e['name'].capitalize), e['name']] }
-    end
-    return grouped_options_for_select(options)
-  end
   
   def link_to_confirmation_window(link_string = "", message = "", url = "", html_options = {})
     title = _("please_confirm")

data/app/helpers/elements_helper.rb

@@ -20,6 +20,7 @@ module ElementsHelper
       :except => [],
       :only => [],
       :from_page => "",
+			:from_cell => "",
       :count => nil,
       :offset => nil,
       :locals => {},
@@ -53,7 +54,7 @@ module ElementsHelper
       element_string = ""
       if options[:fallback]
         unless all_elements.detect { |e| e.name == options[:fallback][:for] }
-          if from = Page.find_by_page_layout(options[:fallback][:from])
+          if from = Page.find_by_page_layout_and_language_id(options[:fallback][:from], session[:language_id])
             all_elements += from.elements.find_all_by_name(options[:fallback][:with].blank? ? options[:fallback][:for] : options[:fallback][:with])
           end
         end
@@ -143,6 +144,12 @@ module ElementsHelper
     return element
   end
 
+	# Renders all element partials from given cell.
+  def render_cell_elements(cell)
+    return warning("No cell given.") if cell.blank?
+		render_elements({:from_cell => cell})
+  end
+
   # Returns a string for the id attribute of a html element for the given element
   def element_dom_id(element)
     return "" if element.nil?