alchemy_cms 3.0.4 → 3.1.0.beta1

data/lib/alchemy/engine.rb

@@ -85,9 +85,6 @@ module Alchemy
 
     config.after_initialize do
       require_relative './userstamp'
-    end
-
-    config.to_prepare do
       # In order to have Alchemy's helpers and basic controller methods
       # available in the host app, we patch the ApplicationController.
       ApplicationController.send(:include, Alchemy::ControllerActions)

data/lib/alchemy/essence.rb

@@ -113,7 +113,7 @@ module Alchemy #:nodoc:
       def validate_ingredient
         validations.each do |validation|
           if validation.respond_to?(:keys)
-            validation.map {|key,value| self.send("validate_#{key}", validation) }
+            validation.map { |key, _value| self.send("validate_#{key}", validation) }
           else
             self.send("validate_#{validation}")
           end

data/lib/alchemy/permissions.rb

@@ -36,8 +36,15 @@ module Alchemy
     module GuestUser
       def alchemy_guest_user_rules
         can([:show, :download], Alchemy::Attachment) { |a| !a.restricted? }
-        can :show,              Alchemy::Element,    public: true, page: { restricted: false }
-        can :show,              Alchemy::Page,       restricted: false, public: true
+        can :read,              Alchemy::Content,    Alchemy::Content.available.not_restricted do |c|
+          c.public? && !c.restricted? && !c.trashed?
+        end
+        can :read,              Alchemy::Element,    Alchemy::Element.available.not_restricted do |e|
+          e.public? && !e.restricted? && !e.trashed?
+        end
+        can :read,              Alchemy::Page,       Alchemy::Page.published.not_restricted do |p|
+          p.public? && !p.restricted?
+        end
         can :see,               Alchemy::Page,       restricted: false, visible: true
         can([:show, :download], Alchemy::Picture)    { |p| !p.restricted? }
       end
@@ -55,8 +62,15 @@ module Alchemy
 
         # Resources
         can [:show, :download], Alchemy::Attachment
-        can :show,              Alchemy::Element,   public: true, page: { restricted: true }
-        can :show,              Alchemy::Page,      public: true
+        can :read,              Alchemy::Content,   Alchemy::Content.available do |c|
+          c.public? && !c.trashed?
+        end
+        can :read,              Alchemy::Element,   Alchemy::Element.available do |e|
+          e.public? && !e.trashed?
+        end
+        can :read,              Alchemy::Page,      Alchemy::Page.published do |p|
+          p.public?
+        end
         can :see,               Alchemy::Page,      restricted: true, visible: true
         can [:show, :download], Alchemy::Picture
         can [:read, :update],   Alchemy.user_class, id: @user.id
@@ -130,7 +144,6 @@ module Alchemy
           :destroy,
           :flush,
           :order,
-          :publish,
           :sort,
           :switch_language
         ], Alchemy::Page
@@ -183,6 +196,7 @@ module Alchemy
         :fold,
         :info,
         :link,
+        :publish,
         :read,
         :update,
         :unlock,

data/lib/alchemy/picture_attributes.rb

@@ -3,7 +3,7 @@ module Alchemy
   #
   class PictureAttributes
 
-    SECURE_ATTRIBUTES = %w(id size crop crop_from crop_size quality).freeze
+    SECURE_ATTRIBUTES = %w(id size crop crop_from crop_size quality upsample).freeze
 
     class << self
 

data/lib/alchemy/test_support/auth_helpers.rb

@@ -6,7 +6,7 @@ module Alchemy
     module AuthHelpers
 
       def sign_in(user = admin_user)
-        controller.stub current_alchemy_user: user
+        allow(controller).to receive(:current_alchemy_user).and_return user
       end
 
       def member_user

data/lib/alchemy/test_support/essence_shared_examples.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 shared_examples_for "an essence" do
-
   let(:element) { Alchemy::Element.new }
   let(:content) { Alchemy::Content.new(name: 'foo') }
   let(:content_description) { {'name' => 'foo'} }
