alchemy_cms 3.1.3 → 3.2.0.beta

data/app/models/alchemy/page/page_naming.rb

@@ -37,7 +37,8 @@ module Alchemy
     # Makes a slug of all ancestors urlnames including mine and delimit them be slash.
     # So the whole path is stored as urlname in the database.
     def update_urlname!
-      new_urlname = nested_url_name(slug)
+      names = ancestors.visible.contentpages.where(language_root: nil).map(&:slug).compact
+      new_urlname = (names << slug).join('/')
       if urlname != new_urlname
         legacy_urls.create(urlname: urlname)
         update_column(:urlname, new_urlname)
@@ -55,18 +56,6 @@ module Alchemy
       "http://#{urlname}"
     end
 
-    # Returns an array of visible/non-language_root ancestors.
-    def visible_ancestors
-      return [] unless parent
-      if new_record?
-        parent.visible_ancestors.tap do |base|
-          base.push(parent) if parent.visible?
-        end
-      else
-        ancestors.visible.contentpages.where(language_root: nil).to_a
-      end
-    end
-
     private
 
     def update_descendants_urlnames
@@ -82,15 +71,18 @@ module Alchemy
     # If url_nesting is enabled the urlname contains the whole path.
     def set_urlname
       if Config.get(:url_nesting)
-        value = slug
+        url_name = [
+          parent_urlname,
+          convert_url_name(urlname.blank? ? name : slug)
+        ].compact.join('/')
       else
-        value = urlname
+        url_name = convert_url_name(urlname.blank? ? name : urlname)
       end
-      self[:urlname] = nested_url_name(value)
+      write_attribute :urlname, url_name
     end
 
     def set_title
-      self[:title] = name
+      write_attribute :title, name
     end
 
     # Converts the given name into an url friendly string.
@@ -98,8 +90,8 @@ module Alchemy
     # Names shorter than 3 will be filled up with dashes,
     # so it does not collidate with the language code.
     #
-    def convert_url_name(value)
-      url_name = convert_to_urlname(value.blank? ? name : value)
+    def convert_url_name(name)
+      url_name = convert_to_urlname(name)
       if url_name.length < 3
         ('-' * (3 - url_name.length)) + url_name
       else
@@ -107,16 +99,11 @@ module Alchemy
       end
     end
 
-    def nested_url_name(value)
-      (ancestor_slugs << convert_url_name(value)).join('/')
-    end
-
-    # Slugs of all visible/non-language_root ancestors.
-    # Returns [], if there is no parent, the parent is
-    # the root page itself, or url_nesting is off.
-    def ancestor_slugs
-      return [] if !Config.get(:url_nesting) || parent.nil? || parent.root?
-      visible_ancestors.map(&:slug).compact
+    # Urlname of parent page.
+    # Returns nil, if the parent is either a language root page or the root page itself
+    def parent_urlname
+      return if parent.nil? || parent.language_root? || parent.root?
+      parent.urlname
     end
   end
 end

data/bin/alchemy

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
-gem 'rails', '~> 4.1.0'
+gem 'rails', '~> 4.2.0'
 
 require 'rails/version'
 require "thor"

data/config/routes.rb

@@ -24,14 +24,13 @@ Alchemy::Engine.routes.draw do
         :as => :show_picture
   get '/pictures/:id/zoom/:name.:format' => 'pictures#zoom',
         :as => :zoom_picture
-  get "/pictures/:id/thumbnails/:size(/:crop)(/:crop_from/:crop_size)/:name.:format" => 'pictures#thumbnail',
+  get "/pictures/:id/thumbnails(/:size)(/:crop)(/:crop_from/:crop_size)/:name.:format" => 'pictures#thumbnail',
         :as => :thumbnail, :defaults => {:format => 'png', :name => "thumbnail"}
 
   get '/admin/leave' => 'admin/base#leave', :as => :leave_admin
 
   resources :messages, :only => [:index, :new, :create]
   resources :elements, :only => :show
-  resources :contents, :only => :show
 
   namespace :api, defaults: {format: 'json'} do
     resources :contents, only: [:index, :show]

data/db/migrate/20130827094554_alchemy_two_point_six.rb

