alchemy_cms 2.2.rc15 → 2.2.0

data/.travis.yml

@@ -7,10 +7,12 @@ rvm:
   - rbx-19mode
 branches:
   only:
-    - master
+    - 2.2-stable
 before_script:
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
   - "sh -c 'cd spec/dummy && RAILS_ENV=test bundle exec rake db:create db:schema:load --trace'"
-script: "bundle exec rspec spec"
+script: "bundle exec rspec spec --format=doc"
 env:
   - DB=mysql
   - DB=postgresql

data/Gemfile

@@ -10,8 +10,8 @@ group :test do
   gem 'sqlite3'               if ENV['DB'].nil? || ENV['DB'] == 'sqlite'
   gem 'mysql2'                if ENV['DB'] == 'mysql'
   gem 'pg'                    if ENV['DB'] == 'postgresql'
+  gem 'poltergeist'
   unless ENV['CI']
-    gem 'capybara-webkit'
     gem 'launchy'
   end
 end

data/README.md

@@ -33,9 +33,7 @@ Features
 Rails Version
 -------------
 
-This branch of Alchemy runs with Rails 3.2.
-
-**This branch is a beta development branch. For productive environments use the current rubygems version, or the latest stable tag.**
+This version of Alchemy runs with Rails 3.2 only.
 
 If you are looking for a Rails 3.1 compatible version check the 2.1-stable branch.
 
@@ -53,7 +51,7 @@ Installation
 
 Use the installer (recommended):
 
-    gem install alchemy_cms --pre
+    gem install alchemy_cms
     alchemy new my_magicpage
 
 Start the local server:
@@ -81,7 +79,7 @@ Add to existing Rails project
 
 In your Gemfile:
 
-    gem 'alchemy_cms', :git => 'git://github.com/magiclabs/alchemy_cms.git', :branch => 'next_stable'
+    gem 'alchemy_cms', :git => 'git://github.com/magiclabs/alchemy_cms.git'
 
 Run in terminal:
 

data/app/assets/javascripts/alchemy/alchemy.custom.js

@@ -0,0 +1 @@
+// You can overwrite this file in your app or engine to customize javascript available in Alchemy's backend.

data/app/assets/javascripts/alchemy/alchemy.js

@@ -25,3 +25,4 @@
 //= require alchemy/alchemy.windows
 //= require alchemy/alchemy.preview_window
 //= require alchemy/alchemy.elements_window
+//= require alchemy/alchemy.custom

data/app/assets/javascripts/alchemy/alchemy.windows.js

