alchemy_cms 3.5.0 → 3.6.0

data/lib/alchemy/tasks/helpers.rb

@@ -12,7 +12,7 @@ module Alchemy
       def database_config
         raise "Could not find #{database_config_file}!" if !File.exist?(database_config_file)
         @database_config ||= begin
-          config_file = YAML.load(ERB.new(File.read(database_config_file)).result)
+          config_file = YAML.safe_load(ERB.new(File.read(database_config_file)).result, [], [], true)
           config_file.fetch(environment)
         rescue KeyError
             raise "Database configuration for #{environment} not found!"

data/lib/alchemy/test_support/config_stubbing.rb

@@ -0,0 +1,28 @@
+module Alchemy
+  module TestSupport
+    # Allows you to stub the Alchemy configuration in your specs
+    #
+    # Require and include this file in your RSpec config.
+    #
+    #     RSpec.configure do |config|
+    #       config.include Alchemy::TestSupport::ConfigStubbing
+    #     end
+    #
+    module ConfigStubbing
+      # Stub a key from the Alchemy config
+      #
+      # @param key [Symbol] The configuration key you want to stub
+      # @param value [Object] The value you want to return instead of the original one
+      #
+      def stub_alchemy_config(key, value)
+        allow(Alchemy::Config).to receive(:get) do |arg|
+          if arg == key
+            value
+          else
+            Alchemy::Config.show[arg.to_s]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/alchemy/test_support/essence_shared_examples.rb

@@ -7,13 +7,13 @@ shared_examples_for "an essence" do
 
   it "touches the content after update" do
     element = create(:alchemy_element)
-    content = create(:alchemy_content, element: element)
-    essence.save
-    content.update(essence: essence, essence_type: essence.class.name)
-    date = content.updated_at
-    content.essence.update(essence.ingredient_column.to_sym => ingredient_value)
+    content = create(:alchemy_content, element: element, essence: essence, essence_type: essence.class.name)
+
+    content.update_column(:updated_at, 3.days.ago)
+    content.essence.update_attributes(essence.ingredient_column.to_sym => ingredient_value)
+
     content.reload
-    expect(content.updated_at).not_to eq(date)
+    expect(content.updated_at).to be_within(3.seconds).of(Time.current)
   end
 
   it "should have correct partial path" do

data/lib/alchemy/test_support/factories/language_factory.rb

@@ -9,7 +9,7 @@ FactoryGirl.define do
     frontpage_name 'Intro'
     page_layout { Alchemy::Config.get(:default_language)['page_layout'] }
     public true
-    site { Alchemy::Site.first || FactoryGirl.create(:alchemy_site) }
+    site { Alchemy::Site.default }
 
     trait :klingon do
       name 'Klingon'

data/lib/alchemy/test_support/factories/page_factory.rb

@@ -16,6 +16,13 @@ FactoryGirl.define do
     # Pass do_not_autogenerate: false to generate elements
     do_not_autogenerate true
 
+    trait :root do
+      name 'Root'
+      language nil
+      parent_id nil
+      page_layout nil
+    end
+
     trait :language_root do
       name 'Startseite'
       page_layout { language.page_layout }

data/lib/alchemy/test_support/factories/site_factory.rb

@@ -5,6 +5,12 @@ FactoryGirl.define do
     name 'A Site'
     host 'domain.com'
 
+    trait :default do
+      public true
+      name Alchemy::Config.get(:default_site)['name']
+      host Alchemy::Config.get(:default_site)['host']
+    end
+
     trait :public do
       public true
     end

data/lib/alchemy/test_support/shared_contexts.rb

@@ -0,0 +1,14 @@
+RSpec.shared_context 'with invalid file' do
+  let(:invalid_file) do
+    fixture_file_upload(
+      File.expand_path('../../../../spec/fixtures/users.yml', __FILE__),
+      'text/x-yaml'
+    )
+  end
+
+  before do
+    allow(Alchemy::Attachment).to receive(:allowed_filetypes) do
+      ['png']
+    end
+  end
+end

