alchemy_cms 3.2.1 → 3.3.0.rc1

data/app/views/alchemy/admin/attachments/create.js.erb

@@ -1,11 +0,0 @@
-<% if @while_assigning -%>
-
-Alchemy.currentDialog().dialog_body.html('<%= j render("archive_overlay", formats: [:html]) %>');
-
-<% else -%>
-
-$('#archive_all').html('<%= j render("files_list") %>');
-Alchemy.growl('<%= j @message %>');
-Alchemy.watchForDialogs('#archive_all');
-
-<% end -%>

data/app/views/alchemy/admin/attachments/new.html.erb

@@ -1,14 +0,0 @@
-<%= form_for [:admin, @attachment], html: {multipart: true} do |f| %>
-  <%= render 'alchemy/admin/partials/upload_form', {
-      file_types: configuration(:uploader)['allowed_filetypes']['attachments'],
-      file_types_description: _t(:documents),
-      redirect_url: admin_attachments_path(
-        swap: @swap,
-        element_id: @element ? @element.id : nil,
-        content_id: @content ? @content.id : nil,
-        options: @options ? @options.to_json : nil),
-      model_name: 'attachment',
-      file_attribute: 'file',
-      item_type: _t(:files)
-    } %>
-<% end %>

data/app/views/alchemy/admin/elements/_element_foot.html.erb

@@ -1,36 +0,0 @@
-<% remarkable_type = element.class.name.demodulize.underscore.pluralize %>
-<div class="element_foot">
-  <span class="element_tools">
-    <%= link_to(
-      "",
-      alchemy.trash_admin_element_path(element),
-      :method => :delete,
-      :class => "delete_element_button",
-      :title => _t("trash element"),
-      :remote => true
-    ) -%>
-    <%= link_to(
-      "",
-      alchemy.insert_admin_clipboard_path(:remarkable_type => remarkable_type, :remarkable_id => element.id, :remove => true),
-      :remote => true,
-      :method => :post,
-      :class => "element_move_button",
-      :title => _t(:cut_element)
-    ) %>
-    <%= link_to(
-      "",
-      alchemy.insert_admin_clipboard_path(:remarkable_type => remarkable_type, :remarkable_id => element.id),
-      :remote => true,
-      :method => :post,
-      :class => "element_copy_button",
-      :title => _t(:copy_element)
-    ) %>
-  </span>
-  <span class="element_public">
-    <%= f.check_box :public, :id => "element_#{element.id}_public" -%>
-    <%= label_tag "element_#{element.id}_public", _t(:visible) -%>
-  </span>
-  <button type="submit" class="button">
-    <%= _t(:save) %>
-  </button>
-</div>

data/app/views/alchemy/admin/partials/_upload_form.html.erb

