alchemy_cms 2.2.rc14 → 2.2.rc15

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
 
-  VERSION = "2.2.rc14"
+  VERSION = "2.2.rc15"
 
 end

data/spec/controllers/admin/elements_controller_spec.rb

@@ -17,7 +17,7 @@ module Alchemy
 
       it "should return a select tag with elements" do
         Alchemy::Page.should_receive(:find_by_urlname_and_language_id).and_return(page)
-        Alchemy::Element.should_receive(:find_all_by_page_id_and_public).and_return([element])
+        Alchemy::Element.stub_chain([:published, :find_all_by_page_id]).and_return([element])
         get :list, {:page_urlname => page.urlname, :format => :js}
         response.body.should match(/select(.*)elements_from_page_selector(.*)option/)
       end

data/spec/controllers/admin/pages_controller_spec.rb

@@ -5,7 +5,7 @@ module Alchemy
 
     before(:each) do
       activate_authlogic
-      Alchemy::UserSession.create FactoryGirl.create(:admin_user)
+      UserSession.create FactoryGirl.create(:admin_user)
     end
 
     describe "#flush" do
@@ -64,7 +64,7 @@ module Alchemy
     describe '#copy_language_tree' do
 
       before(:each) do
-        @language = Alchemy::Language.get_default
+        @language = Language.get_default
         @language_root = FactoryGirl.create(:language_root_page, :language => @language, :name => 'Intro')
         @level_1 = FactoryGirl.create(:public_page, :language => @language, :parent_id => @language_root.id, :visible => true, :name => 'Level 1')
         @level_2 = FactoryGirl.create(:public_page, :language => @language, :parent_id => @level_1.id, :visible => true, :name => 'Level 2')
@@ -74,7 +74,7 @@ module Alchemy
         session[:language_code] = @new_language.code
         session[:language_id] = @new_language.id
         post :copy_language_tree, {:languages => {:new_lang_id => @new_language.id, :old_lang_id => @language.id}}
-        @new_lang_root = Alchemy::Page.language_root_for(@new_language.id)
+        @new_lang_root = Page.language_root_for(@new_language.id)
       end
 
       it "should copy all pages" do
@@ -93,5 +93,25 @@ module Alchemy
 
     end
 
+    describe '#edit' do
+
+      before(:each) do
+        @language = Language.get_default
+        @page = FactoryGirl.create(:public_page, :language => @language)
+        session[:language_id] = @language.id
+      end
+
+      it "should find a page from urlname" do
+        get :edit, {:id => @page.to_param}
+        response.status.should == 200
+      end
+
+      it "should find a page from id" do
+        get :edit, {:id => @page.id}
+        response.status.should == 200
+      end
+
+    end
+
   end
 end

data/spec/models/page_spec.rb

@@ -527,5 +527,17 @@ module Alchemy
 
     end
 
+    describe '#to_param' do
+
+      before(:each) do
+        @page = FactoryGirl.create(:public_page)
+      end
+
+      it "should use the urlname as id parameter in urls" do
+        @page.to_param.should == @page.urlname
+      end
+
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.2.rc14
+  version: 2.2.rc15
   prerelease: 4
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-11 00:00:00.000000000 Z
+date: 2012-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -394,6 +394,7 @@ files:
 - app/assets/javascripts/alchemy/alchemy.elements_window.js
 - app/assets/javascripts/alchemy/alchemy.file_progress.js
 - app/assets/javascripts/alchemy/alchemy.growler.js
+- app/assets/javascripts/alchemy/alchemy.gui.js.coffee
 - app/assets/javascripts/alchemy/alchemy.html5.js
 - app/assets/javascripts/alchemy/alchemy.image_cropper.js
 - app/assets/javascripts/alchemy/alchemy.jquery_loader.js
@@ -519,7 +520,7 @@ files:
 - app/views/alchemy/admin/clipboard/insert.js.erb
 - app/views/alchemy/admin/clipboard/remove.js.erb
 - app/views/alchemy/admin/contents/_missing.html.erb
-- app/views/alchemy/admin/contents/create.js.erb
+- app/views/alchemy/admin/contents/create.js.coffee
 - app/views/alchemy/admin/contents/destroy.js.coffee
 - app/views/alchemy/admin/contents/new.html.erb
 - app/views/alchemy/admin/contents/order.js.erb
@@ -531,7 +532,7 @@ files:
 - app/views/alchemy/admin/elements/_elements_select.html.erb
 - app/views/alchemy/admin/elements/_new_element_form.html.erb
 - app/views/alchemy/admin/elements/_picture_editor.html.erb
-- app/views/alchemy/admin/elements/create.js.coffee
+- app/views/alchemy/admin/elements/create.js.erb
 - app/views/alchemy/admin/elements/fold.js.coffee
 - app/views/alchemy/admin/elements/index.html.erb
 - app/views/alchemy/admin/elements/list.js.erb
@@ -576,7 +577,7 @@ files:
 - app/views/alchemy/admin/pages/show.html.erb
 - app/views/alchemy/admin/pages/sort.js.erb
 - app/views/alchemy/admin/pages/unlock.js.erb
-- app/views/alchemy/admin/pages/update.js.coffee
+- app/views/alchemy/admin/pages/update.js.erb
 - app/views/alchemy/admin/partials/_flash.html.erb
 - app/views/alchemy/admin/partials/_flash_notices.html.erb
 - app/views/alchemy/admin/partials/_flash_upload.html.erb