@@ -9,10 +8,10 @@ shared_examples_for "an essence" do
   it "touches the content after update" do
     essence.save
     content.update(essence: essence, essence_type: essence.class.name)
-    d = content.updated_at
+    date = content.updated_at
     content.essence.update(essence.ingredient_column.to_sym => ingredient_value)
     content.reload
-    content.updated_at.should_not eq(d)
+    expect(content.updated_at).not_to eq(date)
   end
 
   it "should have correct partial path" do
@@ -24,33 +23,39 @@ shared_examples_for "an essence" do
     subject { essence.description }
 
     context 'without element' do
-      it { should eq({}) }
+      it { is_expected.to eq({}) }
     end
 
     context 'with element' do
-      before { essence.stub(element: element) }
+      before do
+        expect(essence).to receive(:element).at_least(:once).and_return(element)
+      end
 
       context 'but without content descriptions' do
-        it { should eq({}) }
+        it { is_expected.to eq({}) }
       end
 
       context 'and content descriptions' do
         before do
-          essence.stub(content: content)
+          allow(essence).to receive(:content).and_return(content)
         end
 
         context 'containing the content name' do
-          before { element.stub(content_descriptions: [content_description]) }
+          before do
+            expect(element).to receive(:content_descriptions).at_least(:once).and_return([content_description])
+          end
 
           it "returns the content description" do
-            should eq(content_description)
+            is_expected.to eq(content_description)
           end
         end
 
         context 'not containing the content name' do
-          before { element.stub(content_descriptions: []) }
+          before do
+            expect(element).to receive(:content_descriptions).at_least(:once).and_return([])
+          end
 
-          it { should eq({}) }
+          it { is_expected.to eq({}) }
         end
       end
     end
@@ -66,25 +71,27 @@ shared_examples_for "an essence" do
   describe 'validations' do
     context 'without essence description in elements.yml' do
       it 'should return an empty array' do
-        essence.stub(:description).and_return nil
+        allow(essence).to receive(:description).and_return nil
         expect(essence.validations).to eq([])
       end
     end
 
     context 'without validations defined in essence description in elements.yml' do
       it 'should return an empty array' do
-        essence.stub(:description).and_return({name: 'test', type: 'EssenceText'})
+        allow(essence).to receive(:description).and_return({name: 'test', type: 'EssenceText'})
         expect(essence.validations).to eq([])
       end
     end
 
     describe 'presence' do
       before do
-        essence.stub(:description).and_return({'validate' => ['presence']})
+        allow(essence).to receive(:description).and_return({'validate' => ['presence']})
       end
 
       context 'when the ingredient column is empty' do
-        before { essence.update(essence.ingredient_column.to_sym => nil) }
+        before do
+          essence.update(essence.ingredient_column.to_sym => nil)
+        end
 
         it 'should not be valid' do
           expect(essence).to_not be_valid
@@ -92,7 +99,9 @@ shared_examples_for "an essence" do
       end
 
       context 'when the ingredient column is not nil' do
-        before { essence.update(essence.ingredient_column.to_sym => ingredient_value) }
+        before do
+          essence.update(essence.ingredient_column.to_sym => ingredient_value)
+        end
 
         it 'should be valid' do
           expect(essence).to be_valid
@@ -102,20 +111,24 @@ shared_examples_for "an essence" do
 
     describe 'uniqueness' do
       before do
-        essence.stub(element: build_stubbed(:element))
-        essence.stub(:description).and_return({'validate' => ['uniqueness']})
+        allow(essence).to receive(:element).and_return(build_stubbed(:element))
+        expect(essence).to receive(:description).at_least(:once).and_return({'validate' => ['uniqueness']})
         essence.update(essence.ingredient_column.to_sym => ingredient_value)
       end
 
       context 'when a duplicate exists' do
-        before { essence.stub(:duplicates).and_return([essence.dup]) }
+        before do
+          allow(essence).to receive(:duplicates).and_return([essence.dup])
+        end
 
         it 'should not be valid' do
           expect(essence).to_not be_valid
         end
 
         context 'when validated essence is not public' do
