alchemy_cms 2.8.3 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc35e337330b8a45d9a53897d1ec6f9377bce876
-  data.tar.gz: 7a100feddc7fb1094fc0dadadd1b6c9530d0e251
+  metadata.gz: b424447a096b31e81ed5a0d290b0ad668337b5b8
+  data.tar.gz: a7eefe0821effccdd65312b9ac99573ad0784f7f
 SHA512:
-  metadata.gz: b8c7b30d537f2b948f7bc9af5ef0fd1e9830b2046fc474a22b4c0c228de101871ac183ec79f414eb00b35aa2c179c49449568db1d40b177af8d7f7ec748211db
-  data.tar.gz: 63502e6354cdeae1f48e4f5aa47ccdc9c40152fdf862bfa5f94831bc0c1b1f93099d23d3a2e6afa7480b5101c678b58e2f8821f95ad45d6aa5e69ea48f10df74
+  metadata.gz: f2b2833ceef66d2a76b6512430f076f6133da8472e9456712d69b3c7f7b0c1531f76f9babbf3d516cbc0e0dd3318aa770ea233099ff20f5b73787ce9bb8587d0
+  data.tar.gz: 4eed6223c08ea0903cd629998c681c5d9117098e69866fccab2e92ff6354663c0b6dbdb68281c38f4c953712b940f2e42557df745b3363c063631fd06035f4d0

data/.travis.yml

@@ -1,10 +1,11 @@
 language: ruby
 rvm:
   - 1.9.3
-  - 2.0.0
+  - 2.0
+  - 2.1
 branches:
   only:
-    - 2.8-stable
+    - 2.9-stable
 script: rake
 env:
   - DB=mysql

data/README.md

@@ -1,11 +1,12 @@
-![Alchemy CMS](http://alchemy-cms.com/assets/alchemy_logo.png)
+![Alchemy CMS](http://alchemy-cms.com/assets/alchemy_logo.svg)
 
 [![Gem Version](https://badge.fury.io/rb/alchemy_cms.png)](http://badge.fury.io/rb/alchemy_cms)
-[![Build Status](https://secure.travis-ci.org/magiclabs/alchemy_cms.png?branch=2.8-stable)](http://travis-ci.org/magiclabs/alchemy_cms) [![Code Climate](https://codeclimate.com/github/magiclabs/alchemy_cms.png)](https://codeclimate.com/github/magiclabs/alchemy_cms) [![Coverage Status](https://coveralls.io/repos/magiclabs/alchemy_cms/badge.png?branch=2.8-stable)](https://coveralls.io/r/magiclabs/alchemy_cms)
+[![Build Status](https://travis-ci.org/magiclabs/alchemy_cms.svg?branch=2.9-stable)](https://travis-ci.org/magiclabs/alchemy_cms) [![Code Climate](https://codeclimate.com/github/magiclabs/alchemy_cms.png)](https://codeclimate.com/github/magiclabs/alchemy_cms) [![Coverage Status](https://coveralls.io/repos/magiclabs/alchemy_cms/badge.png?branch=2.9-stable)](https://coveralls.io/r/magiclabs/alchemy_cms?branch=2.9-stable)
 
 About
 -----
-Alchemy is a powerful, userfriendly and flexible Rails 3 CMS.
+
+Alchemy is the most powerful, userfriendly and flexible Rails CMS.
 
 Read more on the [website](http://alchemy-cms.com) and in the [guidelines](http://guides.alchemy-cms.com).
 
@@ -32,7 +33,9 @@ Features
 Rails Version
 -------------
 
-This version of Alchemy runs with Rails 3.2.11+.
+**This version of Alchemy CMS runs with Rails 3.2**
+
+If you are looking for a Rails 4 compatible version check the [3.0-stable branch](https://github.com/magiclabs/alchemy_cms/tree/3.0-stable).
 
 If you are looking for a Rails 3.1 compatible version check the [2.1-stable branch](https://github.com/magiclabs/alchemy_cms/tree/2.1-stable).
 
@@ -43,57 +46,137 @@ If you are looking for a Rails 2.3 compatible version check the [1.6-stable bran
 Ruby Version
 ------------
 
-Alchemy runs with Ruby >= 1.9.3 (including Ruby 2.0.0).
+Alchemy runs with Ruby >= 1.9.3 (including Ruby 2.0 and 2.1).
 
 For a Ruby 1.8.7 compatible version use the [2.3-stable branch](https://github.com/magiclabs/alchemy_cms/tree/2.3-stable).
 
+
 Installation
 ------------
 
-Use the installer (recommended):
+### As a standalone project
+
+#### 1. Use the installer:
 
     gem install alchemy_cms
     alchemy new my_magicpage
     cd my_magicpage
 
-Start the local server:
+Run
+
+    bundle install
+
+to finish installation process.
+
+#### 2. Start the local server:
+
+    bundle exec rails server
+
+#### 3. Switch to your browser:
+
+Open `http://localhost:3000` and follow the on screen instructions.
 
-    rails server
+### Into an existing Rails project
 
-Then just switch to your browser and open `http://localhost:3000`
+#### 1. Add the Alchemy gem:
 
-Add to existing Rails project
------------------------------
+In your App's Gemfile:
 
-In your Gemfile:
+    gem 'alchemy_cms', github: 'magiclabs/alchemy_cms', branch: '2.9-stable'
 
-    gem 'alchemy_cms', github: 'magiclabs/alchemy_cms', branch: '2.8-stable'
+#### 2. Install Alchemy into your app:
 
 Run in terminal:
 
     bundle install
-    bundle exec rake alchemy:install
+    bundle exec alchemy:install
+
+### Authentication User Model
+
+With Version 2.9 we extracted the Alchemy user model [into its own gem](https://github.com/magiclabs/alchemy-devise).
+
+In order to get the former Alchemy user model back, add the following gem into your Gemfile:
+
+    gem 'alchemy-devise', github: 'magiclabs/alchemy-devise', branch: '1.1-stable'
+
+Run in terminal:
+
+    bundle install
+    bundle exec alchemy_devise:install:migrations db:migrate
+
+**In order to use your own user model, you can add e.g.**
+
+    # config/initializers/alchemy.rb
+    Alchemy.user_class_name = 'YourUserClass'
+    Alchemy.login_path = '/your/login/path'
+    Alchemy.logout_path = '/your/logout/path'
+
+The only thing Alchemy needs to know from your user model is the `alchemy_roles` method.
+
+This method has to return an `Array` or `ActiveRecord::Relation` with at least one of the following roles:
+
+* `member`
+* `author`
+* `editor`
+* `admin`
+
+Example:
+
+    def alchemy_roles
+      self.admin?
+        %w(admin)
+      end
+    end
+
+Testing
+-------
+
+Before running tests (which refer to Alchemy), please make sure to run the rake task
+
+    bundle exec rake alchemy:spec:prepare
+
+to set up the database for testing.
+
+Now you can run your tests, e. g. with RSpec:
+
+    bundle exec rspec spec/...
+
+**Alternatively** you can just run:
+
+    bundle exec rake
+
+This default task executes the database preparations and runs all defined test cases.
+
+Deployment
+----------
+
+Alchemy ships with a generator that creates a Capistrano `config/deploy.rb` file, which
+takes care of everything you need to deploy an Alchemy site.
+
+So, if you don't have your own deploy file, we encourage you to use this generator:
+
+    $ bundle exec rails g alchemy:deploy_script
+
+If you have your own Capistrano receipts, you should require the Alchemy tasks in your app's `config/deploy.rb` file:
 
-### Note:
-If you did not mounted Alchemy on the root route `'/'`, then you have to add Alchemy's view helpers manually to your app.
+    # deploy.rb
+    require 'alchemy/capistrano'
 
-Just paste this in your `app/controllers/application_controller.rb`
+If you don't use Capistrano you have to **make shure that the `uploads`, `tmp/cache/assets`, `public/assets` and `public/pictures` cache folders get shared** between deployments, otherwise you **will loose data**.
 
-```
-helper Alchemy::PagesHelper
-```
+Please take a look into the `lib/alchemy/capistrano.rb` file, to see how to achieve this.
 
 Upgrading
 ---------
 
-After updating Alchemy you should run the upgrader.
+After updating the Alchemy gem in your App, you should run the upgrader.
 
 Run in terminal:
 
-    bundle exec rake alchemy:upgrade
+    bundle exec alchemy:upgrade
 
 
-Tipps
+Tips
 -----
 
 - Read the guidelines: http://guides.alchemy-cms.com.
@@ -113,7 +196,7 @@ Resources
 ---------
 
 * Homepage: <http://alchemy-cms.com>
-* Live-Demo: <http://demo.alchemy-cms.com> (user: demo, password: demo)
+* Live-Demo: <http://demo.alchemy-cms.com> (user: demo, password: demo123)
 * API Documentation: <http://rubydoc.info/github/magiclabs/alchemy_cms>
 * Issue-Tracker: <https://github.com/magiclabs/alchemy_cms/issues>
 * Sourcecode: <https://github.com/magiclabs/alchemy_cms>
@@ -133,4 +216,4 @@ Authors
 License
 -------
 
-* BSD: <https://raw.github.com/magiclabs/alchemy_cms/2.8-stable/LICENSE>
+* BSD: <https://raw.github.com/magiclabs/alchemy_cms/2.9-stable/LICENSE>

data/alchemy_cms.gemspec

@@ -33,7 +33,6 @@ POST_INSTALL
   s.require_paths         = ["lib"]
 
   s.add_runtime_dependency %q<rails>,                            ["~> 3.2.13"]
-  s.add_runtime_dependency %q<devise>,                           ["~> 2.2.3"]
   s.add_runtime_dependency %q<awesome_nested_set>,               ["~> 2.0"]
   s.add_runtime_dependency %q<acts-as-taggable-on>,              ["~> 2.1"]
   s.add_runtime_dependency %q<declarative_authorization>,        ["~> 0.5.7"]

data/app/assets/stylesheets/alchemy/archive.scss

@@ -291,7 +291,7 @@ div#filter_bar {
         left: 8px;
         top: 8px;
         font-family: 'Alchemy Icons';
-        @extend .icon-tag:before;
+        @extend .alchemy-icon-tag:before;
         line-height: 8px;
       }
 
@@ -431,7 +431,7 @@ div#pictures_page_list {
     left: $default-padding;
     top: 2*$default-padding;
     font-family: 'Alchemy Icons';
-    @extend .icon-tag:before;
+    @extend .alchemy-icon-tag:before;
     line-height: 6px;
   }
 }

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

@@ -199,25 +199,6 @@ div#page_editing_menu {
   padding-right: 1px;
 }
 
-div#userinfo {
-  text-align: right;
-  float: right;
-  margin-right: 8px;
-}
-
-#userinfo img {
-  position: relative;
-  top: 1px;
-}
-
-div#user_list_legend {
-  overflow: auto;
-  padding: 1px 1px 4px;
-  margin-bottom: 5px;
-  border-bottom: 1px solid black;
-  width: 370px;
-}
-
 #page_sorting_panel p {
   margin-top: 1em;
 }
@@ -226,11 +207,6 @@ div.table_right span.tools a.icon_button img {
   left: -1px;
 }
 
-#user_edit form {
-  margin: 0;
-  padding: 2*$default-padding;
-}
-
 li.even {
   background-color: #fff;
 }
@@ -277,12 +253,6 @@ ul.list span.right {
   cursor: move;
 }
 
-#userinfo p {
-  padding: 0;
-  margin: 0;
-  font-weight: bold;
-}
-
 .headline_text_editor {
   overflow: auto;
   width: 374px;
@@ -498,13 +468,6 @@ input.with_border {
   border: 1px solid silver;
 }
 
-input#user_admin {
-  margin: 0 0 0 1px;
-  padding: 0;
-  border-width: 0;
-  border-style: none;
-}
-
 #image_edit div {
   height: 25px;
 }

data/app/assets/stylesheets/alchemy/elements.scss

@@ -433,7 +433,7 @@ div.essence_picture_editor {
 
   .thumbnail_background.missing:before {
     font-family: 'Alchemy Icons';
-    @extend .icon-pictures:before;
+    @extend .alchemy-icon-pictures:before;
     font-size: 48px;
     color: $medium-gray;
     vertical-align: top;

data/app/assets/stylesheets/alchemy/flash.scss

@@ -13,7 +13,7 @@ div#flash_notices {
       position: absolute;
       right: 2*$default-padding;
       top: 2*$default-padding;
-      @extend .icon-cross:before;
+      @extend .alchemy-icon-cross:before;
       font-size: 14px;
       font-family: 'Alchemy Icons';
     }

data/app/assets/stylesheets/alchemy/form_elements.scss

@@ -449,7 +449,7 @@ td.select .selectboxit {
       margin-left: 2px;
       font-style: normal;
       display: block;
-      @extend .icon-menu;
+      @extend .alchemy-icon-menu;
     }
 
     &.with_error { border-color: $error_border_color }

data/app/assets/stylesheets/alchemy/icon-font.css.scss

@@ -9,26 +9,26 @@
   font-style: normal;
 }
 
-.icon-plus,
-.icon-minus,
-.icon-cross,
-.icon-plus-2,
-.icon-minus-2,
-.icon-pencil,
-.icon-tag,
-.icon-info,
-.icon-warning,
-.icon-checkmark,
-.icon-ccw,
-.icon-trash,
-.icon-cross-2,
-.icon-pictures,
-.icon-menu,
-.icon-magnifying-glass,
-.icon-fullscreen-exit,
-.icon-help,
-.icon-fullscreen,
-.icon-cog {
+.alchemy-icon-plus,
+.alchemy-icon-minus,
+.alchemy-icon-cross,
+.alchemy-icon-plus-2,
+.alchemy-icon-minus-2,
+.alchemy-icon-pencil,
+.alchemy-icon-tag,
+.alchemy-icon-info,
+.alchemy-icon-warning,
+.alchemy-icon-checkmark,
+.alchemy-icon-ccw,
+.alchemy-icon-trash,
+.alchemy-icon-cross-2,
+.alchemy-icon-pictures,
+.alchemy-icon-menu,
+.alchemy-icon-magnifying-glass,
+.alchemy-icon-fullscreen-exit,
+.alchemy-icon-help,
+.alchemy-icon-fullscreen,
+.alchemy-icon-cog {
   font-family: 'Alchemy Icons';
   speak: none;
   font-size: 12px;
@@ -45,23 +45,23 @@
   @include inline-block;
 }
 
-.icon-plus:before { content: "\e000" }
-.icon-minus:before { content: "\e001" }
-.icon-cross:before { content: "\e004" }
-.icon-plus-2:before { content: "\e005" }
-.icon-minus-2:before { content: "\e006" }
-.icon-pencil:before { content: "\e007" }
-.icon-tag:before { content: "\e034" }
-.icon-info:before { content: "\e008" }
-.icon-warning:before { content: "\e009" }
-.icon-checkmark:before { content: "\e00a" }
-.icon-ccw:before { content: "\e00b" }
-.icon-trash:before { content: "\f014" }
-.icon-cross-2:before { content: "\e00e" }
-.icon-pictures:before { content: "\e00f" }
-.icon-menu:before { content: "\e010" }
-.icon-magnifying-glass:before { content: "\e011" }
-.icon-fullscreen-exit:before { content: "\e01e" }
-.icon-help:before { content: "\e00c" }
-.icon-fullscreen:before { content: "\e01d" }
-.icon-cog:before { content: "\f013" }
+.alchemy-icon-plus:before { content: "\e000" }
+.alchemy-icon-minus:before { content: "\e001" }
+.alchemy-icon-cross:before { content: "\e004" }
+.alchemy-icon-plus-2:before { content: "\e005" }
+.alchemy-icon-minus-2:before { content: "\e006" }
+.alchemy-icon-pencil:before { content: "\e007" }
+.alchemy-icon-tag:before { content: "\e034" }
+.alchemy-icon-info:before { content: "\e008" }
+.alchemy-icon-warning:before { content: "\e009" }
+.alchemy-icon-checkmark:before { content: "\e00a" }
+.alchemy-icon-ccw:before { content: "\e00b" }
+.alchemy-icon-trash:before { content: "\f014" }
+.alchemy-icon-cross-2:before { content: "\e00e" }
+.alchemy-icon-pictures:before { content: "\e00f" }
+.alchemy-icon-menu:before { content: "\e010" }
+.alchemy-icon-magnifying-glass:before { content: "\e011" }
+.alchemy-icon-fullscreen-exit:before { content: "\e01e" }
+.alchemy-icon-help:before { content: "\e00c" }
+.alchemy-icon-fullscreen:before { content: "\e01d" }
+.alchemy-icon-cog:before { content: "\f013" }

data/app/assets/stylesheets/alchemy/icons.scss

@@ -6,7 +6,7 @@
 
   &.add {
     background: none;
-    @extend .icon-plus-2;
+    @extend .alchemy-icon-plus-2;
     line-height: 1em;
     font-size: 19px;
   }
@@ -52,7 +52,7 @@
 
     &.small {
       background: none;
-      @extend .icon-cross;
+      @extend .alchemy-icon-cross;
       line-height: 0;
     }
   }
@@ -212,7 +212,7 @@
   &.search {
     background: none;
     padding-top: 2px;
-    @extend .icon-magnifying-glass;
+    @extend .alchemy-icon-magnifying-glass;
   }
 
   &.select_all {
@@ -245,7 +245,7 @@
 
   &.tag_label {
     background: none;
-    @extend .icon-tag;
+    @extend .alchemy-icon-tag;
   }
 
   &.tag_edit {
@@ -280,34 +280,6 @@
     background-position: 0 -136px;
   }
 
-  &.user {
-    background-position: 0 -104px;
-
-    &.female {
-      background-position: -128px -104px;
-    }
-  }
-
-  &.user_add {
-    background-position: -96px -104px;
-  }
-
-  &.user_delete {
-    background-position: -32px -104px;
-
-    &.female {
-      background-position: -160px -104px;
-    }
-  }
-
-  &.user_edit {
-    background-position: -64px -104px;
-
-    &.female {
-      background-position: -192px -104px;
-    }
-  }
-
   &.vcard {
     background-position: -416px -104px;
   }