alchemy_cms 2.0.rc6 → 2.0

data/assets/javascripts/alchemy.js

@@ -428,10 +428,10 @@ if (typeof(Alchemy) === 'undefined') {
 		
 		openLicencseWindow : function() {
 			var height = $(window).height() - 150;
-			var $iframe = $('<iframe src="http://www.gnu.org/licenses/gpl-3.0.txt"></iframe>');
+			var $iframe = $('<iframe src="https://raw.github.com/magiclabs/alchemy_cms/master/LICENSE"></iframe>');
 			$iframe.dialog({
 				bgiframe: true,
-				title: 'GNU GPL License',
+				title: 'Alchemy CMS License',
 				width: 650,
 				height: height,
 				autoResize: true,

data/assets/stylesheets/elements.css

@@ -469,7 +469,7 @@ div.essence_picture_css_class {
 	position: absolute;
 	z-index: 1;
 	bottom: 24px;
-	width: 102px;
+	width: 99px;
 	background-color: white;
 	background-color: rgba(255,254,255,0.7);
 	padding: 4px 8px;

data/assets/stylesheets/standard_set.css

@@ -1,3 +1,5 @@
+/* @override http://localhost:3000/stylesheets/alchemy/standard_set.css */
+
 body {
 	margin: 0;
 	padding: 0;
@@ -128,11 +130,10 @@ div#header_image {
 #navigation {
 	font-family: "Lucida Grande", Lucida, Verdana, sans-serif;
 	color: #fdfdfd;
-	position: relative;
-	top: 40%;
 	text-transform: uppercase;
-	float: left;
-	clear: both;
+	position: absolute;
+	top: 215px;
+	z-index: 100;
 }
 
 #navigation ul {
@@ -333,36 +334,62 @@ input.field {
 	margin: 0;
 	font: 12px "Lucida Grande", Lucida, Verdana, sans-serif;
 	border: 1px solid silver;
-	width: 290px;
+	width: 310px;
+}
+
+td.field {
+	white-space: nowrap;
 }
 
 input.field.short {
-	width: 100px;
+	width: 105px;
 }
 
 input.field.medium {
-	width: 186px;
+	width: 200px;
 }
 
 td.label {
-	width: 100px;
+	width: 130px;
 }
 
 textarea {
-	width: 290px;
+	width: 310px;
 	padding: 2px;
 	font: 12px "Lucida Grande", Lucida, Verdana, sans-serif;
 	border: 1px solid silver;
-	margin-left: 107px;
+	margin-left: 137px;
 	height: 10em;
 	margin-top: 2em;
 	margin-bottom: 1em;
 }
 
+div.field_with_errors {
+	color: #fe1b15;
+}
+
+div.field_with_errors input.field {
+	border-color: #fe1b15;
+}
+
+p.foot_notice {
+	font-size: 0.8em;
+}
+
 form#contact {
-	padding: 10px;
-	width: 400px;
-	margin-left: 200px;
+	padding: 0 0 0 12px;
+	width: 450px;
+}
+
+#errorExplanation {
+	color: #fe1d16;
+	margin-bottom: 20px;
+	margin-top: 20px;
+}
+
+#errorExplanation ul {
+	list-style-type: disc;
+	padding: 0 0 0 1.5em;
 }
 
 label {
@@ -371,4 +398,47 @@ label {
 
 p.right {
 	text-align: right;
-}
+}
+
+.searchresult {
+	margin-top: 1em;
+	margin-bottom: 1em;
+}
+
+.searchresult form {
+	padding-left: 12px;
+}
+
+.searchresult h2 {
+	padding-left: 12px;
+	margin-bottom: 2em;
+	margin-top: 1em;
+}
+
+.search_results ul {
+	list-style-type: none;
+	padding: 0 0 0 12px;
+}
+
+.search_results ul li {
+	margin-bottom: 2em;
+}
+
+.search_results ul li p {
+	margin-top: 0.5em;
+	margin-bottom: 0.5em;
+}
+
+.search_results ul li h3 {
+	margin-bottom: 0.5em;
+	margin-top: 0.5em;
+}
+
+.search_results ul li h4 {
+	margin-top: 0.5em;
+	margin-bottom: 0.5em;
+}
+
+.search_results em {
+	font-weight: bold;
+}

data/config/alchemy/elements.yml

@@ -196,8 +196,10 @@
     type: EssenceDate
   - name: news_headline
     type: EssenceText
+    rss_title: true
   - name: body
     type: EssenceRichtext
+    rss_description: true
 
 - name: searchresult
   unique: true

data/config/alchemy/page_layouts.yml

@@ -47,6 +47,7 @@
   unique: true
   elements: [headline, news]
   autogenerate: [news]
+  feed_elements: [news]
 
 - name: search
   unique: true

data/config/locales/de.yml

@@ -85,7 +85,7 @@ de:
     # == Translations for the build in full text search.
     search:
       no_results: 'Ihre Suche ergab kein Ergebnis.'
-      result_heading: 'Ihre Suche nach %{query} ergab %{count} Ergebnisse' 
+      result_heading: "Ihre Suche nach '%{query}' hat %{count} Ergebnisse"
     
     # == Contactform translations
     contactform:
@@ -102,7 +102,7 @@ de:
         email: 'Email'
         message: 'Nachricht'
         send: 'Nachricht absenden!'
-        mandatory_fields: 'Pflichtfelder. Vielen Dank!'
+        mandatory_fields: 'Pflichtfelder. Bitte füllen Sie diese Felder aus. Vielen Dank!'
         success_page: 'Folgeseite'
       # Translations for the contactform validations.
       # Validations are set in the config/alchemy/config.yml mailer section.
@@ -323,9 +323,9 @@ de:
     errors:
       template:
         header:
-          one:    "Konnte dieses Formular nicht speichern: 1 Fehler."
-          other:  "Konnte dieses Formular nicht speichern: %{count} Fehler."
-        body: "Bitte überprüfen Sie:"
+          one:    "Konnte nicht fortfahren, da 1 Fehler auftrat."
+          other:  "Konnte nicht fortfahren, da %{count} Fehler auftraten."
+        body: "Fehler:"
       messages:
         inclusion: "%{attribute} ist kein gültiger Wert"
         exclusion: "%{attribute} ist nicht verfügbar"

data/lib/alchemy/version.rb

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

data/lib/rails/generators/alchemy/plugin/templates/config.yml

@@ -1,4 +1,4 @@
-# These is your plugin configuration file.
+# This is your plugin configuration file.
 # ========================================
 # 
 # Options:
@@ -9,9 +9,9 @@
 #   settings:                          # [Optional] Put your own settings in YAML format into here. You can access them with plugin_conf('<%= @plugin_name.underscore %>')['settings'] [YAML]
 #   navigation:
 #     name:                            # The name is used in the Alchemy mainnavi. [String]
-#     controller:                      # The name of the controller to be called when clicking the mainnavi button [String]
+#     controller:                      # The name of the controller to be called when clicking the mainnavi button. Example usage: 'admin/controllername' [String]
 #     action:                          # The name of the action from the controller to be called when clicking the mainnavi button [String]
-#     image:                           # Path to an image inside your public folder used for the icon in the alchemy mainnavi. [String]
+#     icon:                            # CSS classname for the link in the alchemy mainnavi. [String]
 #     sub_navigation:                  # Your plugins sub navigation. Put as much as sub navi entries as you want into here
 #       - name:                        # [String]
 #         controller:                  # Typically your controller and action you set for mainnavi entry.

data/spec/controllers/admin/trash_controller_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe Admin::TrashController do
+
+	before(:each) do
+		activate_authlogic
+		UserSession.create Factory(:admin_user)
+	end
+
+	it "should hold trashed elements" do
+		pending "The controller behaves correct, the test not."
+		@page = Factory(:page, :parent_id => Page.rootpage.id)
+	  @element = Factory(:element, :page => @page)
+		# Rails, RSpec and co. are sucking
+		@element.reload
+		@element.trash
+		@element.reload
+		get :index, :page_id => @page.id
+		response.body.should have_selector('#trash_items #element_4.element_editor')
+	end
+
+end

data/spec/controllers/pages_controller_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe PagesController do
+
+	before(:each) do
+		@default_language = Language.get_default
+		@default_language_root = Factory(:language_root_page, :language => @default_language, :name => 'Home', :public => true)
+	end
+
+	context "requested for a page containing a feed" do
+
+		before(:each) do
+			@page = Factory(:public_page, :parent_id => @default_language_root.id, :page_layout => 'news', :name => 'News', :language => @default_language)
+		end
+		
+		it "should render a rss feed" do
+			get :show, :urlname => 'news', :format => :rss
+			response.content_type.should == 'application/rss+xml'
+		end
+	  
+		it "should include content" do
+			pending "I didn't figured out how to test XML response bodies"
+			@page.elements.first.content_by_name('news_headline').essence.update_attributes({:body => 'Peters Petshop'})
+			get :show, :urlname => 'news', :format => :rss
+			response.body.should match /Peters Petshop/
+		end
+	
+	end
+
+	context "requested for a page that does not contain a feed" do
+		
+		it "should render xml 404 error" do
+			get :show, :urlname => 'home', :format => :rss
+			response.status.should == 404
+		end
+		
+	end
+
+end

data/spec/dummy/db/schema.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -197,7 +198,7 @@ ActiveRecord::Schema.define(:version => 20110919110451) do
     t.string   "urlname"
     t.string   "title"
     t.string   "language_code"
-    t.boolean  "language_root"
+    t.boolean  "language_root",    :limit => 255
     t.string   "page_layout"
     t.text     "meta_keywords"
     t.text     "meta_description"
@@ -205,15 +206,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

@@ -54,6 +54,11 @@ FactoryGirl.define do
 
 	end
 	
+	factory :cell do
+		page { Page.find_by_language_root(true) || Factory(:language_root_page) }
+		name "A Cell"
+	end
+	
 	factory :element do
 	  name 'article'
   end

data/spec/helpers/elements_helper_spec.rb

@@ -23,6 +23,13 @@ describe ElementsHelper do
 	  helper.element_dom_id(@element).should == "#{@element.name}_#{@element.id}"
 	end
 
+	it "should render elements for a cell", :focus => true do
+		cell = Factory(:cell)
+		Factory(:element, :cell_id => cell.id)
+		helper.stub(:configuration).and_return(true)
+	  helper.render_cell_elements(cell).should match(/id="article_7"/)
+	end
+
 	context "in preview mode" do
 
 	  it "should return the data-alchemy-element HTML attribute for element" do

data/spec/integration/pages_controller_spec.rb

@@ -27,7 +27,7 @@ describe PagesController do
 			visit '/'
 			within('div#navigation ul') { page.should have_selector('li a[href="/page-1"], li a[href="/page-2"]') }
 		end
-	  
+
 	end
 
 	context "performing a fulltext search" do

data/spec/models/element_spec.rb

@@ -33,10 +33,10 @@ describe Element do
 		definitions.first.fetch("name").should == 'article'
   end
 
-  it "should always return an array calling all_definitions_for()" do
+	it "should always return an array calling all_definitions_for()" do
 		definitions = Element.all_definitions_for(nil)
 		definitions.should == []
-  end
+	end
 
 	it "should raise an error if no descriptions are found" do
 		FileUtils.mv(File.join(File.dirname(__FILE__), '..', '..', 'config', 'alchemy', 'elements.yml'), File.join(File.dirname(__FILE__), '..', '..', 'config', 'alchemy', 'elements.yml.bak'))
@@ -44,9 +44,55 @@ describe Element do
 		FileUtils.mv(File.join(File.dirname(__FILE__), '..', '..', 'config', 'alchemy', 'elements.yml.bak'), File.join(File.dirname(__FILE__), '..', '..', 'config', 'alchemy', 'elements.yml'))
 	end
 
-	it "should return an ingredient by name" do
-		element = Factory(:element)
-		element.ingredient('intro').should == EssenceText.first.ingredient
+	context "retrieving contents, essences and ingredients" do
+
+		before(:each) do
+			@element = Factory(:element, :name => 'news')
+		end
+
+		it "should return an ingredient by name" do
+			@element.ingredient('news_headline').should == EssenceText.first.ingredient
+		end
+
+		it "should return the content for rss title" do
+			@element.content_for_rss_title.should == @element.contents.find_by_name('news_headline')
+		end
+
+		it "should return the content for rss description" do
+			@element.content_for_rss_description.should == @element.contents.find_by_name('body')
+		end
+
+	end
+
+	it "should return a collection of trashed elements" do
+	  @element = Factory(:element)
+		@element.trash
+		Element.trashed.should include(@element)
+	end
+
+	context "trashed" do
+
+		before(:each) do
+		  @element = Factory(:element)
+			@element.trash
+		end
+	  
+		it "should be not public" do
+	   	@element.public.should be_false
+		end
+		
+		it "should have no page" do
+			@element.page.should == nil
+		end
+
+		it "should be folded" do
+	    @element.folded.should == true
+		end
+		
+	end
+
+	it "should raise error if all_for_page method has no page" do
+	  expect { Element.all_for_page(nil) }.should raise_error(TypeError)
 	end
 
 end