-          before { essence.stub(public?: false) }
+          before do
+            expect(essence).to receive(:public?).and_return(false)
+          end
 
           it 'should be valid' do
             expect(essence).to be_valid
@@ -124,7 +137,9 @@ shared_examples_for "an essence" do
       end
 
       context 'when no duplicate exists' do
-        before { essence.stub(:duplicates).and_return([]) }
+        before do
+          expect(essence).to receive(:duplicates).and_return([])
+        end
 
         it 'should be valid' do
           expect(essence).to be_valid
@@ -134,7 +149,7 @@ shared_examples_for "an essence" do
 
     describe '#acts_as_essence?' do
       it 'should return true' do
-        expect(essence.acts_as_essence?).to be_true
+        expect(essence.acts_as_essence?).to be_truthy
       end
     end
   end

data/lib/alchemy/test_support/integration_helpers.rb

@@ -19,7 +19,7 @@ module Alchemy
         if !user
           user = mock_model('DummyUser', alchemy_roles: %w(admin), language: 'en')
         end
-        ApplicationController.any_instance.stub(:current_user).and_return(user)
+        allow_any_instance_of(ApplicationController).to receive(:current_user).and_return(user)
       end
     end
 

data/lib/alchemy/tinymce.rb

@@ -12,15 +12,21 @@ module Alchemy
       autoresize_max_height: '480',
       menubar: false,
       statusbar: true,
-      toolbar1: 'bold italic underline | strikethrough subscript superscript | numlist bullist indent outdent | removeformat | fullscreen',
-      toolbar2: 'pastetext charmap hr | undo redo | alchemy_link unlink anchor | code',
+      toolbar: [
+        'bold italic underline | strikethrough subscript superscript | numlist bullist indent outdent | removeformat | fullscreen',
+        'pastetext charmap hr | undo redo | alchemy_link unlink anchor | code'
+      ],
       fix_list_elements: true,
       convert_urls: false,
       entity_encoding: 'raw',
+      paste_as_text: true,
       element_format: 'html'
     }
 
     def self.init=(settings)
+      if contains_old_tinymce_toolbar_config?('tinymce' => settings.stringify_keys)
+        warn_about_deprecation!
+      end
       @@init.merge!(settings)
     end
 
@@ -30,10 +36,14 @@ module Alchemy
 
     def self.custom_config_contents(page = nil)
       if page
-        content_definitions_from_elements(page.element_definitions)
+        definitions = content_definitions_from_elements(page.element_definitions)
       else
-        content_definitions_from_elements(Element.definitions)
+        definitions = content_definitions_from_elements(Element.definitions)
+      end
+      if definitions.any? { |d| contains_old_tinymce_toolbar_config?(d['settings']) }
+        warn_about_deprecation!
       end
+      definitions
     end
 
     private
@@ -47,5 +57,12 @@ module Alchemy
       end.flatten.compact
     end
 
+    def self.contains_old_tinymce_toolbar_config?(settings)
+      settings['tinymce'] && settings['tinymce'].keys.any? { |k| k.match(/toolbar[0-9]/) }
+    end
+
+    def self.warn_about_deprecation!
+      ActiveSupport::Deprecation.warn("You use old TinyMCE 4.0 based toolbar config! Please consider to upgrade it to 4.1 compatible syntax. I.e. don't use 'toolbarN', use 'toolbar' with array instead. Visit http://www.tinymce.com/wiki.php/Configuration:toolbar for more information.")
+    end
   end
 end

data/lib/alchemy/upgrader/three_point_one.rb