@@ -293,23 +293,6 @@ class AlchemyTwoPointSix < ActiveRecord::Migration
       add_index "alchemy_sites", ["host", "public"], name: "alchemy_sites_public_hosts_idx"
       add_index "alchemy_sites", ["host"], name: "index_alchemy_sites_on_host"
     end
-
-    unless table_exists?('taggings')
-      create_table "taggings" do |t|
-        t.integer  "tag_id"
-        t.integer  "taggable_id"
-        t.string   "taggable_type"
-        t.integer  "tagger_id"
-        t.string   "tagger_type"
-        t.string   "context"
-        t.datetime "created_at"
-      end
-      add_index "taggings", ["tag_id"], name: "index_taggings_on_tag_id"
-      add_index "taggings", ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context"
-      create_table "tags" do |t|
-        t.string "name"
-      end
-    end
   end
 
   def down

data/lib/alchemy/capistrano.rb

@@ -23,18 +23,17 @@ include Alchemy::Tasks::Helpers
         run "mkdir -p #{shared_path}/uploads/pictures"
         run "mkdir -p #{shared_path}/uploads/attachments"
         run "mkdir -p #{shared_picture_cache_path}"
-        run "mkdir -p #{shared_path}/cache/assets"
+        run "mkdir -p #{shared_path}/cache"
       end
 
-      # This task sets the symlinks for uploads, assets and picture cache folder.
+      # This task symlinks the uploads, picture and general cache folder to the new release.
       desc "Sets the symlinks for uploads and picture cache folder. Called after deploy:finalize_update"
       task :symlink, :roles => :app do
         run "rm -rf #{release_path}/uploads"
         run "ln -nfs #{shared_path}/uploads #{release_path}/"
         run "mkdir -p #{public_path_with_mountpoint}"
         run "ln -nfs #{shared_picture_cache_path} #{public_path_with_mountpoint('pictures')}"
-        run "mkdir -p #{release_path}/tmp/cache"
-        run "ln -nfs #{shared_path}/cache/assets #{release_path}/tmp/cache/assets"
+        run "ln -nfs #{shared_path}/cache #{release_path}/tmp/cache"
       end
 
       def shared_picture_cache_path

data/lib/alchemy/controller_actions.rb

@@ -3,7 +3,8 @@ module Alchemy
     extend ActiveSupport::Concern
 
     included do
-      prepend_before_action :set_alchemy_language, :set_current_alchemy_site
+      before_action :set_current_alchemy_site
+      before_action :set_alchemy_language
 
       helper 'alchemy/pages'
 

data/lib/alchemy/engine.rb

@@ -13,6 +13,7 @@ require 'jquery-ui-rails'
 require 'kaminari'
 require 'non-stupid-digest-assets'
 require 'request_store'
+require 'responders'
 require 'sass-rails'
 require 'sassy-buttons'
 require 'simple_form'

data/lib/alchemy/errors.rb

@@ -19,6 +19,13 @@ module Alchemy
 
   class ElementDefinitionError < StandardError
     # Raised if element definition can not be found.
+    def initialize(attributes)
+      @name = attributes[:name]
+    end
+
+    def message
+      "Element definition for #{@name} not found. Please check your elements.yml"
+    end
   end
 
   class EssenceMissingError < StandardError

data/lib/alchemy/essence.rb

@@ -36,11 +36,11 @@ module Alchemy #:nodoc:
           stampable stamper_class_name: Alchemy.user_class_name
           validate :validate_ingredient, :on => :update, :if => 'validations.any?'
 
-          has_one :content, :as => :essence, class_name: "Alchemy::Content"
-          has_one :element, :through => :content, class_name: "Alchemy::Element"
-          has_one :page,    :through => :element, class_name: "Alchemy::Page"
+          has_one :content, :as => :essence
+          has_one :element, :through => :content
+          has_one :page,    :through => :element
 
-          scope :available,    -> { joins(:element).merge(Alchemy::Element.available) }
+          scope :available,    -> { joins(:element).merge(Element.available) }
           scope :from_element, ->(name) { joins(:element).where(alchemy_elements: { name: name }) }
 
           delegate :restricted?, to: :page,    allow_nil: true

data/lib/alchemy/permissions.rb

@@ -184,7 +184,7 @@ module Alchemy
     def user_role_rules
       return alchemy_guest_user_rules if @user.alchemy_roles.blank?
       @user.alchemy_roles.each do |role|