@@ -32,12 +32,12 @@ if (typeof(Alchemy) === 'undefined') {
 
     AjaxErrorHandler: function($dialog, status, textStatus, errorThrown) {
       var $div = $('<div class="with_padding" />');
-      var $errorDiv = $('<div id="errorExplanation" />');
+      var $errorDiv = $('<div id="errorExplanation" class="ajax_status_code_' + status + '" />');
       $dialog.html($div);
       $div.append($errorDiv);
       if (status === 0) {
-        $errorDiv.append('<h2>The server does not respond!</h2>');
-        $errorDiv.append('<p>Please start server and try again.</p>');
+        $errorDiv.append('<h2>The server does not respond.</h2>');
+        $errorDiv.append('<p>Please check server and try again.</p>');
       } else {
         $errorDiv.append('<h2>' + errorThrown + ' (' + status + ')</h2>');
         $errorDiv.append('<p>Please check log and try again.</p>');

data/app/assets/stylesheets/alchemy/alchemy.css

@@ -16,4 +16,5 @@
 *= require alchemy/jquery-ui.alchemy
 *= require alchemy/jquery.Jcrop
 *= require alchemy/jquery.sb
+*= require alchemy/custom
 */

data/app/assets/stylesheets/alchemy/base.css.scss

@@ -754,6 +754,12 @@ div#toolbar_buttons_right {
   border: 1px solid #d08f91;
   color: #690001;
   @include rounded-corner;
+
+  &.ajax_status_code_0 {
+    border-color: #c4c19c;
+    color: #726d23;
+    background-color: #f3f0c1;
+  }
 }
 
 #errorExplanation h2 {

data/app/assets/stylesheets/alchemy/custom.css

@@ -0,0 +1 @@
+/* You can overwrite this file in your app or engine to customize stylesheets available in Alchemy's backend. */

data/app/controllers/alchemy/admin/pages_controller.rb

@@ -235,8 +235,7 @@ module Alchemy
     private
 
       def load_page
-        @page ||= Page.with_language(session[:language_id]).find_by_urlname(params[:id])
-        @page ||= Page.find_by_id(params[:id])
+        @page = Page.find_by_id(params[:id])
         raise ActiveRecord::RecordNotFound if @page.nil?
       end
 

data/app/controllers/alchemy/pages_controller.rb

@@ -17,7 +17,7 @@ module Alchemy
     caches_action(:show,
       :cache_path => proc { @page.cache_key(request) },
       :if => proc {
-        if Alchemy::Config.get(:cache_pages)
+        if @page && Alchemy::Config.get(:cache_pages)
            pagelayout = PageLayout.get(@page.page_layout)
            pagelayout['cache'].nil? || pagelayout['cache']
         else

data/app/helpers/alchemy/pages_helper.rb

@@ -542,7 +542,7 @@ module Alchemy
           <script type="text/javascript">
             try {
               Alchemy.loadAlchemyMenuBar({
-                page_id: '#{@page.urlname || @page.id}',
+                page_id: #{@page.id},
                 route: '#{Alchemy.mount_point}',
                 locale: '#{current_user.language}'
               });

data/app/views/alchemy/admin/pages/_page.html.erb

@@ -1,4 +1,4 @@
-<li id="page_<%= page.id %>" class="page_level_<%= page.level %>">
+<li id="page_<%= page.id %>" class="<%= "page_level_#{page.level} #{page.page_layout}" %>">
   <div class="sitemap_page<%= page.locked ? ' locked' : '' %>">
     <div class="sitemap_left_images">
       <%= sitemapFolderLink(page) unless page.children.blank? || @sorting %>

data/lib/alchemy/capistrano.rb

@@ -42,17 +42,24 @@ Capistrano::Configuration.instance(:must_exist).load do
 
       desc "Creates the database.yml file"
       task :create do
-        db_config = ERB.new <<-EOF
+        db_adapter       = Capistrano::CLI.ui.ask("Please enter database adapter (Options: mysql2, or postgresql. Default mysql2): ")
+        db_adapter       = db_adapter.empty? ? 'mysql2' : db_adapter.gsub(/^mysql$/, 'mysql2')
+        db_name          = Capistrano::CLI.ui.ask("Please enter database name: ")
+        db_username      = Capistrano::CLI.ui.ask("Please enter database username: ")
+        db_password      = Capistrano::CLI.ui.ask("Please enter database password: ")
+        default_db_host  = db_adapter == 'mysql2' ? 'localhost' : '127.0.0.1'
+        db_host          = Capistrano::CLI.ui.ask("Please enter database host (Default: #{default_db_host}): ")
+        db_host          = db_host.empty? ? default_db_host : db_host
+        db_config        = ERB.new <<-EOF
 production:
-  adapter: mysql2
+  adapter: #{ db_adapter }
   encoding: utf8
   reconnect: false
   pool: 5
-  database: #{ Capistrano::CLI.ui.ask("Database name: ") }
-  username: #{ Capistrano::CLI.ui.ask("Database username: ") }
-  password: #{ Capistrano::CLI.ui.ask("Database password: ") }
-  socket: #{ Capistrano::CLI.ui.ask("Database socket: ") }
-  host: #{ Capistrano::CLI.ui.ask("Database host: ") }
+  database: #{ db_name }
+  username: #{ db_username }
+  password: #{ db_password }
+  host: #{ db_host }
 EOF
         run "mkdir -p #{shared_path}/config"
         put db_config.result, "#{shared_path}/config/database.yml"

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
 
-  VERSION = "2.2.rc15"
+  VERSION = "2.2.0"
 
 end

data/lib/rails/generators/alchemy/deploy_script/templates/deploy.rb.tt

@@ -2,46 +2,48 @@ require 'bundler/capistrano'
 require 'alchemy/capistrano'
 load 'deploy/assets'
 
-# ssh user settings. please change to customers
-set :user, "<%= @ssh_user %>"
-set :password, "<%= @ssh_password %>"
-set :port, <%= @ssh_port %>
-set :use_sudo, false
+# ssh settings
+set :user,                      "<%= @ssh_user %>"
+set :password,                  "<%= @ssh_password %>"
+set :port,                      <%= @ssh_port || 22 %>
 
 # domain names
-role :app, "<%= @server %>"
-role :web, "<%= @server %>"
-role :db,  "<%= @server %>", :primary => true
+role :app,                      "<%= @server %>"
+role :web,                      "<%= @server %>"
+role :db,                       "<%= @server %>", :primary => true
 
-# set the public webserver path
-set :deploy_to, "<%= @deploy_path %>"
-
-set :rails_env, "production"
+# the webserver path
+set :deploy_to,                 "<%= @deploy_path %>"
 
+# repository settings
 <%- if @scm == "svn" -%>
-set :repository_url, "<%= @repository_url %>"
-set :scm, "subversion"
-set :scm_user, "<%= @scm_user %>"
-set :scm_password, "<%= @scm_password %>"
+set :scm,                       "subversion"
+set :repository_url,            "<%= @repository_url %>"
 <%- if @scm_user && @scm_password -%>
-set :repository, Proc.new { "--username #{scm_user} --password #{scm_password} #{repository_url}" }
+set :scm_user,                  "<%= @scm_user %>"
+set :scm_password,              "<%= @scm_password %>"
+set :repository,                Proc.new { "--username #{scm_user} --password #{scm_password} #{repository_url}" }
 <%- else -%>
-set :repository, "<%= @repository_url %>"
+set :repository,                "<%= @repository_url %>"
 <%- end -%>
 <%- elsif @scm == "git" -%>
-set :scm, "git"
-set :repository, "<%= @repository_url %>"
-set :branch, "master"
+set :scm,                       "git"
+set :repository,                "<%= @repository_url %>"
+set :branch,                    "master"
 <%- end -%>
 
-before "deploy:start", "deploy:seed"
-before "deploy:restart", "deploy:migrate"
+# before hooks
+before "deploy:start",          "deploy:seed"
+before "deploy:create_symlink", "deploy:migrate"
 
+# after hooks
 <%- if @database_type == "mysql" -%>
-after "deploy:setup", "alchemy:database_yml:create"
-after "deploy:assets:symlink", "alchemy:database_yml:symlink"
+after "deploy:setup",           "alchemy:database_yml:create"
+after "deploy:assets:symlink",  "alchemy:database_yml:symlink"
 <%- end -%>
-after "deploy", "deploy:cleanup"
+after "deploy",                 "deploy:cleanup"
+
+# special tasks
 
 namespace :logs do
   desc "show last 100 lines of log"
@@ -70,3 +72,14 @@ namespace :deploy do
   end
 
 end
+
+## defaults
+
+# rails env
+set :rails_env,                 "production"
+
+# enable bundler binstubs
+set :bundle_flags,              "--deployment --binstubs"
+
+# do not use sudo
+set :use_sudo,                  false

data/spec/controllers/admin/pages_controller_spec.rb

@@ -101,11 +101,6 @@ module Alchemy
         session[:language_id] = @language.id
       end
 
-      it "should find a page from urlname" do
-        get :edit, {:id => @page.to_param}
-        response.status.should == 200
-      end
-
       it "should find a page from id" do
         get :edit, {:id => @page.id}
         response.status.should == 200

data/spec/integration/admin/pages_controller_spec.rb

@@ -1,12 +1,11 @@
-# Skipping on Travis-CI, because capybara-webkit does not install on travis.
-unless ENV["CI"]
+require 'spec_helper'
 
-  require 'spec_helper'
-
-  describe Alchemy::Admin::PagesController, :js => true do
+module Alchemy
+  describe Admin::PagesController, :js => true do
 
     before(:all) do
       create_admin_user
+      @german_root = FactoryGirl.create(:language_root_page, :language => Language.get_default, :name => 'Deutsch')
     end
 
     before(:each) do
@@ -22,7 +21,6 @@ unless ENV["CI"]
       context "in a multilangual environment" do
 
         before(:all) do
-          @german_root = FactoryGirl.create(:language_root_page, :language => Alchemy::Language.get_default, :name => 'Deutsch')
           @klingonian_root = FactoryGirl.create(:language_root_page, :name => 'Klingonian')
         end
 
@@ -34,7 +32,6 @@ unless ENV["CI"]
 
         after(:all) {
           @klingonian_root.delete
-          @german_root.delete
         }
 
       end
@@ -65,6 +62,9 @@ unless ENV["CI"]
 
     end
 
-  end
+    after(:all) {
+      @german_root.delete
+    }
 
+  end
 end

data/spec/spec_helper.rb

@@ -28,10 +28,10 @@ def configure
 
   # Configure capybara for integration testing
   require "capybara/rails"
-  require 'capybara-webkit' unless ENV['CI']
+  require 'capybara/poltergeist'
   Capybara.default_driver = :rack_test
   Capybara.default_selector = :css
-  Capybara.javascript_driver = :webkit unless ENV['CI']
+  Capybara.javascript_driver = :poltergeist
 
   # Load support files
   Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.2.rc15
-  prerelease: 4
+  version: 2.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-18 00:00:00.000000000 Z
+date: 2012-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -387,6 +387,7 @@ files:
 - app/assets/images/alchemy/ui-icons_666666_256x240.png
 - app/assets/javascripts/alchemy/alchemy.base.js
 - app/assets/javascripts/alchemy/alchemy.buttons.js
+- app/assets/javascripts/alchemy/alchemy.custom.js
 - app/assets/javascripts/alchemy/alchemy.datepicker.js
 - app/assets/javascripts/alchemy/alchemy.dirty.js
 - app/assets/javascripts/alchemy/alchemy.dragndrop.js
@@ -418,6 +419,7 @@ files:
 - app/assets/stylesheets/alchemy/alchemy.css
 - app/assets/stylesheets/alchemy/base.css.scss
 - app/assets/stylesheets/alchemy/buttons.css.scss
+- app/assets/stylesheets/alchemy/custom.css
 - app/assets/stylesheets/alchemy/dashboard.css.scss
 - app/assets/stylesheets/alchemy/elements.css.scss
 - app/assets/stylesheets/alchemy/flash.css.scss
@@ -1032,9 +1034,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 1665960692087372061
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: