RubyGems - alchemy_cms - Versions diffs - 2.5.3.1 → 2.6.0.rc5 - Mend

alchemy_cms 2.5.3.1 → 2.6.0.rc5

Files changed (331) hide show

data/spec/controllers/pictures_controller_spec.rb CHANGED

@@ -8,9 +8,9 @@ end
 module Alchemy
   describe PicturesController do
-    let(:page)               { FactoryGirl.create(:public_page, :restricted => false) }
+    let(:public_page)        { FactoryGirl.create(:public_page, :restricted => false) }
     let(:restricted_page)    { FactoryGirl.create(:public_page, :restricted => true) }
-    let(:element)            { FactoryGirl.create(:element, :page => page, :name => 'bild', :create_contents_after_create => true) }
+    let(:element)            { FactoryGirl.create(:element, :page => public_page, :name => 'bild', :create_contents_after_create => true) }
     let(:restricted_element) { FactoryGirl.create(:element, :page => restricted_page, :name => 'bild', :create_contents_after_create => true) }
     let(:picture)            { Picture.create(:image_file => fixture_file_upload(File.expand_path('../../support/image.png', __FILE__), 'image/png')) }

data/spec/controllers/user_sessions_controller_spec.rb CHANGED

@@ -3,15 +3,15 @@ require 'spec_helper'
 module Alchemy
   describe UserSessionsController do
-    let(:user) { FactoryGirl.create(:admin_user) }
-    let(:page) { FactoryGirl.create(:page) }
+    let(:user)         { FactoryGirl.create(:admin_user) }
+    let(:alchemy_page) { FactoryGirl.create(:page) }
     before { sign_in :user, user }
     describe "signout" do
       it "should unlock all pages" do
         @request.env["devise.mapping"] = Devise.mappings[:user]
-        page.lock(user)
+        alchemy_page.lock(user)
         delete :destroy
         user.locked_pages.should be_empty
       end

data/spec/controllers/users_controller_spec.rb CHANGED

@@ -22,11 +22,11 @@ module Alchemy
       end
       it "should render hidden field for role" do
-        response.body.should have_selector('input[type="hidden"]#user_role')
+        response.body.should have_selector('input[type="hidden"]#user_roles')
       end
       it "should set the role to admin" do
-        assigns(:user).role.should == "admin"
+        assigns(:user).roles.should include("admin")
       end
     end

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

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

data/spec/dummy/app/models/location.rb ADDED

@@ -0,0 +1,4 @@
+class Location < ActiveRecord::Base
+  attr_accessible :name
+  has_many :events
+end

data/spec/dummy/app/views/layouts/application.html.erb CHANGED

@@ -1,51 +1,15 @@
 <!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" %> -->
+  <%= render_meta_data %>
+  <%= stylesheet_link_tag 'application' %>
 </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 id="navigation">
+    <%= render_navigation(:all_sub_menues => true) %>
   </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 %>
+  <%= alchemy_preview_mode_code %>
+  <%= alchemy_menu_bar %>
 </body>
 </html>

data/spec/dummy/config/routes.rb CHANGED

@@ -6,6 +6,6 @@ Rails.application.routes.draw do
     resources :events
   end
-  mount Alchemy::Engine => "/alchemy"
+  mount Alchemy::Engine => "/"
 end

data/spec/dummy/db/migrate/20121026104128_create_events.rb CHANGED

@@ -10,7 +10,6 @@ class CreateEvents < ActiveRecord::Migration
       t.decimal  "entrance_fee", :precision => 6, :scale => 2
       t.boolean  "published"
       t.integer  "location_id"
-      t.integer  "organizer_id"
       t.datetime "created_at",                                 :null => false
       t.datetime "updated_at",                                 :null => false
     end

data/{db/migrate/20121118000000_alchemy_two_point_four.rb → spec/dummy/db/migrate/20130214233001_alchemy_two_point_five.rb} RENAMED

