alchemy_cms 2.2.rc13 → 2.2.rc14

data/spec/dummy/app/models/event.rb

@@ -1,4 +1,4 @@
 class Event < ActiveRecord::Base
-  attr_accessible :name, :hidden_name, :starts_at, :ends_at, :description, :published, :entrance_fee
+  attr_accessible :name, :hidden_name, :starts_at, :ends_at, :description, :published, :entrance_fee, :location_id
   validates_presence_of :name
 end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120302040145) do
+ActiveRecord::Schema.define(:version => 20120611221734) do
 
   create_table "alchemy_attachments", :force => true do |t|
     t.string   "name"
@@ -24,6 +24,14 @@ ActiveRecord::Schema.define(:version => 20120302040145) do
     t.datetime "updated_at",   :null => false
   end
 
+  create_table "alchemy_essence_booleans", :force => true do |t|
+    t.boolean "value"
+    t.timestamps
+    t.userstamps
+  end
+
+  add_index "alchemy_essence_booleans", ["value"], :name => "index_alchemy_essence_booleans_on_value"
+
   create_table "alchemy_cells", :force => true do |t|
     t.integer  "page_id"
     t.string   "name"
@@ -145,6 +153,14 @@ ActiveRecord::Schema.define(:version => 20120302040145) do
     t.datetime "updated_at",                       :null => false
   end
 
+  create_table "alchemy_essence_selects", :force => true do |t|
+    t.string "value"
+    t.timestamps
+    t.userstamps
+  end
+
+  add_index "alchemy_essence_selects", ["value"], :name => "index_alchemy_essence_selects_on_value"
+
   create_table "alchemy_essence_texts", :force => true do |t|
     t.text     "body"
     t.string   "link"
@@ -275,6 +291,7 @@ ActiveRecord::Schema.define(:version => 20120302040145) do
     t.text     "description"
     t.decimal  "entrance_fee", :precision => 6, :scale => 2
     t.boolean  "published"
+    t.integer  "location_id"
     t.datetime "created_at",   :null => false
     t.datetime "updated_at",   :null => false
   end

data/spec/helpers/admin/contents_helper_spec.rb

@@ -16,11 +16,12 @@ describe Alchemy::Admin::ContentsHelper do
 
   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)
