alchemy_cms 2.3.2 → 2.4.beta2

data/lib/alchemy/version.rb

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

data/lib/rails/generators/alchemy/deploy_script/deploy_script_generator.rb

@@ -10,26 +10,59 @@ module Alchemy
       source_root File.expand_path('templates', File.dirname(__FILE__))
 
       def copy_script
+        @scm = options[:scm]
+        @database_type = options[:db]
+
         @server = ask('Please enter server ip or domain:')
-        if !yes?('Do you use ssh public keys to connect to your server? (y/N)')
-          if @store_credentials = yes?('Do want to store the ssh credentials? (PLEASE DO NOT STORE THEM IF THE REPOSITORY IS PUBLIC) (y/N)')
-            @ssh_user = ask('Please enter ssh username:')
-            @ssh_password = ask('Please enter ssh password:')
-            port = ask('Please enter ssh port (22):')
-            @ssh_port = port.blank? ? "22" : port
-          end
+        if @store_credentials = yes?('Do want to store the ssh credentials? (PLEASE DO NOT STORE THEM IF THE REPOSITORY IS PUBLIC) (y/N)')
+          ask_for_credentials
         end
         @deploy_path = ask('Please enter the path to the public html folder:')
-        @scm = options[:scm]
-        @repository_url = ask('Please enter the URL to your projects repository:')
+        if @scm == "git"
+          @repository_url = get_git_remote
+        end
+        if @repository_url.nil?
+          @repository_url = ask('Please enter the URL to your projects repository:')
+        end
         if @scm == "svn" && yes?('Is your repository private? (y/N)')
-          @scm_user = ask('Please enter the username for your repository:')
-          @scm_password = ask('Please enter the password to your repository:')
+          ask_for_repo_credentials
         end
-        @database_type = options[:db]
         template "deploy.rb.tt", Rails.root.join('config', 'deploy.rb')
+        setup_capistrano
+        show_read_me
+      end
+
+    private
+
+      def ask_for_credentials
+        @ssh_user = ask('Please enter ssh username:')
+        port = ask('Please enter ssh port (22):')
+        @ssh_port = port.blank? ? "22" : port
+        @no_ssh_public_keys = !yes?('Do you use ssh public keys to connect to your server? (y/N)')
+        if @no_ssh_public_keys
+          @ssh_password = ask('Please enter ssh password:')
+        end
+      end
+
+      def ask_for_repo_credentials
+        @scm_user = ask('Please enter the username for your repository:')
+        @scm_password = ask('Please enter the password to your repository:')
+      end
+
+      def get_git_remote
+        remotes = `git remote -v`.split("\n")
+        remote = remotes.first
+        if remote
+          remote.split("\t")[1].split(" ")[0]
+        end
+      end
+
+      def setup_capistrano
         puts "\nSetting up Capistrano"
         `capify .`
+      end
+
+      def show_read_me
         puts "\nWe are done!\n"
         puts "\nPlease run 'cap deploy:setup'\n to setup the server for deployment."
         puts "\nIf you want to deploy Alchemy the first time type:\ncap deploy:cold"

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

@@ -3,16 +3,18 @@ require 'alchemy/capistrano'
 load 'deploy/assets'
 
 # ssh settings
-<%- if @ssh_user.blank? -%>
+<%- if @ssh_user.blank? || !@store_credentials -%>
 set(:user)                      { Capistrano::CLI.ui.ask('Enter your ssh username: ') }
 <%- else -%>
 set :user,                      "<%= @ssh_user %>"
 <%- end -%>
+<%- if @no_ssh_public_keys -%>
 <%- if @ssh_password.blank? -%>
 set(:password)                  { Capistrano::CLI.password_prompt("Enter the password for #{user}: ") }
 <%- else -%>
 set :password,                  "<%= @ssh_password %>"
 <%- end -%>
+<%- end -%>
 <%- if @ssh_port != "22" && !@store_credentials -%>
 set(:port)                      { Capistrano::CLI.ui.ask('Enter the ssh port: ') }
 <%- elsif @ssh_port != "22" && @store_credentials -%>

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

