alchemy_cms 2.4.beta2 → 2.4.rc1

data/db/migrate/20121113115120_create_alchemy_essence_links.rb

@@ -0,0 +1,13 @@
+class CreateAlchemyEssenceLinks < ActiveRecord::Migration
+  def change
+    create_table :alchemy_essence_links do |t|
+      t.string :link
+      t.string :link_title
+      t.string :link_target
+      t.string :link_class_name
+
+      t.timestamps
+      t.userstamps
+    end
+  end
+end

data/db/migrate/20121115100736_add_cached_tag_list_to_elements_pages_and_users.rb

@@ -0,0 +1,7 @@
+class AddCachedTagListToElementsPagesAndUsers < ActiveRecord::Migration
+  def change
+    add_column :alchemy_elements, :cached_tag_list, :text
+    add_column :alchemy_pages,    :cached_tag_list, :text
+    add_column :alchemy_users,    :cached_tag_list, :text
+  end
+end

data/db/migrate/20121116140636_add_cached_tag_list_to_alchemy_attachments.rb

@@ -0,0 +1,5 @@
+class AddCachedTagListToAlchemyAttachments < ActiveRecord::Migration
+  def change
+    add_column :alchemy_attachments, :cached_tag_list, :text
+  end
+end

data/db/migrate/20121116141016_change_alchemy_pictures_tag_list_column.rb

@@ -0,0 +1,9 @@
+class ChangeAlchemyPicturesTagListColumn < ActiveRecord::Migration
+  def up
+    change_column :alchemy_pictures, :cached_tag_list, :text, :limit => nil
+  end
+
+  def down
+    change_column :alchemy_pictures, :cached_tag_list, :string
+  end
+end

data/lib/alchemy/engine.rb

