alchemy_cms 2.9.1 → 3.0.0.rc5

data/app/views/alchemy/essences/shared/_linkable_essence_tools.html.erb

@@ -2,18 +2,18 @@
   <%= link_to(
     render_icon(:link),
     '#',
-    :onclick => "Alchemy.LinkOverlay.open(this); return false;",
-    :class => "icon_button#{content.linked? ? ' linked' : ''}",
-    :data => {'content-id' => content.id},
-    :title => _t(:place_link),
-    :id => "edit_link_#{content.id}"
+    onclick: "d = new Alchemy.LinkDialog(this); d.open(); return false;",
+    class: "icon_button#{content.linked? ? ' linked' : ''}",
+    'data-content-id' => content.id,
+    title: _t(:place_link),
+    id: "edit_link_#{content.id}"
   ) %>
   <%= link_to(
     render_icon(:unlink),
     '#',
-    :onclick => "Alchemy.LinkOverlay.removeLink(this, #{content.id}); return false;",
-    :class => "icon_button unlink #{content.linked? ? 'linked' : 'disabled'}",
-    :data => {'content-id' => content.id},
-    :title => _t(:unlink)
+    onclick: "return Alchemy.LinkDialog.removeLink(this, #{content.id})",
+    class: "icon_button unlink #{content.linked? ? 'linked' : 'disabled'}",
+    'data-content-id' => content.id,
+    title: _t(:unlink)
   ) %>
 </span>

data/app/views/alchemy/language_links/_language.html.erb

@@ -1,5 +1,5 @@
 <% css_classes = [language.code] %>
-<% css_classes << 'active' if session[:language_id] == language.id %>
+<% css_classes << 'active' if Alchemy::Language.current.id == language.id %>
 <% css_classes << 'first' if languages.first == language %>
 <% css_classes << 'last' if languages.last == language %>
 <% link_title = options[:show_title] ? _t("#{language.code}.title", scope: 'language_links', default: language.name) : nil %>

data/app/views/kaminari/{_first_page.html.erb → alchemy/_first_page.html.erb}

@@ -7,5 +7,5 @@
     remote:        data-remote
 -%>
 <span class="first">
-  <%= link_to_unless current_page.first?, '&laquo;'.html_safe, url, :remote => remote, :title => t('views.pagination.first'), :class => 'button' %>
+  <%= link_to_unless current_page.first?, '&laquo;'.html_safe, url, remote: remote, title: t('views.pagination.first'), class: 'button' %>
 </span>

data/app/views/kaminari/{_last_page.html.erb → alchemy/_last_page.html.erb}

@@ -7,5 +7,5 @@
     remote:        data-remote
 -%>
 <span class="last">
-  <%= link_to_unless current_page.last?, '&raquo;'.html_safe, url, {:remote => remote, :title => t('views.pagination.last'), :class => 'button'} %>
+  <%= link_to_unless current_page.last?, '&raquo;'.html_safe, url, {remote: remote, title: t('views.pagination.last'), class: 'button'} %>
 </span>

data/app/views/kaminari/{_next_page.html.erb → alchemy/_next_page.html.erb}

@@ -9,5 +9,5 @@
 <% if current_page.last? -%>
 <span class="next_page disabled">&rsaquo;</span>
 <% else -%>
-<%= link_to '&rsaquo;'.html_safe, url, :rel => 'next', :remote => remote, :title => t('views.pagination.next_page'), :class => "next_page button" -%>
-<% end -%>
+<%= link_to '&rsaquo;'.html_safe, url, rel: 'next', remote: remote, title: t('views.pagination.next_page'), class: 'next_page button' -%>
+<% end -%>

data/app/views/kaminari/{_page.html.erb → alchemy/_page.html.erb}

@@ -10,5 +10,5 @@
 <% if page.current? -%>
 <span class="page current"><%= page -%></span>
 <% else -%>
-<%= link_to page, url, opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil, :class => 'button'} -%>
-<% end -%>
+<%= link_to page, url, opts = {remote: remote, rel: page.next? ? 'next' : page.prev? ? 'prev' : nil, class: 'button'} -%>
+<% end -%>