@@ -0,0 +1,51 @@
+require 'rails'
+
+module Alchemy
+  module Generators
+    class EssenceGenerator < ::Rails::Generators::Base
+      desc "This generator generates an Alchemy essence for you."
+      argument :essence_name, :banner => "YourEssenceName"
+      source_root File.expand_path('templates', File.dirname(__FILE__))
+
+      def init
+        @essence_name = essence_name.underscore
+        @essence_view_path = Rails.root.join('app/views/alchemy/essences')
+      end
+
+      def create_model
+        invoke("model", [@essence_name])
+      end
+
+      def create_directory
+        empty_directory @essence_view_path
+      end
+
+      def act_as_essence
+        essence_class_file = Rails.root.join('app/models', "#{@essence_name}.rb")
+        essence_class = @essence_name.classify
+        inject_into_class essence_class_file, essence_class, <<-CLASSMETHOD
+  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.
+  )
+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"
+      end
+
+      def show_todo
+        say "\nPlease open the generated migration file and add your columns to your table."
+        say "Then run 'rake db:migrate' to update your database."
+        say "Also check the generated view files and alter them to fit your needs."
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+<%%#
+  Available locals:
+  * content (The object the essence is linked to the element)
+  * html_options
+
+  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(
+    content.form_field_name,
+    content.ingredient,
+    :id => content.form_field_id
+  ) %>
+</div>
+
+<%% end %>

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

@@ -0,0 +1,2 @@
+<%%# The content object holds the essence %>
+<%%= content.ingredient %>

data/lib/rails/templates/alchemy.rb

@@ -5,7 +5,7 @@ require 'alchemy/version'
 
 gem 'alchemy_cms', "~> #{Alchemy::VERSION}"
 gem 'ruby-debug', :group => :development, :platform => :ruby_18
-gem 'ruby-debug19', :group => :development, :platform => :ruby_19
+gem 'debugger', :group => :development, :platform => :ruby_19
 
 if yes?("\nDo you want to use Capistrano for deployment? (y/N)")
   gem 'capistrano', :group => :development

data/lib/tasks/install.rake

@@ -1,8 +1,60 @@
+require 'thor'
+
+class Alchemy::RoutesInjector < Thor
+  include Thor::Actions
+
+  def initialize; super; end
+
+  no_tasks do
+    def inject
+      mountpoint = ask "\nWhere do you want to mount Alchemy CMS? (/)"
+      mountpoint = "/" if mountpoint.empty?
+      sentinel = /\.routes\.draw do(?:\s*\|map\|)?\s*$/
+      inject_into_file "./config/routes.rb", "\n  mount Alchemy::Engine => '#{mountpoint}'\n", { :after => sentinel, :verbose => true }
+    end
+  end
+end
+
 namespace :alchemy do
 
+  desc "Installs Alchemy CMS into your app."
+  task :install do
+    Rake::Task["alchemy:install:migrations"].invoke
+    Rake::Task["alchemy:mount"].invoke
+    system("rails g alchemy:scaffold")
+    Rake::Task["db:migrate"].invoke
+    Rake::Task["alchemy:db:seed"].invoke
+    puts <<-EOF
+
+\\o/ Successfully installed Alchemy CMS \\o/
+
+Now:
+
+1. Start your Rails server:
+
+  rails server
+
+2. Open your browser and enter the following URL:
+
+  http://localhost:3000/admin/signup
+
+3. Follow the instructions to complete the installation!
+
+Thank you for using Alchemy CMS!
+
+http://alchemy-cms.com
+
+EOF
+  end
+
+  desc "Mounts Alchemy into your routes."
+  task :mount do
+    Alchemy::RoutesInjector.new.inject
+  end
+
   namespace :db do
 
-    desc "Seeds the database with essential data for Alchemy."
+    desc "Seeds your database with essential data for Alchemy CMS."
     task :seed => :environment do
       Alchemy::Seeder.seed!
     end
@@ -11,9 +63,12 @@ namespace :alchemy do
 
   namespace :standard_set do
 
-    desc "Install Alchemys standard set."
+    desc "Install Alchemy CMS's standard set."
     task :install do
       system("rails g alchemy:scaffold --with-standard-set")
+      puts "\n-> Please do not forget to add Alchemy's standard set to precompiable assets. <-\n"
+      puts "\nPut this line in your 'config/environments/production.rb' file:\n"
+      puts "  config.assets.precompile += %w( alchemy/standard_set.css )"
     end
 
   end

data/spec/controllers/admin/elements_controller_spec.rb

