alchemy_cms 2.4.1 → 2.5.0.b2

data/config/routes.rb

@@ -26,7 +26,7 @@ Alchemy::Engine.routes.draw do
   match '/attachment/:id/show' => 'attachments#show',
         :as => :show_attachment
 
-  match "/pictures/:id/show(/:size)(/:crop)(/:crop_from/:crop_size)/:name.:format" => 'pictures#show',
+  match "/pictures/:id/show(/:size)(/:crop)(/:crop_from/:crop_size)(/:quality)/:name.:format" => 'pictures#show',
         :as => :show_picture
   match '/pictures/:id/zoom/:name.:format' => 'pictures#zoom',
         :as => :zoom_picture
@@ -90,7 +90,7 @@ Alchemy::Engine.routes.draw do
         get :edit_multiple
       end
       member do
-        get :show_in_window
+        get :show_in_window, :info
         delete :remove
       end
     end
@@ -140,6 +140,8 @@ Alchemy::Engine.routes.draw do
       end
     end
 
+    resources :sites
+
   end
 
   match '/:lang' => 'pages#show',

data/db/migrate/20121121162313_switch_from_fleximage_to_dragonfly.rb

@@ -0,0 +1,21 @@
+class SwitchFromFleximageToDragonfly < ActiveRecord::Migration
+  def up
+    change_table :alchemy_pictures do |t|
+      t.string  :image_file_uid
+      t.integer :image_file_size
+      t.rename  :image_width,     :image_file_width
+      t.rename  :image_height,    :image_file_height
+      t.rename  :image_filename,  :image_file_name
+    end
+  end
+
+  def down
+    change_table :alchemy_pictures do |t|
+      t.remove :image_file_uid
+      t.remove :image_file_size
+      t.rename :image_file_width,  :image_width
+      t.rename :image_file_height, :image_height
+      t.rename :image_file_name,   :image_filename
+    end
+  end
+end

data/db/migrate/20121205155004_create_alchemy_sites.rb

@@ -0,0 +1,14 @@
+class CreateAlchemySites < ActiveRecord::Migration
+  def change
+    create_table "alchemy_sites" do |t|
+      t.string :host
+      t.string :name
+      t.timestamps
+    end
+    add_index :alchemy_sites, :host, uniq: true
+
+    # add Language#site_id
+    add_column :alchemy_languages, :site_id, :integer
+    add_index  :alchemy_languages, :site_id
+  end
+end

data/db/migrate/20121211163003_add_public_to_alchemy_sites.rb

@@ -0,0 +1,6 @@
+class AddPublicToAlchemySites < ActiveRecord::Migration
+  def change
+    add_column :alchemy_sites, :public, :boolean, :default => false
+    add_index :alchemy_sites, [:host, :public], :name => 'alchemy_sites_public_hosts_idx'
+  end
+end

data/lib/alchemy/capistrano.rb

@@ -77,10 +77,15 @@ EOF
     namespace :db do
 
       desc "Seeds the database with essential data."
-      task :seed, :roles => :app do
+      task :seed, :roles => :db do
         run "cd #{current_path} && RAILS_ENV=#{fetch(:rails_env, 'production')} #{rake} alchemy:db:seed"
       end
 
+      desc "Dumps the database into 'db/dumps'"
+      task :dump, :roles => :db do
+        run "cd #{current_path} && RAILS_ENV=#{fetch(:rails_env, 'production')} #{rake} alchemy:db:dump"
+      end
+
     end
 
     namespace :import do
@@ -125,7 +130,7 @@ EOF
 
       def timestamp
         timestamp ||= Time.now.strftime('%Y-%m-%d-%H-%M')
-      end    
+      end
 
       def unzip_files(type, filename)
         FileUtils.rm_rf "./uploads/#{type}"

data/lib/alchemy/ferret_search.rb

