alchemy_cms 3.0.4 → 3.1.0.beta1

data/app/views/alchemy/essences/_essence_date_view.html.erb

@@ -1,9 +1,11 @@
-<% cache(content) do %>
-<% if content.ingredient.present? %>
-<% if options[:date_format].to_s == 'rfc822' %>
+<%- cache(content) do -%>
+<%- date_format = content_settings_value(content, :date_format,
+  local_assigns.fetch(:options, {})) -%>
+<%- if content.ingredient.present? -%>
+<%- if date_format == 'rfc822' -%>
 <%= content.ingredient.to_s(:rfc822) %>
-<% else %>
-<%= l(content.ingredient, format: options[:date_format]) %>
-<% end %>
-<% end %>
-<% end %>
+<%- else -%>
+<%= l(content.ingredient, format: date_format) %>
+<%- end -%>
+<%- end -%>
+<%- end -%>

data/app/views/alchemy/essences/_essence_file_editor.html.erb

@@ -1,66 +1,61 @@
-<div class="content_editor essence_file" id="<%= content.dom_id %>">
-  <label style="display: inline">
-    <%= render_content_name(content) %>
-    <%= delete_content_link(content) %>
-  </label>
+<% cache(content) do %>
+
+<% dialog_link = link_to_dialog('',
+  alchemy.admin_attachments_path(
+    content_id: content.id,
+    only: content_settings_value(content,
+      :file_assign_show_only,
+      local_assigns.fetch(:options, {})),
+    except: content_settings_value(content,
+      :file_assign_do_not_show,
+      local_assigns.fetch(:options, {})),
+    options: local_assigns.fetch(:options, {}).to_json
+  ),
+  {
+    title: _t(:assign_file),
+    size: '780x585',
+    padding: false
+  },
+  {
+    class: 'assign_file',
+    title: _t(:assign_file)
+  }
+) %>
+
+<div class="content_editor essence_file" id="<%= content.dom_id %>" data-content-id="<%= content.id %>">
+  <%= label_and_remove_link(content) %>
   <div class="file" id="file_<%= content.id %>">
     <div class="file_icon">
     <% if content.ingredient.nil? %>
-      <%= link_to_dialog '',
-        alchemy.admin_attachments_path(
-          content_id: content.id,
-          only: options[:file_assign_show_only],
-          except: options[:file_assign_do_not_show],
-          options: options.to_json
-        ),
-        {
-          title: _t(:assign_file),
-          size: '780x585',
-          padding: false
-        },
-        class: 'assign_file',
-        title: _t(:assign_file)
-      %>
+      <%= dialog_link %>
     <% else %>
       <%= render_icon(content.ingredient.icon_css_class) %>
     <% end %>
     </div>
     <div class="file_name">
-      <%= content.ingredient.name rescue ("&#x2190;" + _t(:assign_file_from_archive)).html_safe %>
+      <%= content.ingredient.try(:name) ||
+        ("&#x2190;" + _t(:assign_file_from_archive)).html_safe %>
     </div>
     <% unless content.ingredient.nil? %>
-    <%= hidden_field_tag content.form_field_name(:attachment_id), content.ingredient.id %>
-    <div class="essence_file_tools">
-      <%= link_to_dialog '',
-        alchemy.admin_attachments_path(
-          content_id: content.id,
-          only: options[:file_assign_show_only],
-          except: options[:file_assign_do_not_show],
-          options: options.to_json
-        ),
-        {
-          title: _t(:assign_file),
-          size: '780x585',
-          padding: false
-        },
-        class: 'assign_file',
-        title: _t(:assign_file)
-      %>
-      <%= link_to_dialog '',
-        url_for(
-          controller: 'essence_files',
-          action: 'edit',
-          options: options.to_json,
-          id: content
-        ),
-        {
-          title: _t(:edit_file_properties),
-          size: '400x165'
-        },
-        class: 'edit_file',
-        title: _t(:edit_file_properties)
-      %>
-    </div>
+      <%= hidden_field_tag content.form_field_name(:attachment_id),
+        content.ingredient.id %>
+      <div class="essence_file_tools">
+        <%= dialog_link %>
+        <%= link_to_dialog '',
+          url_for(
+            controller: 'essence_files',
+            action: 'edit',
+            options: local_assigns.fetch(:options, {}).to_json,
+            id: content
+          ),
+          {
+            title: _t(:edit_file_properties),
+            size: '400x165'
+          },
+          class: 'edit_file',
+          title: _t(:edit_file_properties) %>
+      </div>
     <% end %>
   </div>
 </div>
+<% end %>

data/app/views/alchemy/essences/_essence_file_view.html.erb

@@ -1,10 +1,10 @@
-<% cache(content) do %>
-<% if attachment = content.ingredient %>
+<%- cache(content) do -%>
+<%- if attachment = content.ingredient -%>
 <%= link_to(
   h(attachment.name),
   alchemy.download_attachment_path(attachment),
   class: "file_link #{content.essence.css_class.blank? ? "" : content.essence.css_class}",
   title: "#{content.essence.title.blank? ? attachment.file_name : content.essence.title}"
-) %>
-<% end %>
-<% end %>
+) -%>
+<%- end -%>
+<%- end -%>

data/app/views/alchemy/essences/_essence_html_editor.html.erb

@@ -1,8 +1,9 @@
-<div class="content_editor essence_html_editor"<%= " style=\"float: left;\"" if options[:css_class] == "text_short" %>>
+<% cache(content) do %>
+<div class="content_editor essence_html_editor" data-content-id="<%= content.id %>">
   <%= label_and_remove_link(content) %>
   <%= text_area_tag(
     content.form_field_name,
-    content.ingredient,
-    :class => 'thin_border'
+    content.ingredient
   ) %>
-</div>
+</div>
+<% end %>

data/app/views/alchemy/essences/_essence_link_editor.html.erb

@@ -1,19 +1,21 @@
 <% cache(content) do %>
-<div class="content_editor essence_link" id="<%= content.dom_id %>">
-  <label><%= render_content_name(content) %></label>
-  <%= text_field_tag(
-    '',
-    content.ingredient,
-    :class => "thin_border text_with_icon disabled",
-    :name => nil,
-    :id => nil,
-    :disabled => true
-  ) %>
-  <%= hidden_field_tag content.form_field_name(:link), content.essence.link %>
-  <%= hidden_field_tag content.form_field_name(:link_title), content.essence.link_title %>
-  <%= hidden_field_tag content.form_field_name(:link_class_name), content.essence.link_class_name %>
-  <%= hidden_field_tag content.form_field_name(:link_target), content.essence.link_target %>
-  <%= render 'alchemy/essences/shared/linkable_essence_tools', :content => content %>
+<div class="content_editor essence_link" id="<%= content.dom_id %>" data-content-id="<%= content.id %>">
+  <%= label_and_remove_link(content) %>
+  <%= text_field_tag '', content.ingredient,
+    class: "thin_border text_with_icon disabled",
+    name: nil,
+    id: nil,
+    disabled: true
+  %>
+  <%= hidden_field_tag content.form_field_name(:link),
+    content.essence.link %>
+  <%= hidden_field_tag content.form_field_name(:link_title),
+    content.essence.link_title %>
+  <%= hidden_field_tag content.form_field_name(:link_class_name),
+    content.essence.link_class_name %>
+  <%= hidden_field_tag content.form_field_name(:link_target),
+    content.essence.link_target %>
+  <%= render 'alchemy/essences/shared/linkable_essence_tools', content: content %>
 </div>
 <script type="text/javascript" charset="utf-8">
   $('#<%= content.form_field_id(:link) %>').on('change', function() {

data/app/views/alchemy/essences/_essence_link_view.html.erb

@@ -1,7 +1,11 @@
-<% cache(content) do %>
-<% if content.ingredient %>
-<%- options[:text] ||= content.ingredient %>
-<%- html_options = { target: content.essence.link_target == "blank" ? "_blank" : nil }.merge(html_options) %>
-<%= link_to options[:text], content.ingredient, html_options -%>
-<% end %>
-<% end %>
+<%- cache(content) do -%>
+<%- if content.ingredient.present? -%>
+<%- html_options = {
+  target: content.essence.link_target == "blank" ? "_blank" : nil
+}.merge(local_assigns.fetch(:html_options, {})) -%>
+<%= link_to(content.ingredient, html_options) do -%>
+<%= content_settings_value(content, :text, local_assigns.fetch(:options, {})) ||
+  content.ingredient -%>
+<%- end -%>
+<%- end -%>
+<%- end -%>

data/app/views/alchemy/essences/_essence_picture_editor.html.erb

@@ -1,4 +1,5 @@
-<div id="<%= content.dom_id %>" class="essence_picture_editor<%= ' dragable_picture' if options[:dragable] %><%= ' content_editor' unless options[:grouped] %>">
+<% cache(content) do %>
+<div id="<%= content.dom_id %>" class="essence_picture_editor<%= ' dragable_picture' if options[:dragable] %><%= ' content_editor' unless options[:grouped] %>" data-content-id="<%= content.id %>">
   <% unless options[:grouped] %>
   <%= label_and_remove_link(content) %>
   <% end %>
@@ -35,7 +36,7 @@
         <% end %>
       </div>
     </div>
-    <%- unless options[:css_class].blank? || content.essence.css_class.blank? -%>
+    <%- if content.essence.css_class.present? -%>
     <div class="essence_picture_css_class">
       <%= _t("alchemy.essence_pictures.css_classes.#{content.essence.css_class}", default: content.essence.css_class.camelcase) %>
     </div>
@@ -55,3 +56,4 @@
   <%= hidden_field_tag content.form_field_name(:link_class_name), content.essence.link_class_name %>
   <%= hidden_field_tag content.form_field_name(:link_target), content.essence.link_target %>
 </div>
+<% end %>

data/app/views/alchemy/essences/_essence_picture_view.html.erb

@@ -1,3 +1,5 @@
 <% cache(content) do %>
-<%= render_essence_picture_view(content, options, html_options) %>
-<% end %>
+<%= render_essence_picture_view content,
+  local_assigns.fetch(:options, {}),
+  local_assigns.fetch(:html_options, {}) %>
+<% end %>

data/app/views/alchemy/essences/_essence_richtext_view.html.erb

@@ -1,4 +1,5 @@
-<% cache(content) do %>
-<% options = local_assigns.fetch(:options, {}) %>
-<%= raw content.essence.send(options[:plain_text] ? :stripped_body : :body) %>
-<% end %>
+<%- cache(content) do -%>
+<%- options = local_assigns.fetch(:options, {}) -%>
+<%- plain_text = !!content_settings_value(content, :plain_text, options) -%>
+<%= raw content.essence.send(plain_text ? :stripped_body : :body) -%>
+<%- end -%>

data/app/views/alchemy/essences/_essence_select_editor.html.erb

@@ -1,35 +1,25 @@
 <% cache(content) do %>
-  <div class="content_editor essence_select<%= options[:display_inline].to_s == 'true' ? ' display_inline' : '' %>" id="<%= content.dom_id %>">
-
-  <%= label_and_remove_link(content) %>
-
-  <% if options[:select_values].nil? %>
-
-    <%= warning('options[:select_values] is nil', "No select values given. Please provide :select_values as argument to render_essence_editor_by_name() helper inside this element editor view.") %>
-
-  <% else %>
-
-    <%
-    if options[:select_values].is_a?(Hash)
-      options_tags = grouped_options_for_select(
-        options[:select_values],
-        content.ingredient,
-        ''
-      )
-    else
-      options_tags = options_for_select(
-        options[:select_values],
-        content.ingredient
-      )
-    end
-    %>
-
-    <%= select_tag(content.form_field_name, options_tags, {
-      :class => ["alchemy_selectbox", "essence_editor_select", html_options[:class]].join(' '),
-      :style => html_options[:style]
-    }) %>
-
-  <% end %>
-
+  <%- select_values = content_settings_value(content,
+    :select_values, local_assigns.fetch(:options, {})) -%>
+
+  <div class="content_editor essence_select<%= options[:display_inline].to_s == 'true' ? ' display_inline' : '' %>" id="<%= content.dom_id %>" data-content-id="<%= content.id %>">
+    <%= label_and_remove_link(content) %>
+
+    <% if select_values.nil? %>
+      <%= warning(':select_values is nil', "<strong>No select values given.</strong><br>Please provide :<code>select_values</code> either as argument to <code>render_essence_editor</code> helper or as setting on the content definition in <code>elements.yml</code>.".html_safe) %>
+    <% else %>
+      <%  if select_values.is_a?(Hash)
+            options_tags = grouped_options_for_select select_values,
+              content.ingredient, ''
+          else
+            options_tags = options_for_select select_values,
+              content.ingredient
+          end %>
+
+      <%= select_tag content.form_field_name, options_tags, {
+        class: ["alchemy_selectbox", "essence_editor_select", html_options[:class]].join(' '),
+        style: html_options[:style]
+      } %>
+    <% end %>
   </div>
 <% end %>

data/app/views/alchemy/essences/_essence_text_view.html.erb

@@ -1,7 +1,8 @@
-<% cache(content) do %>
-<% options = local_assigns.fetch(:options, {}) %>
-<% html_options = local_assigns.fetch(:html_options, {}) %>
-<%- if content.essence.link.blank? || options[:disable_link] -%>
+<%- cache(content) do -%>
+<%- options = local_assigns.fetch(:options, {}) -%>
+<%- html_options = local_assigns.fetch(:html_options, {}) -%>
+<%- if content.essence.link.blank? ||
+    content_settings_value(content, :disable_link, options) -%>
 <%= content.ingredient -%>
 <%- else -%>
 <%= link_to(
@@ -12,6 +13,6 @@
     target: (content.essence.link_target == "blank" ? "_blank" : nil),
     'data-link-target' => content.essence.link_target
   }.merge(html_options)
-) %>
+) -%>
 <%- end -%>