data/app/views/kaminari/{_prev_page.html.erb → alchemy/_prev_page.html.erb}

@@ -9,5 +9,5 @@
 <% if current_page.first? -%>
 <span class="previous_page disabled">&lsaquo;</span>
 <% else -%>
-<%= link_to '&lsaquo;'.html_safe, url, :rel => 'prev', :remote => remote, :class => 'previous_page button', :title => t('views.pagination.previous_page') -%>
-<% end -%>
+<%= link_to '&lsaquo;'.html_safe, url, rel: 'prev', remote: remote, class: 'previous_page button', title: t('views.pagination.previous_page') -%>
+<% end -%>

data/app/views/layouts/alchemy/admin.html.erb

@@ -3,26 +3,26 @@
   <head>
     <meta charset="utf-8">
     <title><%= render_alchemy_title %></title>
+    <link rel="shortcut icon" href="/assets/alchemy/favicon.ico">
     <%= csrf_meta_tag %>
     <meta name="robots" content="noindex">
-    <%= stylesheet_link_tag('alchemy/admin', :media => 'screen') %>
-    <%= stylesheet_link_tag('alchemy/print', :media => 'print') %>
+    <%= stylesheet_link_tag('alchemy/admin', :media => 'screen', "data-turbolinks-track" => true) %>
+    <%= stylesheet_link_tag('alchemy/print', :media => 'print', "data-turbolinks-track" => true) %>
     <%= yield :stylesheets %>
     <script type="text/javascript" charset="utf-8">
 
       // Setting TinyMCE path.
       var tinyMCEPreInit = {
-        base: '<%= Rails.application.config.assets.prefix %>/tiny_mce',
-        suffix: ''
+        base: '<%= Rails.application.config.assets.prefix %>/tinymce',
+        suffix: '.min'
       };
 
       // Initialize Alchemys JavaScript framework.
       var Alchemy = {};
       Alchemy.locale = '<%= ::I18n.locale %>';
-      Alchemy.current_url = '<%= url_for.html_safe %>';
 
     </script>
-    <%= javascript_include_tag('alchemy/alchemy') %>
+    <%= javascript_include_tag('alchemy/alchemy', "data-turbolinks-track" => true) %>
     <%= yield :javascript_includes %>
   </head>
   <body id="alchemy" class="<%= body_class %>">
@@ -37,19 +37,19 @@
     </div>
     <div id="left_menu">
       <div id="main_navi">
-        <% alchemy_modules.each do |alchemy_module| %>
+        <% sorted_alchemy_modules.each do |alchemy_module| %>
           <%= alchemy_main_navigation_entry(alchemy_module) %>
         <% end %>
         <%= yield(:alchemy_main_navigation) %>
       </div>
       <div id="logout">
         <% if current_alchemy_user %>
-          <%= link_to_overlay_window(
-            "<span class='module icon exit'></span><label>#{_t(:leave)}</label>".html_safe,
+          <%= link_to_dialog(
+            "#{render_icon('exit module')}<label>#{_t(:leave)}</label>".html_safe,
             alchemy.leave_admin_path, {
-              :size => "300x105",
-              :title => _t("Leave Alchemy")
-          }, {'data-alchemy-hotkey' => 'alt-q'}) %>
+              size: "300x155",
+              title: _t("Leave Alchemy")
+          }, {'data-alchemy-hotkey' => 'alt+q'}) %>
         <% else %>
           <%= link_to(alchemy.root_path) do %>
             <span class="module icon exit"></span>
@@ -70,11 +70,11 @@
         <%= yield(:toolbar) %>
       </div>
       <div id="user_info">
-        <%= select_tag 'change_locale', options_for_select(::I18n.available_locales.map { |l| [l.to_s.upcase, l] }, ::I18n.locale), :class => 'alchemy_selectbox tiny' %>
-        <% if current_alchemy_user.respond_to?(:name) %>
-          <%= _t('Logged in as') %>
-          <%= current_alchemy_user.name %>
-        <% end %>
+        <%= select_tag 'change_locale',
+          options_for_select(translations_for_select, ::I18n.locale),
+          class: 'alchemy_selectbox tiny' %>
+        <%= _t('Logged in as') %>
+        <%= current_alchemy_user.try(:name) %>
       </div>
     </div>
     <% end %>