data/lib/alchemy/test_support/shared_uploader_examples.rb

@@ -0,0 +1,10 @@
+RSpec.shared_examples_for "having a json uploader error message" do
+  it "renders json response with error message" do
+    subject
+    expect(response.content_type).to eq('application/json')
+    expect(response.status).to eq(422)
+    json = JSON.parse(response.body)
+    expect(json).to have_key('growl_message')
+    expect(json).to have_key('files')
+  end
+end

data/lib/alchemy/touching.rb

@@ -2,7 +2,7 @@ module Alchemy
   module Touching
     # Touches the timestamps and userstamps
     #
-    def touch
+    def touch(*)
       # Using update here, because we want the touch call to bubble up to the page.
       update(touchable_attributes)
     end

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
-  VERSION = "3.5.0"
+  VERSION = "3.6.0"
 
   def self.version
     VERSION

data/lib/alchemy_cms.rb

@@ -2,4 +2,59 @@
 module Alchemy
 end
 
-require 'alchemy/engine'
+# Require globally used external libraries
+require 'acts_as_list'
+require 'acts-as-taggable-on'
+require 'action_view/dependency_tracker'
+require 'active_model_serializers'
+require 'awesome_nested_set'
+require 'bourbon'
+require 'cancan'
+require 'dragonfly'
+require 'handlebars_assets'
+require 'jquery-rails'
+require 'jquery-ui-rails'
+require 'kaminari'
+require 'non-stupid-digest-assets'
+require 'ransack'
+require 'request_store'
+require 'responders'
+require 'simple_form'
+require 'select2-rails'
+require 'turbolinks'
+require 'userstamp'
+
+# Require globally used Alchemy mixins
+require_relative 'alchemy/ability_helper'
+require_relative 'alchemy/admin/locale'
+require_relative 'alchemy/auth_accessors'
+require_relative 'alchemy/cache_digests/template_tracker'
+require_relative 'alchemy/config'
+require_relative 'alchemy/configuration_methods'
+require_relative 'alchemy/controller_actions'
+require_relative 'alchemy/errors'
+require_relative 'alchemy/essence'
+require_relative 'alchemy/filetypes'
+require_relative 'alchemy/forms/builder'
+require_relative 'alchemy/hints'
+require_relative 'alchemy/i18n'
+require_relative 'alchemy/logger'
+require_relative 'alchemy/modules'
+require_relative 'alchemy/name_conversions'
+require_relative 'alchemy/on_page_layout'
+require_relative 'alchemy/on_page_layout/callbacks_runner'
+require_relative 'alchemy/page_layout'
+require_relative 'alchemy/paths'
+require_relative 'alchemy/permissions'
+require_relative 'alchemy/picture_attributes'
+require_relative 'alchemy/sass_support'
+require_relative 'alchemy/ssl_protection'
+require_relative 'alchemy/resource'
+require_relative 'alchemy/tinymce'
+require_relative 'alchemy/touching'
+
+# Require hacks
+require_relative 'kaminari/scoped_pagination_url_helper'
+
+# Finally require Alchemy itself
+require_relative 'alchemy/engine'

data/lib/rails/generators/alchemy/base.rb

@@ -32,7 +32,7 @@ module Alchemy
       end
 
       def load_alchemy_yaml(name)
-        YAML.load(ERB.new(File.read("#{Rails.root}/config/alchemy/#{name}")).result)
+        YAML.safe_load(ERB.new(File.read("#{Rails.root}/config/alchemy/#{name}")).result, [Regexp], [], true)
       rescue Errno::ENOENT
         puts "\nERROR: Could not read config/alchemy/#{name} file. Please run: rails generate alchemy:scaffold"
       end

data/lib/rails/generators/alchemy/elements/elements_generator.rb

@@ -8,6 +8,7 @@ module Alchemy
 
       def create_partials
         @elements = load_alchemy_yaml('elements.yml')
+        return unless @elements
         @elements.each do |element|
           @element = element
           @contents = element["contents"] || []
