alchemy_cms 2.0.1 → 2.0.2

data/app/controllers/admin/clipboard_controller.rb

@@ -15,7 +15,7 @@ class Admin::ClipboardController < AlchemyController
   def insert
     @clipboard = get_clipboard(params[:remarkable_type].tableize)
     @item = params[:remarkable_type].classify.constantize.find(params[:remarkable_id])
-    unless @clipboard.include?(params[:remarkable_id])
+    unless @clipboard.collect { |i| i[:id] }.include?(params[:remarkable_id])
       @clipboard.push({:id => params[:remarkable_id], :action => params[:remove] ? 'cut' : 'copy'})
     end
     respond_to do |format|

data/bin/alchemy

@@ -1,30 +1,42 @@
 #!/usr/bin/env ruby
 begin
-  require "rubygems"
-  require "thor"
-rescue LoadError
-  raise LoadError, "\n\nThor not installed. Please run: gem install thor\n\n"
+	require "rubygems"
+	require "thor"
+	require 'alchemy/version'
+	require 'rails'
+	if Rails.version >= "3.1" || Rails.version < "3.0"
+		raise LoadError, "Wrong rails version installed. Please run gem install rails -v'~>3.0.10'"
+	end
 end
 
-class Alchemy < Thor
+class AlchemyInstaller < Thor
   
   include Thor::Actions
-  
+
+  map "-v" => :version
+	map "--version" => :version
+
+	desc "version", "Prints current Alchemy version", :hide => true
+  def version
+  	puts Alchemy::VERSION
+  end
+
   desc "new PROJECT", "Creates a new Alchemy project."
   method_option :scm, :type => :string, :aliases => "-s", :desc => "Type of scm to use for this project. Leave blank for none."
+	method_option :database, :type => :string, :default => 'mysql', :aliases => "-d", :desc => "Type of database to use for this project. Default mysql."
   def new(project)
     project = project.downcase.strip.gsub(/ /, '_')
     if yes?("Install Alchemy into ./#{project}? (y/N)")
       
-      say "Installing...", :yellow
+      say "Generating new Rails App...", :yellow
       
-      if system "rails _3.0.10_ new #{project} -m #{File.join(File.dirname(__FILE__), '..', 'lib', 'rails', 'templates', 'alchemy.rb')} -d mysql -JT"
+      if system("rails _#{Rails.version}_ new #{project} -m #{File.join(File.dirname(__FILE__), '..', 'lib', 'rails', 'templates', 'alchemy.rb')} -d #{options[:database]} -JT")
         
         @application = project
         
-        create_database_yml
+        create_database_yml if options[:database] == 'mysql'
         
