alchemy_cms 2.4.1 → 2.5.0.b2

data/lib/rails/templates/alchemy.rb

@@ -1,14 +1,8 @@
-require 'alchemy/version'
 # This rails template installs Alchemy and all depending gems.
-
-# Installing Alchemy Gem
+require 'alchemy/version'
 
 gem 'alchemy_cms', "~> #{Alchemy::VERSION}"
-gem 'ruby-debug', :group => :development, :platform => :ruby_18
-gem 'debugger', :group => :development, :platform => :ruby_19
 
 if yes?("\nDo you want to use Capistrano for deployment? (y/N)")
   gem 'capistrano', :group => :development
 end
-
-run 'bundle install'

data/lib/tasks/{database.rake → alchemy/db.rake}

@@ -6,7 +6,7 @@ namespace :alchemy do
       Alchemy::Seeder.seed!
     end
 
-    desc "Dumps the database into 'db/dumps'"
+    desc "Dumps the database into 'db/dumps'. NOTE: This only works with MySQL yet."
     task :dump => :environment do
       db_conf = Rails.configuration.database_configuration.fetch(Rails.env)
       raise "Alchemy only supports MySQL database dumping at the moment." unless db_conf['adapter'] =~ /mysql/

data/lib/tasks/{install.rake → alchemy/install.rake}

@@ -19,6 +19,7 @@ namespace :alchemy do
 
   desc "Installs Alchemy CMS into your app."
   task :install do
+    Rake::Task["db:create"].invoke
     Rake::Task["alchemy:install:migrations"].invoke
     Rake::Task["alchemy:mount"].invoke
     system("rails g alchemy:scaffold")
@@ -28,7 +29,7 @@ namespace :alchemy do
 
 \\o/ Successfully installed Alchemy CMS \\o/
 
-Now:
+Now cd into your app folder and
 
 1. Start your Rails server:
 
@@ -36,10 +37,16 @@ Now:
 
 2. Open your browser and enter the following URL:
 
-  http://localhost:3000/#{@mountpoint == '/' ? '' : @mountpoint}/admin/signup
+  http://localhost:3000/#{@mountpoint}
 
 3. Follow the instructions to complete the installation!
 
+== First time Alchemy user?
+
+Then we recommend to install the Alchemy demo kit.
+
+Just add `gem "alchemy-demo_kit"` to your apps Gemfile and run `bundle install`.
+
 Thank you for using Alchemy CMS!
 
 http://alchemy-cms.com/
@@ -52,16 +59,4 @@ EOF
     Alchemy::RoutesInjector.new.inject
   end
 
-  namespace :standard_set do
-
-    desc "Install Alchemy CMS's standard set."
-    task :install do
-      system("rails g alchemy:scaffold --with-standard-set")
-      puts "\n-> Please do not forget to add Alchemy's standard set to precompiable assets. <-\n"
-      puts "\nPut this line in your 'config/environments/production.rb' file:\n"
-      puts "  config.assets.precompile += %w( alchemy/standard_set.css )"
-    end
-
-  end
-
 end

data/lib/tasks/{upgrade.rake → alchemy/upgrade.rake}

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../alchemy/upgrader.rb')
+require File.join(File.dirname(__FILE__), '../../alchemy/upgrader.rb')
 
 namespace :alchemy do
 

data/spec/controllers/elements_controller_spec.rb

@@ -3,29 +3,44 @@ require 'spec_helper'
 module Alchemy
   describe ElementsController do
 
-    let(:page)       { FactoryGirl.create(:public_page, :restricted => true) }
-    let(:element)    { FactoryGirl.create(:element, :page => page, :name => 'download') }
+    let(:page)                { FactoryGirl.create(:public_page) }
+    let(:element)             { FactoryGirl.create(:element, :page => page, :name => 'download') }
+    let(:restricted_page)     { FactoryGirl.create(:public_page, :restricted => true) }
+    let(:restricted_element)  { FactoryGirl.create(:element, :page => restricted_page, :name => 'download') }
 
     describe '#show' do
 
-      it "should not return restricted elements" do
+      it "should render available elements" do
         get :show, :id => element.id
-        response.status.should == 302
-        response.should redirect_to(login_path)
+        response.status.should == 200
       end
 
