alchemy_cms 2.2.rc8 → 2.2.rc11

data/config/alchemy/elements.yml

@@ -39,9 +39,20 @@
 # 
 # After finishing the setup of your element layouts, you need to generate the files for the elements before using them in Alchemy.
 # For creating these files, use the following command in your terminal:
+#
+#
 # 
-#   rails generate elements
+#   rails generate alchemy:elements 
+#
+#
+#   or: 
+#  
+#   rails g alchemy:elements --skip 
+#
+#  
+#   to skip existing elements
 # 
+#
 # All new elements will be created as two different partials in Rails.root/app/views/elements.
 # For each element there is an editor-view wich will be rendered when editing them in Alchemy and another view for the website´s frontend.
 # 

data/config/locales/alchemy.de.yml

@@ -497,6 +497,7 @@ de:
     successfully_added_element: "Element wurde hinzugefügt."
     successfully_saved_element_position: "Die Elementposition wurde gespeichert."
     swap_image: "Bild tauschen"
+    insert_image: "Bild einfügen"
     swfupload:
       cancel_uploads: "Hochladen abbrechen"
     title: "Titel"

data/config/locales/alchemy.en.yml

@@ -339,6 +339,7 @@ en:
     successfully_added_element: "Succesfully added new element."
     successfully_saved_element_position: "Element position updated succesfully."
     swap_image: "Change image"
+    insert_image: "Insert image"
     swfupload:
       cancel_uploads: "Cancel uploads"
     title: "Title"

data/lib/alchemy/essence.rb

@@ -28,7 +28,7 @@ module Alchemy #:nodoc:
         class_eval <<-EOV
           attr_accessor :validation_errors
           include Alchemy::Essence::InstanceMethods
-          stampable
+          stampable(:stamper_class_name => 'Alchemy::User')
           validate :essence_validations, :on => :update
           has_many :contents, :as => :essence
           

data/lib/alchemy/page_layout.rb

@@ -88,20 +88,14 @@ module Alchemy
     end
 
     # Reads the layout definitions from +config/alchemy/page_layouts.yml+.
-    # If this can not be found, it takes the default one from Alchemys standard set.
     def self.read_layouts_file
       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
+      else
         raise LoadError, "Could not find page_layouts.yml file! Please run: rails generate alchemy:scaffold"
       end
-      layouts
+      # Since YAML returns false for an empty file, we have to normalize it here.
+      layouts || []
     end
 
   end

data/lib/alchemy/resource.rb

@@ -3,11 +3,14 @@ require 'active_support/inflector'
 module Alchemy
   class Resource
 
-    SKIP_ATTRIBUTES = %W[id updated_at created_at creator_id updater_id]
+    attr_accessor :skip_attributes
+
+    DEFAULT_SKIPPED_ATTRIBUTES = %W[id updated_at created_at creator_id updater_id]
 
     def initialize(controller_path, module_definition=nil)
       @controller_path = controller_path
       @module_definition = module_definition
+      self.skip_attributes = DEFAULT_SKIPPED_ATTRIBUTES
     end
 
     def model_array
@@ -42,10 +45,7 @@ module Alchemy
     def attributes
       #@_attributes ||=
       self.model.columns.collect do |col|
-        skip_attributes = defined?(self.model::SKIP_ATTRIBUTES) ? self.model::SKIP_ATTRIBUTES : SKIP_ATTRIBUTES
-        unless skip_attributes.include?(col.name)
-          {:name => col.name, :type => col.type}
-        end
+        {:name => col.name, :type => col.type} unless self.skip_attributes.include?(col.name)
       end.compact
     end
 

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
 
-  VERSION = "2.2.rc8"
+  VERSION = "2.2.rc11"
 
 end

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

@@ -35,8 +35,8 @@ module Alchemy
           directory "#{page_layouts_path}/", "#{Rails.root}/app/views/alchemy/page_layouts/"
         else
           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/alchemy/pages.html.erb"
+          template "page_layouts.yml.tt", "#{Rails.root}/config/alchemy/page_layouts.yml"
+          copy_file "#{File.dirname(__FILE__)}/files/pages.html.erb", "#{Rails.root}/app/views/layouts/application.html.erb"
         end
       end
 

data/lib/rails/generators/alchemy/scaffold/{files/page_layouts.yml → templates/page_layouts.yml.tt}

@@ -27,3 +27,7 @@
 #         contact: Kontakt
 #         search: Suche
 # 