-        exec_role_rules(role) if @user.alchemy_roles.include?(role)
+        exec_role_rules(role)
       end
     end
 

data/lib/alchemy/shell.rb

@@ -7,10 +7,23 @@ module Alchemy
   # in a list on the shell / log
   #
   module Shell
+    def self.silence!
+      @silenced = true
+    end
+
+    def self.verbose!
+      @silenced = false
+    end
+
+    def self.silenced?
+      @silenced ||= false
+    end
 
     def desc(message)
-      puts "\n#{message}"
-      puts "#{'-' * message.length}\n"
+      unless Alchemy::Shell.silenced?
+        puts "\n#{message}"
+        puts "#{'-' * message.length}\n"
+      end
     end
 
     def todo(todo, title='')
@@ -54,15 +67,17 @@ module Alchemy
     # @param [Symbol] type
     #
     def log(message, type=nil)
-      case type
-      when :skip
-        puts "#{color(:yellow)}== Skipping! #{message}#{color(:clear)}"
-      when :error
-        puts "#{color(:red)}!! ERROR: #{message}#{color(:clear)}"
-      when :message
-        puts "#{color(:clear)}#{message}"
-      else
-        puts "#{color(:green)}== #{message}#{color(:clear)}"
+      unless Alchemy::Shell.silenced?
+        case type
+        when :skip
+          puts "#{color(:yellow)}== Skipping! #{message}#{color(:clear)}"
+        when :error
+          puts "#{color(:red)}!! ERROR: #{message}#{color(:clear)}"
+        when :message
+          puts "#{color(:clear)}#{message}"
+        else
+          puts "#{color(:green)}== #{message}#{color(:clear)}"
+        end
       end
     end
 

data/lib/alchemy/test_support/controller_requests.rb

@@ -1,37 +1,73 @@
-# Based on spree commerce controller hacks.
-# https://github.com/spree/spree/blob/master/core/spec/support/controller_hacks.rb
-# Thanks!
-
+# Use this module to easily test Alchemy actions within Alchemy components
+# or inside your application to test routes for the mounted Alchemy engine.
+#
+# Inside your spec_helper.rb, include this module inside the RSpec.configure
+# block by doing this:
+#
+#   require 'alchemy/test_support/controller_requests'
+#   RSpec.configure do |c|
+#     c.include Alchemy::TestSupport::ControllerRequests, type: :controller
+#   end
+#
+# Then, in your controller tests, you can access alchemy routes like this:
+#
+#   require 'spec_helper'
+#
+#   describe Alchemy::Admin::PagesController do
+#     it "can see all the pages" do
+#       alchemy_get :index
+#     end
+#   end
+#
+# Use alchemy_get, alchemy_post, alchemy_put or alchemy_delete to make requests
+# to the Alchemy engine, and use regular get, post, put or delete to make
+# requests to your application.
+#
+# Note: Based on Spree::TestingSupport::ControllerRequests. Thanks <3
+#
 module Alchemy
   module TestSupport
     module ControllerRequests
+      extend ActiveSupport::Concern
 
-      def get(action, parameters = nil, session = nil, flash = nil)
+      # Executes a request simulating GET HTTP method
+      def alchemy_get(action, parameters = nil, session = nil, flash = nil)
         process_alchemy_action(action, parameters, session, flash, "GET")
       end
 
-      # Executes a request simulating POST HTTP method and set/volley the response
-      def post(action, parameters = nil, session = nil, flash = nil)
+      # Executes a request simulating POST HTTP method
+      def alchemy_post(action, parameters = nil, session = nil, flash = nil)
         process_alchemy_action(action, parameters, session, flash, "POST")
       end
 
-      # Executes a request simulating PUT HTTP method and set/volley the response
-      def put(action, parameters = nil, session = nil, flash = nil)
+      # Executes a request simulating PUT HTTP method
+      def alchemy_put(action, parameters = nil, session = nil, flash = nil)
         process_alchemy_action(action, parameters, session, flash, "PUT")
       end
 
-      # Executes a request simulating DELETE HTTP method and set/volley the response
-      def delete(action, parameters = nil, session = nil, flash = nil)
+      # Executes a request simulating DELETE HTTP method
+      def alchemy_delete(action, parameters = nil, session = nil, flash = nil)
         process_alchemy_action(action, parameters, session, flash, "DELETE")
       end
 
