alchemy_cms 2.9.1 → 3.0.0.rc5

data/lib/rails/generators/alchemy/essence/templates/editor.html.erb

@@ -6,7 +6,7 @@
   Please consult Alchemy::Content.rb docs for further methods on the content object
 %>
 <%% cache(content) do %>
-<div class="content_editor <%= @essence_name.classify.demodulize %>" id="<%%= content_dom_id(content) %>">
+<div class="content_editor <%= @essence_name.classify.demodulize %>" id="<%%= content.dom_id %>">
   <%%= label_and_remove_link(content) %>
   <%%= text_field_tag(
     content.form_field_name,

data/lib/rails/generators/alchemy/scaffold/files/_article_editor.html.erb

@@ -0,0 +1,5 @@
+<%= element_editor_for(element) do |el| -%>
+  <%= el.edit :headline %>
+  <%= el.edit :picture, crop: true, fixed_ratio: false %>
+  <%= el.edit :text %>
+<%- end -%>

data/lib/rails/generators/alchemy/scaffold/files/_article_view.html.erb

@@ -0,0 +1,7 @@
+<%- cache(element) do -%>
+  <%= element_view_for(element, tag: 'article') do |el| -%>
+    <h2><%= el.render :headline %></h2>
+    <%= el.render :picture, image_size: '1200x600' %>
+    <%= el.render :text %>
+  <%- end -%>
+<%- end -%>

data/lib/rails/generators/alchemy/scaffold/files/alchemy.de.yml

@@ -0,0 +1,31 @@
+de:
+  alchemy:
+
+    # Translations for page layout names
+    page_layout_names:
+      index: Startseite
+
+    # Translations for element names
+    element_names:
+      article: Artikel
+
+    # Translations for content names
+    content_names:
+      headline: Überschrift
+      text: Text
+      picture: Bild
+
+    # Default texts for new contents created
+    default_content_texts:
+      article_headline: "Willkommen auf Ihrer Alchemy Seite"
+      article_text: '<p>Als erstes sollte man sich mit der Struktur von Alchemy vertraut machen. <a class="external" href="http://guides.alchemy-cms.com/edge/alchemy_approach.html" target="_blank" data-link-target="blank">Mehr dazu in den Guidelines</a>.</p><p>Die wichtigsten beiden Dinge die man über Alchemy wissen muss sind Elemente und Seitentypen.</p><p><span style="text-decoration: underline;"><strong>Elemente:</strong></span></p><p>Mit Alchemy kann man eine Seite in Inhaltsbereiche aufteilen, Elemente. Diese Elemente werden aus verschiedenen Grundtypen (Essenzen) zusammengesetzt. Die Essenzen sind:</p><ul><li>EssenceText - <em>Eine Zeile Text</em></li><li>EssenceRichtext - <em>Ein TinyMCE basierter formatierter Textblock</em></li><li>EssencePicture - <em>Ein Verweis auf ein Bild</em></li><li>EssenceHtml - <em>HTML Code</em></li><li>EssenceSelect - <em>Eine Auswahl an Werten</em></li><li>EssenceBoolean - <em>Eine Checkbox</em></li></ul><p>Elemente werden in einer YAML Datei definiert: <strong>config/alchemy/elements.yml</strong></p><p><a class="external" href="http://guides.alchemy-cms.com/edge/elements.html" target="_blank" data-link-target="blank">Mehr über Elemente und wie sie definiert werden, kann in den Guidelines nachgelesen werden.</a></p><p><span style="text-decoration: underline;"><strong>Seitentypen:</strong></span></p><p>Es können verschiedene Seitentypen definiert werden. Diesen können Elemente zugewiesen und ihr Verhalten definiert werden.</p><p>Seitentypen werden ein einer YAML Datei definiert: <strong>config/alchemy/page_layouts.yml</strong></p><p><a class="external" href="http://guides.alchemy-cms.com/edge/page_layouts.html" target="_blank" data-link-target="blank">Mehr über das Erstellen von Seitentypen kann in den Guidelines nachgelesen werden.</a></p>'
+
+    # Hint texts for elements
+    element_hints:
+      article: "Dies ist ein Hinweistext für das Artikel Element. Dieser Text kann in der `config/locales/alchemy.de.yml` Datei angepasst werden."
+
+    # Hint texts for contents
+    content_hints:
+      headline: "Dies ist ein einzeiliger unformatierter Text"
+      picture: "Bilder werden in der Bibliothek gespeichert. Ein Bild kann mehrfach einem Element zugewiesen werden. Auch ein Bildauswahlwerkzeug ist in Alchemy integriert."
+      text: "Dies ist ein formatierbarer Textblock. Die Einstellungen des Editors können angepasst werden. Siehe http://guides.alchemy-cms.com/edge/customize_tinymce.html"

data/lib/rails/generators/alchemy/scaffold/files/alchemy.elements.css.scss

@@ -0,0 +1,30 @@
+article {
+  width: 50%;
+  font: 16px/20px Helvetica, Arial, sans-serif;
+  color: #333;
+  margin: 1em auto;
+  padding: 0.5em 1em;
+  background: #f4f4f4;
+
+  h2 {
+    font-size: 24px;
+    line-height: 1.25;
+    font-weight: bold;
+  }
+
+  a {
+    color: #5588D3;
+  }
+
+  img {
+    max-width: 100%;
+  }
+
+  figure {
+    margin: 0;
+  }
+
+  figcaption {
+    font-size: 14px;
+  }
+}

data/lib/rails/generators/alchemy/scaffold/files/alchemy.en.yml

@@ -0,0 +1,31 @@
+en:
+  alchemy:
+
+    # Translations for page layout names
+    page_layout_names:
+      index: Homepage
+
+    # Translations for element names
+    element_names:
+      article: Article
+
+    # Translations for content names
+    content_names:
+      headline: Headline
+      text: Text
+      picture: Picture
+
+    # Default texts for new contents created
+    default_content_texts:
+      article_headline: "Welcome to your first Alchemy CMS page"
+      article_text: '<p><strong>How to get started.</strong></p><p>First of all you should read about Alchemy and its architecture in the <a class="external" href="http://guides.alchemy-cms.com/edge/alchemy_approach.html" target="_blank" data-link-target="blank">guidelines</a>.</p><p>The most important things to know about Alchemy are elements and page layouts.</p><p><span style="text-decoration: underline;"><strong>Elements:</strong></span></p><p>With Alchemy you can split pages into content parts, elements. These elements can be defined out of several base content types: essences. The basic essences are:</p><ul><li>EssenceText - <em>A single line of text</em></li><li>EssenceRichtext - <em>A TinyMCE powered formatted text block</em></li><li>EssencePicture - <em>A reference to an image</em></li><li>EssenceHtml - <em>HTML embed code</em></li><li>EssenceSelect - <em>A selection of values</em></li><li>EssenceBoolean - <em>A checkbox</em></li></ul><p>Elements get defined in a YAML file <strong>config/alchemy/elements.yml</strong></p><p><a class="external" href="http://guides.alchemy-cms.com/edge/elements.html" target="_blank" data-link-target="blank">Read more about elements and how to define them in the guidelines.</a></p><p><span style="text-decoration: underline;"><strong>Page types:</strong></span></p><p>You can define several types of pages, called page layouts. You can assign elements to page layouts and control how elements and the page of a certain layout behave.</p><p>Page layouts get defined in a YAML file <strong>config/alchemy/page_layouts.yml</strong></p><p><a class="external" href="http://guides.alchemy-cms.com/edge/page_layouts.html" target="_blank" data-link-target="blank">Read more about defining page layouts in the guidelines.</a></p>'
+
+    # Hint texts for elements
+    element_hints:
+      article: "This is a hint text for the article element. You can change this text in `config/locales/alchemy.en.yml`. Feel free to change it as you like, it's yours."
+
+    # Hint texts for contents
+    content_hints:
+      headline: "This is a single line of unformatable Text"
+      picture: "Pictures are stored in the library. You can assign a picture multiple times throughout your site. Alchemy has an image cropper build right in."
+      text: "This is a rich text block powered by TinyMCE editor. You can change the configuration of the editor. See http://guides.alchemy-cms.com/edge/customize_tinymce.html"

data/lib/rails/generators/alchemy/scaffold/files/application.html.erb

@@ -2,11 +2,13 @@
 <html>
 <head>
   <%= render_meta_data %>
-  <%= stylesheet_link_tag 'application' %>
+  <%= stylesheet_link_tag 'application', media: 'all' %>
+  <%= javascript_include_tag 'application' %>
+  <%= csrf_meta_tags %>
 </head>
 <body>
   <%= yield %>
   <%= alchemy_preview_mode_code %>
-  <%= alchemy_menu_bar %>
+  <%= render "alchemy/menubar" %>
 </body>
 </html>

data/lib/rails/generators/alchemy/scaffold/files/elements.yml

@@ -1,3 +1,19 @@
 # == In this configuration you setup Alchemy´s element layouts.
 #
 # For further informations please see http://guides.alchemy-cms.com/create_elements.html
+
+- name: article
+  hint: true
+  unique: true
+  contents:
+  - name: headline
+    type: EssenceText
+    default: :article_headline
+    hint: true
+  - name: picture
+    type: EssencePicture
+    hint: true
+  - name: text
+    type: EssenceRichtext
+    default: :article_text
+    hint: true

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

@@ -4,7 +4,7 @@ module Alchemy
   module Generators
     class ScaffoldGenerator < ::Rails::Generators::Base
 
-      ALCHEMY_VIEWS = %w(breadcrumb language_links messages navigation notifications search)
+      ALCHEMY_VIEWS = %w(breadcrumb language_links messages navigation)
 
       desc "This generator generates the Alchemy scaffold."
       class_option :copy_views, :default => false, :type => :boolean, :desc => "Copy all Alchemy views into your app.", :aliases => '-v'
@@ -28,26 +28,35 @@ module Alchemy
       end
 
       def copy_files
-        copy_file "#{File.dirname(__FILE__)}/files/elements.yml", "#{Rails.root}/config/alchemy/elements.yml"
+        copy_file "#{current_path}/files/elements.yml", "#{Rails.root}/config/alchemy/elements.yml"
         template "page_layouts.yml.tt", "#{Rails.root}/config/alchemy/page_layouts.yml"
-        copy_file "#{File.dirname(__FILE__)}/files/application.html.erb", "#{Rails.root}/app/views/layouts/application.html.erb"
-        copy_file "#{File.dirname(__FILE__)}/files/_standard.html.erb", "#{Rails.root}/app/views/alchemy/page_layouts/_standard.html.erb"
+        copy_file "#{current_path}/files/alchemy.en.yml", "#{Rails.root}/config/locales/alchemy.en.yml"
+        copy_file "#{current_path}/files/alchemy.de.yml", "#{Rails.root}/config/locales/alchemy.de.yml"
+        copy_file "#{current_path}/files/application.html.erb", "#{Rails.root}/app/views/layouts/application.html.erb"
+        copy_file "#{current_path}/files/_standard.html.erb", "#{Rails.root}/app/views/alchemy/page_layouts/_standard.html.erb"
+        copy_file "#{current_path}/files/_article_view.html.erb", "#{Rails.root}/app/views/alchemy/elements/_article_view.html.erb"
+        copy_file "#{current_path}/files/_article_editor.html.erb", "#{Rails.root}/app/views/alchemy/elements/_article_editor.html.erb"
+        copy_file "#{current_path}/files/alchemy.elements.css.scss", "#{Rails.root}/app/assets/stylesheets/alchemy.elements.css.scss"
       end
 
-    private
+      private
 
       def config_path
-        @config_path ||= File.expand_path('../../../../../config/alchemy', File.dirname(__FILE__))
+        @config_path ||= File.expand_path('../../../../../config/alchemy', current_path)
       end
 
       def copy_alchemy_views
         ALCHEMY_VIEWS.each do |dir|
-          src = File.expand_path("../../../../../app/views/alchemy/#{dir}", File.dirname(__FILE__))
+          src = File.expand_path("../../../../../app/views/alchemy/#{dir}", current_path)
           dest = Rails.root.join('app/views/alchemy', dir)
           directory src, dest
         end
       end
 
+      def current_path
+        @current_path ||= File.dirname(__FILE__)
+      end
+
     end
   end
 end

data/lib/rails/generators/alchemy/scaffold/templates/page_layouts.yml.tt

@@ -1,7 +1,8 @@
-# == This file defines the page_layouts for new pages.
+# == This file defines the page layouts for new pages.
 #
 # For further informations please see http://guides.alchemy-cms.com/create_page_layouts.html
 
 - name: <%= Alchemy::Config.get(:default_language)['page_layout'] %>
   unique: true
-  elements: []
+  elements: [article]
+  autogenerate: [article]

data/lib/rails/templates/alchemy.rb

@@ -1,9 +1,6 @@
 # This rails template installs Alchemy and all depending gems.
 require File.expand_path('../../../alchemy/version', __FILE__)
 
-gem 'alchemy_cms', "~> #{Alchemy::VERSION}"
-gem 'alchemy-devise', github: 'magiclabs/alchemy-devise', branch: '1.1-stable'
-
-if yes?("\nDo you want to use Capistrano for deployment? (y/N)")
-  gem 'capistrano', group: 'development'
-end
+gem 'alchemy_cms', github: 'magiclabs/alchemy_cms', branch: 'master'
+gem 'alchemy-devise', github: 'magiclabs/alchemy-devise', branch: 'master'
+gem 'capistrano', '~> 2.15.5', group: 'development'

data/lib/tasks/alchemy/install.rake

@@ -1,15 +1,24 @@
 require 'thor'
 
-class Alchemy::RoutesInjector < Thor
+class Alchemy::InstallTask < Thor
   include Thor::Actions
 
   no_tasks do
-    def inject
-      mountpoint = ask "\nWhere do you want to mount Alchemy CMS? (/)"
+    def inject_routes
+      mountpoint = ask "\nAt which path do you want to mount Alchemy CMS at? (DEFAULT: At root path '/')"
       mountpoint = "/" if mountpoint.empty?
       sentinel = /\.routes\.draw do(?:\s*\|map\|)?\s*$/
-      inject_into_file "./config/routes.rb", "\n  mount Alchemy::Engine => '#{mountpoint}'\n", { :after => sentinel, :verbose => true }
-      mountpoint
+      inject_into_file "./config/routes.rb", "\n  mount Alchemy::Engine => '#{mountpoint}'\n", { after: sentinel, verbose: true }
+    end
+
+    def set_primary_language
+      code = ask "\nWhat's the language code of your site's primary language? (DEFAULT: en)"
+      code = "en" if code.empty?
+      name = ask "What's the name of your site's primary language? (DEFAULT: English)"
+      name = "English" if name.empty?
+      gsub_file "./config/alchemy/config.yml", /default_language:\n\s\scode:\sen\n\s\sname:\sEnglish/m do |match|
+        match = "default_language:\n  code: #{code}\n  name: #{name}"
+      end
     end
   end
 
@@ -17,44 +26,26 @@ end
 
 namespace :alchemy do
 
-  desc "Creates, migrates and seeds the database to run Alchemy."
-  task :prepare => ["db:create", "alchemy:install:migrations", "db:migrate", "alchemy:db:seed"]
-
   desc "Installs Alchemy CMS into your app."
-  task :install => ["alchemy:prepare", "alchemy:mount"] do
-    system("rails g alchemy:scaffold")
-    puts <<-EOF
-
-\\o/ Successfully installed Alchemy CMS \\o/
-
-Now cd into your app folder and
-
-1. Start your Rails server:
-
-  rails server
-
-2. Open your browser and enter the following URL:
-
-  http://localhost:3000/#{@mountpoint.gsub(/^\//, '')}
-
-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/
-
-EOF
+  task :install do
+    puts "\nAlchemy Installer"
+    puts "-----------------"
+    Rake::Task["alchemy:mount"].invoke
+    system('rails g alchemy:scaffold') || exit!(1)
+    Alchemy::InstallTask.new.set_primary_language
+    Rake::Task["db:create"].invoke
+    Rake::Task["alchemy:install:migrations"].invoke
+    Rake::Task["db:migrate"].invoke
+    Rake::Task["alchemy:db:seed"].invoke
+    puts "\nAlchemy successfully installed."
+    puts "\nNow start the server with:"
+    puts "\n$ bin/rails server"
+    puts "\nand point your browser to http://localhost:3000/admin and follow the onscreen instructions to finalize the installation."
   end
 
   desc "Mounts Alchemy into your routes."
   task :mount do
-    @mountpoint = Alchemy::RoutesInjector.new.inject
+    Alchemy::InstallTask.new.inject_routes
   end
 
 end

data/lib/tasks/alchemy/tidy.rake

@@ -37,7 +37,7 @@ module Alchemy
         cells_for_layout = cells.select { |cell| layout['cells'].include? cell['name'] }
         Alchemy::Page.where(page_layout: layout['name']).each do |page|
           cells_for_layout.each do |cell_for_layout|
-            cell = Alchemy::Cell.find_or_initialize_by_name_and_page_id(name: cell_for_layout['name'], page_id: page.id)
+            cell = Alchemy::Cell.find_or_initialize_by(name: cell_for_layout['name'], page_id: page.id)
             cell.elements << page.elements.select { |element| cell_for_layout['elements'].include?(element.name) }
             if cell.new_record?
               cell.save

data/spec/controllers/admin/attachments_controller_spec.rb

@@ -2,15 +2,13 @@ require 'spec_helper'
 
 module Alchemy
   describe Admin::AttachmentsController do
-
-    let(:attachment) { mock_model('Attachment', file_name: 'testfile', file_mime_type: 'image/png', file: mock('File', data: nil)) }
+    let(:attachment) { build_stubbed(:attachment) }
 
     before do
       sign_in(admin_user)
     end
 
     describe "#index" do
-
       it "should always paginate the records" do
         Attachment.should_receive(:find_paginated)
         get :index
@@ -18,19 +16,20 @@ module Alchemy
 
       context "when params[:tagged_with] is set" do
         it "should filter the records by tags" do
-          Attachment.should_receive(:tagged_with).and_return(Attachment.scoped)
+          Attachment.should_receive(:tagged_with).and_return(Attachment.all)
           get :index, tagged_with: "pdf"
         end
       end
 
       context "when params[:content_id]" do
-        render_views
+        let(:content) { mock_model(Content) }
 
         context "is set" do
-          it "should render the archive_overlay partial" do
-            Content.stub!(:find).with('1', {:select => 'id'}).and_return(mock_model(Content))
-            get :index, {content_id: 1, format: :html}
+          it "it renders the archive_overlay partial" do
+            Content.stub_chain(:select, :find_by).and_return(content)
+            get :index, {content_id: content.id}
             expect(response).to render_template(partial: '_archive_overlay')
+            assigns(:content).should eq(content)
           end
         end
 
@@ -40,17 +39,24 @@ module Alchemy
             expect(response).to render_template(:index)
           end
         end
+      end
+    end
 
+    describe '#show' do
+      before do
+        Attachment.stub(find: attachment)
       end
 
+      it "renders the show template" do
+        get :show, id: attachment.id
+        expect(response).to render_template(:show)
+      end
     end
 
     describe "#new" do
-
       context "in overlay" do
-
         before do
-          controller.stub!(:in_overlay?).and_return(true)
+          controller.stub(:in_overlay?).and_return(true)
           Content.stub(:find).and_return(mock_model('Content'))
         end
 
@@ -64,49 +70,110 @@ module Alchemy
           assigns(:swap).should eq('true')
         end
       end
-
     end
 
-    describe "#show" do
-      before do
-        Attachment.stub!(:find).with("#{attachment.id}").and_return(attachment)
-      end
+    describe '#create' do
+      subject { post :create, params }
 
-      it "should assign @attachment with Attachment found by id" do
-        get :edit, id: attachment.id
-        expect(assigns(:attachment)).to eq(attachment)
+      let(:attachment) { mock_model('Attachment', name: 'contract.pdf', to_jq_upload: {}) }
+      let(:params)     { {attachment: {name: ''}} }
+
+      context 'with passing validations' do
+        before do
+          Attachment.should_receive(:new).and_return(attachment)
+          attachment.should_receive(:save).and_return(true)
+        end
+
+        context 'if inside of archive overlay' do
+          let(:params)  { {attachment: {name: ''}, content_id: 1} }
+          let(:content) { mock_model('Content') }
+
+          before do
+            Content.stub_chain(:select, :find_by).and_return(content)
+          end
+
+          it "assigns lots of instance variables" do
+            subject
+            assigns(:options).should eq({})
+            assigns(:while_assigning).should be_true
+            assigns(:content).should eq(content)
+            assigns(:swap).should eq(nil)
+          end
+        end
+
+        it "renders json response with success message" do
+          subject
+          response.content_type.should eq('application/json')
+          response.status.should eq(201)
+          json = JSON.parse(response.body)
+          json.should have_key('growl_message')
+          json.should have_key('files')
+        end
       end
 
-      context "if xhr request" do
-        it "should render no layout" do
-          xhr :get, :edit, id: attachment.id
-          expect(@layouts).to be_empty
+      context 'without passing validations' do
+        it "renders json response with error message" do
+          subject
+          response.content_type.should eq('application/json')
+          response.status.should eq(422)
+          json = JSON.parse(response.body)
+          json.should have_key('growl_message')
+          json.should have_key('files')
         end
       end
     end
 
-    describe "#edit" do
+    describe '#update' do
+      subject { put :update, attachment: {name: ''} }
+
+      let(:attachment) { build_stubbed(:attachment) }
+
       before do
-        Attachment.stub!(:find).with("#{attachment.id}").and_return(attachment)
+        Attachment.stub(find: attachment)
       end
 
-      it "should assign @attachment with Attachment found by id" do
-        get :edit, id: attachment.id
-        expect(assigns(:attachment)).to eq(attachment)
+      context 'with passing validations' do
+        before do
+          attachment.should_receive(:update_attributes).and_return(true)
+        end
+
+        it "redirects to index path" do
+          should redirect_to admin_attachments_path
+        end
       end
 
-      context "if xhr request" do
-        it "should render no layout" do
-          xhr :get, :edit, id: attachment.id
-          expect(@layouts).to be_empty
+      context 'with failing validations' do
+        before do
+          attachment.stub(update_attributes: false)
+          attachment.stub_chain(:errors, :empty?).and_return(false)
         end
+
+        it "renders edit form" do
+          should render_template(:edit)
+        end
+      end
+    end
+
+    describe '#destroy' do
+      let(:attachment) { build_stubbed(:attachment) }
+
+      before do
+        Attachment.stub(find: attachment)
+      end
+
+      it "destroys the attachment and sets and success message" do
+        attachment.should_receive(:destroy)
+        xhr :delete, :destroy
+        assigns(:attachment).should eq(attachment)
+        assigns(:url).should_not be_blank
+        flash[:notice].should_not be_blank
       end
     end
 
     describe "#download" do
       before do
-        Attachment.stub!(:find).with("#{attachment.id}").and_return(attachment)
-        controller.stub!(:render).and_return(nil)
+        Attachment.stub(:find).with("#{attachment.id}").and_return(attachment)
+        controller.stub(:render).and_return(nil)
       end
 
       it "should assign @attachment with Attachment found by id" do
@@ -119,6 +186,5 @@ module Alchemy
         get :download, id: attachment.id
       end
     end
-
   end
 end