RubyGems - alchemy_cms - Versions diffs - 2.4.beta2 → 2.4.rc1 - Mend

alchemy_cms 2.4.beta2 → 2.4.rc1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (168) hide show

data/spec/dummy/app/views/layouts/application.html.erb ADDED Viewed

@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <!-- Your site title-prefix (That is YourSite in "YourSite - CurrentPage" is taken from a layout-page by default.
+    Alternatively you can hardcode it here -->
+  <%= render_meta_data(:title_prefix => sitename_from_header_page, :title_seperator => "-") %>
+  <!-- Paths here are relative to app/assets/stylesheets.
+    alchemy/standard_set, though, is located in Alchemy-source and doesn't have to be present in your app,
+     but you can copy it over and customize it of course. -->
+  <%= stylesheet_link_tag "alchemy/standard_set", :media => :screen %>
+  <%= stylesheet_link_tag "alchemy/standard_set", :media => :print %>
+  <!-- Here is also the place for custom javascripts. Put them in app/assets/javascripts/yourscript.js (or yourscript.js.coffee)
+    and include them like this (remove the \):
+    <\%= javascript_include_tag "yourscript" %> -->
+</head>
+<body>
+<div id="page">
+  <div id="language_select">
+    <!-- Render links with flags for all public languages -->
+    <%= language_switches(:linkname => :code) %>
+  </div>
+  <div id="breadcrump">
+    <!-- Renders a breadcrumb/ariadne-path. For customizing see docs for render_breadcrumb (link?) -->
+    <%= render_breadcrumb :seperator => "<span>&nbsp;<&nbsp;</span>" %>
+  </div>
+  <div id="navigation">
+    <!-- Renders main navigation. For customizing see docs for render_navigation (link?)
+        You can overwrite app/views/navigation/_renderer.html.erb and app/views/navigation/_link.html.erb
+        if you want to roll out your own markup -->
+    <%= render_navigation :all_sub_menues => true %>
+  </div>
+  <!-- Most important call here!
+    This yields (=inserts) all content of the current page.
+    Markup depends on page_layout, elements and essences and can be changed in app/views/alchemy/... -->
+  <%= yield %>
+  <div class="footer">
+    <!-- Renders elements that are called "footnote" (name-attribute in elements.yml)
+      from page_layout "layout_footer" (name-attribute in page_layout.yml) -->
+    <%= render_elements(
+          :from_page => 'layout_footer',
+          :only => ['footnote']
+        ) %>
+  </div>
+</div>
+<!-- This is used in Alchemy's backend to prevent navigating to other pages through the preview window -->
+<%= alchemy_preview_mode_code %>
+<!-- Renders a menu_bar when a user with sufficient rights visits a page -->
+<%= alchemy_menu_bar %>
+</body>
+</html>

data/spec/dummy/db/migrate/20121026100815_alchemy_two_point_three.rb CHANGED Viewed

@@ -63,18 +63,6 @@ class AlchemyTwoPointThree < ActiveRecord::Migration
       t.integer "page_id"
     end
-    create_table "alchemy_essence_audios", :force => true do |t|
-      t.integer  "attachment_id"
-      t.integer  "width",           :default => 400
-      t.integer  "height",          :default => 300
-      t.boolean  "show_eq",         :default => true
-      t.boolean  "show_navigation", :default => true
-      t.integer  "creator_id"
-      t.integer  "updater_id"
-      t.datetime "created_at",                        :null => false
-      t.datetime "updated_at",                        :null => false
-    end
     create_table "alchemy_essence_booleans", :force => true do |t|
       t.boolean  "value"
       t.datetime "created_at", :null => false
@@ -103,17 +91,6 @@ class AlchemyTwoPointThree < ActiveRecord::Migration
       t.datetime "updated_at",    :null => false
     end
-    create_table "alchemy_essence_flashes", :force => true do |t|
-      t.integer  "attachment_id"
-      t.integer  "width",          :default => 400
-      t.integer  "height",         :default => 300
-      t.string   "player_version", :default => "9.0.28"
-      t.integer  "creator_id"
-      t.integer  "updater_id"
-      t.datetime "created_at",                           :null => false
-      t.datetime "updated_at",                           :null => false
-    end
     create_table "alchemy_essence_htmls", :force => true do |t|
       t.text     "source"
       t.integer  "creator_id"
@@ -176,19 +153,6 @@ class AlchemyTwoPointThree < ActiveRecord::Migration
       t.datetime "updated_at",                         :null => false
     end
-    create_table "alchemy_essence_videos", :force => true do |t|
-      t.integer  "attachment_id"
-      t.integer  "width"
-      t.integer  "height"
-      t.boolean  "allow_fullscreen", :default => true
-      t.boolean  "auto_play",        :default => false
-      t.boolean  "show_navigation",  :default => true
-      t.integer  "creator_id"
-      t.integer  "updater_id"
-      t.datetime "created_at",                          :null => false
-      t.datetime "updated_at",                          :null => false
-    end
     create_table "alchemy_folded_pages", :force => true do |t|
       t.integer "page_id"
       t.integer "user_id"

data/spec/dummy/db/migrate/20121113115120_create_alchemy_essence_links.rb ADDED Viewed

@@ -0,0 +1,13 @@
+class CreateAlchemyEssenceLinks < ActiveRecord::Migration
+  def change
+    create_table :alchemy_essence_links do |t|
+      t.string :link
+      t.string :link_title
+      t.string :link_target
+      t.string :link_class_name
+      t.timestamps
+      t.userstamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20121115100736_add_cached_tag_list_to_elements_pages_and_users.rb ADDED Viewed

@@ -0,0 +1,7 @@
+class AddCachedTagListToElementsPagesAndUsers < ActiveRecord::Migration
+  def change
+    add_column :alchemy_elements, :cached_tag_list, :text
+    add_column :alchemy_pages,    :cached_tag_list, :text
+    add_column :alchemy_users,    :cached_tag_list, :text
+  end
+end

data/spec/dummy/db/migrate/20121116140636_add_cached_tag_list_to_alchemy_attachments.rb ADDED Viewed

@@ -0,0 +1,5 @@
+class AddCachedTagListToAlchemyAttachments < ActiveRecord::Migration
+  def change
+    add_column :alchemy_attachments, :cached_tag_list, :text
+  end
+end

data/spec/dummy/db/migrate/20121116141016_change_alchemy_pictures_tag_list_column.rb ADDED Viewed

@@ -0,0 +1,9 @@
+class ChangeAlchemyPicturesTagListColumn < ActiveRecord::Migration
+  def up
+    change_column :alchemy_pictures, :cached_tag_list, :text, :limit => nil
+  end
+  def down
+    change_column :alchemy_pictures, :cached_tag_list, :string
+  end
+end

data/spec/dummy/db/schema.rb CHANGED Viewed

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20121026104128) do
+ActiveRecord::Schema.define(:version => 20121116141016) do
   create_table "alchemy_attachments", :force => true do |t|
     t.string   "name"