data/bin/alchemy

@@ -1,9 +1,10 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
-gem 'rails', '~> 3.2.14'
+gem 'rails', '~> 4.0.2'
 
 require 'rails/version'
 require "thor"
+require 'io/console' # for password prompt
 require File.expand_path('../../lib/alchemy/version', __FILE__)
 
 class AlchemyInstaller < Thor
@@ -11,59 +12,125 @@ class AlchemyInstaller < Thor
 
   map "-v" => :version
   map "--version" => :version
-  desc "version", "Prints current Alchemy CMS version", :hide => true
+  desc "version", "Prints current Alchemy CMS version", hide: true
   def version
     puts Alchemy.version
   end
 
   desc "new PROJECT", "Creates a new Alchemy CMS project."
-  method_option :database, :type => :string, :default => 'mysql', :aliases => "-d", :desc => "Type of database to use for this project. Default mysql."
+  method_option :database, type: :string, aliases: "-d", desc: "Type of database to use for this project. Default sqlite."
   def new(project)
     @application = project.downcase.strip.gsub(/ /, '_')
-    if system("rails _#{Rails::VERSION::STRING}_ new #{@application} -m #{File.join(File.dirname(__FILE__), '..', 'lib', 'rails', 'templates', 'alchemy.rb')} -d #{options[:database]} -JT")
-      create_database_yml if options[:database] == 'mysql'
-      system("cd ./#{@application} && bundle exec rake alchemy:install")
-      gitignore = <<-GIT
-log/*
-tmp/*
-.DS_Store
+    system("rails _#{rails_version}_ new #{@application} -m #{alchemy_template} -d #{options[:database]} -JT") || exit!(1)
+    if options[:database] == 'mysql' || options[:database] == 'postgresql'
+      create_database_yml(options[:database])
+    end
+    system("#{rake_cmd} alchemy:install") || exit!(1)
+    system("#{rake_cmd} alchemy_devise:install:migrations") || exit!(1)
+    system("#{rake_cmd} db:migrate") || exit!(1)
+    cleanup
+    say "\n## SUCCESSFULLY INSTALLED ALCHEMY CMS\n", :green
+    say further_instructions
+  rescue
+    say "\nError while installing Alchemy CMS!\n#{$!}\n", :red
+  end
+
+  private
+
+  def rails_version
+    Rails::VERSION::STRING
+  end
+
+  def rake_cmd
+    "cd #{@application} && bin/rake"
+  end
+
+  def alchemy_template
+    File.join(File.dirname(__FILE__), '..', 'lib', 'rails', 'templates', 'alchemy.rb')
+  end
+
+  def further_instructions
+    <<-EOF
+:: FURTHER INSTRUCTIONS :::::::::::::::::::::::::::::::::::::::::::::::::
+::                                                                     ::
+:: Change into your app folder:                                        ::
+::                                                                     ::
+:: $ cd #{@application}#{' ' * (63 - @application.length)}::
+::                                                                     ::
+:: Start your local Rails server with:                                 ::
+::                                                                     ::
+:: $ bin/rails server                                                  ::
+::                                                                     ::
+:: Open your browser and enter the following URL:                      ::
+::                                                                     ::
+:: http://localhost:3000/admin                                         ::
+::                                                                     ::
+:: and follow the on screen instructions to complete the installation. ::
+::                                                                     ::
+:: Read more about Alchemy in the guidelines:                          ::
+::                                                                     ::
+:: http://guides.alchemy-cms.com/                                      ::
+:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+EOF
+  end
+
+  def cleanup
+    append_file "#{@application}/.gitignore" do
+      <<-GITIGNORE
+
+# Ignore Alchemy uploads folder
 upload/*
-index/*
+
+# Ignore sensitive data
 config/database.yml
-GIT
-      %x[
-        cd ./#{@application}
-        rm ./public/index.html
-        rm ./app/assets/images/rails.png
-        mkdir -p ./index
-        mkdir -p ./uploads
-        touch ./index/.gitkeep
-        touch ./uploads/.gitkeep
-        echo "#{gitignore}" > .gitignore
-      ]
-    else
-      say "\nError while installation!\n", :red
+config/initializers/secret_token.rb
+GITIGNORE
     end
+    %x[
+      cd #{@application}
+      mkdir -p ./uploads
+      touch ./uploads/.gitkeep
+    ]
   end
 
-private
+  def create_database_yml(type)
+    case type
+    when 'mysql'
+      @db_user_name = ask("\nPlease enter your local mysql username (DEFAULT: root):")
+      @db_user_name = 'root' if @db_user_name.empty?
+      @db_password = ask_password("Please enter the password for #{@db_user_name} (Leave blank for none):")
+      local_standard_socket = '/tmp/mysql.sock'
+      @db_socket = ask("Please enter your local mysql socket (DEFAULT: #{local_standard_socket}):")
+      @db_socket = local_standard_socket if @db_socket.empty?
+      file = mysql_yml_file
+    when 'postgresql'
+      @db_user_name = ask("\nPlease enter the local postgresql user name:")
+      @db_password = ask_password("Please enter the password for #{@db_user_name} (Leave blank for none):")
+      file = postgres_yml_file
+    end
+    create_file "./#{@application}/config/database.yml", file, force: true
+  end
 
-  def create_database_yml
-    @db_root_password = ask("\nPlease provide your local root password for mysql (Leave blank for none):")
-    local_standard_socket = '/tmp/mysql.sock'
-    @db_local_socket = ask("\nPlease provide your local mysql socket (#{local_standard_socket}):")
-    @db_local_socket = local_standard_socket if @db_local_socket.empty?
-    create_file "./#{@application}/config/database.yml", :force => true do
+  def mysql_yml_file
 <<-DATABASE
+# MySQL.  Versions 4.1 and 5.0 are recommended.
+#
+# Install the MYSQL driver
+#   gem install mysql2
+#
+# Ensure the MySQL gem is defined in your Gemfile
+#   gem 'mysql2'
+#
+# And be sure to use new-style password hashing:
+#   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:
   adapter: mysql2
   encoding: utf8
-  reconnect: false
   database: #{@application}_development
   pool: 5
-  username: root
-  password: #{@db_root_password}
-  socket: #{@db_local_socket}
+  username: #{@db_user_name}
+  password: #{@db_password}
+  socket: #{@db_socket}
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
@@ -71,24 +138,92 @@ development:
 test:
   adapter: mysql2
   encoding: utf8
-  reconnect: false
   database: #{@application}_test
   pool: 5
-  username: root
-  password: #{@db_root_password}
-  socket: #{@db_local_socket}
+  username: #{@db_user_name}
+  password: #{@db_password}
+  socket: #{@db_socket}
 
 production:
   adapter: mysql2
   encoding: utf8
-  reconnect: false
   database: #{@application}_production
   pool: 5
-  username: root
-  password: #{@db_root_password}
-  socket: #{@db_local_socket}
+  username: #{@db_user_name}
+  password: #{@db_password}
+  socket: #{@db_socket}
 DATABASE
-    end
+  end
+
+  def postgres_yml_file
+<<-DATABASE
+# PostgreSQL. Versions 8.2 and up are supported.
+#
+# Install the pg driver:
+#   gem install pg
+# On OS X with Homebrew:
+#   gem install pg -- --with-pg-config=/usr/local/bin/pg_config
+# On OS X with MacPorts:
+#   gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
+# On Windows:
+#   gem install pg
+#       Choose the win32 build.
+#       Install PostgreSQL and put its /bin directory on your path.
+#
+# Configure Using Gemfile
+# gem 'pg'
+#
+development:
+  adapter: postgresql
+  encoding: unicode
+  database: #{@application}_development
+  pool: 5
+  username: #{@db_user_name}
+  password: #{@db_password}
+
+  # Connect on a TCP socket. Omitted by default since the client uses a
+  # domain socket that doesn't need configuration. Windows does not have
+  # domain sockets, so uncomment these lines.
+  #host: localhost
+
+  # The TCP port the server listens on. Defaults to 5432.
+  # If your server runs on a different port number, change accordingly.
+  #port: 5432
+
+  # Schema search path. The server defaults to $user,public
+  #schema_search_path: myapp,sharedapp,public
+
+  # Minimum log levels, in increasing order:
+  #   debug5, debug4, debug3, debug2, debug1,
+  #   log, notice, warning, error, fatal, and panic
+  # Defaults to warning.
+  #min_messages: notice
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  adapter: postgresql
+  encoding: unicode
+  database: #{@application}_test
+  pool: 5
+  username: #{@db_user_name}
+  password: #{@db_password}
+
+production:
+  adapter: postgresql
+  encoding: unicode
+  database: #{@application}_production
+  pool: 5
+  username: #{@db_user_name}
+  password: #{@db_password}
+DATABASE
+  end
+
+  def ask_password(message)
+    password = $stdin.noecho { ask(message) }
+    puts "\n"
+    password
   end
 
 end

data/bin/rails

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 4 gems installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('../..', __FILE__)
+ENGINE_PATH = File.expand_path('../../lib/alchemy/engine', __FILE__)
+
+require 'rails/all'
+require 'rails/engine/commands'

data/config/alchemy/config.yml

@@ -25,16 +25,6 @@ auto_logout_time: 30
 redirect_index: true
 redirect_to_public_child: true
 
-# === Enable 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: true
-
 # === Page caching
 #
 # Enable/Disable pagecaching globally.
@@ -45,11 +35,11 @@ cache_pages: true
 
 # === Sitemap
 #
-# Alchemy renders a nice HTML (<ul><li> style) and XML (Google conform!) Sitemap for you.
+# Alchemy creates a XML, Google compatible, sitemap for you.
 #
-# Just place a sitemap element for a page layout in your page_layouts.yml file. Alchemy does the rest.
+# The url is: http://your-domain.tld/sitemap.xml
 #
-# ==== Options:
+# ==== Config Options:
 #
 #   show_root [Boolean] # Show language root page in sitemap?
 #   show_flag [Boolean] # Enables the Checkbox in Page#update overlay. So your customer can set the visibilit of pages in the sitemap.
@@ -89,12 +79,12 @@ output_image_jpg_quality: 85
 preprocess_image_resize:
 image_output_format: jpg
 
-# This is the default language for the seeder.
+# This is the default language for new sites.
 default_language:
-  code: de
-  name: Deutsch
-  page_layout: intro
-  frontpage_name: Intro
+  code: en
+  name: English
+  page_layout: index
+  frontpage_name: Index
 
 # === Mailer Settings:
 #
@@ -134,10 +124,11 @@ mailer:
 
 # === 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.
+# You can add own user roles.
+#
 # Further documentation for the auth system used please visit:
 #
-# https://github.com/stffn/declarative_authorization/blob/master/README.rdoc
+# https://github.com/ryanb/cancan/wiki
 #
 # ==== Translating User roles
 #
@@ -147,7 +138,7 @@ mailer:
 #     user_roles:
 #       rolename: Name of the role
 #
-user_roles: [registered, author, editor, admin]
+user_roles: [member, author, editor, admin]
 
 # === Uploader Settings
 #
@@ -183,4 +174,15 @@ link_target_options: [blank]
 # Should pages that redirect to an external url open the link in a new tab/window?
 open_external_links_in_new_tab: true
 
-email_regexp: !ruby/regexp '/\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/'
+# === Format matchers
+#
+# Named aliases for regular expressions that can be used in various places.
+# The most common use case is the format validation of essences, or attribute validations of your individual models.
+#
+# == Example:
+#
+#   validates_format_of :url, with: Alchemy::Config.get('format_matchers')['url']
+#
+format_matchers:
+  email: !ruby/regexp '/\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/'
+  url: !ruby/regexp '/\A[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?\z/ix'