alchemy_cms 2.6.3 → 2.7.0

data/lib/alchemy/version.rb

@@ -1,6 +1,6 @@
 module Alchemy
 
-  VERSION = "2.6.3"
+  VERSION = "2.7.0"
 
   def self.version
     VERSION

data/lib/alchemy_cms.rb

@@ -1,52 +1,11 @@
 require 'rails'
 
+# Instantiate the global Alchemy namespace
+module Alchemy
+end
+
 if Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR == 2
-  require 'acts_as_list'
-  require 'acts-as-taggable-on'
-  require 'devise'
-  require 'devise-encryptable'
-  require 'awesome_nested_set'
-  require 'dragonfly'
-  require 'dynamic_form'
-  require 'jquery-rails'
-  require 'jquery-ui-rails'
-  require 'rails3-jquery-autocomplete'
-  require 'handles_sortable_columns'
-  require 'kaminari'
-  require 'userstamp'
-  require 'yaml'
-  require 'sass-rails'
-  require 'compass-rails'
-  require 'coffee-rails'
-  require 'sassy-buttons'
-  require 'declarative_authorization'
-  require 'extensions/hash'
-  require 'extensions/array'
-  require 'extensions/action_view'
-  require 'alchemy/mount_point'
-  require 'alchemy/version'
-  require 'alchemy/auth_engine'
   require 'alchemy/engine'
-  require 'alchemy/picture_attributes'
-  [
-    'config',
-    'logger',
-    'errors',
-    'essence',
-    'page_layout',
-    'modules',
-    'tinymce',
-    'i18n',
-    'scoped_pagination_url_helper',
-    'resource',
-    'resources_helper',
-    'ferret_search',
-    'filetypes',
-    'name_conversions'
-  ].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.5 needs Rails 3.2 or higher. You are currently using Rails #{Rails::VERSION::STRING}"
+  raise "Alchemy #{Alchemy::VERSION} needs Rails 3.2 or higher. You are currently using Rails #{Rails::VERSION::STRING}"
 end

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

@@ -94,7 +94,7 @@ namespace :deploy do
 
   desc 'Seeds the database'
   task :seed, :roles => :app, :except => { :no_release => true } do
-    run "cd #{release_path} #{rake} && RAILS_ENV=#{rails_env} db:seed"
+    run "cd #{release_path} && #{rake} RAILS_ENV=#{rails_env} db:seed"
   end
 
 end

data/lib/rails/generators/alchemy/devise/devise_generator.rb

@@ -9,11 +9,16 @@ module Alchemy
       def copy_devise_config
         copy_file "devise.rb", "#{Rails.root}/config/initializers/devise.rb"
         msg = <<-MSG
-If your are upgrading from Alchemy < 2.5.0, alter the encryptor to authlogic_sha512
-and the stretches value from 10 to 20:
+If your are upgrading from Alchemy < 2.5.0:
 
-  config.stretches = Rails.env.test? ? 1 : 20
-  config.encryptor = :authlogic_sha512
+1. Add `gem 'devise-encryptable'` into your Gemfile
+2. Run `bundle install`
+3. Alter the encryptor and the stretches value in your devise config:
+
+  # config/initializers/devise.rb
+  ...
+    config.stretches = Rails.env.test? ? 1 : 20
+    config.encryptor = :authlogic_sha512
 
 MSG
         puts msg

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

@@ -27,17 +27,18 @@ module Alchemy
   acts_as_essence(
     # Your options:
     #
-    # :ingredient_column =>   Symbol      # Specifies the column name you use for storing the content in the database. [Default] :body
-    # :validate_column =>     Symbol      # Which column should be validated. [Default] ingredient_column
-    # :preview_text_column => Symbol      # Specifies the column for the preview_text method. [Default] ingredient_column
-    # :preview_text_method => Symbol      # A method called on ingredient to get the preview text.
+    # ingredient_column:   [String or Symbol] - Specifies the column name you use for storing the content in the database. (Default :body)
+    # validate_column:     [String or Symbol] - Which column should be validated. (Default: ingredient_column)
+    # preview_text_column: [String or Symbol] - Specifies the column for the preview_text method. (Default: ingredient_column)
+    # preview_text_method: [String or Symbol] - A method called on ingredient to get the preview text. (Default: ingredient_column)
   )
 CLASSMETHOD
       end
 
       def copy_templates