-<% end %>
+<%- end -%>

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

@@ -1,4 +1,4 @@
-<% if options[:crop] && content.ingredient %>
+<% if options[:crop] && content.ingredient && content.ingredient.can_be_cropped_to(options[:image_size], options[:upsample]) %>
 <%= link_to_dialog(
   render_icon('crop'),
   alchemy.crop_admin_essence_picture_path(content.essence, options: options.to_json),

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

@@ -14,7 +14,11 @@
       var Alchemy = {};
       // Setting TinyMCE path.
       var tinyMCEPreInit = {
-        base: '<%= Rails.application.config.assets.prefix %>/tinymce',
+        <% if ActionController::Base.config.asset_host_set? %>
+        base: '<%= asset_url(assets_prefix + '/tinymce') %>',
+        <% else %>
+        base: '<%= asset_path(assets_prefix + '/tinymce') %>',
+        <% end %>
         suffix: '.min'
       };
       // Store regular expression for external link url matching.
@@ -92,8 +96,6 @@
     <script>
       // Store current locale for javascript translations.
       Alchemy.locale = '<%= ::I18n.locale %>';
-      // Setting the correct locale for select2 dropdown replacement.
-      $.extend($.fn.select2.defaults, $.fn.select2.locales['<%= ::I18n.locale %>']);
     </script>
     <%= yield(:javascripts) %>
   </body>

data/config/initializers/inflections.rb

@@ -0,0 +1,3 @@
+ActiveSupport::Inflector.inflections(:en) do |inflect|
+  inflect.acronym 'API'
+end

data/config/initializers/simple_form.rb

@@ -94,7 +94,7 @@ SimpleForm.setup do |config|
   # config.item_wrapper_class = nil
 
   # How the label text should be generated altogether with the required text.
-  config.label_text = lambda { |label, required| "#{label}#{required}" }
+  config.label_text = proc { |label, required| "#{label}#{required}" }
 
   # You can define the class to use on all labels. Default is nil.
   config.label_class = 'control-label'

data/config/locales/alchemy.en.yml

@@ -501,7 +501,6 @@ en:
         last_upload: "from last upload"
         recent: "that where recently uploaded"
         without_tag: "without tag"
-    pictures_in_page: "%{page} in %{pictures}"
     place_link: "Link text"
     player_version: "Flash Player version"
     "please enter subject and mail address": "Please enter recipient and subject."

data/config/routes.rb

@@ -36,6 +36,20 @@ Alchemy::Engine.routes.draw do
   resources :elements, :only => :show
   resources :contents, :only => :show
 
+  namespace :api, defaults: {format: 'json'} do
+    resources :contents, only: [:index, :show]
+    resources :elements, only: [:index, :show] do
+      get '/contents' => 'contents#index', as: 'contents'
+      get '/contents/:name' => 'contents#show', as: 'content'
+    end
+    resources :pages, only: [:index] do
+      get 'elements' => 'elements#index', as: 'elements'
+      get 'elements/:named' => 'elements#index', as: 'named_elements'
+    end
+    get '/pages/*urlname(.:format)' => 'pages#show', as: 'page'
+    get '/admin/pages/:id(.:format)' => 'pages#show', as: 'preview_page'
+  end
+
   namespace :admin do
 
     resources :contents do

data/lib/alchemy/capistrano.rb

@@ -156,6 +156,77 @@ EOF
       end
     end
 
+    namespace :export do
+      desc "Sends all data (Pictures, attachments and the database) to your remote machine."
+      task :all, :roles => [:app, :db] do
+        pictures
+        attachments
+        database
+      end
+
+      desc "Imports the server database into your local development machine."
+      task :database, :roles => [:db], :only => {:primary => true} do
+        if Capistrano::CLI.ui.agree('WARNING: This task will override your remote database. Do you want me to make a backup? (y/n)')
+          backup_database
+          export_database
+        else
+          if Capistrano::CLI.ui.agree('Are you sure? (y/n)')
+            export_database
+          else
+            backup_database
+            export_database
+          end
+        end
+      end
+
+      desc "Sends attachments to your remote machine using rsync."
+      task :attachments, :roles => [:app] do
+        send_files :attachments
+      end
+
+      desc "Sends pictures to your remote machine using rsync."
+      task :pictures, :roles => [:app] do
+        send_files :pictures
+      end
+
+      # Makes a backup of the remote database and stores it in db/ folder
+      def backup_database
+        Capistrano::CLI.ui.say('Backing up database')
+        timestamp = Time.now.strftime('%Y-%m-%d-%H-%M')
+        run "cd #{current_path} && #{rake} RAILS_ENV=#{fetch(:rails_env, 'production')} alchemy:db:dump DUMP_FILENAME=db/dump-#{timestamp}.sql"
+      end
+
+      # Sends the database via ssh to the server
+      def export_database
+        require 'spinner'
+        server = find_servers_for_task(current_task).first
+        spinner = Spinner.new
+        print "\n"
+        spinner.task("Exporting the database. Please wait...") do
+          system db_export_cmd(server)
+        end
+        spinner.spin!
+      end
+
+      # The actual export command that sends the data
+      def db_export_cmd(server)
+        import_cmd = "cd #{current_path} && #{rake} RAILS_ENV=#{fetch(:rails_env, 'production')} alchemy:db:import"
+        ssh_cmd = "ssh -p #{fetch(:port, 22)} #{user}@#{server} '#{import_cmd}'"
+        "#{database_dump_command(database_config['adapter'])} | #{ssh_cmd}"
+      end
+
+      # Sends files of given type via rsync to server
+      def send_files(type)
+        FileUtils.mkdir_p "./uploads/#{type}"
+        server = find_servers_for_task(current_task).first
+        if server
+          system "rsync --progress -rue 'ssh -p #{fetch(:port, 22)}' uploads/#{type} #{user}@#{server}:#{shared_path}/uploads/"
+        else
+          raise "No server found"
+        end
+      end
+    end
+
   end
 
 end