@@ -19,7 +20,7 @@ module Alchemy
 
           conditional_template "editor.html.#{template_engine}", "#{elements_dir}/_#{@element_name}_editor.html.#{template_engine}"
           conditional_template "view.html.#{template_engine}", "#{elements_dir}/_#{@element_name}_view.html.#{template_engine}"
-        end if @elements
+        end
       end
 
       private

data/lib/rails/generators/alchemy/page_layouts/page_layouts_generator.rb

@@ -8,11 +8,12 @@ module Alchemy
 
       def create_partials
         @page_layouts = load_alchemy_yaml('page_layouts.yml')
+        return unless @page_layouts
         @page_layouts.each do |page_layout|
           next if page_layout['redirects_to_external']
           @page_layout_name = page_layout["name"].underscore
           conditional_template "layout.html.#{template_engine}", "#{page_layouts_dir}/_#{@page_layout_name}.html.#{template_engine}"
-        end if @page_layouts
+        end
       end
 
       private

data/lib/rails/generators/alchemy/site_layouts/site_layouts_generator.rb

@@ -8,10 +8,11 @@ module Alchemy
 
       def create_partials
         @sites = Alchemy::Site.all
+        return unless @sites
         @sites.each do |site|
           @site_name = site.name.parameterize.underscore
           conditional_template "layout.html.#{template_engine}", "#{site_layouts_dir}/_#{@site_name}.html.#{template_engine}"
-        end if @sites
+        end
       end
 
       private

data/lib/tasks/alchemy/tidy.rake

@@ -63,123 +63,125 @@ module Alchemy
   class Tidy
     extend Shell
 
-    def self.create_missing_cells(page_layouts, cells)
-      page_layouts.each do |layout|
-        next if layout['cells'].blank?
-        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: 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
-              log "Creating cell #{cell.name} for page #{page.name}"
-            else
-              log "Cell #{cell.name} for page #{page.name} already present", :skip
+    class << self
+      def create_missing_cells(page_layouts, cells)
+        page_layouts.each do |layout|
+          next if layout['cells'].blank?
+          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: 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
+                log "Creating cell #{cell.name} for page #{page.name}"
+              else
+                log "Cell #{cell.name} for page #{page.name} already present", :skip
+              end
             end
           end
         end
       end
-    end
 
-    def self.update_element_positions
-      Alchemy::Page.all.each do |page|
-        if page.elements.any?
-          puts "\n## Updating element positions of page `#{page.name}`"
-        end
-        page.elements.group_by(&:cell_id).each do |_cell_id, elements|
-          elements.each_with_index do |element, idx|
-            position = idx + 1
-            if element.position != position
-              log "Updating position for element ##{element.id} to #{position}"
-              element.update_column(:position, position)
-            else
-              log "Position for element ##{element.id} is already correct (#{position})", :skip
+      def update_element_positions
+        Alchemy::Page.all.each do |page|
+          if page.elements.any?
+            puts "\n## Updating element positions of page `#{page.name}`"
+          end
+          page.elements.group_by(&:cell_id).each do |_cell_id, elements|
+            elements.each_with_index do |element, idx|
+              position = idx + 1
+              if element.position != position
+                log "Updating position for element ##{element.id} to #{position}"
+                element.update_column(:position, position)
+              else
+                log "Position for element ##{element.id} is already correct (#{position})", :skip
+              end
             end
           end
         end
       end
-    end
 
-    def self.update_content_positions
-      Alchemy::Element.all.each do |element|
-        if element.contents.any?
-          puts "\n## Updating content positions of element `#{element.name}`"
-        end
-        element.contents.group_by(&:essence_type).each do |essence_type, contents|
-          puts "-> Contents of type `#{essence_type}`"
-          contents.each_with_index do |content, idx|
-            position = idx + 1
-            if content.position != position
-              log "Updating position for content ##{content.id} to #{position}"
-              content.update_column(:position, position)
-            else
-              log "Position for content ##{content.id} is already correct (#{position})", :skip
+      def update_content_positions
+        Alchemy::Element.all.each do |element|
+          if element.contents.any?
+            puts "\n## Updating content positions of element `#{element.name}`"
+          end
+          element.contents.group_by(&:essence_type).each do |essence_type, contents|
+            puts "-> Contents of type `#{essence_type}`"
+            contents.each_with_index do |content, idx|
+              position = idx + 1
+              if content.position != position
+                log "Updating position for content ##{content.id} to #{position}"
+                content.update_column(:position, position)
+              else
+                log "Position for content ##{content.id} is already correct (#{position})", :skip
+              end
             end
           end
         end
       end