-      context "for registered user" do
+      it "should raise ActiveRecord::RecordNotFound error for trashed elements" do
+        element.trash
+        expect { get(:show, :id => element.id) }.to raise_error(ActiveRecord::RecordNotFound)
+      end
 
+      it "should raise ActiveRecord::RecordNotFound error for unpublished elements" do
+        element.update_attributes(:public => false)
+        expect { get(:show, :id => element.id) }.to raise_error(ActiveRecord::RecordNotFound)
+      end
+
+      context "for guest user" do
+        it "should raise ActiveRecord::RecordNotFound error for elements of restricted pages" do
+          expect { get(:show, :id => restricted_element.id) }.to raise_error(ActiveRecord::RecordNotFound)
+        end
+      end
+
+      context "for registered user" do
         before do
           activate_authlogic
           UserSession.create(FactoryGirl.create(:registered_user))
         end
 
-        it "should render restricted elements" do
-          get :show, :id => element.id
+        it "should render elements of restricted pages" do
+          get :show, :id => restricted_element.id
           response.status.should == 200
         end
-
       end
 
     end

data/spec/controllers/pictures_controller_spec.rb

@@ -22,7 +22,6 @@ module Alchemy
     end
 
     context "Requesting a picture that is assigned on restricted and non-restricted pages" do
-
       before do
         essence = element.contents.where(:name => 'image').first.essence
         essence.picture_id = picture.id
@@ -39,11 +38,9 @@ module Alchemy
           response.status.should == 200
         end
       end
-
     end
 
     context "Requesting a picture that is assigned with restricted pages only" do
-
       before do
         essence = restricted_element.contents.where(:name => 'image').first.essence
         essence.picture_id = picture.id
@@ -51,17 +48,14 @@ module Alchemy
       end
 
       context "as guest user" do
-
         it "should not render the picture, but redirect to login path" do
           get :show, :id => picture.id, :sh => picture.security_token
           response.status.should == 302
           response.should redirect_to(login_path)
         end
-
       end
 
       context "as registered user" do
-
         before do
           activate_authlogic
           UserSession.create(FactoryGirl.create(:registered_user))
@@ -71,10 +65,19 @@ module Alchemy
           get :show, :id => picture.id, :format => :png, :sh => picture.security_token
           response.status.should == 200
         end
-
       end
+    end
 
-
+    context "Requesting a picture with crop and size parameters" do
+      it "should render a cropped image" do
+        options = {
+          :crop => 'crop',
+          :size => '10x10',
+          :format => 'png'
+        }
+        get :show, options.merge(:id => picture.id, :sh => picture.security_token(options))
+        response.body[0x10..0x18].unpack('NN').should == [10,10]
+      end
     end
 
 

data/spec/dummy/config/alchemy/elements.yml

@@ -0,0 +1,86 @@
+- name: header
+  unique: true
+  contents:
+  - name: image
+    type: EssencePicture
+
+- name: headline
+  contents:
+  - name: headline
+    type: EssenceText
+
+- name: article
+  taggable: true
+  contents:
+  - name: intro
+    type: EssenceText
+  - name: headline
+    type: EssenceText
+    settings:
+      deletable: true
+  - name: image
+    type: EssencePicture
+  - name: text
+    type: EssenceRichtext
+    settings:
+      deletable: true
+  available_contents:
+  - name: text
+    type: EssenceRichtext
+  - name: headline
+    type: EssenceText
+
+- name: text
+  contents:
+  - name: text
+    type: EssenceRichtext
+
+- name: news
+  contents:
+  - name: date
+    type: EssenceDate
+  - name: news_headline
+    type: EssenceText
+    rss_title: true
+  - name: body
+    type: EssenceRichtext
+    rss_description: true
+
+- name: download
+  contents:
+  - name: file
+    type: EssenceFile
+    settings:
+      deletable: true
+  available_contents:
+  - name: file
+    type: EssenceFile
+
+- name: bild
+  contents:
+  - name: image
+    type: EssencePicture
+
+- name: contactform
+  unique: true
+  contents:
+  - name: mail_from
+    type: EssenceText
+    validate:
+      - presence
+  - name: mail_to
+    type: EssenceText
+    validate:
+      - presence
+  - name: subject
+    type: EssenceText
+    take_me_for_preview: true
+    validate:
+      - presence
+  - name: success_page
+    type: EssenceSelect
+    validate:
+      - presence
+
+- name: searchresult
+  unique: true

