alchemy_cms 2.0.rc3 → 2.0.rc4

data/assets/stylesheets/elements.css

@@ -1,6 +1,5 @@
-/* @override http://localhost:3000/stylesheets/alchemy/elements.css */
-
 /* @override 
+	http://localhost:3000/stylesheets/alchemy/elements.css
 	http://0.0.0.0:3000/stylesheets/alchemy/elements.css
 	http://localhost:3000/stylesheets/alchemy/elements.css
 */
@@ -63,7 +62,7 @@ img.add_element_spinner {
 	position: absolute;
 	top: 0;
 	left: 0;
-	background: url(/images/alchemy/icons.png) no-repeat -112px -40px;
+	background: url(/images/alchemy/icons.png) no-repeat -224px -72px;
 }
 
 .element_handle span.icon {
@@ -74,7 +73,7 @@ img.add_element_spinner {
 }
 
 .element_handle span.icon.element_dirty {
-	background-position: -29px -104px;
+	background-position: -160px -166px;
 }
 
 div.element_foot span.element_public {
@@ -105,7 +104,7 @@ div.element_foot span.element_public {
 
 .add_content {
 	float: left;
-	margin: 3px;
+	margin: 1px;
 	width: 111px;
 	padding: 4px;
 	background-color: #f0e8d7;
@@ -129,7 +128,7 @@ div.element_foot span.element_public {
 }
 
 .add_content a .icon.assign {
-	background: url(/images/alchemy/icons.png) no-repeat -144px -40px;
+	background: url(/images/alchemy/icons.png) no-repeat -288px -72px;
 	position: absolute;
 	top: 52px;
 	left: 47px;
@@ -226,15 +225,15 @@ span.element_tools_icons {
 }
 
 a.delete_element_button {
-	background: url(/images/alchemy/icons.png) no-repeat -32px -40px;
+	background: url(/images/alchemy/icons.png) no-repeat -63px -72px;
 }
 
 a.element_copy_button {
-	background: url(/images/alchemy/icons.png) no-repeat -64px -40px;
+	background: url(/images/alchemy/icons.png) no-repeat -128px -72px;
 }
 
 a.element_move_button {
-	background: url(/images/alchemy/icons.png) no-repeat -48px -40px;
+	background: url(/images/alchemy/icons.png) no-repeat -97px -72px;
 }
 
 .element_head {
@@ -256,17 +255,14 @@ form.add_gallery_to_index {
 
 div.picture_gallery_images {
 	margin-top: 8px;
-	height: 100%;
-	padding-top: 1px;
-	padding-bottom: 2px;
 	overflow: hidden;
 	margin-bottom: 8px;
 	border: 1px inset #cecece;
-	padding-left: 2px;
 	-webkit-border-radius: 3px;
 	-moz-border-radius: 3px;
 	border-radius: 3px;
 	background-color: #e5dcca;
+	padding: 1px;
 }
 
 div.picture_thumbnail div.picture_image img.img_paddingtop {
@@ -352,7 +348,7 @@ div.content_editor a.icon_button.unlink {
 }
 
 a.expand_element {
-	background: url(/images/alchemy/icons.png) no-repeat -80px -40px;
+	background: url(/images/alchemy/icons.png) no-repeat -160px -72px;
 	height: 16px;
 	width: 16px;
 	text-decoration: none;
@@ -361,7 +357,7 @@ a.expand_element {
 }
 
 a.fold_element {
-	background: url(/images/alchemy/icons.png) no-repeat -96px -40px;
+	background: url(/images/alchemy/icons.png) no-repeat -192px -72px;
 	height: 16px;
 	width: 16px;
 	text-decoration: none;
@@ -800,7 +796,7 @@ textarea {
 	width: 111px;
 	height: 115px;
 	padding: 4px;
-	margin: 3px;
+	margin: 1px;
 }
 
 div.element_editor div.error {

data/bin/alchemy

@@ -18,7 +18,7 @@ class Alchemy < Thor
       
       say "Installing...", :yellow
       
-      if system "rails new #{project} -m #{File.join(File.dirname(__FILE__), '..', 'lib', 'rails', 'templates', 'alchemy.rb')} -d mysql -JT"
+      if system "rails _3.0.10_ new #{project} -m #{File.join(File.dirname(__FILE__), '..', 'lib', 'rails', 'templates', 'alchemy.rb')} -d mysql -JT"
         
         @application = project
         

data/config/alchemy/config.yml

@@ -115,9 +115,13 @@ default_language:
 :user_roles: [registered, author, editor, admin]
 
 # === Uploader Settings
+# Set an upload limit in megabytes which counts for all uploads together.
+# Set a file size limit in megabytes for a per file limit.
 # Allow filetypes to upload.
 # Pass * to allow all kind of files.
 :uploader:
+  :upload_limit: 500
+  :file_size_limit: 100
   :allowed_filetypes:
     :pictures: [jpg, jpeg, gif, png, psd, pdf]
     :attachments: [*]

data/config/initializers/tinymce_hammer.rb

@@ -18,6 +18,7 @@ if defined?(Tinymce::Hammer)
     :width => "100%",
     :theme_advanced_resizing => true,
     :theme_advanced_resize_horizontal => false,
+    :theme_advanced_resizing_min_height => '185',
     :theme_advanced_toolbar_align => 'left',
     :theme_advanced_toolbar_location => 'top',
     :theme_advanced_statusbar_location => 'bottom',

data/config/locales/de.yml

@@ -202,6 +202,8 @@ de:
       video/x-msvideo: 'AVI-Video'
       video/x-ms-wmv: 'Windows Media Video'
       image/tiff: 'TIFF-Bild'
+      'text/x-vcard': 'vCard'
+      application/vcard: 'vCard'
     
     link_target_options:
       default: gleichem Fenster
@@ -323,7 +325,7 @@ de:
         inclusion: "%{attribute} ist kein gültiger Wert"
         exclusion: "%{attribute} ist nicht verfügbar"
         invalid: "%{attribute} ist nicht gültig"
-        record_invalid: 'Validierung ist fehlgeschlagen'
+        record_invalid: 'Validierung von %{errors} ist fehlgeschlagen'
         confirmation: "%{attribute} stimmt nicht mit der Bestätigung überein"
         accepted: "%{attribute} muss akzeptiert werden"
         empty: "%{attribute} muss ausgefüllt werden"

data/config/locales/en.yml

@@ -188,6 +188,8 @@ en:
       image/jpeg: 'JPG-Image'
       video/x-msvideo: 'AVI-Video'
       image/tiff: 'TIFF-Image'
+      'text/x-vcard': 'vCard'
+      application/vcard: 'vCard'
     
     link_target_options:
       default: Same Window

data/config/routes.rb

@@ -14,7 +14,7 @@ Rails.application.routes.draw do
     :as => :leave_admin
   match '/admin/logout' => 'admin#logout',
     :as => :logout
-  match '/attachment/:id/download/:name' => 'attachments#download',
+  match '/attachment/:id/download(/:name)(.:suffix)' => 'attachments#download',
     :as => :download_attachment
   match '/attachment/:id/show' => 'attachments#show',
     :as => :show_attachment
@@ -29,12 +29,14 @@ Rails.application.routes.draw do
   match  '/pictures/thumbnails/:id/:size(/:crop_from)(/:crop_size)/thumbnail.png' => 'pictures#thumbnail',
     :as => :thumbnail, :defaults => { :format => 'png' }
   match '/:lang' => 'pages#show',
-    :constraints => {:lang => Regexp.new(Language.all_codes_for_published.join('|'))},
+    :constraints => {:lang => /[a-z]{2}/},
     :as => :show_language_root
   match '(/:lang)/:urlname(.:format)' => 'pages#show',
-    :constraints => {:lang => Regexp.new(Language.all_codes_for_published.join('|'))},
+    :constraints => {:lang => /[a-z]{2}/},
     :as => :show_page
-  
+  match '/wa_files/download/:id' => 'attachments#download'
+  match '/uploads/files/0000/:id/:name(.:suffix)' => 'attachments#download'
+
   resources :user_sessions
   resources :elements, :only => :show
 

data/lib/alchemy/capistrano.rb

@@ -16,11 +16,9 @@ Capistrano::Configuration.instance(:must_exist).load do
       # Call after deploy:setup like +after "deploy:setup", "alchemy:create_shared_folders"+ in your +deploy.rb+.
       desc "Creates the uploads and picture cache directory in the shared folder. Call after deploy:setup"
       task :create, :roles => :app do
-        run "mkdir -p #{shared_path}/uploads"
         run "mkdir -p #{shared_path}/index"
         run "mkdir -p #{shared_path}/uploads/pictures"
         run "mkdir -p #{shared_path}/uploads/attachments"
-        run "mkdir -p #{shared_path}/cache"
         run "mkdir -p #{shared_path}/cache/pictures"
       end
 
@@ -28,13 +26,12 @@ Capistrano::Configuration.instance(:must_exist).load do
       # Call after deploy:symlink like +after "deploy:symlink", "alchemy:symlink_folders"+ in your +deploy.rb+.
       desc "Sets the symlinks for uploads, picture cache and ferret index folder. Call after deploy:symlink"
       task :symlink, :roles => :app do
-        run "rm -rf #{current_path}/public/uploads/*"
-        run "ln -nfs #{shared_path}/uploads/pictures/ #{current_path}/uploads/pictures"
-        run "ln -nfs #{shared_path}/uploads/attachments/ #{current_path}/uploads/attachments"
+        run "rm -rf #{current_path}/uploads"
+        run "ln -nfs #{shared_path}/uploads #{current_path}/"
         run "rm -rf #{current_path}/public/pictures"
-        run "ln -nfs #{shared_path}/cache/pictures/ #{current_path}/public/pictures"
+        run "ln -nfs #{shared_path}/cache/pictures #{current_path}/public/"
         run "rm -rf #{current_path}/index"
-        run "ln -nfs #{shared_path}/index/ #{current_path}/index"
+        run "ln -nfs #{shared_path}/index #{current_path}/"
       end
 
     end

data/lib/alchemy/page_layout.rb

@@ -13,14 +13,18 @@ module Alchemy
     
     # Returns the page_layout.yml file. Tries to first load from config/alchemy and if not found from vendor/plugins/alchemy/config/alchemy.
     def self.get_layouts
-      if File.exists? "#{Rails.root}/config/alchemy/page_layouts.yml"
-        layouts = YAML.load_file( "#{Rails.root}/config/alchemy/page_layouts.yml" )
-      elsif File.exists? "#{Rails.root}/vendor/plugins/alchemy/config/alchemy/page_layouts.yml"
-        layouts = YAML.load_file( "#{Rails.root}/vendor/plugins/alchemy/config/alchemy/page_layouts.yml" )
-      else
-        raise LoadError, "Could not find page_layouts.yml file! Please run: rails generate alchemy:scaffold"
-      end
-      layouts
+			if File.exists? "#{Rails.root}/config/alchemy/page_layouts.yml"
+				layouts = YAML.load_file( "#{Rails.root}/config/alchemy/page_layouts.yml" )
+			end
+			if !layouts
+				if File.exists?(File.join(File.dirname(__FILE__), "../../config/alchemy/page_layouts.yml"))
+					layouts = YAML.load_file( File.join(File.dirname(__FILE__), "../../config/alchemy/page_layouts.yml") )
+				end
+			end
+			if !layouts
+				raise LoadError, "Could not find page_layouts.yml file! Please run: rails generate alchemy:scaffold"
+			end
+			layouts
     end
    
     # Returns the page_layout description found by name in page_layouts.yml

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   
-  VERSION = "2.0.rc3"
+  VERSION = "2.0.rc4"
   
 end

data/spec/controllers/admin/clipboard_controller_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Admin::ClipboardController do
+
+	before(:each) do
+		activate_authlogic
+		UserSession.create FactoryGirl.create(:admin_user)
+	end
+
+  context "clipboard" do
+
+    it "should not insert the same element twice" do
+			pending "We have to spec our models before we write integration tests"
+			@page = FactoryGirl.create(:page, :parent_id => Page.rootpage.id)
+		  @element = FactoryGirl.create(:element, :page => @page)
+			post(:insert, {:remarkable_type => 'element', :remarkable_id => element.id, :format => :js})
+			post(:insert, {:remarkable_type => 'element', :remarkable_id => element.id, :format => :js})
+			session[:clipboard][:elements].should == [element.id]
+    end
+
+  end
+
+end

data/spec/dummy/db/schema.rb

@@ -197,7 +197,7 @@ ActiveRecord::Schema.define(:version => 20110919110451) do
     t.string   "urlname"
     t.string   "title"
     t.string   "language_code"
-    t.boolean  "language_root",    :limit => 255
+    t.boolean  "language_root"
     t.string   "page_layout"
     t.text     "meta_keywords"
     t.text     "meta_description"
@@ -205,15 +205,15 @@ ActiveRecord::Schema.define(:version => 20110919110451) do
     t.integer  "rgt"
     t.integer  "parent_id"
     t.integer  "depth"
-    t.boolean  "visible",                         :default => false
-    t.boolean  "public",                          :default => false
-    t.boolean  "locked",                          :default => false
+    t.boolean  "visible",          :default => false
+    t.boolean  "public",           :default => false
+    t.boolean  "locked",           :default => false
     t.integer  "locked_by"
-    t.boolean  "restricted",                      :default => false
-    t.boolean  "robot_index",                     :default => true
-    t.boolean  "robot_follow",                    :default => true
-    t.boolean  "sitemap",                         :default => true
-    t.boolean  "layoutpage",                      :default => false
+    t.boolean  "restricted",       :default => false
+    t.boolean  "robot_index",      :default => true
+    t.boolean  "robot_follow",     :default => true
+    t.boolean  "sitemap",          :default => true
+    t.boolean  "layoutpage",       :default => false
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "creator_id"

data/spec/factories.rb

@@ -28,16 +28,34 @@ FactoryGirl.define do
 		code "kl"
 		name 'Klingonian'
 		default false
-		frontpage_name 'tuq'
+		frontpage_name 'Tuq'
 		page_layout 'intro'
 		public true
 	end
-	
+
 	factory :page do
-		name "tuq"
-		page_layout "intro"
-		association :language
-		public false
+		language { Language.find_by_code('kl') || Factory(:language) }
+		name "A Page"
+		parent_id { Factory(:language_root_page).id }
+		page_layout "standard"
+
+    factory :language_root_page do
+  		name 'Klingonian'
+  		page_layout 'intro'
+  		language_root true
+  		public true
+  		parent_id { Page.root.id }
+  	end
+
+		factory :public_page do
+  		name "A Public Page"
+		  public true
+	  end
+
 	end
 	
+	factory :element do
+	  name 'article'
+  end
+	
 end

data/spec/helpers/admin/elements_helper_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+include AlchemyHelper
+
+describe Admin::ElementsHelper do
+
+	before(:each) do
+		@page = Factory(:public_page)
+	  @element = Factory(:element, :page => @page)
+	end
+
+	it "should render an element editor partial" do
+	  helper.render_editor(@element).should match(/class="content_editor".+id="essence_text_11"/)
+	end
+
+	it "should render a picture editor partial" do
+		helper.render_picture_editor(@element).should match(/class="essence_picture_editor"/)
+	end
+
+end

data/spec/helpers/alchemy_helper_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe AlchemyHelper do
+
+  context "maximum amount of images option" do
+
+		before(:each) do
+		  @options = {}
+		end
+
+    context "with max_images option" do
+
+			it "should return nil for empty string" do
+	      @options[:max_images] = ""
+				max_image_count.should be(nil)
+	    end
+
+	    it "should return an integer for string number" do
+	      @options[:max_images] = "1"
+				max_image_count.should be(1)
+	    end
+
+    end
+
+		context "with maximum_amount_of_images option" do
+
+			it "should return nil for empty string" do
+	      @options[:maximum_amount_of_images] = ""
+				max_image_count.should be(nil)
+	    end
+
+	    it "should return an integer for string number" do
+	      @options[:maximum_amount_of_images] = "1"
+				max_image_count.should be(1)
+	    end
+
+		end
+
+  end
+
+end

data/spec/helpers/contents_helper_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+include AlchemyHelper
+
+describe ContentsHelper do
+
+	before(:each) do
+	  @element = Factory(:element)
+	end
+
+  it "should render a dom id" do
+		content_dom_id(@element.contents.first).should == "essence_text_1"
+	end
+
+	it "should render the content name" do
+		render_content_name(@element.contents.first).should == "Einleitung"
+	end
+
+	it "should render a link to add new content to element" do
+		render_new_content_link(@element).should match(/Alchemy.openWindow.+\/admin\/elements\/1\/contents\/new/m)
+	end
+
+	it "should render a link to create a content in element" do
+		render_create_content_link(@element).should match(/a.+href.*admin\/contents.+class.+button new_content_link.*data-method.+post/)
+	end
+
+end