@@ -20,8 +20,9 @@ ActiveRecord::Schema.define(:version => 20121026104128) do
     t.integer  "size"
     t.integer  "creator_id"
     t.integer  "updater_id"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+    t.text     "cached_tag_list"
   end
   create_table "alchemy_cells", :force => true do |t|
@@ -49,14 +50,15 @@ ActiveRecord::Schema.define(:version => 20121026104128) do
     t.string   "name"
     t.integer  "position"
     t.integer  "page_id"
-    t.boolean  "public",     :default => true
-    t.boolean  "folded",     :default => false
-    t.boolean  "unique",     :default => false
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
+    t.boolean  "public",          :default => true
+    t.boolean  "folded",          :default => false
+    t.boolean  "unique",          :default => false
+    t.datetime "created_at",                         :null => false
+    t.datetime "updated_at",                         :null => false
     t.integer  "creator_id"
     t.integer  "updater_id"
     t.integer  "cell_id"
+    t.text     "cached_tag_list"
   end
   add_index "alchemy_elements", ["page_id", "position"], :name => "index_elements_on_page_id_and_position"
@@ -66,18 +68,6 @@ ActiveRecord::Schema.define(:version => 20121026104128) do
     t.integer "page_id"
   end
-  create_table "alchemy_essence_audios", :force => true do |t|
-    t.integer  "attachment_id"
-    t.integer  "width",           :default => 400
-    t.integer  "height",          :default => 300
-    t.boolean  "show_eq",         :default => true
-    t.boolean  "show_navigation", :default => true
-    t.integer  "creator_id"
-    t.integer  "updater_id"
-    t.datetime "created_at",                        :null => false
-    t.datetime "updated_at",                        :null => false
-  end
   create_table "alchemy_essence_booleans", :force => true do |t|
     t.boolean  "value"
     t.datetime "created_at", :null => false
@@ -106,17 +96,6 @@ ActiveRecord::Schema.define(:version => 20121026104128) do
     t.datetime "updated_at",    :null => false
   end