@@ -1,67 +0,0 @@
-<div class="info">
-  <%= render_icon('info') %>
-  <p><%= _t('explain_upload.intro', name: item_type) %>:</p>
-  <ol>
-    <li><%= _t('explain_upload.step1', name: item_type) %></li>
-    <li><%= _t('explain_upload.step2', name: item_type) %>*</li>
-    <li id="explain_step3"><%= _t('explain_upload.step3') %></li>
-    <li id="explain_drag_n_drop"><%= _t('explain_upload.dragndrop', name: item_type) %></li>
-  </ol>
-  <% unless file_types.first == '*' %>
-  <p>
-    <%= _t('You may upload files with following extensions',
-      file_types_description: file_types_description,
-      file_types: file_types.to_sentence) %>.
-  </p>
-  <% end %>
-  <small>*<%= _t('explain_upload.footnote', name: item_type) %></small>
-</div>
-
-<div class="upload-container">
-  <%= label_tag :fileupload, _t(:browse) %>
-  <input name="<%= model_name %>[<%= file_attribute %>]" id="fileupload" type="file" multiple value="<%= _t(:browse) %>">
-  <div id="dropbox"><%= _t('Or drag files over here') %></div>
-</div>
-
-<div class="overall-upload">
-  <div class="progress">
-    <span class="progress-status">0%</span>
-    (<span class="uploaded-files-count">0</span>/<span class="total-files-count">0</span>)
-  </div>
-</div>
-
-<div id="uploadProgressContainer"></div>
-
-<%- post_params = [
-  {name: 'while_assigning', value: !!@while_assigning},
-  {name: 'content_id', value: @content.blank? ? nil : @content.id},
-  {name: 'element_id', value: @element.blank? ? nil : @element.id},
-  {name: 'size', value: @size},
-  {name: "#{model_name}[upload_hash]", value: model_name == 'picture' ? Time.now.hash : nil},
-  {name: 'options', value: @options ? @options.to_json : nil}
-].delete_if { |h| !h.detect { |k, v| v.blank? }.nil? }.to_json -%>
-
-<script type='text/javascript'>
-  $(function() {
-    var options = {
-      post_params: <%= post_params.html_safe %>,
-      file_size_limit: <%= configuration(:uploader)['file_size_limit'] || 100 -%>,
-      file_types: '<%= file_types.join("|") %>',
-      file_types_description: "<%= file_types_description %>",
-      file_upload_limit: <%= configuration(:uploader)['upload_limit'] || 50 -%>,
-      locale: "<%= ::I18n.locale || 'en' %>",
-      complete: function() {
-        var url = '<%= redirect_url.html_safe %>';
-      <% if @while_assigning %>
-        Alchemy.closeCurrentDialog(function() {
-          $.get(url, null, null, 'script');
-        });
-      <% else %>
-        Alchemy.pleaseWaitOverlay();
-        window.location.href = url;
-      <% end %>
-      }
-    };
-    Alchemy.Uploader(options);
-  });
-</script>

data/app/views/alchemy/admin/pictures/info.html.erb

@@ -1,38 +0,0 @@
-<div class="resource_info">
-  <div class="value">
-    <label><%= Alchemy::Picture.human_attribute_name :name %></label>
-    <p><%= @picture.name %></p>
-  </div>
-  <div class="value">
-    <label><%= Alchemy::Picture.human_attribute_name :image_file_name %></label>
-    <p><%= @picture.image_file_name %></p>
-  </div>
-  <div class="value">
-    <label><%= Alchemy::Picture.human_attribute_name :image_file_dimensions %></label>
-    <p><%= @picture.image_file_dimensions %> px</p>
-  </div>
-  <div class="value">
-    <label><%= Alchemy::Picture.human_attribute_name :image_file_size %></label>
-    <p><%= number_to_human_size @picture.image_file_size %></p>
-  </div>
-
-  <% unless @picture.deletable? %>
-    <h2><%= _t(:this_picture_is_used_on_these_pages) %>:</h2>
-    <div id="pictures_page_list">
-    <% @picture.essence_pictures.group_by(&:page).each do |page, essence_pictures| %>
-      <div class="value">
-        <label><%= link_to page.name, edit_admin_page_path(page) %></label>
-        <ul>
-          <% essence_pictures.group_by(&:element).each do |element, essence_pictures| %>
-          <li class="<%= cycle('even', 'odd') %>">
-            <% page_link = link_to element.display_name_with_preview_text, edit_admin_page_path(page, :anchor => "element_#{element.id}") %>
-            <% pictures = essence_pictures.collect { |e| e.content.name_for_label }.to_sentence %>
-            <%= _t(:pictures_in_page, :page => page_link, :pictures => pictures) %>
-          </li>
-          <% end %>
-        </ul>
-      </div>
-    <% end %>
-    </div>
-  <% end %>
-</div>

data/app/views/alchemy/admin/pictures/new.html.erb

@@ -1,16 +0,0 @@
-<%= form_for [:admin, @picture], html: {multipart: true} do |f| %>
-  <%= render 'alchemy/admin/partials/upload_form', {
-      file_types: configuration(:uploader)['allowed_filetypes']['pictures'],
-      file_types_description: _t(:images),
-      redirect_url: admin_pictures_path(
-        size: params[:size],
-        filter: 'last_upload',
-        element_id: @element ? @element.id : nil,
-        content_id: @content ? @content.id : nil,
-        options: @options ? @options.to_json : nil),
-      model_name: 'picture',
-      file_attribute: 'image_file',
-      item_type: _t(:images)
-    } %>
-  <%= f.submit :upload, class: 'upload-button' %>
-<% end %>

