alchemy_cms 2.0.pre2 → 2.0.pre3

data/.gitignore

@@ -4,4 +4,8 @@
 doc/
 rdoc/
 Gemfile.lock
-pkg
+pkg
+/spec/dummy/log/development.log
+/spec/dummy/log/test.log
+/spec/dummy/db/test.sqlite3
+/spec/dummy/db/development.sqlite3

data/Gemfile

@@ -5,4 +5,7 @@ gemspec
 
 group :development do
   gem 'gettext', '~>2.0', :git => 'git://github.com/cameel/gettext.git', :require => false
+  gem "capybara", ">= 0.4.0"
+  gem "rspec-rails", ">= 2.0.0.beta"
+  gem "sqlite3"
 end

data/Rakefile

@@ -1,30 +1,32 @@
 # encoding: UTF-8
+require 'rubygems'
+begin
+  require 'bundler'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+
 require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
+
+require 'rspec/core'
+require 'rspec/core/rake_task'
 
 import File.join(File.dirname(__FILE__), 'lib/tasks/gettext.rake')
 
-desc 'Default: run unit tests.'
-task :default => :test
+RSpec::Core::RakeTask.new(:spec)
 
-desc 'Test the alchemy plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
+task :default => :spec
+
+Bundler::GemHelper.install_tasks
 
 desc 'Generate documentation for the alchemy plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Alchemy'
+  rdoc.title    = 'Alchemy CMS'
   rdoc.options << '--line-numbers' << '--inline-source'
   rdoc.rdoc_files.include('README.md')
   rdoc.rdoc_files.include('config/alchemy/*.yml')
   rdoc.rdoc_files.include('lib/**/*.rb')
   rdoc.rdoc_files.include('app/**/*.rb')
 end
-
-require 'bundler'
-Bundler::GemHelper.install_tasks

data/{alchemy.gemspec → alchemy_cms.gemspec}

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.license = 'GPL-3'
   
   s.files         = `git ls-files`.split("\n")
-  #s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   

data/app/models/message.rb

@@ -37,7 +37,7 @@ class Message
   attr_accessor :contact_form_id, :ip
   
   Alchemy::Config.get(:mailer)[:fields].each do |field|
-    attr_accessor field.keys.first.to_sym
+    attr_accessor field.to_sym
   end
   
   validate_fields = Alchemy::Config.get(:mailer)[:validate_fields]

data/app/views/elements/_searchresult_view.html.erb

@@ -1,6 +1,6 @@
 <div class="searchresult" id="<%= element_dom_id(element) %>" <%= element_preview_code(element) -%>>
     
-    <%= form_tag show_page_with_language_path(:urlname => "suche", :lang => session[:language_id]), :method => :get do %>
+    <%= form_tag show_page_with_language_path(:urlname => "suche", :lang => @page.language_code), :method => :get do %>
         <%= text_field_tag "query", params[:query], :class => 'field' %>
         <%= submit_tag _("search"), :name => nil %>
     <%- end -%>

data/config/initializers/fast_gettext.rb

@@ -1,2 +1,2 @@
 require 'fast_gettext'
-FastGettext.add_text_domain 'alchemy', :path => File.join(File.dirname(__FILE__), '..', '..', 'locale')
+FastGettext.add_text_domain 'alchemy', :path => File.join(File.dirname(__FILE__), '..', '..', 'locale')

data/config/routes.rb

@@ -107,6 +107,9 @@ Rails.application.routes.draw do
     end
     
     resources :essence_pictures, :except => [:show, :new, :create] do 
+      collection do
+        put :assign
+      end
       member do 
         get :crop
       end

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   
-  VERSION = "2.0.pre2"
+  VERSION = "2.0.pre3"
   
 end

data/lib/rails/generators/alchemy/scaffold/scaffold_generator.rb

@@ -4,7 +4,7 @@ module Alchemy
   module Generators
     class ScaffoldGenerator < ::Rails::Generators::Base
       desc "This generator generates the Alchemy scaffold. Pass --with-standard-set to copy Alchemys standard set into your app."