data/app/views/alchemy/admin/contents/create.js.erb

@@ -1,49 +0,0 @@
-(function($) {
-  <% if params[:was_missing] -%>
-
-  $("#element_<%= @element.id -%>_content_missing").replaceWith('<%= escape_javascript(
-    render(
-      :partial => "alchemy/essences/#{@content.essence_partial_name}_editor",
-      :locals => @locals
-    )
-  ) -%>');
-
-  <% else -%>
-
-  $("<%= @element_dom_id -%>").before('<%= escape_javascript(
-    render(
-      :partial => "alchemy/essences/#{@content.essence_partial_name}_editor",
-      :locals => @locals
-    )
-  ) -%>');
-  Alchemy.enableButton('.disabled.button');
-  Alchemy.overlayObserver('#<%= content_dom_id(@content) %>');
-
-  <% end -%>
-
-  <% case @content.essence_type -%>
-  <% when "Alchemy::EssencePicture" -%>
-  $('#picture_to_assign_<%= @content.ingredient.id %> a').attr('href', '#').off('click');
-  <% if @contents_of_this_type.length > 1 -%>
-  $('#element_<%= @element.id -%>_contents .essence_picture_editor').addClass('dragable_picture');
-  <% end -%>
-  <% if !max_image_count.blank? && (@contents_of_this_type.length >= max_image_count) -%>
-  $("#add_content_<%= @element.id -%>").remove();
-  <% end -%>
-  Alchemy.SortableContents('#element_<%= @element.id -%>_contents', '<%= form_authenticity_token -%>');
-
-  <% when "Alchemy::EssenceDate" -%>
-
-  Alchemy.Datepicker('#element_<%= @element.id -%> input.date');
-
-  <% when "Alchemy::EssenceRichtext" -%>
-
-  Alchemy.Tinymce.addEditor('contents_content_<%= @content.id -%>_body');
-
-  <% end -%>
-
-  Alchemy.reloadPreview();
-  Alchemy.closeCurrentWindow();
-  Alchemy.SelectBox("#element_<%= @element.id %> select.alchemy_selectbox");
-  Alchemy.growl('<%= t("Successfully added content", :content => @content.name) -%>');
-})(jQuery);

data/app/views/alchemy/admin/elements/create.js.coffee

@@ -1,31 +0,0 @@
-<% if @cutted_element_id %>
-$('.element_editor[data-element-id="<%= @cutted_element_id %>"]').remove()
-<% end %>
-
-<% if @page.can_have_cells? %>
-Alchemy.selectOrCreateCellTab('<%= @cell.nil? ? "for_other_elements" : @cell.name -%>', '<%= @cell.nil? ? t("other Elements") : @cell.name_for_label -%>')
-<% end %>
-
-$('#cell_<%= @cell.nil? ? "for_other_elements" : @cell.name -%>').append('<%= escape_javascript render(:partial => "element", :object => @element, :locals => {:draggable => true}) -%>')
-$('#cell_<%= @cell.nil? ? "for_other_elements" : @cell.name -%>').sortable('refresh')
-Alchemy.growl('<%= t("successfully_added_element") -%>')
-Alchemy.closeCurrentWindow()
-
-<% @element.rtf_contents.each do |content| %>
-Alchemy.Tinymce.addEditor('<%= content.form_field_id -%>')
-<% end %>
-
-Alchemy.PreviewWindow.refresh()
-Alchemy.ElementEditorSelector.init()
-
-$el = $('#element_<%= @element.id -%>')
-$el.trigger('Alchemy.SelectElementEditor')
-Alchemy.ElementDirtyObserver($el)
-Alchemy.SelectBox('select', $el)
-Alchemy.ButtonObserver('button.button', $el)
-Alchemy.Datepicker('input[type="date"]', $el)
-Alchemy.overlayObserver($el)
-
-<% if @clipboard.blank? %>
-$('#clipboard_button .icon.clipboard').removeClass('full')
-<% end %>

data/app/views/alchemy/admin/pages/update.js.coffee

@@ -1,36 +0,0 @@
-Alchemy.closeCurrentWindow()
-
-<% if @while_page_edit %>
-
-Alchemy.reloadPreview()
-$('#page_<%= @page.id %>_status').replaceWith('<%= escape_javascript(render(:partial => "page_status")) -%>')
-
-<% else %>
-$page = $('#page_<%= @page.id %>')
-$('.sitemap_page > .sitemap_sitename .sitemap_pagename_link', $page).html('<%= @page.name -%>')
-
-<% if @page.locked? && @page.locker == current_user %>
-
-$('#locked_page_<%= @page.id %> > a').html('<%= @page.name -%>')
-
-<% end %>
-
-$('#page_<%= @page.id %>_infos').html('<%= escape_javascript(render(:partial => "page_infos", :locals => {:page => @page})) -%>')
-
-<% if @page.restricted? %>
-
-$('.page_status:nth-child(3)', $page).addClass('restricted', 'not_restricted').removeClass('not_restricted')
-
-<% elsif @page.redirects_to_external? %>
-
-$('span.redirect_url', $page).html('&raquo; <%= t("Redirects to") %>: <%= h @page.urlname %>')
-
-<% else %>
-
-$('.page_status:nth-child(3)', $page).addClass('not_restricted').removeClass('restricted')
-
-<% end %>
-
-<% end %>
-
-Alchemy.growl("<%= @notice -%>")