-  create_table "alchemy_essence_flashes", :force => true do |t|
-    t.integer  "attachment_id"
-    t.integer  "width",          :default => 400
-    t.integer  "height",         :default => 300
-    t.string   "player_version", :default => "9.0.28"
-    t.integer  "creator_id"
-    t.integer  "updater_id"
-    t.datetime "created_at",                           :null => false
-    t.datetime "updated_at",                           :null => false
-  end
   create_table "alchemy_essence_htmls", :force => true do |t|
     t.text     "source"
     t.integer  "creator_id"
@@ -125,6 +104,17 @@ ActiveRecord::Schema.define(:version => 20121026104128) do
     t.datetime "updated_at", :null => false
   end
+  create_table "alchemy_essence_links", :force => true do |t|
+    t.string   "link"
+    t.string   "link_title"
+    t.string   "link_target"
+    t.string   "link_class_name"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+    t.integer  "creator_id"
+    t.integer  "updater_id"
+  end
   create_table "alchemy_essence_pictures", :force => true do |t|
     t.integer  "picture_id"
     t.string   "caption"
@@ -179,19 +169,6 @@ ActiveRecord::Schema.define(:version => 20121026104128) do
     t.datetime "updated_at",                         :null => false
   end
-  create_table "alchemy_essence_videos", :force => true do |t|
-    t.integer  "attachment_id"
-    t.integer  "width"
-    t.integer  "height"
-    t.boolean  "allow_fullscreen", :default => true
-    t.boolean  "auto_play",        :default => false
-    t.boolean  "show_navigation",  :default => true
-    t.integer  "creator_id"
-    t.integer  "updater_id"
-    t.datetime "created_at",                          :null => false
-    t.datetime "updated_at",                          :null => false
-  end
   create_table "alchemy_folded_pages", :force => true do |t|
     t.integer "page_id"
     t.integer "user_id"
@@ -242,6 +219,7 @@ ActiveRecord::Schema.define(:version => 20121026104128) do
     t.integer  "creator_id"
     t.integer  "updater_id"
     t.integer  "language_id"
+    t.text     "cached_tag_list"
   end
   add_index "alchemy_pages", ["language_id"], :name => "index_pages_on_language_id"
@@ -258,7 +236,7 @@ ActiveRecord::Schema.define(:version => 20121026104128) do
     t.integer  "creator_id"
     t.integer  "updater_id"
     t.string   "upload_hash"
-    t.string   "cached_tag_list"
+    t.text     "cached_tag_list"
   end
   create_table "alchemy_users", :force => true do |t|
@@ -285,6 +263,7 @@ ActiveRecord::Schema.define(:version => 20121026104128) do
     t.datetime "updated_at",                                                   :null => false
     t.integer  "creator_id"
     t.integer  "updater_id"
+    t.text     "cached_tag_list"
   end
   add_index "alchemy_users", ["perishable_token"], :name => "index_users_on_perishable_token"

data/spec/helpers/elements_block_helper_spec.rb ADDED Viewed