-      class_option :with_standard_set, :type => :boolean, :desc => "Copy standard set files."
+      class_option 'with-standard-set', :type => :boolean, :desc => "Copy standard set files."
       source_root File.expand_path('templates', File.dirname(__FILE__))
       
       def create_config_dir
@@ -17,7 +17,7 @@ module Alchemy
       end
       
       def copy_yamls
-        if options['--with-standard-set']
+        if options['with-standard-set']
           layouts_path = File.expand_path('../../../../../app/views/layouts', File.dirname(__FILE__)) 
           copy_file "#{@config_path}/elements.yml", "#{Rails.root}/config/alchemy/elements.yml"
           copy_file "#{@config_path}/page_layouts.yml", "#{Rails.root}/config/alchemy/page_layouts.yml"

data/lib/rails/templates/alchemy.rb

@@ -3,7 +3,7 @@
 
 # Installing Alchemy Gem
 
-gem 'alchemy_cms'
+gem 'alchemy_cms', '>= 2.0.pre2'
 gem 'ruby-debug', :group => :development
 gem 'mongrel', :group => :development
 

data/spec/alchemy_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe Alchemy do
+  it "should be valid" do
+    Alchemy.should be_a(Module)
+  end
+end

data/spec/config_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe Alchemy::Config do
+  it "should have an array of fields for mailer" do
+    Alchemy::Config.get(:mailer)[:fields].should be_a(Array)
+  end
+end

data/spec/dummy/Rakefile

@@ -0,0 +1,7 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+require 'rake'
+
+Dummy::Application.load_tasks

data/spec/dummy/app/controllers/application_controller.rb

@@ -0,0 +1,3 @@
+class ApplicationController < ActionController::Base
+  protect_from_forgery
+end

data/spec/dummy/app/helpers/application_helper.rb

@@ -0,0 +1,2 @@
+module ApplicationHelper
+end

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

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Dummy</title>
+  <%= stylesheet_link_tag :all %>
+  <%= javascript_include_tag :defaults %>
+  <%= csrf_meta_tag %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>

data/spec/dummy/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run Dummy::Application

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