-        template "view.html.erb", "#{@essence_view_path}/_#{@essence_name}_view.html.erb"
-        template "editor.html.erb", "#{@essence_view_path}/_#{@essence_name}_editor.html.erb"
+        essence_name = @essence_name.classify.demodulize
+        template "view.html.erb", "#{@essence_view_path}/_#{essence_name}_view.html.erb"
+        template "editor.html.erb", "#{@essence_view_path}/_#{essence_name}_editor.html.erb"
       end
 
       def show_todo

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

@@ -6,7 +6,7 @@
   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) %>">
+<div class="content_editor <%= @essence_name.classify.demodulize %>" id="<%%= content_dom_id(content) %>">
   <%%= label_and_remove_link(content) %>
   <%%= text_field_tag(
     content.form_field_name,

data/lib/rails/generators/alchemy/scaffold/files/_standard.html.erb

@@ -0,0 +1 @@
+<%= render_elements %>

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

@@ -31,6 +31,7 @@ module Alchemy
         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"
+        copy_file "#{File.dirname(__FILE__)}/files/_standard.html.erb", "#{Rails.root}/app/views/alchemy/page_layouts/_standard.html.erb"
       end
 
     private

data/lib/rails/generators/alchemy/site_layouts/site_layouts_generator.rb

@@ -0,0 +1,23 @@
+require File.join(__FILE__, '../../base')
+
+module Alchemy
+  module Generators
+    class SiteLayoutsGenerator < Base
+      desc "This generator generates your site layouts view partials."
+      source_root File.expand_path('templates', File.dirname(__FILE__))
+
+      def create_directory
+        @site_layouts_dir = "#{Rails.root}/app/views/alchemy/site_layouts"
+        empty_directory @site_layouts_dir
+      end
+
+      def create_partials
+        @sites = Alchemy::Site.all
+        @sites.each do |site|
+          @site_name = site.name.parameterize.underscore
+          conditional_template "layout.html.#{template_engine}", "#{@site_layouts_dir}/_#{@site_name}.html.#{template_engine}"
+        end if @sites
+      end
+    end
+  end
+end

data/lib/rails/generators/alchemy/site_layouts/templates/layout.html.erb

@@ -0,0 +1 @@
+<%%= yield %>

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

@@ -0,0 +1 @@
+= yield

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

@@ -0,0 +1 @@
+= yield

data/lib/rails/templates/alchemy.rb

@@ -1,8 +1,8 @@
 # This rails template installs Alchemy and all depending gems.
-require 'alchemy/version'
+require File.expand_path('../../../alchemy/version', __FILE__)
 
 gem 'alchemy_cms', "~> #{Alchemy::VERSION}"
 
 if yes?("\nDo you want to use Capistrano for deployment? (y/N)")
-  gem 'capistrano', :group => :development
+  gem 'capistrano', group: 'development'
 end

data/lib/tasks/alchemy/db.rake

@@ -1,3 +1,5 @@
+require 'alchemy/seeder'
+
 namespace :alchemy do
   namespace :db do
 
@@ -10,7 +12,7 @@ namespace :alchemy do
     task :dump => :environment do
       db_conf = Rails.configuration.database_configuration.fetch(Rails.env)
       raise "Sorry, but Alchemy only supports MySQL database dumping at the moment." unless db_conf['adapter'] =~ /mysql/
-      dump_store = ENV['DUMP_FILENAME'] ? " > #{Rails.root.join('db/dumps', dump_name)}" : ""
+      dump_store = ENV['DUMP_FILENAME'] ? " > #{ENV['DUMP_FILENAME']}" : ""
       cmd = "mysqldump --user='#{db_conf['username']}'#{db_conf['password'].present? ? " --password='#{db_conf['password']}'" : nil} #{db_conf['database']}#{dump_store}"
       system cmd
     end

data/lib/tasks/alchemy/tidy.rake

@@ -0,0 +1,82 @@
+namespace :alchemy do
+  namespace :tidy do
+
+    desc "Tidy up Alchemy database."
+    task :up do
+      Rake::Task['alchemy:tidy:cells'].invoke
+      Rake::Task['alchemy:tidy:element_positions'].invoke
+    end
+
+    desc "Creates missing cells for pages."
+    task :cells => :environment do
+      cells = Alchemy::Cell.definitions
+      page_layouts = Alchemy::PageLayout.all
+      if cells && page_layouts
+        Alchemy::Tidy.create_missing_cells(page_layouts, cells)
+      else
+        puts "No page layouts or cell definitions found."
+      end
+    end
+
+    desc "Fixes element positions."
+    task :element_positions => [:environment] do
+      Alchemy::Tidy.update_element_positions
+    end
+
+  end
+end
+
+module Alchemy
+  class Tidy
+    extend Shell
+
+    def self.create_missing_cells(page_layouts, cells)
+      desc "Create missing cells"
+      page_layouts.each do |layout|
+        next if layout['cells'].blank?
+        cells_for_layout = cells.select { |cell| layout['cells'].include? cell['name'] }
+        Alchemy::Page.where(page_layout: layout['name']).each do |page|
+          cells_for_layout.each do |cell_for_layout|
+            cell = Alchemy::Cell.find_or_initialize_by_name_and_page_id(name: cell_for_layout['name'], page_id: page.id)
+            cell.elements << page.elements.select { |element| cell_for_layout['elements'].include?(element.name) }
+            if cell.new_record?
+              cell.save
+              log "Creating cell #{cell.name} for page #{page.name}"
+            else
+              log "Cell #{cell.name} for page #{page.name} already present", :skip
+            end
+          end
+        end
+      end
+    end
+
+    def self.update_element_positions
+      desc "Update element positions"
+      Alchemy::Page.all.each do |page|
+        page.elements.group_by(&:cell_id).each do |cell_id, elements|
+          elements.each_with_index do |element, idx|
+            position = idx + 1
+            if element.position != position
+              log "Updating position for element ##{element.id} to #{position}"
+              element.update_column(:position, position)
+            else
+              log "Position for element ##{element.id} is already correct", :skip
+            end
+          end
+        end
+      end
+    end
+
+    # TODO: implement remove_orphan_cells
+    def self.remove_orphan_cells(page_layouts, cells)
+      puts "== Remove cell orphans"
+      Alchemy::Cell.all.each do |cell|
+        if cells.detect { |cell| cell['name'] == cell.name }.nil?
+          # move elements to page or into another cell of page
+          # remove cell from database
+        end
+      end
+    end
+
+  end
+end

data/lib/tasks/alchemy/upgrade.rake

@@ -1,4 +1,5 @@
-require File.join(File.dirname(__FILE__), '../../alchemy/upgrader.rb')
+require 'alchemy/upgrader'
+require 'alchemy/version'
 
 namespace :alchemy do
 

data/spec/controllers/admin/attachments_controller_spec.rb

@@ -0,0 +1,124 @@
+require 'spec_helper'
+
+module Alchemy
+  describe Admin::AttachmentsController do
+
+    let(:attachment) { mock_model('Attachment', file_name: 'testfile', file_mime_type: 'image/png', file: mock('File', data: nil)) }
+
+    before do
+      sign_in(admin_user)
+    end
+    
+    describe "#index" do
+
+      it "should always paginate the records" do
+        Attachment.should_receive(:find_paginated)
+        get :index
+      end
+
+      context "when params[:tagged_with] is set" do
+        it "should filter the records by tags" do
+          Attachment.should_receive(:tagged_with).and_return(Attachment.scoped)
+          get :index, tagged_with: "pdf"
+        end
+      end
+
+      context "when params[:content_id]" do
+        render_views
+
+        context "is set" do
+          it "should render the archive_overlay partial" do
+            Content.stub!(:find).with('1', {:select => 'id'}).and_return(mock_model(Content))
+            get :index, {content_id: 1, format: :html}
+            expect(response).to render_template(partial: '_archive_overlay')
+          end
+        end
+
+        context "is not set" do
+          it "should render the default index view" do
+            get :index
+            expect(response).to render_template(:index)
+          end
+        end
+
+      end
+
+    end
+    
+    describe "#new" do
+      
+      context "in overlay" do
+
+        before do
+          controller.stub!(:in_overlay?).and_return(true)
+          Content.stub(:find).and_return(mock_model('Content'))
+        end
+
+        it "should set @while_assigning to true" do
+          get :new
+          assigns(:while_assigning).should eq(true)
+        end
+
+        it "should set @swap to params[:swap]" do
+          get :new, swap: 'true'
+          assigns(:swap).should eq('true')
+        end
+      end
+
+    end
+
+    describe "#show" do
+      before do
+        Attachment.stub!(:find).with("#{attachment.id}").and_return(attachment)
+      end
+
+      it "should assign @attachment with Attachment found by id" do
+        get :edit, id: attachment.id
+        expect(assigns(:attachment)).to eq(attachment)
+      end
+
+      context "if xhr request" do
+        it "should render no layout" do
+          xhr :get, :edit, id: attachment.id
+          expect(@layouts).to be_empty
+        end
+      end
+    end
+
+    describe "#edit" do
+      before do
+        Attachment.stub!(:find).with("#{attachment.id}").and_return(attachment)
+      end
+
+      it "should assign @attachment with Attachment found by id" do
+        get :edit, id: attachment.id
+        expect(assigns(:attachment)).to eq(attachment)
+      end
+
+      context "if xhr request" do
+        it "should render no layout" do
+          xhr :get, :edit, id: attachment.id
+          expect(@layouts).to be_empty
+        end
+      end
+    end
+
+    describe "#download" do
+      before do
+        Attachment.stub!(:find).with("#{attachment.id}").and_return(attachment)
+        controller.stub!(:render).and_return(nil)
+      end
+
+      it "should assign @attachment with Attachment found by id" do
+        get :download, id: attachment.id
+        expect(assigns(:attachment)).to eq(attachment)
+      end
+
+      it "should send the data to the browser" do
+        controller.should_receive(:send_data)
+        get :download, id: attachment.id
+      end
+    end
+
+  end
+end

data/spec/controllers/admin/base_controller_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe Alchemy::Admin::BaseController do
+
+  describe '#options_from_params' do
+    subject { controller.send(:options_from_params) }
+
+    context "params[:options] is a JSON string" do
+      before { controller.stub(:params).and_return(options: '{"hallo":"World"}') }
+
+      it "parses the string into an object" do
+        expect(subject).to be_an_instance_of(Hash)
+        expect(subject).to eq({hallo: 'World'})
+      end
+    end
+
+    context "params[:options] is already an object" do
+      before { controller.stub(:params).and_return(options: {hallo: "World"}) }
+
+      it "parses the string into an object" do
+        expect(subject).to be_an_instance_of(Hash)
+      end
+    end
+
+    context "params[:options] is not present" do
+      before { controller.stub(:params).and_return({}) }
+
+      it "returns ampty object" do
+        expect(subject).to be_an_instance_of(Hash)
+        expect(subject).to eq({})
+      end
+    end
+  end
+
+end