@@ -0,0 +1,84 @@
+module Alchemy
+  # Provides full text search methods in your controller
+  #
+  # === Usage
+  #
+  #   include Alchemy::FerretSearch
+  #
+  module FerretSearch
+
+    # Adds a +before_filter+ to your controller
+    #
+    def self.included(controller)
+      controller.send(:before_filter, :perform_search, :only => :show)
+      controller.send(:helper_method, :find_search_result_page)
+    end
+
+    # Performs a full text search with +Ferret+.
+    #
+    # Gets invoked everytime 'query' is given in params.
+    #
+    # This method only sets the +@search_results+ instance variable.
+    #
+    # You have to redirect to the search result page within a search form.
+    #
+    # === Alchemy provides a handy helper for rendering the search form:
+    #
+    #  render_search_form
+    #
+    # === Note
+    #
+    # If in preview mode a fake search value "lorem" will be set.
+    #
+    # @see Alchemy::PagesHelper#render_search_form
+    #
+    def perform_search
+      if @preview_mode && params[:query].blank?
+        params[:query] = 'lorem'
+      end
+      return if params[:query].blank?
+      @search_results = get_search_results
+    end
+
+    # Finds what is provided in "query" param with Ferret on EssenceText and EssenceRichtext
+    #
+    # @return [Array]
+    #
+    def get_search_results
+      search_results = []
+      %w(Alchemy::EssenceText Alchemy::EssenceRichtext).each do |e|
+        search_results += e.constantize.includes(:contents => {:element => :page}).find_with_ferret(
+          "*#{params[:query]}*",
+          {:limit => :all},
+          {:conditions => [
+            'alchemy_pages.public = ? AND alchemy_pages.layoutpage = ? AND alchemy_pages.restricted = ? AND alchemy_pages.language_id = ?',
+            true, false, false, session[:language_id]
+          ]}
+        )
+      end
+      if search_results.any?
+        search_results.sort { |y, x| x.ferret_score <=> y.ferret_score }
+      end
+    end
+
+    # A view helper that loads the search result page.
+    #
+    # === Raises a ActiveRecord::RecordNotFound error, if the page could not be found or is not published.
+    #
+    # @return [Alchemy::Page]
+    #
+    def find_search_result_page
+      if searchresult_page_layout = PageLayout.get_all_by_attributes(:searchresults => true).first
+        search_result_page = Page.published.where(
+          :page_layout => searchresult_page_layout["name"],
+          :language_id => session[:language_id]
+        ).limit(1).first
+      end
+      if search_result_page.nil?
+        logger.warn "\n++++++\nNo published search result page found. Please create one or publish your search result page.\n++++++\n"
+      end
+      search_result_page
+    end
+
+  end
+end

data/lib/alchemy/picture_attributes.rb

@@ -0,0 +1,29 @@
+module Alchemy
+  # Provides methods to secure your picture attributes against DOS attacks.
+  #
+  class PictureAttributes
+
+    SECURE_ATTRIBUTES = %w(id size crop crop_from crop_size quality).freeze
+
+    class << self
+
+      # Secures given attributes
+      #
+      # @param attributes [Hash]
+      # @return [String]
+      #
+      def secure(attributes)
+        Digest::SHA1.hexdigest(joined_attributes(attributes))[0..15]
+      end
+
+    private
+
+      # Takes attributes and joins them with the +security_token+ of your rails app.
+      #
+      def joined_attributes(attributes)
+        attributes.stringify_keys.values_at(*SECURE_ATTRIBUTES, Rails.configuration.secret_token).join('-')
+      end
+
+    end
+  end
+end

data/lib/alchemy/seeder.rb

@@ -8,7 +8,7 @@ module Alchemy
       # This seed builds the necessary page structure for alchemy in your database.
       # Run the alchemy:db:seed rake task to seed your database.
       def seed!
-        create_default_language
+        create_default_site
         create_root_page
       end
 
@@ -74,23 +74,17 @@ module Alchemy
 
     protected
 