@@ -0,0 +1,199 @@
+# = Configuration
+#
+# == This is the global Alchemy configuration file
+# Please override your apps settings in your config/alchemy/config.yml file.
+# You can use a handy rake task to generate it.
+#
+#   rake alchemy:app_structure:create:config
+
+# The amount of time of inactivity in minutes after which the user is kicked out of his current session.
+# Only active in production environment!!!
+:auto_logout_time: 30
+
+# === Redirect options
+# redirect_index: You can set to redirect (an 301 permanent, for all you SEO geeks ^_^) to first child page (typically the homepage) the index/intro page if it's not visible.
+# So you don't get an 404 error if the language root page is not visible.
+# redirect_to_public_child: Alchemy redirects to the first public child page found, if a page is not visible.
+:redirect_index: true
+:redirect_to_public_child: true
+
+# Enabling the Ferret fulltext search engine.
+# Tip! For best performance and stability install a crontab that reindexes ferrets search index periodly.
+# Example: cd ~/html/alchemy/current && RAILS_ENV=production rake ferret:rebuild_index
+:ferret: false
+
+# === Pagecaching
+# Enable/Disable pagecaching globally.
+# Hint: You can enable/disable page caching for single Alchemy::PageLayouts in the page_layout.yml file.
+:cache_pages: true
+
+# === Sitemap
+# Alchemy renders a nice HTML (<ul><li> style) and XML (Google conform!) Sitemap for you.
+# Just place a sitemap element for a page layout in your page_layouts.yml file. Alchemy does the rest.
+# ==== Options:
+# show_root: Show language root page in sitemap?
+# show_flag: enables the Checkbox in Page#update overlay. So your customer can set the visibilit of pages in the sitemap.
+:sitemap: 
+  :show_root: true
+  :show_flag: false
+
+# === Picture rendering settings
+# Alchemy uses Fleximage and RMagick to render images. Use {:image_size => "XXXxYYY", :crop => BOOLEAN [true]} to resize images.
+# See https://github.com/Squeegy/fleximage for further infos.
+# ==== Options:
+# output_image_jpg_quality: If rendered as JPG this is the quality setting for it.
+# preprocess_image_resize: Large images are downsized after upload to save diskspace.
+# image_store_format: Masterimage storage format. Images are rendered from this master image, so a lossless format (png) is strongly recommended.
+# image_output_format: Globally image output format setting.
+# TIP: You can always override the output format in the options of your Essence. I.e. {:format => :gif}
+:output_image_jpg_quality: 85
+:preprocess_image_resize: 1000x1000
+:image_store_format: png
+:image_output_format: jpg
+
+# Set available translations for your customers.
+# Currently available translations are German and English.
+:translations:
+  - :language_code: de
+    :language: Deutsch
+  - :language_code: en
+    :language: English
+
+default_translation: en
+
+# Default language for your homepgae.
+default_language:
+  code: en
+  name: English
+  page_layout: intro
+  frontpage_name: Intro
+
+# === Mailer Settings:
+# 
+# To send Mails via contact forms you can create your form fields here and set which fields are to be validated.
+# 
+# ==== Options:
+# 
+# fields: An Array from Hashes with fieldname as keys and type as values. Types are ActiveRecord column types (i.e. string, text, boolean, etc.).
+# validate_fields: A Hash with fieldname as key and a Hash (with :message as key and a message_id as value) as value
+# 
+# ==== Translating validation messages:
+# 
+# The message_id is passed through I18n.t so you can translate it in your language yml file.
+# 
+# Example:
+# 
+#   de:  
+#     alchemy:
+#      contactform:
+#         validations:
+#           enter_name: 'Bitte geben Sie einen Namen an'
+# 
+:mailer:
+  :page_layout_name: contact
+  :forward_to_page: false
+  :mail_success_page: thanks
+  :fields: [salutation, firstname, lastname, address, zip, city, phone, email, message]
+  :validate_fields:
+    :lastname:
+      :message: enter_name
+    :email:
+      :message: enter_mail
+
+# === User roles
+# You can add own user roles. To set permissions for this roles please add an authorization_rules.rb file in your config folder.
+# Further documentation for the auth system used please visit:
+# https://github.com/stffn/declarative_authorization/blob/master/README.rdoc
+# 
+# ==== Translating Userroles
+# Userroles can be translated inside your the language yml file under:
+#   alchemy:
+#     user_roles:
+#       rolename: Name of the role
+:user_roles: [registered, author, editor, admin]
+
+# === Uploader Settings
+# Allow filetypes to upload.
+# Pass * to allow all kind of files.
+:uploader:
+  :allowed_filetypes:
+    :pictures: [jpg, jpeg, gif, png, psd, pdf]
+    :attachments: [*]
+
+# === Link Target Options
+# Values for the link target selectbox inside the page link overlay.
+# The value gets attached as a data-link-target attribute to the link.
+# 
+# == Example:
+# Open all links set to overlay inside an jQuery UI Dialog Window.
+# 
+#   jQuery(a[data-link-target="overlay"]).dialog();
+:link_target_options: [blank]
+
+# == Alchemy core plugins configuration
+
+alchemy_plugins:
+
+  - name: dashboard
+    navigation:
+      name: 'home'
+      controller: 'admin'
+      action: index
+      icon: home
+      sub_navigation:
+        - name: 'home'
+          controller: 'admin'
+          action: index
+    
+  - name: pages
+    navigation:
+      name: 'module: pages'
+      controller: 'admin/pages'
+      action: index
+      icon: pages
+      sub_navigation:
+        - name: 'module: pages'
+          controller: 'admin/pages'
+          action: index
+        - name: 'module: layoutpages'
+          controller: 'admin/layoutpages'
+          action: index
+      nested:
+        - controller: 'admin/pages'
+          action: edit
+
+  - name: languages
+    navigation:
+      name: 'module: languages'
+      controller: 'admin/languages'
+      action: index
+      icon: languages
+      sub_navigation:
+        - name: 'module: languages'
+          controller: 'admin/languages'
+          action: index
+
+  - name: users
+    navigation:
+      name: 'module: users'
+      controller: 'admin/users'
+      action: index
+      icon: users
+      sub_navigation:
+        - name: 'module: users'
+          controller: 'admin/users'
+          action: index
+        
+  - name: archive
+    navigation:
+      controller: 'admin/pictures'
+      action: index
+      name: 'module: library'
+      icon: library
+      sub_navigation:
+        - name: 'module: images'
+          controller: 'admin/pictures'
+          action: index
+        - name: 'module: attachments'
+          controller: 'admin/attachments'
+          action: index

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