@@ -8,8 +8,91 @@ module Alchemy
       Alchemy::UserSession.create FactoryGirl.create(:admin_user)
     end
 
-    let(:page) { mock_model('Page', {:id => 1, :urlname => 'lulu'}) }
-    let(:element) { mock_model('Element', {:id => 1, :page_id => page.id, :public => true, :display_name_with_preview_text => 'lalaa', :dom_id => 1}) }
+    let(:page) { FactoryGirl.create(:page, :urlname => 'lulu') }
+    let(:element) { FactoryGirl.create(:element, :page_id => page.id) }
+    let(:element_in_clipboard) { FactoryGirl.create(:element, :page_id => page.id) }
+    let(:clipboard) { session[:clipboard] = Clipboard.new }
+
+    describe '#create' do
+
+      before { element }
+
+      it "should insert the element at bottom of list" do
+        post :create, {:element => {:name => 'news', :page_id => page.id}, :format => :js}
+        page.elements.count.should == 2
+        page.elements.last.name.should == 'news'
+      end
+
+      context "on a page with a setting for insert_elements_at of top" do
+
+        before do
+          PageLayout.stub(:get).and_return({
+            'name' => 'news',
+            'elements' => ['news'],
+            'insert_elements_at' => 'top'
+          })
+        end
+
+        it "should insert the element at top of list" do
+          post :create, {:element => {:name => 'news', :page_id => page.id}, :format => :js}
+          page.elements.count.should == 2
+          page.elements.first.name.should == 'news'
+        end
+      end
+    end
+
+    describe '#find_or_create_cell' do
+
+      before do
+        Cell.stub!(:definition_for).and_return({'name' => 'header', 'elements' => ['header']})
+        controller.instance_variable_set(:@page, page)
+      end
+
+      context "with element name and cell name in the params" do
+
+        before do
+          controller.stub(:params).and_return({
+            :element => {:name => 'header#header'}
+          })
+        end
+
+        context "with cell not existing" do
+          it "should create the cell" do
+            expect {
+              controller.send(:find_or_create_cell)
+            }.to change(page.cells, :count).from(0).to(1)
+          end
+        end
+
+        context "with the cell already present" do
+
+          before { FactoryGirl.create(:cell, :page => page, :name => 'header') }
+
+          it "should load the cell" do
+            expect {
+              controller.send(:find_or_create_cell)
+            }.to_not change(page.cells, :count)
+          end
+
+        end
+
+      end
+
+      context "with only the element name in the params" do
+
+        before do
+          controller.stub(:params).and_return({
+            :element => {:name => 'header'}
+          })
+        end
+
+        it "should return nil" do
+          controller.send(:find_or_create_cell).should be_nil
+        end
+
+      end
+
+    end
 
     describe '#list' do
 
@@ -33,19 +116,19 @@ module Alchemy
       end
 
       it "should set a new position to the element" do
-        post :order, {:element_ids => ["#{@element.id}"]}
+        post :order, {:element_ids => ["#{@element.id}"], :format => :js}
         @element.reload
         @element.position.should_not == nil
       end
 
       it "should assign the (new) page_id to the element" do
-        post :order, {:element_ids => ["#{@element.id}"], :page_id => 1, :cell_id => nil}
+        post :order, {:element_ids => ["#{@element.id}"], :page_id => 1, :cell_id => nil, :format => :js}
         @element.reload
         @element.page_id.should == 1
       end
 
       it "should assign the (new) cell_id to the element" do
-        post :order, {:element_ids => ["#{@element.id}"], :page_id => 1, :cell_id => 5}
+        post :order, {:element_ids => ["#{@element.id}"], :page_id => 1, :cell_id => 5, :format => :js}
         @element.reload
         @element.cell_id.should == 5
       end
@@ -75,27 +158,95 @@ module Alchemy
 
       context "with cells" do
 
-        before do
-          @page = FactoryGirl.create(:public_page, :do_not_autogenerate => false)
-          @cell = FactoryGirl.create(:cell, :name => 'header', :page => @page)
-          Page.any_instance.stub(:can_have_cells?).and_return(true)
-          Cell.stub!(:definition_for).and_return({'name' => 'header', 'elements' => ['article']})
-        end
+        context "" do
+
+          before do
+            @page = FactoryGirl.create(:public_page, :do_not_autogenerate => false)
+            @cell = FactoryGirl.create(:cell, :name => 'header', :page => @page)
+            PageLayout.stub(:get).and_return({
+              'name' => 'standard',
+              'elements' => ['article'],
+              'cells' => ['header']
+            })
+            Cell.stub!(:definition_for).and_return({'name' => 'header', 'elements' => ['article']})
+          end
 