+    helper.render_new_content_link(@element).should match(/a.+href.*admin\/elements\/#{@element.id}\/contents\/new/m)
   end
 
   it "should render a link to create a content in element" do
-    helper.render_create_content_link(@element).should match(/a.+href.*admin\/contents.+class.+button new_content_link.*data-method.+post/)
+    helper.stub!(:render_icon).and_return('')
+    helper.render_create_content_link(@element, 'headline').should match(/a.+href.*admin\/contents.+class.+button new_content_link.*data-method.+post/)
   end
 
 end

data/spec/models/clipboard_spec.rb

@@ -81,10 +81,21 @@ module Alchemy
       end
 
       describe '#clear' do
-        it "should clear complete category collection" do
-          clipboard.clear(:elements)
-          clipboard[:elements].should be_empty
+
+        context "passing a category" do
+          it "should clear the category collection" do
+            clipboard.clear(:elements)
+            clipboard[:elements].should be_empty
+          end
+        end
+
+        context "passing no category" do
+          it "should clear the complete clipboard" do
+            clipboard.clear
+            clipboard.should be_empty
+          end
         end
+
       end
 
       describe '#get' do

data/spec/models/essence_boolean_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+module Alchemy
+  describe EssenceBoolean do
+
+    it "should act as essence" do
+      expect { EssenceBoolean.new.acts_as_essence? }.should_not raise_error(NoMethodError)
+    end
+
+    it "should have correct partial path" do
+      EssenceBoolean.new.to_partial_path.should == 'alchemy/essences/essence_boolean_view'
+    end
+
+  end
+end

data/spec/models/essence_select_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+module Alchemy
+  describe EssenceSelect do
+
+    it "should act as essence" do
+      expect { EssenceSelect.new.acts_as_essence? }.should_not raise_error(NoMethodError)
+    end
+
+    it "should have correct partial path" do
+      EssenceSelect.new.to_partial_path.should == 'alchemy/essences/essence_select_view'
+    end
+
+  end
+end

data/spec/models/resource_spec.rb

@@ -0,0 +1,113 @@
+require 'spec_helper'
+
+module Alchemy
+  describe Resource do
+
+    def module_definition
+      {
+        "name" => "event_list",
+        "engine_name" => "event_engine",
+        "navigation" => {
+          "name" => "modules.event_list",
+          "controller" => "admin/events",
+          "action" => "index",
+          "image" => "/assets/event_list_module.png"
+        }
+      }
+    end
+
+    def resource_relations
+      {
+        "event" => {
+          "location_id" => {
+            "attr_method" => "location#name",
+            "attr_type" => "string"
+          }
+        }
+      }
+    end
+
+    let(:resource) { Resource.new("admin/events", module_definition) }
+
+    describe "#initialize" do
+      it "should set an instance variable wich holds the controller path" do
+        resource.instance_variable_get(:@controller_path).should == "admin/events"
+      end
+
+      it "should set an instance variable wich holds the module definition" do
+        resource.instance_variable_get(:@module_definition).should == module_definition
+      end
+
+      it "should set the standard rails database attributes to be skipped" do
+        resource.skip_attributes.should == %W[id updated_at created_at creator_id updater_id]
+      end
+    end
+
+    describe "#model" do
+      it "should return the classified and constantized model name" do
+        resource.model.should == Event
+      end
+    end
+
+    describe "#resources_name" do
+      it "should return the resources name as a string" do
+        resource.resources_name.should == "events"
+      end
+    end
+
+    describe "#model_name" do
+      it "should return the model name (singularized and as a string)" do
+        resource.model_name.should == "event"
+      end
+    end
+
+    describe "#permission_scope" do
+      it "should set an instance variable wich holds the permission scope for declarative authorization" do
+        resource.permission_scope
+        resource.instance_variable_get(:@_permission).should == :admin_events
+      end
+    end
+
+    describe "#namespace_for_scope" do
+      it "should return the namespace" do
+        resource.namespace_for_scope.should == ["admin"]
+      end
+    end
+
+    describe "#attributes" do
+      it "should not return the to be skipped attributes" do
+        resource.class.const_get(:DEFAULT_SKIPPED_ATTRIBUTES).each do |skipped_attr|
+          resource.attributes.detect{|a| a[:name] == skipped_attr }.should == nil
+        end
+      end
+
+      context "when resource relations defined in the config.yml" do
+        it "should use the attribute location#name instead of location_id" do
+          Config.stub(:get).with(:resource_relations).and_return(resource_relations)
+          resource.attributes.detect{|a| a[:name] == "location#name" }.should == {:name=>"location#name", :type=> :string}
+        end
+      end
+
+      context "when no resource relations defined in the config.yml" do
+        it "should use the attribute location_id" do
+          Config.stub(:get).with(:resource_relations).and_return(nil)
+          resource.attributes.detect{|a| a[:name] == "location_id" }.should == {:name=>"location_id", :type=> :integer}
+        end
+      end
+
+    end
+
+    describe "#engine_name" do
+      it "should return the engine name of the module" do
+        resource.engine_name.should == "event_engine"
+      end
+    end
+
+    describe "#in_engine?" do
+      it "should return true if the module is shipped within an engine" do
+        resource.in_engine?.should == true
+      end
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.2.rc13
+  version: 2.2.rc14
   prerelease: 4
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-03 00:00:00.000000000 Z
+date: 2012-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -222,6 +222,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.3
+- !ruby/object:Gem::Dependency
+  name: coffee-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: bumpy
   requirement: !ruby/object:Gem::Requirement
@@ -468,12 +484,14 @@ files:
 - app/models/alchemy/content.rb
 - app/models/alchemy/element.rb
 - app/models/alchemy/essence_audio.rb
+- app/models/alchemy/essence_boolean.rb
 - app/models/alchemy/essence_date.rb
 - app/models/alchemy/essence_file.rb
 - app/models/alchemy/essence_flash.rb
 - app/models/alchemy/essence_html.rb
 - app/models/alchemy/essence_picture.rb
 - app/models/alchemy/essence_richtext.rb
+- app/models/alchemy/essence_select.rb
 - app/models/alchemy/essence_text.rb
 - app/models/alchemy/essence_video.rb
 - app/models/alchemy/folded_page.rb
@@ -502,7 +520,7 @@ files:
 - 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/destroy.js.erb
+- app/views/alchemy/admin/contents/destroy.js.coffee
 - app/views/alchemy/admin/contents/new.html.erb
 - app/views/alchemy/admin/contents/order.js.erb
 - app/views/alchemy/admin/dashboard/index.html.erb
@@ -513,8 +531,8 @@ 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.erb
-- app/views/alchemy/admin/elements/fold.js.erb
+- app/views/alchemy/admin/elements/create.js.coffee
+- app/views/alchemy/admin/elements/fold.js.coffee
 - app/views/alchemy/admin/elements/index.html.erb
 - app/views/alchemy/admin/elements/list.js.erb
 - app/views/alchemy/admin/elements/new.html.erb
@@ -523,9 +541,9 @@ files:
 - app/views/alchemy/admin/elements/update.js.erb
 - app/views/alchemy/admin/essence_files/assign.js.erb
 - app/views/alchemy/admin/essence_files/edit.html.erb
-- app/views/alchemy/admin/essence_pictures/assign.js.erb
+- app/views/alchemy/admin/essence_pictures/assign.js.coffee
 - app/views/alchemy/admin/essence_pictures/crop.html.erb
-- app/views/alchemy/admin/essence_pictures/destroy.js.erb
+- app/views/alchemy/admin/essence_pictures/destroy.js.coffee
 - app/views/alchemy/admin/essence_pictures/edit.html.erb
 - app/views/alchemy/admin/essence_pictures/save_link.js.erb
 - app/views/alchemy/admin/essence_pictures/update.js.erb
@@ -547,7 +565,7 @@ files:
 - app/views/alchemy/admin/pages/_sitemap.html.erb
 - app/views/alchemy/admin/pages/configure.html.erb
 - app/views/alchemy/admin/pages/configure_external.html.erb
-- app/views/alchemy/admin/pages/destroy.js.erb
+- app/views/alchemy/admin/pages/destroy.js.coffee
 - app/views/alchemy/admin/pages/edit.html.erb
 - app/views/alchemy/admin/pages/flush.js.erb
 - app/views/alchemy/admin/pages/fold.js.erb
@@ -558,7 +576,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.erb
+- app/views/alchemy/admin/pages/update.js.coffee
 - 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
@@ -588,7 +606,7 @@ files:
 - app/views/alchemy/admin/resources/edit.html.erb
 - app/views/alchemy/admin/resources/index.html.erb
 - app/views/alchemy/admin/resources/new.html.erb
-- app/views/alchemy/admin/trash/clear.js.erb
+- app/views/alchemy/admin/trash/clear.js.coffee
 - app/views/alchemy/admin/trash/index.html.erb
 - app/views/alchemy/admin/users/_table.html.erb
 - app/views/alchemy/admin/users/_user.html.erb
@@ -645,6 +663,8 @@ files:
 - app/views/alchemy/elements/show.js.erb
 - app/views/alchemy/essences/_essence_audio_editor.html.erb
 - app/views/alchemy/essences/_essence_audio_view.html.erb
+- app/views/alchemy/essences/_essence_boolean_editor.html.erb
+- app/views/alchemy/essences/_essence_boolean_view.html.erb
 - app/views/alchemy/essences/_essence_date_editor.html.erb
 - app/views/alchemy/essences/_essence_date_view.html.erb
 - app/views/alchemy/essences/_essence_file_editor.html.erb
@@ -658,6 +678,8 @@ files:
 - app/views/alchemy/essences/_essence_picture_view.html.erb
 - app/views/alchemy/essences/_essence_richtext_editor.html.erb
 - app/views/alchemy/essences/_essence_richtext_view.html.erb
+- app/views/alchemy/essences/_essence_select_editor.html.erb
+- app/views/alchemy/essences/_essence_select_view.html.erb
 - app/views/alchemy/essences/_essence_text_editor.html.erb
 - app/views/alchemy/essences/_essence_text_view.html.erb
 - app/views/alchemy/essences/_essence_video_editor.html.erb
@@ -751,6 +773,8 @@ files:
 - db/migrate/20110919110451_add_default_role_to_users.rb
 - db/migrate/20111116125112_namespace_alchemy_models.rb
 - db/migrate/20120216135355_add_country_code_to_languages.rb
+- db/migrate/20120608085509_create_alchemy_essence_selects.rb
+- db/migrate/20120611221734_create_alchemy_essence_booleans.rb
 - lib/alchemy/auth_engine.rb
 - lib/alchemy/authentication_helpers.rb
 - lib/alchemy/capistrano.rb
@@ -818,7 +842,6 @@ files:
 - spec/dummy/app/controllers/errors_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.gitkeep
-- spec/dummy/app/models/.gitkeep
 - spec/dummy/app/models/event.rb
 - spec/dummy/app/views/layouts/.gitkeep
 - spec/dummy/config.ru
@@ -877,11 +900,14 @@ files:
 - spec/models/clipboard_spec.rb
 - spec/models/content_spec.rb
 - spec/models/element_spec.rb
+- spec/models/essence_boolean_spec.rb
 - spec/models/essence_picture_spec.rb
 - spec/models/essence_richtext_spec.rb
+- spec/models/essence_select_spec.rb
 - spec/models/language_spec.rb
 - spec/models/page_spec.rb
 - spec/models/picture_spec.rb
+- spec/models/resource_spec.rb
 - spec/models/user_spec.rb
 - spec/page_layout_spec.rb
 - spec/routing_spec.rb
@@ -1035,7 +1061,6 @@ test_files:
 - spec/dummy/app/controllers/errors_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.gitkeep
-- spec/dummy/app/models/.gitkeep
 - spec/dummy/app/models/event.rb
 - spec/dummy/app/views/layouts/.gitkeep
 - spec/dummy/config.ru
@@ -1094,11 +1119,14 @@ test_files:
 - spec/models/clipboard_spec.rb
 - spec/models/content_spec.rb
 - spec/models/element_spec.rb
+- spec/models/essence_boolean_spec.rb
 - spec/models/essence_picture_spec.rb
 - spec/models/essence_richtext_spec.rb
+- spec/models/essence_select_spec.rb
 - spec/models/language_spec.rb
 - spec/models/page_spec.rb
 - spec/models/picture_spec.rb
+- spec/models/resource_spec.rb
 - spec/models/user_spec.rb
 - spec/page_layout_spec.rb
 - spec/routing_spec.rb

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

@@ -1,7 +0,0 @@
-(function($) {
-
-  $('#<%= content_dom_id(@content_dup) %>').remove();
-  Alchemy.growl('<%= escape_javascript(@notice) %>');
-  Alchemy.reloadPreview();
-
-})(jQuery);

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

@@ -1,36 +0,0 @@
-(function($) {
-
-  var $el;
-
-  <% 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);
-
-  <%- if @clipboard.blank? -%>
-    $('#clipboard_button .icon.clipboard').removeClass('full');
-  <%- end -%>
-
-})(jQuery);