data/lib/alchemy/middleware/rescue_old_cookies.rb

@@ -1,27 +0,0 @@
-module Alchemy
-  module Middleware
-    class RescueOldCookies
-      def initialize(app)
-        @app = app
-      end
-
-      def call(env)
-        begin
-          @app.call(env)
-        rescue NameError => error
-          if error.to_s =~ /uninitialized constant Alchemy::Clipboard/
-            message = "<h2>You have an old style Alchemy clipboard in your session!</h2>"
-            message += "<h3>Please remove your cookies and try again.</h3>"
-            Rails.logger.error(error)
-            return [
-              500, { "Content-Type" => "text/html" },
-              [message]
-            ]
-          else
-            raise error
-          end
-        end
-      end
-    end
-  end
-end

data/spec/controllers/admin/resources_controller_spec.rb

@@ -1,53 +0,0 @@
-require "spec_helper"
-
-class Admin::EventsController < Alchemy::Admin::ResourcesController
-end
-
-describe Admin::EventsController do
-  it "should include ResourcesHelper" do
-    expect(controller.respond_to?(:resource_window_size)).to be_truthy
-  end
-
-  describe '#index' do
-    let(:params) { Hash.new }
-    let(:peter)  { Event.create(name: 'Peter') }
-    let(:lustig) { Event.create(name: 'Lustig') }
-
-    before do
-      authorize_user(:as_admin)
-      peter; lustig
-    end
-
-    it "returns all records" do
-      get :index, params
-      expect(assigns(:events)).to include(peter)
-      expect(assigns(:events)).to include(lustig)
-    end
-
-    context 'with search query given' do
-      let(:params) { {query: 'PeTer'} }
-
-      it "returns only matching records" do
-        get :index, params
-        expect(assigns(:events)).to include(peter)
-        expect(assigns(:events)).not_to include(lustig)
-      end
-
-      context "but searching for record with certain association" do
-        let(:bauwagen) { Location.create(name: 'Bauwagen') }
-        let(:params)   { {query: 'Bauwagen'} }
-
-        before do
-          peter.location = bauwagen
-          peter.save
-        end
-
-        it "returns only matching records" do
-          get :index, params
-          expect(assigns(:events)).to include(peter)
-          expect(assigns(:events)).not_to include(lustig)
-        end
-      end
-    end
-  end
-end

data/spec/controllers/base_controller_spec.rb

@@ -1,51 +0,0 @@
-require 'spec_helper'
-
-module Alchemy
-  describe BaseController do
-
-    describe '#set_locale' do
-      context 'with Language.current set' do
-        let(:language) { create(:klingonian) }
-
-        before { Alchemy::Language.current = language }
-
-        it "sets the ::I18n.locale to current language code" do
-          controller.send(:set_locale)
-          expect(::I18n.locale).to eq(language.code.to_sym)
-        end
-      end
-
-      context 'without Language.current set' do
-        before { Alchemy::Language.current = nil }
-
-        it "sets the ::I18n.locale to default language code" do
-          controller.send(:set_locale)
-          expect(::I18n.locale).to eq(Language.default.code.to_sym)
-        end
-      end
-    end
-
-    describe "#configuration" do
-      it "returns certain configuration options" do
-        allow(Config).to receive(:show).and_return({"some_option" => true})
-        expect(controller.configuration(:some_option)).to eq(true)
-      end
-    end
-
-    describe "#multi_language?" do
-      context "if more than one published language exists" do
-        it "returns true" do
-          allow(Alchemy::Language).to receive(:published).and_return double(count: 2)
-          expect(controller.multi_language?).to eq(true)
-        end
-      end
-
-      context "if less than two published languages exists" do
-        it "returns false" do
-          allow(Alchemy::Language).to receive(:published).and_return double(count: 1)
-          expect(controller.multi_language?).to eq(false)
-        end
-      end
-    end
-  end
-end

data/spec/helpers/essences_helper_spec.rb