data/spec/dummy/config/alchemy/page_layouts.yml

@@ -0,0 +1,26 @@
+- name: intro
+  unique: true
+
+- name: standard
+  elements: [article, header]
+  autogenerate: [header, article]
+
+- name: news
+  feed: true
+  unique: true
+  insert_elements_at: top
+  elements: [headline, news]
+  autogenerate: [news]
+  feed_elements: [news]
+
+- name: contact
+  unique: true
+  cache: false
+  elements: [headline, text, contactform]
+  autogenerate: [headline, text, contactform]
+
+- name: search
+  unique: true
+  elements: [headline, text, searchresult]
+  autogenerate: [searchresult]
+  searchresults: true

data/spec/dummy/config/application.rb

@@ -37,7 +37,7 @@ module Dummy
 
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    config.i18n.default_locale = :en
+    # config.i18n.default_locale = :de
 
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"

data/spec/dummy/db/migrate/20121121162313_switch_from_fleximage_to_dragonfly.rb

@@ -0,0 +1,21 @@
+class SwitchFromFleximageToDragonfly < ActiveRecord::Migration
+  def up
+    change_table :alchemy_pictures do |t|
+      t.string  :image_file_uid
+      t.integer :image_file_size
+      t.rename  :image_width,     :image_file_width
+      t.rename  :image_height,    :image_file_height
+      t.rename  :image_filename,  :image_file_name
+    end
+  end
+
+  def down
+    change_table :alchemy_pictures do |t|
+      t.remove :image_file_uid
+      t.remove :image_file_size
+      t.rename :image_file_width,  :image_width
+      t.rename :image_file_height, :image_height
+      t.rename :image_file_name,   :image_filename
+    end
+  end
+end

data/spec/dummy/db/migrate/20121205155004_create_alchemy_sites.rb

@@ -0,0 +1,14 @@
+class CreateAlchemySites < ActiveRecord::Migration
+  def change
+    create_table "alchemy_sites" do |t|
+      t.string :host
+      t.string :name
+      t.timestamps
+    end
+    add_index :alchemy_sites, :host, uniq: true
+
+    # add Language#site_id
+    add_column :alchemy_languages, :site_id, :integer
+    add_index  :alchemy_languages, :site_id
+  end
+end

data/spec/dummy/db/migrate/20121211163003_add_public_to_alchemy_sites.rb

@@ -0,0 +1,6 @@
+class AddPublicToAlchemySites < ActiveRecord::Migration
+  def change
+    add_column :alchemy_sites, :public, :boolean, :default => false
+    add_index :alchemy_sites, [:host, :public], :name => 'alchemy_sites_public_hosts_idx'
+  end
+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 => 20121116141016) do
+ActiveRecord::Schema.define(:version => 20121211163003) do
 
   create_table "alchemy_attachments", :force => true do |t|
     t.string   "name"
@@ -187,10 +187,12 @@ ActiveRecord::Schema.define(:version => 20121116141016) do
     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_pages", :force => true do |t|
     t.string   "name"
@@ -228,17 +230,30 @@ ActiveRecord::Schema.define(:version => 20121116141016) do
 
   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
   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"

data/spec/factories.rb

@@ -5,7 +5,6 @@ FactoryGirl.define do
     login "jdoe"
     password 's3cr3t'
     password_confirmation 's3cr3t'
-    language 'en'
 
     factory :admin_user do
       role "admin"
@@ -32,6 +31,7 @@ FactoryGirl.define do
     frontpage_name 'Intro'
     page_layout 'intro'
     public true
+    site { Alchemy::Site.first }
 
     factory :klingonian do
       name 'Klingonian'
@@ -94,7 +94,7 @@ FactoryGirl.define do
   factory :picture, :class => 'Alchemy::Picture' do
     image_file File.new(File.expand_path('../support/image.png', __FILE__))
     name 'image'
-    image_filename 'image.png'
+    image_file_name 'image.png'
     upload_hash Time.now.hash
   end
 
@@ -108,4 +108,8 @@ FactoryGirl.define do
     entrance_fee 12.3
   end
 
+  factory :site, class: 'Alchemy::Site' do
+    name 'A Site'
+    host 'domain.com'
+  end
 end