alchemy_cms 3.1.1 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da3fbeab242eee7ed6dde78b96f4a503df8168d1
-  data.tar.gz: 372a82e46f31f66b61776290d1c2e6a56fa340a6
+  metadata.gz: 769125dc98331eab2415c8b2e4339082170834fc
+  data.tar.gz: 279c3a68c99d1118c422247437477c0781657b95
 SHA512:
-  metadata.gz: c6d578e24ffa7c5c6dc715e9e6ce3f859e49d7acbc1d42ad2b83f64e1adb9ce91acb5c4463071b91a6e88a020bc3592cee949517fc98304f5d4a5b35ff265531
-  data.tar.gz: e047f4e17c7081890e7b6abe6e4707de26715b610bb11e722d7cbb695bfcce2a446ef524895cb3f4591132ec157ade16d7d2244c66661199c0ecf876405090e9
+  metadata.gz: dee4216e57abff1cface5e8fb44b1087c5cd0e32528f6909b5c5e33dbccadf1d94b1f27b5d2f3bca0eb2d157b9b74f737d700329a77f6859a25b1672ca9da3c7
+  data.tar.gz: 2896eb6816bdd6ae3cfb18390ebb88357b8306b815fa5630e4163599d46087039407eaf4962063206e3bfd0cabd78c5464636bca6174b25f8fabad86211f85b7

data/Gemfile

@@ -7,7 +7,7 @@ if ENV['RAILS_VERSION']
 end
 
 gem 'sqlite3' if ENV['DB'].nil? || ENV['DB'] == 'sqlite'
-gem 'mysql2'  if ENV['DB'] == 'mysql'
+gem 'mysql2', '~> 0.3.18' if ENV['DB'] == 'mysql'
 gem 'pg'      if ENV['DB'] == 'postgresql'
 
 group :development, :test do

data/alchemy_cms.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'acts_as_list',                     ['~> 0.3']
   gem.add_runtime_dependency 'acts-as-taggable-on',              ['~> 3.1']
   gem.add_runtime_dependency 'awesome_nested_set',               ['~> 3.0.0']
-  gem.add_runtime_dependency 'cancancan',                        ['~> 1.9']
+  gem.add_runtime_dependency 'cancancan',                        ['~> 1.9', '< 1.13.0']
   gem.add_runtime_dependency 'coffee-rails',                     ['~> 4.0']
   gem.add_runtime_dependency 'compass-rails',                    ['~> 1.1']
   gem.add_runtime_dependency 'dragonfly',                        ['~> 1.0.1']

data/app/assets/javascripts/alchemy/alchemy.base.js.coffee

@@ -46,16 +46,17 @@ $.extend Alchemy,
   # fades the image after its been loaded
   ImageLoader: (scope = document, options = {color: '#fff'}) ->
     $('img', scope).each ->
-      image = $(this).hide()
-      $parent = image.parent()
-      spinner = Alchemy.Spinner.small options
-      spinner.spin $parent[0]
-      image.on 'load', ->
-        spinner.stop()
-        image.fadeIn 400
-      image.on 'error', ->
-        spinner.stop()
-        $parent.html('<span class="icon warn"/>')
+      if !this.complete
+        image = $(this).hide()
+        $parent = image.parent()
+        spinner = Alchemy.Spinner.small options
+        spinner.spin $parent[0]
+        image.on 'load', ->
+          spinner.stop()
+          image.fadeIn 400
+        image.on 'error', ->
+          spinner.stop()
+          $parent.html('<span class="icon warn"/>')
 
   removePicture: (selector) ->
     $form_field = $(selector)

data/app/assets/stylesheets/alchemy/selects.scss