@@ -1,156 +0,0 @@
-require 'spec_helper'
-
-describe Alchemy::EssencesHelper do
-  let(:element) { build_stubbed(:element) }
-  let(:content) { build_stubbed(:content, element: element, ingredient: 'hello!') }
-  let(:essence) { mock_model('EssenceText', link: nil, partial_name: 'essence_text', ingredient: 'hello!')}
-
-  before do
-    allow_message_expectations_on_nil
-    allow(content).to receive(:essence).and_return(essence)
-  end
-
-  describe 'render_essence' do
-    subject { render_essence(content) }
-
-    it "renders an essence view partial" do
-      is_expected.to have_content 'hello!'
-    end
-
-    context 'with editor given as view part' do
-      subject { helper.render_essence(content, :editor) }
-
-      before do
-        allow(helper).to receive(:label_and_remove_link)
-        allow(content).to receive(:settings).and_return({})
-      end
-
-      it "renders an essence editor partial" do
-        expect(content).to receive(:form_field_name)
-        is_expected.to have_selector 'input[type="text"]'
-      end
-    end
-
-    context 'if content is nil' do
-      let(:content) { nil }
-
-      it "returns empty string" do
-        is_expected.to eq('')
-      end
-
-      context 'editor given as part' do
-        subject { helper.render_essence(content, :editor) }
-
-        before { allow(helper).to receive(:_t).and_return('') }
-
-        it "displays warning" do
-          expect(helper).to receive(:warning).and_return('')
-          is_expected.to eq('')
-        end
-      end
-    end
-
-    context 'if essence is nil' do
-      let(:essence) { nil }
-
-      it "returns empty string" do
-        is_expected.to eq('')
-      end
-
-      context 'editor given as part' do
-        subject { helper.render_essence(content, :editor) }
-
-        before { allow(helper).to receive(:_t).and_return('') }
-
-        it "displays warning" do
-          expect(helper).to receive(:warning).and_return('')
-          is_expected.to eq('')
-        end
-      end
-    end
-  end
-
-  describe 'render_essence_view' do
-    it "renders an essence view partial" do
-      expect(render_essence_view(content)).to have_content 'hello!'
-    end
-  end
-
-  describe "render_essence_view_by_name" do
-    it "renders an essence view partial by content name" do
-      expect(element).to receive(:content_by_name).and_return(content)
-      expect(render_essence_view_by_name(element, 'intro')).to have_content 'hello!'
-    end
-  end
-
-  describe 'content_settings_value' do
-    subject { content_settings_value(content, key, options) }
-
-    let(:key) { :key }
-
-    context 'with content having settings' do
-      let(:content) { double(settings: {key: 'content_settings_value'}) }
-
-      context 'and empty options' do
-        let(:options) { {} }
-
-        it "returns the value for key from content settings" do
-          expect(subject).to eq('content_settings_value')
-        end
-      end
-
-      context 'and nil options' do
-        let(:options) { nil }
-
-        it "returns the value for key from content settings" do
-          expect(subject).to eq('content_settings_value')
-        end
-      end
-
-      context 'but same key present in options' do
-        let(:options) { {key: 'options_value'} }
-
-        it "returns the value for key from options" do
-          expect(subject).to eq('options_value')
-        end
-      end
-    end
-
-    context 'with content having no settings' do
-      let(:content) { double(settings: {}) }
-
-      context 'and empty options' do
-        let(:options) { {} }
-
-        it { expect(subject).to eq(nil) }
-      end
-
-      context 'but key present in options' do
-        let(:options) { {key: 'options_value'} }
-
-        it "returns the value for key from options" do
-          expect(subject).to eq('options_value')
-        end
-      end
-    end
-
-    context 'with content having settings with string as key' do
-      let(:content) { double(settings: {'key' => 'value_from_string_key'}) }
-      let(:options) { {} }
-
-      it "returns value" do
-        expect(subject).to eq('value_from_string_key')
-      end
-    end
-
-    context 'with key passed as string' do
-      let(:content) { double(settings: {key: 'value_from_symbol_key'}) }
-      let(:key)     { 'key' }
-      let(:options) { {} }
-
-      it "returns value" do
-        expect(subject).to eq('value_from_symbol_key')
-      end
-    end
-  end
-end