+
+- name: <%= Alchemy::Config.get(:default_language)['page_layout'] %>
+  unique: true
+  elements: []

data/spec/config_spec.rb

@@ -2,6 +2,6 @@ require 'spec_helper'
 
 describe Alchemy::Config do
   it "should have an array of fields for mailer" do
-    Alchemy::Config.get(:mailer)[:fields].should be_a(Array)
+    Alchemy::Config.get(:mailer)['fields'].should be_a(Array)
   end
 end

data/spec/dummy/db/schema.rb

@@ -273,7 +273,7 @@ ActiveRecord::Schema.define(:version => 20120302040145) do
     t.datetime "starts_at"
     t.datetime "ends_at"
     t.text     "description"
-    t.decimal  "entrance_fee"
+    t.decimal  "entrance_fee", :precision => 6, :scale => 2
     t.boolean  "published"
     t.datetime "created_at",   :null => false
     t.datetime "updated_at",   :null => false

data/spec/helpers/admin/contents_helper_spec.rb

@@ -3,18 +3,19 @@ require 'spec_helper'
 describe Alchemy::Admin::ContentsHelper do
 
   before(:each) do
-    @element = FactoryGirl.create(:element)
+    @element = FactoryGirl.create(:element, :name => 'article')
   end
 
   it "should render a dom id" do
-    helper.content_dom_id(@element.contents.first).should match(/essence_text_\d{1,}/)
+    helper.content_dom_id(@element.content_by_type('EssenceText')).should match(/essence_text_\d{1,}/)
   end
 
   it "should render the content name" do
-    helper.render_content_name(@element.contents.first).should == "Intro"
+    helper.render_content_name(@element.content_by_type('EssenceText')).should == "Intro"
   end
 
   it "should render a link to add new content to element" do