@@ -139,6 +139,10 @@ select {
 
   .select2-search {
     margin: $default-margin 0;
+
+    .select2-input {
+      width: inherit;
+    }
   }
 
   &.select2-with-searchbox .select2-results > .select2-result:first-child {

data/app/controllers/alchemy/admin/contents_controller.rb

@@ -33,9 +33,10 @@ module Alchemy
       end
 
       def order
-        params[:content_ids].each do |id|
-          content = Content.find(id)
-          content.move_to_bottom
+        Content.transaction do
+          params[:content_ids].each_with_index do |id, idx|
+            Content.where(id: id).update_all(position: idx + 1)
+          end
         end
         @notice = _t("Successfully saved content position")
       end

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

@@ -37,8 +37,7 @@ 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!
-      names = ancestors.visible.contentpages.where(language_root: nil).map(&:slug).compact
-      new_urlname = (names << slug).join('/')
+      new_urlname = nested_url_name(slug)
       if urlname != new_urlname
         legacy_urls.create(urlname: urlname)
         update_column(:urlname, new_urlname)
@@ -56,6 +55,18 @@ 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
@@ -71,18 +82,15 @@ module Alchemy
     # If url_nesting is enabled the urlname contains the whole path.
     def set_urlname
       if Config.get(:url_nesting)
-        url_name = [
-          parent_urlname,
-          convert_url_name(urlname.blank? ? name : slug)
-        ].compact.join('/')
+        value = slug
       else
-        url_name = convert_url_name(urlname.blank? ? name : urlname)
+        value = urlname
       end
-      write_attribute :urlname, url_name
+      self[:urlname] = nested_url_name(value)
     end
 
     def set_title
-      write_attribute :title, name
+      self[:title] = name
     end
 
     # Converts the given name into an url friendly string.
@@ -90,8 +98,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(name)
-      url_name = convert_to_urlname(name)
+    def convert_url_name(value)
+      url_name = convert_to_urlname(value.blank? ? name : value)
       if url_name.length < 3
         ('-' * (3 - url_name.length)) + url_name
       else
@@ -99,11 +107,16 @@ module Alchemy
       end
     end
 
-    # 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
+    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
     end
   end
 end

data/lib/alchemy/controller_actions.rb

@@ -3,8 +3,7 @@ module Alchemy
     extend ActiveSupport::Concern
 
     included do
-      before_action :set_current_alchemy_site
-      before_action :set_alchemy_language
+      prepend_before_action :set_alchemy_language, :set_current_alchemy_site
 
       helper 'alchemy/pages'
 
@@ -66,8 +65,8 @@ module Alchemy
         Alchemy.registered_abilities.each do |klass|
           alchemy_permissions.merge(klass.new(current_alchemy_user))
         end
-        if (Object.const_get('Ability') rescue false)
-          alchemy_permissions.merge(Ability.new(current_alchemy_user))
+        if (Object.const_get('::Ability') rescue false)
+          alchemy_permissions.merge(::Ability.new(current_alchemy_user))
         end
         alchemy_permissions
       end

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
-          has_one :element, :through => :content
-          has_one :page,    :through => :element
+          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"
 
-          scope :available,    -> { joins(:element).merge(Element.available) }
+          scope :available,    -> { joins(:element).merge(Alchemy::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

@@ -182,7 +182,7 @@ module Alchemy
     private
 
     def user_role_rules
-      return [] if @user.alchemy_roles.nil?
+      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)
       end

data/lib/alchemy/version.rb

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

data/spec/controllers/admin/contents_controller_spec.rb

@@ -14,7 +14,6 @@ module Alchemy
         expect(Element).to receive(:find).and_return(element)
       end
 
-
       describe '#create' do
         let(:element) { build_stubbed(:element, name: 'headline') }
 
@@ -61,11 +60,17 @@ module Alchemy
 
     describe "#order" do
       context "with content_ids in params" do
+        let(:element) do
+          create(:element, name: 'all_you_can_eat', create_contents_after_create: true)
+        end
+
+        let(:content_ids) { element.contents.pluck(:id).shuffle }
+
         it "should reorder the contents" do
-          content_ids = element.contents.essence_texts.pluck(:id)
-          xhr :post, :order, {content_ids: content_ids.reverse}
+          xhr :post, :order, {content_ids: content_ids}
+
           expect(response.status).to eq(200)
-          expect(element.contents.essence_texts.pluck(:id)).to eq(content_ids.reverse)
+          expect(element.contents(true).pluck(:id)).to eq(content_ids)
         end
       end
     end

data/spec/dummy/app/models/dummy_model.rb

@@ -0,0 +1,3 @@
+class DummyModel < ActiveRecord::Base
+  acts_as_essence ingredient_column: 'data'
+end

data/spec/dummy/db/migrate/20130827094554_alchemy_two_point_six.rb

@@ -0,0 +1 @@
+../../../../db/migrate/20130827094554_alchemy_two_point_six.rb

data/spec/dummy/db/migrate/20130828121054_remove_do_not_index_from_alchemy_essence_texts.rb

@@ -0,0 +1 @@
+../../../../db/migrate/20130828121054_remove_do_not_index_from_alchemy_essence_texts.rb

data/spec/dummy/db/migrate/20130828121120_remove_do_not_index_from_alchemy_essence_richtexts.rb

@@ -0,0 +1 @@
+../../../../db/migrate/20130828121120_remove_do_not_index_from_alchemy_essence_richtexts.rb

data/spec/dummy/db/migrate/20130918201742_add_published_at_to_alchemy_pages.rb

@@ -0,0 +1 @@
+../../../../db/migrate/20130918201742_add_published_at_to_alchemy_pages.rb

data/spec/dummy/db/migrate/20140107192720_add_missing_unique_indices_to_tags_and_taggings.rb

@@ -0,0 +1 @@
+../../../../db/migrate/20140107192720_add_missing_unique_indices_to_tags_and_taggings.rb

data/spec/dummy/db/migrate/20140701160159_add_taggings_counter_cache_to_tags.rb

@@ -0,0 +1 @@
+../../../../db/migrate/20140701160159_add_taggings_counter_cache_to_tags.rb

data/spec/dummy/db/migrate/20140701160225_add_missing_taggable_index.rb

@@ -0,0 +1 @@
+../../../../db/migrate/20140701160225_add_missing_taggable_index.rb

data/spec/dummy/db/migrate/20150412103152_create_dummy_model.rb

@@ -0,0 +1,7 @@
+class CreateDummyModel < ActiveRecord::Migration
+  def change
+    create_table :dummy_models do |t|
+      t.string :data
+    end
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,9 +11,9 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140701160225) do
+ActiveRecord::Schema.define(version: 20150412103152) do
 
-  create_table "alchemy_attachments", force: true do |t|
+  create_table "alchemy_attachments", force: :cascade do |t|
     t.string   "name"
     t.string   "file_name"
     t.string   "file_mime_type"
@@ -28,14 +28,14 @@ ActiveRecord::Schema.define(version: 20140701160225) do
 
   add_index "alchemy_attachments", ["file_uid"], name: "index_alchemy_attachments_on_file_uid"
 
-  create_table "alchemy_cells", force: true do |t|
+  create_table "alchemy_cells", force: :cascade do |t|
     t.integer  "page_id"
     t.string   "name"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
 
-  create_table "alchemy_contents", force: true do |t|
+  create_table "alchemy_contents", force: :cascade do |t|
     t.string   "name"
     t.string   "essence_type"
     t.integer  "essence_id"
@@ -49,7 +49,7 @@ ActiveRecord::Schema.define(version: 20140701160225) do
 
   add_index "alchemy_contents", ["element_id", "position"], name: "index_contents_on_element_id_and_position"
 
-  create_table "alchemy_elements", force: true do |t|
+  create_table "alchemy_elements", force: :cascade do |t|
     t.string   "name"
     t.integer  "position"
     t.integer  "page_id"
@@ -66,12 +66,12 @@ ActiveRecord::Schema.define(version: 20140701160225) do
 
   add_index "alchemy_elements", ["page_id", "position"], name: "index_elements_on_page_id_and_position"
 
-  create_table "alchemy_elements_alchemy_pages", id: false, force: true do |t|
+  create_table "alchemy_elements_alchemy_pages", id: false, force: :cascade do |t|
     t.integer "element_id"
     t.integer "page_id"
   end
 
-  create_table "alchemy_essence_booleans", force: true do |t|
+  create_table "alchemy_essence_booleans", force: :cascade do |t|
     t.boolean  "value"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
@@ -81,7 +81,7 @@ ActiveRecord::Schema.define(version: 20140701160225) do
 
   add_index "alchemy_essence_booleans", ["value"], name: "index_alchemy_essence_booleans_on_value"
 
-  create_table "alchemy_essence_dates", force: true do |t|
+  create_table "alchemy_essence_dates", force: :cascade do |t|
     t.datetime "date"
     t.integer  "creator_id"
     t.integer  "updater_id"
@@ -89,7 +89,7 @@ ActiveRecord::Schema.define(version: 20140701160225) do
     t.datetime "updated_at", null: false
   end
 
-  create_table "alchemy_essence_files", force: true do |t|
+  create_table "alchemy_essence_files", force: :cascade do |t|
     t.integer  "attachment_id"
     t.string   "title"
     t.string   "css_class"
@@ -99,7 +99,7 @@ ActiveRecord::Schema.define(version: 20140701160225) do
     t.datetime "updated_at",    null: false
   end
 
-  create_table "alchemy_essence_htmls", force: true do |t|
+  create_table "alchemy_essence_htmls", force: :cascade do |t|
     t.text     "source"
     t.integer  "creator_id"
     t.integer  "updater_id"
@@ -107,7 +107,7 @@ ActiveRecord::Schema.define(version: 20140701160225) do
     t.datetime "updated_at", null: false
   end
 
-  create_table "alchemy_essence_links", force: true do |t|
+  create_table "alchemy_essence_links", force: :cascade do |t|
     t.string   "link"
     t.string   "link_title"
     t.string   "link_target"
@@ -118,7 +118,7 @@ ActiveRecord::Schema.define(version: 20140701160225) do
     t.integer  "updater_id"
   end
 
-  create_table "alchemy_essence_pictures", force: true do |t|
+  create_table "alchemy_essence_pictures", force: :cascade do |t|
     t.integer  "picture_id"
     t.string   "caption"
     t.string   "title"
@@ -137,7 +137,7 @@ ActiveRecord::Schema.define(version: 20140701160225) do
     t.string   "render_size"
   end
 
-  create_table "alchemy_essence_richtexts", force: true do |t|
+  create_table "alchemy_essence_richtexts", force: :cascade do |t|
     t.text     "body"
     t.text     "stripped_body"
     t.boolean  "public"
@@ -147,7 +147,7 @@ ActiveRecord::Schema.define(version: 20140701160225) do
     t.datetime "updated_at",    null: false
   end
 
-  create_table "alchemy_essence_selects", force: true do |t|
+  create_table "alchemy_essence_selects", force: :cascade do |t|
     t.string   "value"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
@@ -157,7 +157,7 @@ ActiveRecord::Schema.define(version: 20140701160225) do
 
   add_index "alchemy_essence_selects", ["value"], name: "index_alchemy_essence_selects_on_value"
 
-  create_table "alchemy_essence_texts", force: true do |t|
+  create_table "alchemy_essence_texts", force: :cascade do |t|
     t.text     "body"
     t.string   "link"
     t.string   "link_title"
@@ -170,13 +170,13 @@ ActiveRecord::Schema.define(version: 20140701160225) do
     t.datetime "updated_at",                      null: false
   end
 
-  create_table "alchemy_folded_pages", force: true do |t|
+  create_table "alchemy_folded_pages", force: :cascade do |t|
     t.integer "page_id"
     t.integer "user_id"
     t.boolean "folded",  default: false
   end
 
-  create_table "alchemy_languages", force: true do |t|
+  create_table "alchemy_languages", force: :cascade do |t|
     t.string   "name"
     t.string   "language_code"
     t.string   "frontpage_name"
@@ -195,7 +195,7 @@ ActiveRecord::Schema.define(version: 20140701160225) do
   add_index "alchemy_languages", ["language_code"], name: "index_alchemy_languages_on_language_code"
   add_index "alchemy_languages", ["site_id"], name: "index_alchemy_languages_on_site_id"
 
-  create_table "alchemy_legacy_page_urls", force: true do |t|
+  create_table "alchemy_legacy_page_urls", force: :cascade do |t|
     t.string   "urlname",    null: false
     t.integer  "page_id",    null: false
     t.datetime "created_at", null: false
@@ -204,7 +204,7 @@ ActiveRecord::Schema.define(version: 20140701160225) do
 
   add_index "alchemy_legacy_page_urls", ["urlname"], name: "index_alchemy_legacy_page_urls_on_urlname"
 
-  create_table "alchemy_pages", force: true do |t|
+  create_table "alchemy_pages", force: :cascade do |t|
     t.string   "name"
     t.string   "urlname"
     t.string   "title"
@@ -239,7 +239,7 @@ ActiveRecord::Schema.define(version: 20140701160225) do
   add_index "alchemy_pages", ["parent_id", "lft"], name: "index_pages_on_parent_id_and_lft"
   add_index "alchemy_pages", ["urlname"], name: "index_pages_on_urlname"
 
-  create_table "alchemy_pictures", force: true do |t|
+  create_table "alchemy_pictures", force: :cascade do |t|
     t.string   "name"
     t.string   "image_file_name"
     t.integer  "image_file_width"
@@ -254,7 +254,7 @@ ActiveRecord::Schema.define(version: 20140701160225) do
     t.integer  "image_file_size"
   end
 
-  create_table "alchemy_sites", force: true do |t|
+  create_table "alchemy_sites", force: :cascade do |t|
     t.string   "host"
     t.string   "name"
     t.datetime "created_at",                               null: false
@@ -267,14 +267,18 @@ ActiveRecord::Schema.define(version: 20140701160225) do
   add_index "alchemy_sites", ["host", "public"], name: "alchemy_sites_public_hosts_idx"
   add_index "alchemy_sites", ["host"], name: "index_alchemy_sites_on_host"
 
-  create_table "dummy_users", force: true do |t|
+  create_table "dummy_models", force: :cascade do |t|
+    t.string "data"
+  end
+
+  create_table "dummy_users", force: :cascade do |t|
     t.string "email"
     t.string "password"
   end
 
   add_index "dummy_users", ["email"], name: "index_dummy_users_on_email"
 
-  create_table "events", force: true do |t|
+  create_table "events", force: :cascade do |t|
     t.string   "name"
     t.string   "hidden_name"
     t.datetime "starts_at"
@@ -289,13 +293,13 @@ ActiveRecord::Schema.define(version: 20140701160225) do
     t.datetime "updated_at",                              null: false
   end
 
-  create_table "locations", force: true do |t|
+  create_table "locations", force: :cascade do |t|
     t.string   "name"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "taggings", force: true do |t|
+  create_table "taggings", force: :cascade do |t|
     t.integer  "tag_id"
     t.integer  "taggable_id"
     t.string   "taggable_type"
@@ -308,7 +312,7 @@ ActiveRecord::Schema.define(version: 20140701160225) do
   add_index "taggings", ["tag_id", "taggable_id", "taggable_type", "context", "tagger_id", "tagger_type"], name: "taggings_idx", unique: true
   add_index "taggings", ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context"
 
-  create_table "tags", force: true do |t|
+  create_table "tags", force: :cascade do |t|
     t.string  "name"
     t.integer "taggings_count", default: 0
   end