-      def create_default_language
-        desc "Creating default language"
-        default_language = Alchemy::Config.get(:default_language)
-        lang = Alchemy::Language.find_or_initialize_by_language_code(
-          :name => default_language['name'],
-          :language_code => default_language['code'],
-          :frontpage_name => default_language['frontpage_name'],
-          :page_layout => default_language['page_layout'],
-          :public => true,
-          :default => true
+      def create_default_site
+        desc "Creating default site"
+        site = Alchemy::Site.find_or_initialize_by_host(
+          :name => 'Default Site',
+          :host => '*'
         )
-        if lang.new_record?
-          if lang.save!
-            log "Created language #{lang.name}."
-          end
+        if site.new_record?
+          site.save!
+          log "Created default site with default language."
         else
-          log "Language #{lang.name} was already present.", :skip
+          log "Default site was already present.", :skip
         end
       end
 

data/lib/alchemy/upgrader.rb

@@ -19,12 +19,29 @@ module Alchemy
         convert_essence_texts_displayed_as_checkbox_into_essence_booleans
         copy_new_config_file
         removed_richmedia_essences_notice
+        convert_picture_storage
+        upgrade_to_sites
+        removed_standard_set_notice
 
         display_todos
       end
 
     private
 
+      def upgrade_to_sites
+        desc "Creating default site and migrating existing languages to it"
+        if Site.count == 0
+          Alchemy::Site.transaction do
+            site = Alchemy::Site.new(host: '*', name: 'Default Site')
+            site.languages << Alchemy::Language.all
+            site.save!
+            log "Done."
+          end
+        else
+          log "Site(s) already present.", :skip
+        end
+      end
+
       # Creates Language model if it does not exist (Alchemy CMS prior v1.5)
       # Also creates missing associations between pages and languages
       def upgrade_to_language
@@ -182,15 +199,17 @@ module Alchemy
       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"
+        desc "Copy configuration file."
+        config_file = Rails.root.join('config/alchemy/config.yml')
+        default_config = File.join(File.dirname(__FILE__), '../../config/alchemy/config.yml')
+        if FileUtils.identical? default_config, config_file
+          log "Configuration file already present.", :skip
+        else
+          log "Custom configuration file found."
+          FileUtils.cp default_config, Rails.root.join('config/alchemy/config.yml.defaults')
+          log "Copied new default configuration file."
+          todo "Check the default configuration file (./config/alchemy/config.yml.defaults) for new configuration options and insert them into your 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
 
       def removed_richmedia_essences_notice
@@ -205,6 +224,38 @@ We left the tables in your database, you can simply drop them if you don't use t
 drop_table :alchemy_essence_audios
 drop_table :alchemy_essence_flashes
 drop_table :alchemy_essence_videos
+WARN
+        todo warn
+      end
+
+      def convert_picture_storage
+        desc "Convert the picture storage"
+        converted_images = []
+        images = Dir.glob Rails.root.join 'uploads/pictures/**/*.*'
+        if images.blank?
+          log "No pictures found", :skip
+        else
+          images.each do |image|
+            image_uid = image.gsub(/#{Rails.root.to_s}\/uploads\/pictures\//, '')
+            image_id = image_uid.split('/').last.split('.').first
+            picture = Alchemy::Picture.find_by_id(image_id)
+            if picture && picture.image_file_uid.blank?
+              picture.image_file_uid = image_uid
+              picture.image_file_size = File.new(image).size
+              if picture.save!
+                log "Converted #{image_uid}"
+              end
+            else
+              log "Picture with id #{image_id} not found or already converted.", :skip
+            end
+          end
+        end
+      end
+
+      def removed_standard_set_notice
+        warn = <<-WARN
+We removed the standard set from Alchemy core!
+In order to get the standard set back, install the `alchemy-demo_kit` gem.
 WARN
         todo warn
       end

data/lib/alchemy/version.rb

@@ -1,6 +1,6 @@
 module Alchemy
 
-  VERSION = "2.4.1"
+  VERSION = "2.5.0.b2"
 
   def self.version
     VERSION

data/lib/alchemy_cms.rb

@@ -1,11 +1,13 @@
-if defined?(Rails) && Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR == 2
+require 'rails'
+
+if 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'
+  require 'dragonfly'
   require 'dynamic_form'
-  require 'fleximage'
   require 'jquery-rails'
   require 'rails3-jquery-autocomplete'
   require 'kaminari'
@@ -23,12 +25,13 @@ if defined?(Rails) && Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR == 2
   require 'alchemy/version'
   require 'alchemy/auth_engine'
   require 'alchemy/engine'
-  %w(config essence page_layout modules tinymce i18n scoped_pagination_url_helper resource resources_helper).each do |class_name|
+  require 'alchemy/picture_attributes'
+  %w(config essence page_layout modules tinymce i18n scoped_pagination_url_helper resource resources_helper ferret_search).each do |class_name|
     require File.join(File.dirname(__FILE__), "alchemy", class_name)
   end
   require File.join(File.dirname(__FILE__), "alchemy", "seeder")
 else
-  raise "Alchemy 2.3 needs Rails 3.2 or higher. You are currently using Rails #{Rails::VERSION::STRING}"
+  raise "Alchemy 2.5 needs Rails 3.2 or higher. You are currently using Rails #{Rails::VERSION::STRING}"
 end
 
 module Alchemy

data/lib/rails/generators/alchemy/deploy_script/templates/deploy.rb.tt

@@ -55,6 +55,9 @@ set :rails_env,                 "production"
 
 # before hooks
 before "deploy:start",          "deploy:seed"
+<%- if @database_type == "mysql" -%>
+before "deploy:migrate",        "alchemy:db:dump"
+<%- end -%>
 before "deploy:create_symlink", "deploy:migrate"
 
 # after hooks

data/lib/rails/generators/alchemy/elements/elements_generator.rb

@@ -21,7 +21,11 @@ module Alchemy
           else
             @contents = (element["contents"] or [])
           end
-          @element_name = element["name"].underscore
+          if element["name"] =~ /\A[a-z0-9_-]+\z/
+            @element_name = element["name"].underscore
+          else
+            raise "Element name '#{element['name']}' has wrong format. Only lowercase and non whitespace characters allowed."
+          end
 
           conditional_template "editor.html.#{template_engine}", "#{@elements_dir}/_#{@element_name}_editor.html.#{template_engine}"
           conditional_template "view.html.#{template_engine}", "#{@elements_dir}/_#{@element_name}_view.html.#{template_engine}"

data/lib/rails/generators/alchemy/page_layouts/page_layouts_generator.rb

@@ -14,6 +14,7 @@ module Alchemy
       def create_partials
         @page_layouts = load_alchemy_yaml('page_layouts.yml')
         @page_layouts.each do |page_layout|
+          next if page_layout['redirects_to_external']
           @page_layout_name = page_layout["name"].underscore
           conditional_template "layout.html.#{template_engine}", "#{@page_layouts_dir}/_#{@page_layout_name}.html.#{template_engine}"
         end if @page_layouts

data/lib/rails/generators/alchemy/scaffold/scaffold_generator.rb

@@ -3,8 +3,7 @@ require 'rails'
 module Alchemy
   module Generators
     class ScaffoldGenerator < ::Rails::Generators::Base
-      desc "This generator generates the Alchemy scaffold. Pass --with-standard-set to copy Alchemys Standardset files into your app."
-      class_option 'with-standard-set', :type => :boolean, :desc => "Copy standard set files."
+      desc "This generator generates the Alchemy scaffold."
       source_root File.expand_path('templates', File.dirname(__FILE__))
 
       def create_config_dir
@@ -17,27 +16,19 @@ module Alchemy
       end
 
       def copy_config
-        @config_path = File.expand_path('../../../../../config/alchemy', File.dirname(__FILE__))
-        copy_file "#{@config_path}/config.yml", "#{Rails.root}/config/alchemy/config.yml"
+        copy_file "#{config_path}/config.yml", "#{Rails.root}/config/alchemy/config.yml"
       end
 
       def copy_files
-        if options['with-standard-set']
-          layouts_path = File.expand_path('../../../../../app/views/layouts/alchemy', File.dirname(__FILE__))
-          elements_path = File.expand_path('../../../../../app/views/alchemy/elements', File.dirname(__FILE__))
-          page_layouts_path = File.expand_path('../../../../../app/views/alchemy/page_layouts', File.dirname(__FILE__))
-          copy_file "#{@config_path}/elements.yml", "#{Rails.root}/config/alchemy/elements.yml"
-          copy_file "#{@config_path}/page_layouts.yml", "#{Rails.root}/config/alchemy/page_layouts.yml"
-          copy_file "#{layouts_path}/pages.html.erb", "#{Rails.root}/app/views/layouts/application.html.erb"
-          Dir.glob("#{elements_path}/*").reject { |file_path| !(File.basename(file_path) =~ /(.+)_(view|editor).html.erb/) }.each do |file_path|
-            copy_file file_path, "#{Rails.root}/app/views/alchemy/elements/#{File.basename(file_path)}"
-          end
-          directory "#{page_layouts_path}/", "#{Rails.root}/app/views/alchemy/page_layouts/"
-        else
-          copy_file "#{File.dirname(__FILE__)}/files/elements.yml", "#{Rails.root}/config/alchemy/elements.yml"
-          template "page_layouts.yml.tt", "#{Rails.root}/config/alchemy/page_layouts.yml"
-          copy_file "#{File.dirname(__FILE__)}/files/pages.html.erb", "#{Rails.root}/app/views/layouts/application.html.erb"
-        end
+        copy_file "#{File.dirname(__FILE__)}/files/elements.yml", "#{Rails.root}/config/alchemy/elements.yml"
+        template "page_layouts.yml.tt", "#{Rails.root}/config/alchemy/page_layouts.yml"
+        copy_file "#{File.dirname(__FILE__)}/files/application.html.erb", "#{Rails.root}/app/views/layouts/application.html.erb"
+      end
+
+    private
+
+      def config_path
+        @config_path ||= File.expand_path('../../../../../config/alchemy', File.dirname(__FILE__))
       end
 
     end