+    helper.stub!(:render_icon).and_return('')
     helper.render_new_content_link(@element).should match(/Alchemy.openWindow.+\/admin\/elements\/#{@element.id}\/contents\/new/m)
   end
 

data/spec/helpers/admin/essences_helper_spec.rb

@@ -3,25 +3,21 @@ require 'spec_helper'
 describe Alchemy::Admin::EssencesHelper do
 
   before(:each) do
-    @element = FactoryGirl.create(:element)
+    @element = FactoryGirl.create(:element, :name => 'article')
     @element.content_by_name('intro').essence.update_attributes(:body => 'hello!')
   end
 
   it "should render an essence editor" do
     content = @element.content_by_name('intro')
-    render_essence_editor(content).should match(/input.+type="text".+value="hello!/)
+    helper.render_essence_editor(content).should match(/input.+type="text".+value="hello!/)
   end
 
   it "should render an essence editor by name" do
-    render_essence_editor_by_name(@element, 'intro').should match(/input.+type="text".+value="hello!/)
+    helper.render_essence_editor_by_name(@element, 'intro').should match(/input.+type="text".+value="hello!/)
   end
 
   it "should render an essence editor by type" do
-    render_essence_editor_by_type(@element, 'EssenceText').should match(/input.+type="text".+value="hello!/)
-  end
-
-  it "should render an essence editor by position" do
-    render_essence_editor_by_position(@element, 1).should match(/input.+type="text".+value="hello!/)
+    helper.render_essence_editor_by_type(@element, 'EssenceText').should match(/input.+type="text".+value="hello!/)
   end
 
 end

data/spec/helpers/essences_helper_spec.rb

@@ -25,8 +25,4 @@ describe Alchemy::EssencesHelper do
     render_essence_view_by_type(@element, 'EssenceText').should match(/hello!/)
   end
 
-  it "should render an essence view by position" do
-    render_essence_view_by_position(@element, 1).should match(/hello!/)
-  end
-
 end

data/spec/helpers/pages_helper_spec.rb

@@ -28,7 +28,7 @@ describe Alchemy::PagesHelper do
       end
 
       it "should render the page navigation" do
-        helper.render_navigation.should have_selector("ul.navigation_level_1 li.#{@page.urlname}.active.last a.active[href=\"/alchemy/#{@page.urlname}\"]")
+        helper.render_navigation.should have_selector("ul.navigation.level_1 li.#{@page.urlname}.active.last a.active[href=\"/alchemy/#{@page.urlname}\"]")
       end
 
       context "with enabled url nesting" do
@@ -47,6 +47,15 @@ describe Alchemy::PagesHelper do
 
     end
 
+    context "with id and class in the html options" do
+      it "should append id to the generated ul tag" do
+        helper.render_navigation({}, {:id => 'foobar_id'}).should have_selector("ul[id='foobar_id']")
+      end
+      it "should replace the default css class from the generated ul tag" do
+        helper.render_navigation({}, {:class => 'foobar_class'}).should have_selector("ul[class='foobar_class']")
+      end
+    end
+
   end
 
   describe '#render_subnavigation' do

data/spec/integration/admin/modules_integration_spec.rb

@@ -1,30 +1,34 @@
-require 'spec_helper'
-require 'support/integration_spec_helper'
+# Skipping on Travis-CI, because capybara-webkit does not install on travis.
+unless ENV["CI"]
+  require 'spec_helper'
 
-describe "Modules" do
+  describe "Modules" do
 
-  before(:all) do
-    FactoryGirl.build(:admin_user).save_without_session_maintenance
-  end
-  describe "a custom module with a main-apps controller" do
-    it "should have a button in main_navigation, pointing to the configured controller" do
-      Alchemy::Modules.register_module(
-        {
-          :name => 'events',
-          :navigation => {
-            :icon => 'icon events',
-            :name => 'Events',
-            :controller => '/admin/events',
-            :action => 'index'
-          }
-        })
-      login_into_alchemy
-      without_access_control do
+    context "A custom module with a main-apps controller" do
+
+      before(:each) do
+        load_authorization_rules
+        create_admin_user
+        login_into_alchemy
+      end
+
+      it "should have a button in main_navigation, pointing to the configured controller" do
+        Alchemy::Modules.register_module(
+          {
+            :name => 'events',
+            :navigation => {
+              :icon => 'icon events',
+              :name => 'Events',
+              :controller => '/admin/events',
+              :action => 'index'
+            }
+          })
         visit '/alchemy/admin'
         click_on 'Events'
         page.should_not have_content('Upps!')
       end
+
     end
-  end
 
+  end
 end

data/spec/integration/admin/pages_controller_spec.rb

@@ -5,26 +5,34 @@ unless ENV["CI"]
 
   describe Alchemy::Admin::PagesController, :js => true do
 
+    before(:all) do
+      create_admin_user
+    end
+
+    before(:each) do
+      login_into_alchemy
+    end
+
     describe "language tree switching" do
 
+      before(:all) do
+        @language = FactoryGirl.create(:language)
+      end
+
       context "in a multilangual environment" do
 
         before(:all) do
-          FactoryGirl.build(:admin_user).save_without_session_maintenance
-          @language = FactoryGirl.create(:language)
           @german_root = FactoryGirl.create(:language_root_page, :language => Alchemy::Language.get_default, :name => 'Deutsch')
           @klingonian_root = FactoryGirl.create(:language_root_page, :name => 'Klingonian')
         end
 
         it "one should be able to switch the language tree" do
-          login_into_alchemy
           visit('/alchemy/admin/pages')
           page.select 'Klingonian', :from => 'language'
           page.should have_selector('#sitemap .sitemap_pagename_link', :text => 'Klingonian')
         end
 
         after(:all) {
-          @language.destroy
           @klingonian_root.delete
           @german_root.delete
         }
@@ -33,34 +41,23 @@ unless ENV["CI"]
 
       context "with no language root page" do
 
-        before(:all) do
-          FactoryGirl.build(:admin_user).save_without_session_maintenance
-          @language = FactoryGirl.create(:language)
-        end
-
         it "it should display the form for creating language root" do
-          login_into_alchemy
           visit('/alchemy/admin/pages')
           page.select 'Klingonian', :from => 'language'
           page.should have_content('This language tree does not exist')
         end
 
-        after(:all) {
-          @language.destroy
-        }
-
       end
 
+      after(:all) {
+        @language.destroy
+      }
+
     end
 
     describe "flush complete page cache" do
 
-      before(:all) do
-        FactoryGirl.build(:admin_user).save_without_session_maintenance
-      end
-
       it "should remove the cache of all pages" do
-        login_into_alchemy
         visit '/alchemy/admin/pages'
         click_link 'Flush page cache'
         page.should have_content('Page cache flushed')

data/spec/integration/admin/resources_integration_spec.rb

@@ -1,100 +1,94 @@
-require 'spec_helper'
-require 'support/integration_spec_helper'
-
-describe "Resources" do
-
-  before(:all) do
-    Event.create!(:name => 'My Event',
-                  :hidden_name => 'not shown',
-                  :starts_at => DateTime.new(2012, 03, 02, 8, 15),
-                  :ends_at => DateTime.new(2012, 03, 02, 19, 30),
-                  :description => "something\nfancy",
-                  :published => false,
-                  :entrance_fee => 12.32)
-  end
+# Skipping on Travis-CI, because capybara-webkit does not install on travis.
+unless ENV["CI"]
+  require 'spec_helper'
 
-  describe "index view" do
+  describe "Resources" do
 
-    it "should have a button for creating a new resource items" do
-      without_access_control { visit '/admin/events' }
-      page.should have_selector('#toolbar div.button_with_label a.icon_button span.icon.create')
+    before(:all) do
+      create_admin_user
+      load_authorization_rules
+      Event.create!(:name => 'My Event',
+                    :hidden_name => 'not shown',
+                    :starts_at => DateTime.new(2012, 03, 02, 8, 15),
+                    :ends_at => DateTime.new(2012, 03, 02, 19, 30),
+                    :description => "something\nfancy",
+                    :published => false,
+                    :entrance_fee => 12.32)
+      Event.create!(:name => 'My second Event',
+                    :starts_at => DateTime.new(2012, 03, 02, 8, 15),
+                    :ends_at => DateTime.new(2012, 03, 02, 19, 30),
+                    :description => "something\nfancy",
+                    :published => false,
+                    :entrance_fee => 12.32)
     end
 
-    it "should list existing items" do
-      without_access_control {
+    before(:each) {
+      login_into_alchemy
+    }
+
+    describe "index view" do
+
+      it "should have a button for creating a new resource items" do
+        visit '/admin/events'
+        page.should have_selector('#toolbar div.button_with_label a.icon_button span.icon.create')
+      end
+
+      it "should list existing items" do
         visit '/admin/events'
         page.should have_content("My Event")
         page.should have_content("something fancy")
         page.should have_content("12.32")
-      }
-    end
+      end
 
-    it "should list existing resource-items nicely formatted"
+      it "should list existing resource-items nicely formatted"
 
-  end
+    end
 
-  describe "form for creating and updating items" do
-    it "renders an input field according to the attribute's type"
-  end
+    describe "form for creating and updating items" do
+      it "renders an input field according to the attribute's type"
+    end
 
-  describe "create resource item" do
+    describe "create resource item" do
 
-    context "when form filled with valid data" do
-      it "lists the new item" do
-        without_access_control {
-          create_admin_user
-          login_with_admin_user
+      context "when form filled with valid data" do
+        it "lists the new item" do
           visit '/admin/events/new'
           fill_in 'event_name', :with => 'My second event'
           fill_in 'event_starts_at', :with => DateTime.new(2012, 03, 03, 20, 00)
           click_on 'Save'
           page.should have_content "My second event"
           page.should have_content "2012-03-03"
-        }
+        end
       end
-    end
 
-    context "when form filled with invalid data" do
-      it "shows the form again" do
-        without_access_control {
-          create_admin_user
-          login_with_admin_user
+      context "when form filled with invalid data" do
+        it "shows the form again" do
           visit '/admin/events/new'
           fill_in 'event_name', :with => '' #invalid!
           click_on 'Save'
           page.should have_selector "input#event_name"
-        }
+        end
+        it "lists invalid fields"
       end
-      it "lists invalid fields"
-    end
 
-  end
+    end
 
-  describe "updating an item" do
-    it "shows the updated value"
-  end
+    describe "updating an item" do
+      it "shows the updated value"
+    end
 
-  describe "destroying an item" do
-    it "should'n be on the list anymore", :js => true do
-      pending "Needs js, but doesn't work, neither with selenium nor webkit.
-               When trying to create an user inside the 'without-access-control'-block
-               it's saved but not found anymore when trying to login"
+    describe "destroying an item" do
 
-      Event.create!(:name => 'My second Event',
-                    :starts_at => DateTime.new(2012, 03, 02, 8, 15),
-                    :ends_at => DateTime.new(2012, 03, 02, 19, 30),
-                    :description => "something\nfancy",
-                    :published => false,
-                    :entrance_fee => 12.32)
-
-      without_access_control {
-        create_admin_user
+      it "should'n be on the list anymore", :js => true do
         visit '/admin/events'
-        click_link 'Delete'
+        within('tr', :text => 'My second Event') do
+          click_on 'Delete'
+        end
+        click_on 'Yes'
         page.should have_content "My Event"
         page.should_not have_content "My second Event"
-      }
+      end
     end
-  end
 
+  end
 end