@@ -0,0 +1,43 @@
+module Alchemy
+  module Upgrader::ThreePointOne
+    private
+
+    def alchemy_3_1_todos
+      notice = <<-NOTE
+
+JSON API moved into '/api' namespace
+------------------------------------
+
+The JSON API now lives under /api and not as additional format to default controllers.
+Also the serialization changed into more useful payload.
+
+Please upgrade your API calls to use the new /api namespace.
+
+
+TinyMCE default paste behavior changed
+--------------------------------------
+
+Text is now always pasted in as plain text. To change this, the user has to
+disable it with the toolbar button, as they had to before to enable it.
+
+If you have a custom TinyMCE configuration you have to enable this by adding
+
+  paste_as_text: true
+
+into you custom TinyMCE configuration.
+
+
+TinyMCE toolbar config has changed
+----------------------------------
+
+The 'toolbar' configuration now takes an array of toolbar rows, instead of
+using 'toolbarN' syntax. Please update your TinyMCE configuration.
+
+Visit http://www.tinymce.com/wiki.php/Configuration:toolbar for more information.
+
+NOTE
+      todo notice, 'Alchemy v3.1 changes'
+    end
+
+  end
+end

data/lib/alchemy/upgrader/three_point_zero.rb

@@ -16,6 +16,19 @@ module Alchemy
       end
     end
 
+    def publish_unpublished_public_pages
+      desc 'Sets `published_at` of public pages without a `published_at` date set to their `updated_at` value'
+      public_pages = Alchemy::Page.published.where('published_at IS NULL')
+      if public_pages.any?
+        public_pages.each do |page|
+          page.update_column(:published_at, page.updated_at)
+          log "Sets `published_at` of #{page.name} to #{page.updated_at}"
+        end
+      else
+        log 'No unpublished public pages found.', :skip
+      end
+    end
+
     def alchemy_3_todos
       notice = <<-NOTE
 

data/lib/alchemy/version.rb

@@ -1,7 +1,8 @@
 module Alchemy
-  VERSION = "3.0.4"
+  VERSION = "3.1.0.beta1"
 
   def self.version
     VERSION
   end
+
 end

data/lib/rails/generators/alchemy/module/module_generator.rb

@@ -0,0 +1,30 @@
+require 'rails'
+
+module Alchemy
+  module Generators
+    class ModuleGenerator < ::Rails::Generators::Base
+      desc "This generator generates an Alchemy module for you."
+      argument :module_name, :banner => "your_module_name"
+      source_root File.expand_path('templates', File.dirname(__FILE__))
+
+      def init
+        @module_name = module_name.downcase
+        @class_name = @module_name.singularize.classify
+        @controller_name = @module_name.tableize
+        @controller_class = @controller_name.classify.pluralize
+      end
+
+      def make_route
+        route "namespace :admin do\n    resources :#{@controller_name}\n  end"
+      end
+
+      def copy_templates
+        empty_directory Rails.root.join("app/controllers/admin")
+
+        template "controller.rb.tt", Rails.root.join("app/controllers/admin/#{@controller_name}_controller.rb")
+        template "ability.rb.tt", Rails.root.join('app/models', "alchemy_#{@module_name}_ability.rb")
+        template "module_config.rb.tt", Rails.root.join("config/initializers/alchemy_#{@module_name}.rb")
+      end
+    end
+  end
+end

data/lib/rails/generators/alchemy/module/templates/ability.rb.tt

@@ -0,0 +1,11 @@
+class <%= @class_name %>Ability
+  include CanCan::Ability
+
+  def initialize(user)
+    if user.present? && user.is_admin?
+      can :manage, <%= @class_name %>
+      can :manage, :admin_<%= @controller_name %>
+    end
+  end
+
+end

data/lib/rails/generators/alchemy/module/templates/controller.rb.tt

@@ -0,0 +1,2 @@
+class Admin::<%= @controller_class %>Controller < Alchemy::Admin::ResourcesController
+end

data/lib/rails/generators/alchemy/module/templates/module_config.rb.tt

@@ -0,0 +1,15 @@
+Alchemy::Modules.register_module({
+  name: '<%= @module_name %>',
+  order: 1,
+  navigation: {
+    name: 'modules.<%= @module_name %>',
+    controller: '/admin/<%= @module_name %>',
+    action: 'index',
+    image: '/assets/<%= @module_name %>.png',
+    sub_navigation: [{
+      name: 'modules.<%= @module_name %>',
+      controller: '/admin/<%= @module_name %>',
+      action: 'index'
+    }]
+  }
+})