-        context "and cell name in element name" do
+          context "and cell name in element name" do
+
+            it "should put the element in the correct cell" do
+              post :create, {:element => {:name => "article#header", :page_id => @page.id}, :format => :js}
+              @cell.elements.first.should be_an_instance_of(Element)
+            end
+
+          end
+
+          context "and no cell name in element name" do
+
+            it "should put the element in the main cell" do
+              post :create, {:element => {:name => "article", :page_id => @page.id}, :format => :js}
+              @page.elements.not_in_cell.first.should be_an_instance_of(Element)
+            end
 
-          it "should put the element in the correct cell" do
-            post :create, {:element => {:name => "article#header", :page_id => @page.id}}
-            @cell.elements.first.should be_an_instance_of(Element)
           end
 
         end
 
-        context "and no cell name in element name" do
+        context "with paste_from_clipboard in parameters" do
+
+          context "" do
+            before do
+              @page = FactoryGirl.create(:public_page, :do_not_autogenerate => false)
+              @cell = FactoryGirl.create(:cell, :name => 'header', :page => @page)
+              PageLayout.stub(:get).and_return({
+                'name' => 'standard',
+                'elements' => ['article'],
+                'cells' => ['header']
+              })
+              Cell.stub!(:definition_for).and_return({'name' => 'header', 'elements' => ['article']})
+              clipboard[:elements] = [{:id => element_in_clipboard.id}]
+            end
+
+            it "should create the element in the correct cell" do
+              post :create, {:element => {:page_id => @page.id}, :paste_from_clipboard => "#{element_in_clipboard.id}##{@cell.name}", :format => :js}
+              @cell.elements.first.should be_an_instance_of(Element)
+            end
 
-          it "should put the element in the main cell" do
-            post :create, {:element => {:name => "article", :page_id => @page.id}}
-            @page.elements.not_in_cell.first.should be_an_instance_of(Element)
+            context "" do
+
+              before { @cell.elements.create(:page_id => @page.id, :name => "article", :create_contents_after_create => false) }
+
+              it "should set the correct position for the element" do
+                post :create, {:element => {:page_id => @page.id}, :paste_from_clipboard => "#{element_in_clipboard.id}##{@cell.name}", :format => :js}
+                @cell.elements.last.position.should == @cell.elements.count
+              end
+
+            end
+          end
+
+          context "on a page with a setting for insert_elements_at of top" do
+            let(:page)                 { FactoryGirl.create(:public_page, :name => 'News') }
+            let(:element_in_clipboard) { FactoryGirl.create(:element, :page => page, :name => 'news') }
+            let(:cell)                 { page.cells.first }
+            let(:element)              { FactoryGirl.create(:element, :name => 'news', :page => page, :cell => cell) }
+
+            before do
+              PageLayout.stub(:get).and_return({
+                'name' => 'news',
+                'elements' => ['news'],
+                'insert_elements_at' => 'top',
+                'cells' => ['news']
+              })
+              Cell.stub!(:definition_for).and_return({'name' => 'news', 'elements' => ['news']})
+              clipboard[:elements] = [{:id => element_in_clipboard.id}]
+              cell.elements << element
+            end
+
+            it "should insert the element at top of list" do
+              post :create, {:element => {:name => 'news', :page_id => page.id}, :paste_from_clipboard => "#{element_in_clipboard.id}##{cell.name}", :format => :js}
+              cell.elements.count.should == 2
+              cell.elements.first.name.should == 'news'
+              cell.elements.first.should_not == element
+            end
           end
 
         end
@@ -106,9 +257,6 @@ module Alchemy
 
         render_views
 
-        let(:clipboard) { session[:clipboard] = Clipboard.new }
-        let(:element_in_clipboard) { @element ||= FactoryGirl.create(:element, :page_id => page.id) }
-
         before(:each) do
           clipboard[:elements] = [{:id => element_in_clipboard.id, :action => 'cut'}]
         end