+      # Executes a simulated XHR request
+      def alchemy_xhr(method, action, parameters = nil, session = nil, flash = nil)
+        process_alchemy_xhr_action(method, action, parameters, session, flash)
+      end
+
       private
 
       def process_alchemy_action(action, parameters = nil, session = nil, flash = nil, method = "GET")
+        @routes = Alchemy::Engine.routes
         parameters ||= {}
-        process(action, method, parameters.merge!(:use_route => :alchemy), session, flash)
+        process(action, method, parameters, session, flash)
       end
 
+      def process_alchemy_xhr_action(method, action, parameters = nil, session = nil, flash = nil)
+        @routes = Alchemy::Engine.routes
+        parameters ||= {}
+        xml_http_request(method, action, parameters, session, flash)
+      end
     end
   end
 end

data/lib/alchemy/upgrader.rb

@@ -5,6 +5,7 @@ module Alchemy
 
     Dir["#{File.dirname(__FILE__)}/upgrader/*.rb"].each { |f| require f }
 
+    extend Alchemy::Upgrader::ThreePointTwo
     extend Alchemy::Upgrader::ThreePointOne
     extend Alchemy::Upgrader::ThreePointZero
 

data/lib/alchemy/upgrader/three_point_one.rb

@@ -1,6 +1,5 @@
 module Alchemy
   module Upgrader::ThreePointOne
-
     private
 
     def alchemy_3_1_todos

data/lib/alchemy/upgrader/three_point_two.rb

@@ -0,0 +1,39 @@
+require 'thor'
+
+class Alchemy::Upgrader::ThreePointTwoTask < Thor
+  include Thor::Actions
+
+  no_tasks do
+
+    def patch_acts_as_taggable_on_migrations
+      sentinel = /def self.up/
+
+      aato_file = Dir.glob('db/migrate/*_acts_as_taggable_on_migration.*.rb').first
+      if aato_file
+        inject_into_file aato_file,
+          "\n    # inserted by Alchemy CMS upgrader\n    return if table_exists?(:tags)\n",
+          { after: sentinel, verbose: true }
+      end
+
+      aato_file = Dir.glob('db/migrate/*_add_missing_unique_indices.*.rb').first
+      if aato_file
+        inject_into_file aato_file,
+          "\n    # inserted by Alchemy CMS upgrader\n    return if index_exists?(:tags, :name)\n",
+          { after: sentinel, verbose: true }
+      end
+    end
+  end
+end
+
+module Alchemy
+  module Upgrader::ThreePointTwo
+    private
+
+    def upgrade_acts_as_taggable_on_migrations
+      # We can't invoke this rake task, because Rails will use wrong engine names otherwise
+      `bundle exec rake railties:install:migrations`
+      Alchemy::Upgrader::ThreePointTwoTask.new.patch_acts_as_taggable_on_migrations
+      Rake::Task["db:migrate"].invoke
+    end
+  end
+end

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
-  VERSION = "3.1.3"
+  VERSION = "3.2.0.beta"
 
   def self.version
     VERSION

data/lib/rails/templates/alchemy.rb

@@ -1,7 +1,7 @@
 # This rails template installs Alchemy and all depending gems.
 require File.expand_path("../../../alchemy/version", __FILE__)
 
-gem "alchemy_cms",    github: "AlchemyCMS/alchemy_cms",    branch: "3.1-stable"
-gem "alchemy-devise", github: "AlchemyCMS/alchemy-devise", branch: "2.1-stable"
+gem "alchemy_cms",    github: "AlchemyCMS/alchemy_cms",    branch: "master"
+gem "alchemy-devise", github: "AlchemyCMS/alchemy-devise", branch: "master"
 
 gem "capistrano", "~> 2.15.5", group: "development"

data/lib/tasks/alchemy/install.rake

@@ -36,7 +36,8 @@ namespace :alchemy do
     system("rails g alchemy:scaffold#{ ENV['from_binary'] ? ' --force' : '' }") || exit!(1)
     Alchemy::InstallTask.new.set_primary_language
     Rake::Task["db:create"].invoke