-        with_standard_set = yes?("\nDo you want to install Alchemys Standardset? (y/N)")
+        with_standard_set = yes?("\nDo you want to install Alchemys Standardset files into your App? (y/N)")
         
         %x[
           cd ./#{project}
@@ -50,7 +62,7 @@ class Alchemy < Thor
               repository = ask("\nName of the repository? (#{project})")
               repository = project if repository.empty?
               
-              say "\nImporting #{project} into #{server}/#{repository} ...", :yellow              
+              say "\nImporting #{project} into #{server}/#{repository} ...", :yellow
               output = %x[svn import ./#{project} #{server}/#{repository} -m 'initial import by Alchemy installer']; imported = $?.success?
               
               if imported
@@ -83,17 +95,17 @@ class Alchemy < Thor
                   @ssh_port = standard_port if @ssh_port.empty?
                   
                   # db settings
-                  @db_user = ask "Database User (#{@ssh_user}):"
+                  @db_user = ask "Production Database User (#{@ssh_user}):"
                   @db_user = @ssh_user if @db_user.empty?
-                  @db_password = ask "Database Password:"
+                  @db_password = ask "Production Database Password:"
                   standard_db_name = "usr_#{@db_user}_1"
-                  @db_name = ask "Database Name (#{standard_db_name}):"
+                  @db_name = ask "Production Database Name (#{standard_db_name}):"
                   @db_name = standard_db_name if @db_name.empty?
                   standard_host = "localhost"
-                  @db_host = ask "Database Host (#{standard_host}):"
+                  @db_host = ask "Production Database Host (#{standard_host}):"
                   @db_host = standard_host if @db_host.empty?
                   standard_socket = '/var/run/mysqld/mysqld.sock'
-                  @db_socket = ask "Database Socket (#{standard_socket}):"
+                  @db_socket = ask "Production Database Socket (#{standard_socket}):"
                   @db_socket = standard_socket if @db_socket.empty?
                   
                   # deploy_path
@@ -193,7 +205,7 @@ private
     local_standard_socket = '/tmp/mysql.sock'
     @db_local_socket = ask("\nPlease provide your local mysql socket (#{local_standard_socket}):")
     @db_local_socket = local_standard_socket if @db_local_socket.empty?
-    create_file "./#{@application}/config/database.yml" do
+    create_file "./#{@application}/config/database.yml", :force => true do
 <<-DATABASE
 development:
   adapter: mysql2
@@ -344,4 +356,4 @@ DEPLOY
   
 end
 
-Alchemy.start
+AlchemyInstaller.start

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
   
 end

data/lib/rails/generators/alchemy/plugin/plugin_generator.rb

@@ -22,9 +22,9 @@ module Alchemy
       end
 
       def create_defaults
-        template("translation.pot", "#{@plugin_path}/locale/#{@plugin_name}.pot")
-        template("translation_de.po", "#{@plugin_path}/locale/de/#{@plugin_name}.po")
-        template("translation_en.po", "#{@plugin_path}/locale/en/#{@plugin_name}.po")
+        copy_file("#{File.dirname(__FILE__)}/files/translation.pot", "#{@plugin_path}/locale/#{@plugin_name}.pot")
+        copy_file("#{File.dirname(__FILE__)}/files/translation_de.po", "#{@plugin_path}/locale/de/#{@plugin_name}.po")
+        copy_file("#{File.dirname(__FILE__)}/files/translation_en.po", "#{@plugin_path}/locale/en/#{@plugin_name}.po")
         template("gettext.rb", "#{@plugin_path}/config/initializers/gettext.rb")
         template("config.yml", "#{@plugin_path}/config/alchemy/config.yml")
         template("authorization_rules.rb", "#{@plugin_path}/config/authorization_rules.rb")

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

@@ -0,0 +1,10 @@
+<!DOCTYPE>
+<html>
+	<head>
+		<%= render_meta_data %>
+	</head>
+	<body>
+		<%= yield %>
+		<%= alchemy_preview_mode_code %>
+	</body>
+</html>

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

@@ -3,20 +3,25 @@ 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 standard set into your app."
+      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."
       source_root File.expand_path('templates', File.dirname(__FILE__))
       
       def create_config_dir
         empty_directory "#{Rails.root}/config/alchemy"
       end
+
+			def create_view_dirs
+				empty_directory Rails.root.join("app/views/elements")
+				empty_directory Rails.root.join("app/views/page_layouts")
+			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"
       end
       
-      def copy_yamls
+      def copy_files
         if options['with-standard-set']
           layouts_path = File.expand_path('../../../../../app/views/layouts', File.dirname(__FILE__)) 
           copy_file "#{@config_path}/elements.yml", "#{Rails.root}/config/alchemy/elements.yml"
@@ -25,8 +30,9 @@ module Alchemy
           Rails::Generators.invoke("alchemy:elements")
           Rails::Generators.invoke("alchemy:page_layouts")
         else
-          template "elements.yml", "#{Rails.root}/config/alchemy/elements.yml"
-          template "page_layouts.yml", "#{Rails.root}/config/alchemy/page_layouts.yml"
+          copy_file "#{File.dirname(__FILE__)}/files/elements.yml", "#{Rails.root}/config/alchemy/elements.yml"
+          copy_file "#{File.dirname(__FILE__)}/files/page_layouts.yml", "#{Rails.root}/config/alchemy/page_layouts.yml"
+					copy_file "#{File.dirname(__FILE__)}/files/pages.html.erb", "#{Rails.root}/app/views/layouts/pages.html.erb"
         end
       end
       

data/lib/rails/templates/alchemy.rb

@@ -1,8 +1,9 @@
+require 'alchemy/version'
 # This rails template installs Alchemy and all depending gems.
 
 # Installing Alchemy Gem
 
-gem 'alchemy_cms'
+gem 'alchemy_cms', "~> #{Alchemy::VERSION}"
 gem 'ruby-debug', :group => :development, :platform => :ruby_18
 gem 'ruby-debug19', :group => :development, :platform => :ruby_19
 

data/spec/controllers/admin/clipboard_controller_spec.rb

@@ -13,26 +13,26 @@ describe Admin::ClipboardController do
 			@page = Factory(:page, :parent_id => Page.rootpage.id)
 		  @element = Factory(:element, :page => @page)
 		  @another_element = Factory(:element, :page => @page)
-			session[:clipboard] = { :elements => [@element.id] }
+			session[:clipboard] = { :elements => [{:id => @element.id, :action => 'copy'}] }
 			post(:insert, {:remarkable_type => 'element', :remarkable_id => @another_element.id, :format => :js})
-			session[:clipboard][:elements].should == [@element.id, @another_element.id]
+			session[:clipboard][:elements].should == [{:id => @element.id, :action => 'copy'}, {:id => @another_element.id, :action => 'copy'}]
     end
 
     it "should not have the same element twice" do
 			@page = Factory(:page, :parent_id => Page.rootpage.id)
 		  @element = Factory(:element, :page => @page)
-			session[:clipboard] = { :elements => [@element.id] }
+			session[:clipboard] = { :elements => [{:id => @element.id, :action => 'copy'}] }
 			post(:insert, {:remarkable_type => 'element', :remarkable_id => @element.id, :format => :js})
-			session[:clipboard][:elements].should == [@element.id]
+			session[:clipboard][:elements].should == [{:id => @element.id, :action => 'copy'}]
     end
 
     it "should remove element ids" do
 			@page = Factory(:page, :parent_id => Page.rootpage.id)
 		  @element = Factory(:element, :page => @page)
 		  @another_element = Factory(:element, :page => @page)
-			session[:clipboard] = { :elements => [@element.id, @another_element.id] }
+			session[:clipboard] = { :elements => [{:id => @element.id, :action => 'copy'}, {:id => @another_element.id, :action => 'copy'}] }
 			delete(:remove, {:remarkable_type => 'element', :remarkable_id => @another_element.id, :format => :js})
-			session[:clipboard][:elements].should == [@element.id]
+			session[:clipboard][:elements].should == [{:id => @element.id, :action => 'copy'}]
     end
 
     it "should be clearable" do

metadata

@@ -2,7 +2,7 @@
 name: alchemy_cms
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors: 
 - Thomas von Deyen
@@ -677,6 +677,9 @@ files:
 - lib/rails/generators/alchemy/elements/templates/view.html.erb
 - lib/rails/generators/alchemy/page_layouts/page_layouts_generator.rb
 - lib/rails/generators/alchemy/page_layouts/templates/layout.html.erb
+- lib/rails/generators/alchemy/plugin/files/translation.pot
+- lib/rails/generators/alchemy/plugin/files/translation_de.po
+- lib/rails/generators/alchemy/plugin/files/translation_en.po
 - lib/rails/generators/alchemy/plugin/plugin_generator.rb
 - lib/rails/generators/alchemy/plugin/templates/authorization_rules.rb
 - lib/rails/generators/alchemy/plugin/templates/config.yml
@@ -684,12 +687,10 @@ files:
 - lib/rails/generators/alchemy/plugin/templates/init.rb
 - lib/rails/generators/alchemy/plugin/templates/plugin.rb
 - lib/rails/generators/alchemy/plugin/templates/routes.rb
-- lib/rails/generators/alchemy/plugin/templates/translation.pot
-- lib/rails/generators/alchemy/plugin/templates/translation_de.po
-- lib/rails/generators/alchemy/plugin/templates/translation_en.po
+- lib/rails/generators/alchemy/scaffold/files/elements.yml
+- lib/rails/generators/alchemy/scaffold/files/page_layouts.yml
+- lib/rails/generators/alchemy/scaffold/files/pages.html.erb
 - lib/rails/generators/alchemy/scaffold/scaffold_generator.rb
-- lib/rails/generators/alchemy/scaffold/templates/elements.yml
-- lib/rails/generators/alchemy/scaffold/templates/page_layouts.yml
 - lib/rails/templates/alchemy.rb
 - lib/tasks/fleximage.rake
 - lib/tasks/gettext.rake