@@ -1,11 +1,11 @@
-# This is a compressed migration for creating all Alchemy 2.4 tables at once.
+# This is a compressed migration for creating all Alchemy 2.5 tables at once.
 #
 # === Notice
 #
 # In order to upgrade from an old version of Alchemy, you have to run all migrations from
 # each version you missed up to the version you want to upgrade to, before running this migration.
 #
-class AlchemyTwoPointFour < ActiveRecord::Migration
+class AlchemyTwoPointFive < ActiveRecord::Migration
   def up
     # Do not run if Alchemy tables are already present
     return if table_exists?(:alchemy_pages)
@@ -184,10 +184,21 @@ class AlchemyTwoPointFour < ActiveRecord::Migration
       t.integer  "updater_id"
       t.boolean  "default",        :default => false
       t.string   "country_code",   :default => "",      :null => false
+      t.integer  "site_id"
     end
     add_index "alchemy_languages", ["language_code", "country_code"], :name => "index_alchemy_languages_on_language_code_and_country_code"
     add_index "alchemy_languages", ["language_code"], :name => "index_alchemy_languages_on_language_code"
+    add_index "alchemy_languages", ["site_id"], :name => "index_alchemy_languages_on_site_id"
+    create_table "alchemy_legacy_page_urls", :force => true do |t|
+      t.string   "urlname",    :null => false
+      t.integer  "page_id",    :null => false
+      t.datetime "created_at", :null => false
+      t.datetime "updated_at", :null => false
+    end
+    add_index "alchemy_legacy_page_urls", ["urlname"], :name => "index_alchemy_legacy_page_urls_on_urlname"
     create_table "alchemy_pages", :force => true do |t|
       t.string   "name"
@@ -225,59 +236,61 @@ class AlchemyTwoPointFour < ActiveRecord::Migration
     create_table "alchemy_pictures", :force => true do |t|
       t.string   "name"
-      t.string   "image_filename"
-      t.integer  "image_width"
-      t.integer  "image_height"
-      t.datetime "created_at",      :null => false
-      t.datetime "updated_at",      :null => false
+      t.string   "image_file_name"
+      t.integer  "image_file_width"
+      t.integer  "image_file_height"
+      t.datetime "created_at",        :null => false
+      t.datetime "updated_at",        :null => false
       t.integer  "creator_id"
       t.integer  "updater_id"
       t.string   "upload_hash"
       t.text     "cached_tag_list"
+      t.string   "image_file_uid"
+      t.integer  "image_file_size"
     end
+    create_table "alchemy_sites", :force => true do |t|
+      t.string   "host"
+      t.string   "name"
+      t.datetime "created_at",                                  :null => false
+      t.datetime "updated_at",                                  :null => false
+      t.boolean  "public",                   :default => false
+      t.text     "aliases"
+      t.boolean  "redirect_to_primary_host"
+    end
+    add_index "alchemy_sites", ["host", "public"], :name => "alchemy_sites_public_hosts_idx"
+    add_index "alchemy_sites", ["host"], :name => "index_alchemy_sites_on_host"
     create_table "alchemy_users", :force => true do |t|
       t.string   "firstname"
       t.string   "lastname"
       t.string   "login"
       t.string   "email"
       t.string   "gender"
-      t.string   "role",                               :default => "registered"
+      t.string   "role",                                  :default => "registered"
       t.string   "language"
-      t.string   "crypted_password",    :limit => 128, :default => "",           :null => false
-      t.string   "password_salt",       :limit => 128, :default => "",           :null => false
-      t.integer  "login_count",                        :default => 0,            :null => false
-      t.integer  "failed_login_count",                 :default => 0,            :null => false
+      t.string   "encrypted_password",     :limit => 128, :default => "",           :null => false
+      t.string   "password_salt",          :limit => 128, :default => "",           :null => false
+      t.integer  "sign_in_count",                         :default => 0,            :null => false
+      t.integer  "failed_attempts",                       :default => 0,            :null => false
       t.datetime "last_request_at"
-      t.datetime "current_login_at"
-      t.datetime "last_login_at"
-      t.string   "current_login_ip"
-      t.string   "last_login_ip"
-      t.string   "persistence_token",                                            :null => false
-      t.string   "single_access_token",                                          :null => false
-      t.string   "perishable_token",                                             :null => false
-      t.datetime "created_at",                                                   :null => false
-      t.datetime "updated_at",                                                   :null => false
+      t.datetime "current_sign_in_at"
+      t.datetime "last_sign_in_at"
+      t.string   "current_sign_in_ip"
+      t.string   "last_sign_in_ip"
+      t.datetime "created_at",                                                      :null => false
+      t.datetime "updated_at",                                                      :null => false
       t.integer  "creator_id"
       t.integer  "updater_id"
       t.text     "cached_tag_list"
+      t.string   "reset_password_token"
+      t.datetime "reset_password_sent_at"
     end
-    add_index "alchemy_users", ["perishable_token"], :name => "index_users_on_perishable_token"
-    create_table "events", :force => true do |t|
-      t.string   "name"
-      t.string   "hidden_name"
-      t.datetime "starts_at"
-      t.datetime "ends_at"
-      t.text     "description"
-      t.decimal  "entrance_fee", :precision => 6, :scale => 2
-      t.boolean  "published"
-      t.integer  "location_id"
-      t.integer  "organizer_id"
-      t.datetime "created_at",                                 :null => false
-      t.datetime "updated_at",                                 :null => false
-    end
+    add_index "alchemy_users", ["email"], :name => "index_alchemy_users_on_email", :unique => true
+    add_index "alchemy_users", ["login"], :name => "index_alchemy_users_on_login", :unique => true
+    add_index "alchemy_users", ["reset_password_token"], :name => "index_alchemy_users_on_reset_password_token", :unique => true
     create_table "taggings", :force => true do |t|
       t.integer  "tag_id"
@@ -295,5 +308,6 @@ class AlchemyTwoPointFour < ActiveRecord::Migration
     create_table "tags", :force => true do |t|
       t.string "name"
     end
   end
 end

data/spec/dummy/db/migrate/20130221200514_migrate_attachments_to_dragonfly.rb ADDED

@@ -0,0 +1,21 @@
+class MigrateAttachmentsToDragonfly < ActiveRecord::Migration
+  def up
+    change_table :alchemy_attachments do |t|
+      t.string :file_uid
+      t.index :file_uid
+      t.rename :filename, :file_name
+      t.rename :content_type, :file_mime_type
+      t.rename :size, :file_size
+    end
+  end
+  def down
+    change_table :alchemy_attachments do |t|
+      t.remove :file_uid
+      t.rename :file_name, :filename
+      t.rename :file_mime_type, :content_type
+      t.rename :file_size, :size
+      t.remove_index :file_uid
+    end
+  end
+end

data/spec/dummy/db/migrate/20130312205327_change_alchemy_users_role_to_roles.rb ADDED

@@ -0,0 +1,11 @@
+class ChangeAlchemyUsersRoleToRoles < ActiveRecord::Migration
+  def up
+    rename_column :alchemy_users, :role, :roles
+    add_index :alchemy_users, :roles
+  end
+  def down
+    remove_index :alchemy_users, :roles
+    rename_column :alchemy_users, :roles, :role
+  end
+end

data/spec/dummy/db/migrate/20130328101418_create_locations.rb ADDED

@@ -0,0 +1,9 @@
+class CreateLocations < ActiveRecord::Migration
+  def change
+    create_table :locations do |t|
+      t.string :name
+      t.timestamps
+    end
+  end
+end

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

@@ -11,20 +11,23 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20130121092645) do
+ActiveRecord::Schema.define(:version => 20130328101418) do
   create_table "alchemy_attachments", :force => true do |t|
     t.string   "name"
-    t.string   "filename"
-    t.string   "content_type"
-    t.integer  "size"
+    t.string   "file_name"
+    t.string   "file_mime_type"
+    t.integer  "file_size"
     t.integer  "creator_id"
     t.integer  "updater_id"
     t.datetime "created_at",      :null => false
     t.datetime "updated_at",      :null => false
     t.text     "cached_tag_list"
+    t.string   "file_uid"
   end
+  add_index "alchemy_attachments", ["file_uid"], :name => "index_alchemy_attachments_on_file_uid"
   create_table "alchemy_cells", :force => true do |t|
     t.integer  "page_id"
     t.string   "name"
@@ -271,7 +274,7 @@ ActiveRecord::Schema.define(:version => 20130121092645) do
     t.string   "login"
     t.string   "email"
     t.string   "gender"
-    t.string   "role",                                  :default => "registered"
+    t.string   "roles",                                 :default => "registered"
     t.string   "language"
     t.string   "encrypted_password",     :limit => 128, :default => "",           :null => false
     t.string   "password_salt",          :limit => 128, :default => "",           :null => false
@@ -294,6 +297,7 @@ ActiveRecord::Schema.define(:version => 20130121092645) do
   add_index "alchemy_users", ["email"], :name => "index_alchemy_users_on_email", :unique => true
   add_index "alchemy_users", ["login"], :name => "index_alchemy_users_on_login", :unique => true
   add_index "alchemy_users", ["reset_password_token"], :name => "index_alchemy_users_on_reset_password_token", :unique => true
+  add_index "alchemy_users", ["roles"], :name => "index_alchemy_users_on_roles"
   create_table "events", :force => true do |t|
     t.string   "name"
@@ -304,11 +308,16 @@ ActiveRecord::Schema.define(:version => 20130121092645) do
     t.decimal  "entrance_fee", :precision => 6, :scale => 2
     t.boolean  "published"
     t.integer  "location_id"
-    t.integer  "organizer_id"
     t.datetime "created_at",                                 :null => false
     t.datetime "updated_at",                                 :null => false
   end
+  create_table "locations", :force => true do |t|
+    t.string   "name"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
   create_table "taggings", :force => true do |t|
     t.integer  "tag_id"
     t.integer  "taggable_id"

data/spec/factories.rb CHANGED

@@ -10,19 +10,19 @@ FactoryGirl.define do
     language 'en'
     factory :admin_user do
-      role "admin"
+      roles 'admin'
     end
     factory :registered_user do
-      role "registered"
+      roles 'registered'
     end
     factory :author_user do
-      role "author"
+      roles 'author'
     end
     factory :editor_user do
-      role "editor"
+      roles 'editor'
     end
   end

data/spec/{integration → features}/admin/link_overlay_spec.rb RENAMED

File without changes

data/spec/{integration → features}/admin/modules_integration_spec.rb RENAMED

@@ -20,7 +20,7 @@ describe "Modules" do
             :action => 'index'
           }
         })
-      visit '/alchemy/admin'
+      visit '/admin'
       click_on 'Events'
       page.should_not have_content('Upps!')
     end

data/spec/{integration → features}/admin/pages_controller_spec.rb RENAMED

@@ -16,14 +16,19 @@ module Alchemy
       context "in a multilangual environment" do
-        before { klingonian_root }
+        before do
+          klingonian_root
+          Capybara.default_wait_time = 3 # Raising this helps this test to pass, even on travis-ci
+        end
         it "one should be able to switch the language tree" do
-          visit('/alchemy/admin/pages')
+          visit('/admin/pages')
           page.select 'Klingonian', :from => 'language'
           page.should have_selector('#sitemap .sitemap_pagename_link', :text => 'Klingonian')
         end
+        after { Capybara.default_wait_time = 2 } # Reset to default
       end
       context "with no language root page" do
@@ -31,7 +36,7 @@ module Alchemy
         before { klingonian }
         it "it should display the form for creating language root" do
-          visit('/alchemy/admin/pages')
+          visit('/admin/pages')
           page.select 'Klingonian', :from => 'language'
           page.should have_content('This language tree does not exist')
         end
@@ -43,7 +48,7 @@ module Alchemy
     describe "flush complete page cache" do
       it "should remove the cache of all pages" do
-        visit '/alchemy/admin/pages'
+        visit '/admin/pages'
         click_link 'Flush page cache'
         page.should have_content('Page cache flushed')
       end