@@ -0,0 +1,135 @@
+require 'spec_helper'
+include Alchemy::ElementsHelper
+module Alchemy
+  describe ElementsBlockHelper do
+    let(:page)    { FactoryGirl.create(:public_page) }
+    let(:element) { FactoryGirl.create(:element, page: page, tag_list: 'foo, bar') }
+    let(:expected_wrapper_tag) { "div.#{element.name}##{element_dom_id(element)}" }
+    describe '#element_view_for' do
+      it "should yield an instance of ElementViewHelper" do
+        expect { |b| element_view_for(element, &b) }.
+          to yield_with_args(ElementsBlockHelper::ElementViewHelper)
+      end
+      it "should wrap its output in a DOM element" do
+        element_view_for(element).
+          should have_css expected_wrapper_tag
+      end
+      it "should change the wrapping DOM element according to parameters" do
+        element_view_for(element, tag: 'span', class: 'some_class', id: 'some_id').
+          should have_css 'span.some_class#some_id'
+      end
+      it "should include the element's tags in the wrapper DOM element" do
+        element_view_for(element).
+          should have_css "#{expected_wrapper_tag}[data-element-tags='foo bar']"
+      end
+      it "should use the provided tags formatter to format tags" do
+        element_view_for(element, tags_formatter: lambda { |tags| tags.join ", " }).
+          should have_css "#{expected_wrapper_tag}[data-element-tags='foo, bar']"
+      end
+      it "should include the contents rendered by the block passed to it" do
+        element_view_for(element) do
+          'view'
+        end.should have_content 'view'
+      end
+      context "when/if preview mode is not active" do
+        subject { element_view_for(element) }
+        it { should have_css expected_wrapper_tag }
+        it { should_not have_css "#{expected_wrapper_tag}[data-alchemy-element]" }
+      end
+      context "when/if preview mode is active" do
+        before do
+          assign(:preview_mode, true)
+          assign(:page, page)
+        end
+        subject { helper.element_view_for(element) }
+        it { should have_css "#{expected_wrapper_tag}[data-alchemy-element='#{element.id}']" }
+      end
+    end
+    describe '#element_editor_for' do
+      it "should yield an instance of ElementEditorHelper" do
+        expect { |b| element_editor_for(element, &b) }.
+          to yield_with_args(ElementsBlockHelper::ElementEditorHelper)
+      end
+      it "should not add any extra elements" do
+        element_editor_for(element) do
+          'view'
+        end.should == 'view'
+      end
+    end
+    describe ElementsBlockHelper::ElementViewHelper do
+      let(:scope) { mock }
+      subject { ElementsBlockHelper::ElementViewHelper.new(scope, element: element) }
+      it 'should have a reference to the specified element' do
+        subject.element == element
+      end
+      describe '#render' do
+        it 'should delegate to the render_essence_view_by_name helper' do
+          scope.should_receive(:render_essence_view_by_name).with(element, "title", foo: 'bar')
+          subject.render :title, foo: 'bar'
+        end
+      end
+      describe '#content' do
+        it "should delegate to the element's #content_by_name method" do
+          element.should_receive(:content_by_name).with(:title)
+          subject.content :title
+        end
+      end
+      describe '#ingredient' do
+        it "should delegate to the element's #ingredient method" do
+          element.should_receive(:ingredient).with(:title)
+          subject.ingredient :title
+        end
+      end
+      describe '#has?' do
+        it "should delegate to the element's #has_ingredient? method" do
+          element.should_receive(:has_ingredient?).with(:title)
+          subject.has? :title
+        end
+      end
+      describe '#essence' do
+        it "should provide the specified content essence" do
+          subject.should_receive(:content).with(:title).
+            and_return(mock('content', :essence => mock('essence')))
+          subject.essence :title
+        end
+      end
+    end
+    describe ElementsBlockHelper::ElementEditorHelper do
+      let(:scope) { mock }
+      subject { ElementsBlockHelper::ElementEditorHelper.new(scope, element: element) }
+      it 'should have a reference to the specified element' do
+        subject.element == element
+      end
+      describe '#edit' do
+        it "should delegate to the render_essence_editor_by_name helper" do
+          scope.should_receive(:render_essence_editor_by_name).with(element, "title", foo: 'bar')
+          subject.edit :title, foo: 'bar'
+        end
+      end
+    end
+  end
+end

data/spec/helpers/elements_helper_spec.rb CHANGED Viewed

@@ -158,14 +158,52 @@ describe Alchemy::ElementsHelper do
   end
   context "in preview mode" do
+    describe '#element_preview_code_attributes' do
+      it "should return the data-alchemy-element HTML attribute for element" do
+        @preview_mode = true
+        helper.element_preview_code_attributes(@element).should == {:'data-alchemy-element' => @element.id}
+      end
+      it "should return an empty hash if not in preview_mode" do
+        helper.element_preview_code_attributes(@element).should == {}
+      end
+    end
+    describe '#element_preview_code' do
+      it "should return the data-alchemy-element HTML attribute for element" do
+        assign(:preview_mode, true)
+        helper.element_preview_code(@element).should == " data-alchemy-element=\"#{@element.id}\""
+      end
+      it "should not return the data-alchemy-element HTML attribute if not in preview_mode" do
+        helper.element_preview_code(@element).should_not == " data-alchemy-element=\"#{@element.id}\""
+      end
+    end
+  end
+  describe '#element_tags' do
+    context "element having tags" do
+      before { @element.tag_list = "peter, lustig"; @element.save! }
-    it "should return the data-alchemy-element HTML attribute for element" do
-      @preview_mode = true
-      helper.element_preview_code(@element).should == " data-alchemy-element='#{@element.id}'"
+      context "with no formatter lambda given" do
+        it "should return tag list as HTML data attribute" do
+          helper.element_tags(@element).should == " data-element-tags=\"peter lustig\""
+        end
+      end
+      context "with a formatter lambda given" do
+        it "should return a properly formatted HTML data attribute" do
+          helper.element_tags(@element, :formatter => lambda { |tags| tags.join ", " }).
+            should == " data-element-tags=\"peter, lustig\""
+        end
+      end
     end
-    it "should not return the data-alchemy-element HTML attribute if not in preview_mode" do
-      helper.element_preview_code(@element).should_not == " data-alchemy-element='#{@element.id}'"
+    context "element not having tags" do
+      it "should return empty string" do
+        helper.element_tags(@element).should be_blank
+      end
     end
   end