-    Rake::Task["alchemy:install:migrations"].invoke
+    # We can't invoke this rake task, because Rails will use wrong engine names otherwise
+    `bundle exec rake railties:install:migrations`
     Rake::Task["db:migrate"].invoke
     Rake::Task["alchemy:db:seed"].invoke
     unless ENV['from_binary']

data/spec/controllers/admin/attachments_controller_spec.rb

@@ -11,13 +11,13 @@ module Alchemy
     describe "#index" do
       it "should always paginate the records" do
         expect(Attachment).to receive(:find_paginated)
-        get :index
+        alchemy_get :index
       end
 
       context "when params[:tagged_with] is set" do
         it "should filter the records by tags" do
           expect(Attachment).to receive(:tagged_with).and_return(Attachment.all)
-          get :index, tagged_with: "pdf"
+          alchemy_get :index, tagged_with: "pdf"
         end
       end
 
@@ -27,7 +27,7 @@ module Alchemy
         context "is set" do
           it "it renders the archive_overlay partial" do
             expect(Content).to receive(:find_by).and_return(content)
-            get :index, {content_id: content.id}
+            alchemy_get :index, {content_id: content.id}
             expect(response).to render_template(partial: '_archive_overlay')
             expect(assigns(:content)).to eq(content)
           end
@@ -35,7 +35,7 @@ module Alchemy
 
         context "is not set" do
           it "should render the default index view" do
-            get :index
+            alchemy_get :index
             expect(response).to render_template(:index)
           end
         end
@@ -47,7 +47,7 @@ module Alchemy
 
         context 'with params[:only]' do
           it 'only loads attachments with matching content type' do
-            get :index, only: 'jpeg'
+            alchemy_get :index, only: 'jpeg'
             expect(assigns(:attachments).to_a).to eq([jpg])
             expect(assigns(:attachments).to_a).to_not eq([png])
           end
@@ -55,7 +55,7 @@ module Alchemy
 
         context 'with params[:except]' do
           it 'does not load attachments with matching content type' do
-            get :index, except: 'jpeg'
+            alchemy_get :index, except: 'jpeg'
             expect(assigns(:attachments).to_a).to eq([png])
             expect(assigns(:attachments).to_a).to_not eq([jpg])
           end
@@ -69,7 +69,7 @@ module Alchemy
       end
 
       it "renders the show template" do
-        get :show, id: attachment.id
+        alchemy_get :show, id: attachment.id
         expect(response).to render_template(:show)
       end
     end
@@ -82,19 +82,19 @@ module Alchemy
         end
 
         it "should set @while_assigning to true" do
-          get :new
+          alchemy_get :new
           expect(assigns(:while_assigning)).to eq(true)
         end
 
         it "should set @swap to params[:swap]" do
-          get :new, swap: 'true'
+          alchemy_get :new, swap: 'true'
           expect(assigns(:swap)).to eq('true')
         end
       end
     end
 
     describe '#create' do
-      subject { post :create, params }
+      subject { alchemy_post :create, params }
 
       let(:attachment) { mock_model('Attachment', name: 'contract.pdf', to_jq_upload: {}) }
       let(:params)     { {attachment: {name: ''}} }
@@ -145,7 +145,7 @@ module Alchemy
     end
 
     describe '#update' do
-      subject { put :update, attachment: {name: ''} }
+      subject { alchemy_put :update, {id: 1, attachment: {name: ''}} }
 
       let(:attachment) { build_stubbed(:attachment) }
 
@@ -184,7 +184,7 @@ module Alchemy
 
       it "destroys the attachment and sets and success message" do
         expect(attachment).to receive(:destroy)
-        xhr :delete, :destroy
+        alchemy_xhr :delete, :destroy, id: 1
         expect(assigns(:attachment)).to eq(attachment)
         expect(assigns(:url)).not_to be_blank
         expect(flash[:notice]).not_to be_blank
@@ -198,13 +198,13 @@ module Alchemy
       end
 
       it "should assign @attachment with Attachment found by id" do
-        get :download, id: attachment.id
+        alchemy_get :download, id: attachment.id
         expect(assigns(:attachment)).to eq(attachment)
       end
 
       it "should send the data to the browser" do
         expect(controller).to receive(:send_data)
-        get :download, id: attachment.id
+        alchemy_get :download, id: attachment.id
       end
     end
   end