@@ -13,7 +13,7 @@ module Alchemy
       app.config.assets.precompile += [
         "alchemy/alchemy.js",
         "alchemy/preview.js",
-        "alchemy/alchemy.css",
+        "alchemy/admin.css",
         "alchemy/menubar.css",
         "alchemy/menubar.js",
         "alchemy/print.css",

data/lib/alchemy/resource.rb

@@ -92,4 +92,4 @@ module Alchemy
     end
 
   end
-end
+end

data/lib/alchemy/resources_helper.rb

@@ -61,4 +61,4 @@ module Alchemy
       obj
     end
   end
-end
+end

data/lib/alchemy/upgrader.rb

@@ -17,6 +17,7 @@ module Alchemy
         convert_essence_texts_displayed_as_select_into_essence_selects
         convert_essence_texts_displayed_as_checkbox_into_essence_booleans
         copy_new_config_file
+        removed_richmedia_essences_notice
 
         display_todos
       end
@@ -191,6 +192,22 @@ module Alchemy
         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
+        warn = <<-WARN
+We removed the EssenceAudio, EssenceFlash and EssenceVideo essences from Alchemy core!
+In order to get the essences back, install the `alchemy-richmedia-essences` gem.
+
+gem 'alchemy-richmedia-essences'
+
+We left the tables in your database, you can simply drop them if you don't use these essences in your project.
+
+drop_table :alchemy_essence_audios
+drop_table :alchemy_essence_flashes
+drop_table :alchemy_essence_videos
+WARN
+        todo warn
+      end
+
     end
 
   end

data/lib/alchemy/version.rb

@@ -1,6 +1,6 @@
 module Alchemy
 
-  VERSION = "2.4.beta2"
+  VERSION = "2.4.rc1"
 
   def self.version
     VERSION

data/lib/alchemy_cms.rb

@@ -7,6 +7,7 @@ if defined?(Rails) && Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR == 2
   require 'dynamic_form'
   require 'fleximage'
   require 'jquery-rails'
+  require 'rails3-jquery-autocomplete'
   require 'kaminari'
   require 'userstamp'
   require 'yaml'

data/lib/rails/generators/alchemy/base.rb

@@ -0,0 +1,41 @@
+require 'rails'
+
+module Alchemy
+  module Generators
+    class Base < ::Rails::Generators::Base
+      class_option :template_engine, :type => :string, :aliases => '-e', :desc => 'Template engine for the views. Available options are "erb", "haml", and "slim".'
+
+      private
+
+      def conditional_template(source, destination)
+        files = Dir.glob(destination.gsub(/\.([a-z]+)$/, '*'))
+        if files.any?
+          ext = File.extname(files.first)[1..-1]
+
+          # If view already exists using a different template engine, change
+          # source and destination file names to use that engine.
+          if ext != template_engine.to_s
+            say_status :warning, "View uses unexpected template engine '#{ext}'.", :cyan
+            destination.gsub!(/#{template_engine}$/, ext)
+            source.gsub!(/#{template_engine}$/, ext)
+          end
+        end
+
+        template source, destination
+      end
+
+      def template_engine
+        # Rails is clever enough to default this to whatever template
+        # engine is configured through its generator configuration,
+        # but we'll default it to erb anyway, just in case.
+        options[:template_engine] || 'erb'
+      end
+
+      def load_alchemy_yaml(name)
+        YAML.load_file "#{Rails.root}/config/alchemy/#{name}"
+      rescue Errno::ENOENT
+        puts "\nERROR: Could not read config/alchemy/#{name} file. Please run: rails generate alchemy:scaffold"
+      end
+    end
+  end
+end

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

@@ -28,6 +28,7 @@ role :db,                       "<%= @server %>", :primary => true
 
 # the webserver path
 set :deploy_to,                 "<%= @deploy_path %>"
+set :deploy_via,                :remote_cache
 
 # repository settings
 <%- if @scm == "svn" -%>
@@ -46,6 +47,9 @@ set :repository,                "<%= @repository_url %>"
 set :branch,                    "master"
 <%- end -%>
 
+# rails env
+set :rails_env,                 "production"
+
 # before hooks
 before "deploy:start",          "deploy:seed"
 before "deploy:create_symlink", "deploy:migrate"
@@ -91,11 +95,14 @@ end
 
 ## defaults
 
-# rails env
-set :rails_env,                 "production"
-
 # enable bundler binstubs
 set :bundle_flags,              "--deployment --binstubs"
 
 # do not use sudo
 set :use_sudo,                  false
+
+# enable ssh-agent forwarding
+ssh_options[:forward_agent] =   true
+
+# Enable git password prompting
+default_run_options[:pty]   =   true

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

@@ -1,8 +1,8 @@
-require 'rails'
+require File.join(__FILE__, '../../base')
 
 module Alchemy
   module Generators
-    class ElementsGenerator < ::Rails::Generators::Base
+    class ElementsGenerator < Base
       desc "This generator generates your elements view partials."
       source_root File.expand_path('templates', File.dirname(__FILE__))
 
@@ -12,7 +12,7 @@ module Alchemy
       end
 
       def create_partials
-        @elements = get_elements_from_yaml
+        @elements = load_alchemy_yaml('elements.yml')
         @elements.each do |element|
           @element = element
           if @element['available_contents']
@@ -22,19 +22,11 @@ module Alchemy
             @contents = (element["contents"] or [])
           end
           @element_name = element["name"].underscore
-          template "editor.html.erb", "#{@elements_dir}/_#{@element_name}_editor.html.erb"
-          template "view.html.erb", "#{@elements_dir}/_#{@element_name}_view.html.erb"
-        end if @elements
-      end
-
-      private
 
-      def get_elements_from_yaml
-        YAML.load_file "#{Rails.root}/config/alchemy/elements.yml"
-      rescue Errno::ENOENT
-        puts "\nERROR: Could not read config/alchemy/elements.yml file. Please run: rails generate alchemy:scaffold"
+          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}"
+        end if @elements
       end
-
     end
   end
 end

data/lib/rails/generators/alchemy/elements/templates/editor.html.erb

@@ -1,12 +1,14 @@
+<%%= element_editor_for(element) do |el| -%>
 <%- if @element['picture_gallery'] -%>
-<%%= render_picture_gallery_editor(element, :max_images => nil, :crop => true) %>
+  <%%= render_picture_gallery_editor(element, :max_images => nil, :crop => true) %>
 <%- end -%>
 <% @contents.each do |content| -%>
-<%%= render_essence_editor_by_name(element, '<%= content["name"] %>') %>
+  <%%= el.edit :<%= content["name"] %> %>
 <% end -%>
 <%- if @element['available_contents'] -%>
-<%% element.contents.where(:name => ['<%= @available_contents_names.join("', '") %>']).each do |content| %>
-  <%%= render_essence_editor content %>
-<%% end %>
-<p><%%= render_new_content_link(element) %></p>
+  <%% element.contents.where(:name => ['<%= @available_contents_names.join("', '") %>']).each do |content| %>
+    <%%= render_essence_editor content %>
+  <%% end %>
+  <p><%%= render_new_content_link(element) %></p>
 <%- end -%>
+<%%- end -%>

data/lib/rails/generators/alchemy/elements/templates/editor.html.haml

@@ -0,0 +1,13 @@
+= element_editor_for(element) do |el|
+<%- if @element['picture_gallery'] -%>
+  = render_picture_gallery_editor(element, :max_images => nil, :crop => true)
+<%- end -%>
+<% @contents.each do |content| -%>
+  = el.edit :<%= content["name"] %>
+<% end -%>
+<%- if @element['available_contents'] -%>
+  - element.contents.where(:name => ['<%= @available_contents_names.join("', '") %>']).each do |content|
+    = render_essence_editor content
+
+  %p= render_new_content_link(element)
+<% end -%>

data/lib/rails/generators/alchemy/elements/templates/editor.html.slim

@@ -0,0 +1,13 @@
+= element_editor_for(element) do |el|
+<%- if @element['picture_gallery'] -%>
+  = render_picture_gallery_editor(element, :max_images => nil, :crop => true)
+<%- end -%>
+<% @contents.each do |content| -%>
+  = el.edit :<%= content["name"] %>
+<% end -%>
+<%- if @element['available_contents'] -%>
+  - element.contents.where(:name => ['<%= @available_contents_names.join("', '") %>']).each do |content|
+    = render_essence_editor content
+
+  p= render_new_content_link(element)
+<% end -%>

data/lib/rails/generators/alchemy/elements/templates/view.html.erb

@@ -1,4 +1,4 @@
-<div class="<%= @element_name %>" id="<%%= element_dom_id(element) %>"<%%= element_preview_code(element) %>>
+<%%= element_view_for(element) do |el| -%>
 <%- if @element["picture_gallery"] -%>
   <div class="<%= @element_name %>_images">
     <%%- element.contents.gallery_pictures.each do |image| -%>
@@ -11,10 +11,10 @@
 <%- @contents.each do |content| -%>
   <%- if @contents.length > 1 -%>
   <div class="<%= content["name"] %>">
-    <%%= render_essence_view_by_name(element, '<%= content["name"] %>') %>
+    <%%= el.render :<%= content["name"] %> %>
   </div>
   <%- else -%>
-  <%%= render_essence_view_by_name(element, '<%= content["name"] %>') %>
+  <%%= el.render :<%= content["name"] %> %>
   <%- end -%>
 <%- end -%>
-</div>
+<%%- end -%>

data/lib/rails/generators/alchemy/elements/templates/view.html.haml

@@ -0,0 +1,15 @@
+= element_view_for(element) do |el|
+<%- if @element["picture_gallery"] -%>
+  .<%= @element_name %>_images
+    - element.contents.gallery_pictures.each do |image|
+    .<%= @element_name %>_image<%= image.essence.css_class ? ".#{image.essence.css_class}" : '' %>
+      = render_essence_view(image, :image_size => "160x120")
+<%- end -%>
+<%- @contents.each do |content| -%>
+  <%- if @contents.length > 1 -%>
+  .<%= content["name"] %>
+    = el.render :<%= content["name"] %>
+  <%- else -%>
+  = el.render :<%= content["name"] %>
+  <%- end -%>
+<%- end -%>

data/lib/rails/generators/alchemy/elements/templates/view.html.slim

@@ -0,0 +1,15 @@
+= element_view_for(element) do |el|
+<%- if @element["picture_gallery"] -%>
+  .<%= @element_name %>_images
+    - element.contents.gallery_pictures.each do |image|
+    .<%= @element_name %>_image<%= image.essence.css_class ? ".#{image.essence.css_class}" : '' %>
+      = render_essence_view(image, :image_size => "160x120")
+<%- end -%>
+<%- @contents.each do |content| -%>
+  <%- if @contents.length > 1 -%>
+  .<%= content["name"] %>
+    = el.render :<%= content["name"] %>
+  <%- else -%>
+  = el.render :<%= content["name"] %>
+  <%- end -%>
+<%- end -%>

data/lib/rails/generators/alchemy/essence/essence_generator.rb

@@ -8,7 +8,7 @@ module Alchemy
       source_root File.expand_path('templates', File.dirname(__FILE__))
 
       def init
-        @essence_name = essence_name.underscore
+        @essence_name = Alchemy::Content.normalize_essence_type(essence_name).underscore
         @essence_view_path = Rails.root.join('app/views/alchemy/essences')
       end
 

data/lib/rails/generators/alchemy/essence/templates/editor.html.erb

@@ -6,13 +6,12 @@
   Please consult Alchemy::Content.rb docs for further methods on the content object
 %>
 <%% cache(content) do %>
-
 <div class="content_editor <%= @essence_name %>" id="<%%= content_dom_id(content) %>">
-  <%%#= text_field_tag(
+  <%%= label_and_remove_link(content) %>
+  <%%= text_field_tag(
     content.form_field_name,
     content.ingredient,
     :id => content.form_field_id
   ) %>
 </div>
-
 <%% end %>

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

@@ -1,8 +1,8 @@
-require 'rails'
+require File.join(__FILE__, '../../base')
 
 module Alchemy
   module Generators
-    class PageLayoutsGenerator < ::Rails::Generators::Base
+    class PageLayoutsGenerator < Base
       desc "This generator generates your page_layouts view partials."
       source_root File.expand_path('templates', File.dirname(__FILE__))
 
@@ -12,21 +12,12 @@ module Alchemy
       end
 
       def create_partials
-        @page_layouts = get_page_layouts_from_yaml
+        @page_layouts = load_alchemy_yaml('page_layouts.yml')
         @page_layouts.each do |page_layout|
           @page_layout_name = page_layout["name"].underscore
-          template "layout.html.erb", "#{@page_layouts_dir}/_#{@page_layout_name}.html.erb"
+          conditional_template "layout.html.#{template_engine}", "#{@page_layouts_dir}/_#{@page_layout_name}.html.#{template_engine}"
         end if @page_layouts
       end
-
-      private
-
-      def get_page_layouts_from_yaml
-        YAML.load_file "#{Rails.root}/config/alchemy/page_layouts.yml"
-      rescue Errno::ENOENT
-        puts "\nERROR: Could not read config/alchemy/page_layouts.yml file. Please run: rails generate alchemy:scaffold"
-      end
-
     end
   end
 end

data/lib/rails/generators/alchemy/page_layouts/templates/layout.html.haml

@@ -0,0 +1 @@
+= render_elements

data/lib/rails/generators/alchemy/page_layouts/templates/layout.html.slim

@@ -0,0 +1 @@
+= render_elements

data/spec/controllers/pages_controller_spec.rb

@@ -58,11 +58,9 @@ describe Alchemy::PagesController do
     end
 
     context "with params layout set to not existing layout" do
-
-      it "should raise ActionController::RoutingError" do
-        expect { get :show, :urlname => :home, :layout => 'lkuiuk' }.to raise_error(ActionController::RoutingError)
+      it "should raise ActionView::MissingTemplate" do
+        expect { get :show, :urlname => :home, :layout => 'lkuiuk' }.to raise_error(ActionView::MissingTemplate)
       end
-
     end
 
     context "with param layout set to a custom layout" do
@@ -84,36 +82,6 @@ describe Alchemy::PagesController do
       end
 
     end
-
-    context "with application layout absent" do
-
-      it "should render pages layout" do
-        get :show, :urlname => :home
-        response.body.should_not have_content('I am the application layout')
-      end
-
-    end
-
-    context "with application layout present" do
-
-      before do
-        @app_layout = Rails.root.join('app/views/layouts', 'application.html.erb')
-        File.open(@app_layout, 'w') do |app_layout|
-          app_layout.puts "<html>I am the application layout</html>"
-        end
-      end
-
-      it "should render application layout" do
-        get :show, :urlname => :home
-        response.body.should have_content('I am the application layout')
-      end
-
-      after do
-        FileUtils.rm(@app_layout)
-      end
-
-    end
-
   end
 
   describe "url nesting" do
@@ -157,4 +125,43 @@ describe Alchemy::PagesController do
     end
   end
 
+  describe '#redirect_to_public_child' do
+
+    let(:root_page)    { FactoryGirl.create(:language_root_page, :public => false) }
+    let(:page)         { FactoryGirl.create(:page, :parent_id => root_page.id) }
+    let(:public_page)  { FactoryGirl.create(:public_page, :parent_id => page.id) }
+
+    before { controller.instance_variable_set("@page", root_page) }
+
+    context "with unpublished and published pages in page tree" do
+
+      before do
+        public_page
+        root_page.reload
+      end
+
+      it "should redirect to first public child" do
+        controller.should_receive(:redirect_page)
+        controller.send(:redirect_to_public_child)
+        controller.instance_variable_get('@page').should == public_page
+      end
+
+    end
+
+    context "with only unpublished pages in page tree" do
+
+      before do
+        page
+        root_page.reload
+      end
+
+      it "should raise not found error" do
+        expect {
+          controller.send(:redirect_to_public_child)
+        }.to raise_error(ActionController::RoutingError)
+      end
+
+    end
+  end
+
 end