-    end
 
-    def self.remove_orphaned_cells
-      puts "\n## Removing orphaned cells"
-      cells = Alchemy::Cell.unscoped.all
-      if cells.any?
-        orphaned_cells = cells.select do |cell|
-          cell.page.nil? && cell.page_id.present?
-        end
-        if orphaned_cells.any?
-          destroy_orphaned_records(orphaned_cells, 'cell')
+      def remove_orphaned_cells
+        puts "\n## Removing orphaned cells"
+        cells = Alchemy::Cell.unscoped.all
+        if cells.any?
+          orphaned_cells = cells.select do |cell|
+            cell.page.nil? && cell.page_id.present?
+          end
+          if orphaned_cells.any?
+            destroy_orphaned_records(orphaned_cells, 'cell')
+          else
+            log "No orphaned cells found", :skip
+          end
         else
-          log "No orphaned cells found", :skip
+          log "No cells found", :skip
         end
-      else
-        log "No cells found", :skip
       end
-    end
 
-    def self.remove_orphaned_elements
-      puts "\n## Removing orphaned elements"
-      elements = Alchemy::Element.unscoped.all
-      if elements.any?
-        orphaned_elements = elements.select do |element|
-          element.page.nil? && element.page_id.present? ||
-            element.cell.nil? && element.cell_id.present?
-        end
-        if orphaned_elements.any?
-          destroy_orphaned_records(orphaned_elements, 'element')
+      def remove_orphaned_elements
+        puts "\n## Removing orphaned elements"
+        elements = Alchemy::Element.unscoped.all
+        if elements.any?
+          orphaned_elements = elements.select do |element|
+            element.page.nil? && element.page_id.present? ||
+              element.cell.nil? && element.cell_id.present?
+          end
+          if orphaned_elements.any?
+            destroy_orphaned_records(orphaned_elements, 'element')
+          else
+            log "No orphaned elements found", :skip
+          end
         else
-          log "No orphaned elements found", :skip
+          log "No elements found", :skip
         end
-      else
-        log "No elements found", :skip
       end
-    end
 
-    def self.remove_orphaned_contents
-      puts "\n## Removing orphaned contents"
-      contents = Alchemy::Content.unscoped.all
-      if contents.any?
-        orphaned_contents = contents.select do |content|
-          content.essence.nil? && content.essence_id.present? ||
-            content.element.nil? && content.element_id.present?
-        end
-        if orphaned_contents.any?
-          destroy_orphaned_records(orphaned_contents, 'content')
+      def remove_orphaned_contents
+        puts "\n## Removing orphaned contents"
+        contents = Alchemy::Content.unscoped.all
+        if contents.any?
+          orphaned_contents = contents.select do |content|
+            content.essence.nil? && content.essence_id.present? ||
+              content.element.nil? && content.element_id.present?
+          end
+          if orphaned_contents.any?
+            destroy_orphaned_records(orphaned_contents, 'content')
+          else
+            log "No orphaned contents found", :skip
+          end
         else
-          log "No orphaned contents found", :skip
+          log "No contents found", :skip
         end
-      else
-        log "No contents found", :skip
       end
-    end
 
-    private
+      private
 
-    def self.destroy_orphaned_records(records, class_name)
-      records.each do |record|
-        log "Destroy orphaned #{class_name}: #{record.id}"
-        record.destroy
+      def destroy_orphaned_records(records, class_name)
+        records.each do |record|
+          log "Destroy orphaned #{class_name}: #{record.id}"
+          record.destroy
+        end
       end
     end
   end