@@ -0,0 +1,91 @@
+# == In this configuration you setup Alchemy´s element layouts.
+# 
+# Use rails generate alchemy:scaffold to generate this file for your app.
+# 
+# Elements containing all necessary basic tools for displaying and editing content inside Alchemy.
+# They consists of composed contents (different essence-types) as shown in the illustration of an elements-sheme below.
+#
+# == Schema of an element
+# 
+#   =================================
+#   #  Content 1 (EssenceText)      #
+#   #                               #
+#   #  Content 2 (EssencePicture)   #
+#   #                               #
+#   #  Content 3 (EssenceRichtext)  #
+#   =================================
+#
+# == Example of a basic element layout
+# 
+#   - name: a_unique_name (Used for the partial name in +app/views/elements+ and translated as Element.display_name)
+#     unique: Bool //pass true if this element only can be displayed once on page
+#     contents:
+#     - name: head
+#       type: EssenceText
+#     - name: text
+#       type: EssenceRichtext
+#
+# As already mentioned above, there are different content-types wich can be defined for each content in an element.
+# Defining these types is used to render predefined views in the element.
+#
+# == Content-Types:
+#
+# * EssenceText               (Used to store a String (max. 255 Chars.) i.e. a headline, or productname. The editor is renderd as a single-lined input field. The view output will be sanitized and escaped. So it's XSS save.)
+# * EssenceRichtext           (Used to store editable richtext. Editor is rendered as a textarea with TinyMCE Editor.)
+# * EssencePicture            (Used to store picture ids from pictures assigned through the library. The editor is rendered as a picture-editor collection with a lot of options (i.e. image cropper). The view renders the assigned picture, resizes it, crops it and caches the result.)
+# * EssenceFlash              (Used to store attachment ids from attachments assigned through the library. The view renders an embeded object.)
+# * EssenceDate               (Used to store a DateTime object. The view output is passed through Rails I18n Library, so it will be fully localized.)
+# * EssenceHtml               (Used to store a String (max. 255 Chars.). The view output renders the raw, not sanitized or unescaped String. So be carefull!)
+# 
+# After finishing the setup of your element layouts, you need to generate the files for the elements before using them in Alchemy.
+# For creating these files, use the following command in your terminal:
+# 
+#   rails generate elements
+# 
+# All new elements will be created as two different partials in Rails.root/app/views/elements.
+# For each element there is an editor-view wich will be rendered when editing them in Alchemy and another view for the website´s frontend.
+# 
+#   app/views/elements/_elements_name_editor.html.erb
+#   app/views/elements/_elements_name_view.html.erb
+# 
+# For most contents in an element you can specify additional options, so they get rendered in a specific way.
+# These options can be defined as symbols, but its too much to list them up here.
+# You can find these options described in the application_helper.rb, most of them at the render_essence method.
+#
+# == Setting a content as preview-text for the element
+# 
+# You can set a content-essence as preview-text for its element like this
+# take_me_for_preview: true
+#
+#
+# == Adding contents dynamically in the frontend
+# 
+# You are able to add content-essences dynamically to the element from the Alchemy frontend.
+# You just have to make contents available for adding them.
+# This example enables this feature
+# 
+#   - name: headline
+#     unique: false
+#     contents:
+#     - name: headline
+#       type: EssenceText
+#     - name: big_text
+#       type: EssenceRichtext
+#     available_contents:
+#     - name: big_text
+#       type: EssenceRichtext
+#
+# Now an Alchemy user can add the content 'big_text' from the element as much as desired.
+#
+# === Translate element names
+# 
+# Element names are passed through the I18n library. So you can translate them in your config/locales language yml file.
+# 
+# Example:
+#   
+#   de:
+#     alchemy:
+#       element_names:
+#         contact: Kontakt
+#         search: Suche
+