alchemy_cms 2.7.5 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 491ad71e83bcd6aaaeb4f79f9c696982ea8c8112
-  data.tar.gz: 64c210c6d964efa046475945ede684ecf3e626ed
+  metadata.gz: edf3ac4fd7a2b98807ac909f6f091cdafb11f9c6
+  data.tar.gz: 4515777e5e93ef98b427f57dd9fd5a9f4b59333f
 SHA512:
-  metadata.gz: be1fe2cef675009c89d8f1a70f6b8b90ded20c81e91e74c0619347e9d7047d73da29683391d8512281147a7a71d0a88b3dbd840b94c5a0427814ada8eb9fb1a0
-  data.tar.gz: 91beddf874b48a4f4b761a5952c73a18059e5b355d0e28b417d8a34c1a4c61fda2f20e18369ee13488c2521555b3ddd8f9fb1c139b09f14d750d6402e6aba36c
+  metadata.gz: a32052e6ccd970e0ba9f51e978d57897b67ffd0980425c283ddb1c01d27e5a8f71006d553867c6833420c33fc95802917987de9a599322fd1f44908e0e4d9455
+  data.tar.gz: d8199c8dce2e4d9f52aa0d6da2eca587050a574ef6d67855fe28c484718a8cb4d19a5fba1848e39ff1163512a148fabf014bc5d5ebd1c0002e55f304459be1eb

data/.travis.yml

@@ -4,7 +4,7 @@ rvm:
   - 2.0.0
 branches:
   only:
-    - 2.7-stable
+    - 2.8-stable
 script: rake
 env:
   - DB=mysql

data/Gemfile

@@ -14,8 +14,6 @@ gem 'sqlite3'               if ENV['DB'].nil? || ENV['DB'] == 'sqlite'
 gem 'mysql2'                if ENV['DB'] == 'mysql'
 gem 'pg'                    if ENV['DB'] == 'postgresql'
 
-gem 'database_cleaner'
-
 unless ENV['CI']
   gem 'pry'
   gem 'quiet_assets' # Mute assets loggin
@@ -25,6 +23,7 @@ end
 group :test do
   unless ENV['FAST_SPECS']
     gem 'poltergeist'
+    gem 'connection_pool' # https://gist.github.com/mperham/3049152
     unless ENV['CI']
       gem 'launchy'
     end

data/README.md

@@ -1,7 +1,7 @@
 ![Alchemy CMS](http://alchemy-cms.com/assets/alchemy_logo.png)
 
 [![Gem Version](https://badge.fury.io/rb/alchemy_cms.png)](http://badge.fury.io/rb/alchemy_cms)
-[![Build Status](https://secure.travis-ci.org/magiclabs/alchemy_cms.png?branch=2.7-stable)](http://travis-ci.org/magiclabs/alchemy_cms) [![Code Climate](https://codeclimate.com/github/magiclabs/alchemy_cms.png)](https://codeclimate.com/github/magiclabs/alchemy_cms) [![Coverage Status](https://coveralls.io/repos/magiclabs/alchemy_cms/badge.png?branch=2.7-stable)](https://coveralls.io/r/magiclabs/alchemy_cms)
+[![Build Status](https://secure.travis-ci.org/magiclabs/alchemy_cms.png?branch=2.8-stable)](http://travis-ci.org/magiclabs/alchemy_cms) [![Code Climate](https://codeclimate.com/github/magiclabs/alchemy_cms.png)](https://codeclimate.com/github/magiclabs/alchemy_cms) [![Coverage Status](https://coveralls.io/repos/magiclabs/alchemy_cms/badge.png?branch=2.8-stable)](https://coveralls.io/r/magiclabs/alchemy_cms)
 
 About
 -----
@@ -67,7 +67,7 @@ Add to existing Rails project
 
 In your Gemfile:
 
-    gem 'alchemy_cms', github: 'magiclabs/alchemy_cms', branch: '2.7-stable'
+    gem 'alchemy_cms', github: 'magiclabs/alchemy_cms', branch: '2.8-stable'
 
 Run in terminal:
 
@@ -133,4 +133,4 @@ Authors
 License
 -------
 
-* BSD: <https://raw.github.com/magiclabs/alchemy_cms/2.7-stable/LICENSE>
+* BSD: <https://raw.github.com/magiclabs/alchemy_cms/2.8-stable/LICENSE>

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

@@ -200,19 +200,17 @@ module Alchemy
         @sorting = true
       end
 
-      # Receives a JSON object representing a language tree to be ordered
-      # and updates all pages in that language structure to their correct indexes
       def order
-        neworder = JSON.parse(params[:set])
-        rootpage = Page.language_root_for(session[:language_id])
-
-        tree = create_tree(neworder, rootpage)
+        @page_root = Page.language_root_for(session[:language_id])
 
-        Alchemy::Page.transaction do
-          tree.each do |key, node|
-            dbitem = Page.find(key)
-            dbitem.update_node!(node)
-          end
+        # Taken from https://github.com/matenia/jQuery-Awesome-Nested-Set-Drag-and-Drop
+        neworder = JSON.parse(params[:set])
+        prev_item = nil
+        neworder.each do |item|
+          dbitem = Page.find(item['id'])
+          prev_item.nil? ? dbitem.move_to_child_of(@page_root) : dbitem.move_to_right_of(prev_item)
+          sort_children(item, dbitem) unless item['children'].nil?
+          prev_item = dbitem.reload
         end
 
         flash[:notice] = _t("Pages order saved")
@@ -242,85 +240,6 @@ module Alchemy
 
       private
 
-      # Returns the current left index and the aggregated hash of tree nodes indexed by page id visited so far
-      #
-      # Visits a batch of children nodes, assigns them the correct ordering indexes and spuns recursively the same
-      # procedure on their children, if any
-      #
-      # @param [Array]
-      #   An array of children nodes to be visited
-      # @param [Integer]
-      #   The lft attribute that should be given to the first node in the array
-      # @param [Integer]
-      #   The page id of the parent of this batch of children nodes
-      # @param [Integer]
-      #   The depth at which these children reside
-      # @param [Hash]
-      #   A Hash of TreeNode's indexed by their page ids
-      # @param [String]
-      #   The url for the parent node of these children
-      # @param [Boolean]
-      #   Whether these children reside in a restricted branch according to their ancestors
-      #
-      def visit_nodes(nodes, my_left, parent, depth, tree, url, restricted)
-        nodes.each do |item|
-          my_right = my_left + 1
-          my_restricted = item['restricted'] || restricted
-          urls = process_url(url, item)
-
-          if item['children']
-            my_right, tree = visit_nodes(item['children'], my_left + 1, item['id'], depth + 1, tree, urls[:children_path], my_restricted)
-          end
-
-          tree[item['id']] = TreeNode.new(my_left, my_right, parent, depth, urls[:my_urlname], my_restricted)
-          my_left = my_right + 1
-        end
-
-        [my_left, tree]
-      end
-
-      # Returns a Hash of TreeNode's indexed by their page ids
-      #
-      # Grabs the array representing a tree structure of pages passed as a parameter,
-      # visits it and creates a map of TreeNodes indexed by page id featuring Nested Set
-      # ordering information consisting of the left, right, depth and parent_id indexes as
-      # well as a node's url and restricted status
-      #
-      # @param [Array]
-      #   An Array representing a tree of Alchemy::Page's
-      # @param [Alchemy::Page]
-      #   The root page for the language being ordered
-      #
-      def create_tree(items, rootpage)
-        _, tree = visit_nodes(items, rootpage.lft + 1, rootpage.id, rootpage.depth + 1, {}, "", rootpage.restricted)
-        tree
-      end
-
-      # Returns a pair, the path that a given tree node should take, and the path its children should take
-      #
-      # This function will add a node's own slug into their ancestor's path
-      # in order to create the full URL of a node
-      #
-      # NOTE: external and invisible pages are not part of the full path of their children
-      #
-      # @param [String]
-      #   The node's ancestors path
-      # @param [Hash]
-      #   A children node
-      #
-      def process_url(ancestors_path, item)
-        default_urlname = (ancestors_path.blank? ? "" : "#{ancestors_path}/") + item['slug']
-
-        pair = {my_urlname: default_urlname, children_path: default_urlname}
-
-        if item['external'] == true || item['visible'] == false
-          # children ignore an ancestor in their path if external or invisible
-          pair[:children_path] = ancestors_path
-        end
-
-        pair
-      end
-
       def load_page
         @page = Page.find(params[:id])
       end
@@ -329,6 +248,17 @@ module Alchemy
         request.raw_post.split('&').map { |i| i = {i.split('=')[0].gsub(/[^0-9]/, '') => i.split('=')[1]} }
       end
 
+      # Taken from https://github.com/matenia/jQuery-Awesome-Nested-Set-Drag-and-Drop
+      def sort_children(element, dbitem)
+        prevchild = nil
+        element['children'].each do |child|
+          childitem = Page.find(child['id'])
+          prevchild.nil? ? childitem.move_to_child_of(dbitem) : childitem.move_to_right_of(prevchild)
+          sort_children(child, childitem) unless child['children'].nil?
+          prevchild = childitem
+        end
+      end
+
       def redirect_path_after_page_create
         if @page.redirects_to_external?
           admin_pages_path

data/app/controllers/alchemy/base_controller.rb

@@ -84,52 +84,6 @@ module Alchemy
       end
     end
 
-    # Sets the language for rendering pages in pages controller.
-    #
-    def set_language(lang = nil)
-      if lang
-        @language = lang.is_a?(Language) ? lang : load_language_from(lang)
-      else
-        # find the best language and remember it for later
-        @language = load_language_from_params ||
-                    load_language_from_session ||
-                    load_language_default
-      end
-
-      # store language in session
-      store_language_in_session(@language)
-
-      # switch locale to selected language
-      ::I18n.locale = @language.code
-    end
-
-    def load_language_from_params
-      if params[:lang].present?
-        Language.find_by_code(params[:lang])
-      end
-    end
-
-    def load_language_from_session
-      if session[:language_id].present?
-        Language.find_by_id(session[:language_id])
-      end
-    end
-
-    def load_language_from(language_code_or_id)
-      Language.find_by_id(language_code_or_id) || Language.find_by_code(language_code_or_id)
-    end
-
-    def load_language_default
-      Language.get_default || raise(DefaultLanguageNotFoundError)
-    end
-
-    def store_language_in_session(language)
-      if language && language.id
-        session[:language_id]   = language.id
-        session[:language_code] = language.code
-      end
-    end
-
     def store_location
       session[:redirect_path] = request.path
     end

data/app/helpers/alchemy/admin/base_helper.rb

@@ -45,6 +45,7 @@ module Alchemy
       #    Should the window show overflowing content?
       #
       def link_to_overlay_window(content, url, options={}, html_options={})
+        ActiveSupport::Deprecation.warn("Used deprecated link_to_overlay_window helper. It will be removed in Alchemy v3.0. Please use link_to_dialog instead.")
         default_options = {
           :modal => true,
           :overflow => true,
@@ -139,6 +140,7 @@ module Alchemy
       #   The label for the cancel button
       #
       def link_to_confirmation_window(link_string = "", message = "", url = "", html_options = {})
+        ActiveSupport::Deprecation.warn("Used deprecated link_to_confirmation_window helper. It will be removed in Alchemy v3.0. Please use link_to_confirm_dialog instead.")
         link_to(link_string, url,
           html_options.merge(
             'data-alchemy-confirm-delete' => {

data/app/helpers/alchemy/admin/essences_helper.rb

@@ -22,6 +22,7 @@ module Alchemy
       #   * editor_options (Hash) - Will be passed to the render_essence_editor partial renderer
       #
       def render_essence_editor_by_type(element, essence_type, options = {}, editor_options = {})
+        ActiveSupport::Deprecation.warn("Used deprecated render_essence_editor_by_type helper. It will be removed in Alchemy v3.0. You can use render_essence_editor_by_name instead.")
         return warning('Element is nil', _t(:no_element_given)) if element.blank?
         return warning('EssenceType is blank', _t("No EssenceType given")) if essence_type.blank?
         defaults = {
@@ -76,6 +77,7 @@ module Alchemy
       # Otherwise the pages are ordered by their position in the nested set.
       #
       def page_selector(element, content_name, options = {}, select_options = {})
+        ActiveSupport::Deprecation.warn("Used deprecated page_selector helper. It will be removed in Alchemy v3.0. Please use a select_tag with pages_for_select instead.")
         default_options = {
           :page_attribute => :id,
           :global => false,

data/app/helpers/alchemy/elements_helper.rb

@@ -213,6 +213,7 @@ module Alchemy
     # @note When passing a String for options :from_page, it must be a page_layout name.
     #
     def all_elements_by_name(name, options = {})
+      ActiveSupport::Deprecation.warn("Used deprecated all_elements_by_name helper. It will be removed in Alchemy v3.0. Please build the relevant behavior on your own.")
       warning('options[:language] option not allowed any more in all_elements_by_name helper') unless options[:language].blank?
       options = {
         count: :all,
@@ -244,6 +245,7 @@ module Alchemy
     #   The id of the Page the element is associated with
     #
     def element_from_page(options = {})
+      ActiveSupport::Deprecation.warn("Used deprecated element_from_page helper. It will be removed in Alchemy v3.0. Please build the relevant behavior on your own.")
       default_options = {
         page_urlname: "",
         page_id: nil,
@@ -263,6 +265,7 @@ module Alchemy
 
     # Renders all element partials from given cell.
     def render_cell_elements(cell)
+      ActiveSupport::Deprecation.warn("Used deprecated render_cell_elements helper. It will be removed in Alchemy v3.0. You can use render_elements(from_cell: cell) instead.")
       return warning("No cell given.") if cell.blank?
       render_elements({:from_cell => cell})
     end

data/app/helpers/alchemy/essences_helper.rb

@@ -60,6 +60,7 @@ module Alchemy
     #   <%= render_essence_view_by_type(element, "EssencePicture", 1, {:image_size => "120x80", :crop => true}) %>
     #
     def render_essence_view_by_type(element, type, position = 1, options = {}, html_options = {})
+      ActiveSupport::Deprecation.warn("Used deprecated render_essence_view_by_type helper. It will be removed in Alchemy v3.0. You can use render_essence_view_by_name instead.")
       if element.blank?
         warning('Element is nil')
         return ""

data/app/helpers/alchemy/pages_helper.rb

@@ -33,12 +33,12 @@ module Alchemy
     end
 
     def language_switches(options={})
-      ActiveSupport::Deprecation.warn("Used deprecated language_switches helper. Please use language_links instead.")
+      ActiveSupport::Deprecation.warn("Used deprecated language_switches helper. It will be removed in Alchemy v3.0. You can use language_links instead.")
       language_links(options)
     end
 
     def language_switcher(options={})
-      ActiveSupport::Deprecation.warn("Used deprecated language_switcher helper. Please use language_links instead.")
+      ActiveSupport::Deprecation.warn("Used deprecated language_switcher helper. It will be removed in Alchemy v3.0. You can use language_links instead.")
       language_links(options)
     end
 
@@ -411,6 +411,7 @@ module Alchemy
 
     # Renders a menubar for logged in users that are visiting a page.
     def alchemy_menu_bar
+      ActiveSupport::Deprecation.warn('Used deprecated alchemy_menu_bar helper. It will be removed in Alchemy v3.0. You can use `render "/alchemy/menubar"` instead.')
       return if @preview_mode
       if permitted_to?(:edit, :alchemy_admin_pages)
         menu_bar_string = ""

data/app/helpers/alchemy/url_helper.rb

@@ -25,7 +25,7 @@ module Alchemy
     #   <%= link_to '&raquo order now', page_path_for(:page_layout => 'orderform', :product_id => element.id) %>
     #
     def page_path_for(options={})
-      ActiveSupport::Deprecation.warn("Used deprecated page_path_for helper. Please use show_alchemy_page_path instead.")
+      ActiveSupport::Deprecation.warn("Used deprecated page_path_for helper. It will be removed in Alchemy v3.0. You can use show_alchemy_page_path instead.")
       return warning("No page_layout, or urlname given. I got #{options.inspect} ") if options[:page_layout].blank? && options[:urlname].blank?
       if options[:urlname].blank?
         page = Page.find_by_page_layout(options[:page_layout])

data/app/models/alchemy/page.rb

@@ -298,25 +298,6 @@ module Alchemy
       set_language_code
     end
 
-    # Updates an Alchemy::Page based on a new ordering to be applied to it
-    #
-    # Note: Page's urls should not be updated (and a legacy URL created) if nesting is OFF
-    # or if a page is external or if the URL is the same
-    #
-    # @param [TreeNode]
-    #   A tree node with new lft, rgt, depth, url, parent_id and restricted indexes to be updated
-    #
-    def update_node!(node)
-      hash = {lft: node.left, rgt: node.right, parent_id: node.parent, depth: node.depth, restricted: node.restricted}
-
-      if Config.get(:url_nesting) && !self.redirects_to_external? && self.urlname != node.url
-        LegacyPageUrl.create(page_id: self.id, urlname: self.urlname)
-        hash.merge!(urlname: node.url)
-      end
-
-      self.class.update_all(hash, {id: self.id})
-    end
-
   private
 
     # Returns the next or previous page on the same level or nil.

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

@@ -27,7 +27,7 @@ module Alchemy
 
     # Returns true or false if the pages layout_description for config/alchemy/page_layouts.yml contains redirects_to_external: true
     def redirects_to_external?
-      !!definition["redirects_to_external"]
+      definition["redirects_to_external"]
     end
 
     def has_controller?

data/app/views/alchemy/admin/elements/trash.js.erb

@@ -6,7 +6,7 @@ $('#element_<%= @element.id %>').hide(200, function() {
   $('#element_trash_button .icon').addClass('full');
   Alchemy.PreviewWindow.refresh();
   <% @element.contents.essence_richtexts.each do |content| %>
-    tinymce.get('tinymce_<%= content.id %>').remove();
+  tinymce.get('contents_content_<%= content.id %>_body').remove();
   <% end %>
   <%= update_essence_select_elements(@page, @element) -%>
 });

data/app/views/alchemy/admin/pages/_page.html.erb

@@ -1,4 +1,4 @@
-<li id="page_<%= page.id %>" class="page_level_<%= "#{page.level} #{page.page_layout}" %>" data-slug="<%= page.slug %>" data-restricted="<%= page.restricted? %>" data-visible="<%= page.visible? %>" data-external="<%= page.redirects_to_external? %>">
+<li id="page_<%= page.id %>" class="page_level_<%= "#{page.level} #{page.page_layout}" %>">
   <div class="sitemap_page<%= page.locked ? ' locked' : '' %>" name="<%= page.name %>">
     <div class="sitemap_left_images">
       <%= sitemap_folder_link(page) unless page.level == 1 || page.children.blank? || @sorting %>

data/lib/alchemy/engine.rb

@@ -19,6 +19,7 @@ require 'alchemy/essence'
 require 'alchemy/ferret/search'
 require 'alchemy/filetypes'
 require 'alchemy/i18n'
+require 'alchemy/language_helpers'
 require 'alchemy/logger'
 require 'alchemy/modules'
 require 'alchemy/mount_point'
@@ -73,5 +74,9 @@ module Alchemy
       Alchemy::Auth::Engine.get_instance.load(File.join(File.dirname(__FILE__), '../..', 'config/authorization_rules.rb'))
     end
 
+    config.to_prepare do
+      ApplicationController.send(:include, Alchemy::LanguageHelpers)
+    end
+
   end
 end

data/lib/alchemy/language_helpers.rb

@@ -0,0 +1,55 @@
+module Alchemy
+  module LanguageHelpers
+    def self.included(controller)
+      controller.send(:before_filter, :set_language)
+    end
+
+    private
+
+    # Sets the language for rendering pages in pages controller.
+    #
+    def set_language(lang = nil)
+      if lang
+        @language = lang.is_a?(Language) ? lang : load_language_from(lang)
+      else
+        # find the best language and remember it for later
+        @language = load_language_from_params ||
+                    load_language_from_session ||
+                    load_language_default
+      end
+
+      # store language in session
+      store_language_in_session(@language)
+
+      # switch locale to selected language
+      ::I18n.locale = @language.code
+    end
+
+    def load_language_from_params
+      if params[:lang].present?
+        Language.find_by_code(params[:lang])
+      end
+    end
+
+    def load_language_from_session
+      if session[:language_id].present?
+        Language.find_by_id(session[:language_id])
+      end
+    end
+
+    def load_language_from(language_code_or_id)
+      Language.find_by_id(language_code_or_id) || Language.find_by_code(language_code_or_id)
+    end
+
+    def load_language_default
+      Language.get_default || raise(DefaultLanguageNotFoundError)
+    end
+
+    def store_language_in_session(language)
+      if language && language.id
+        session[:language_id]   = language.id
+        session[:language_code] = language.code
+      end
+    end
+  end
+end

data/lib/alchemy/version.rb

@@ -1,7 +1,9 @@
 module Alchemy
-  VERSION = "2.7.5"
+
+  VERSION = "2.8.1"
 
   def self.version
     VERSION
   end
+
 end

data/spec/controllers/admin/pages_controller_spec.rb

@@ -55,95 +55,6 @@ module Alchemy
       end
     end
 
-    describe '#order' do
-      let(:page_1)       { FactoryGirl.create(:page, visible: true) }
-      let(:page_2)       { FactoryGirl.create(:page, visible: true) }
-      let(:page_3)       { FactoryGirl.create(:page, visible: true) }
-      let(:page_item_1)  { {id: page_1.id, slug: page_1.slug, restricted: false, external: page_1.redirects_to_external?, visible: page_1.visible?, children: [page_item_2]} }
-      let(:page_item_2)  { {id: page_2.id, slug: page_2.slug, restricted: false, external: page_2.redirects_to_external?, visible: page_2.visible?, children: [page_item_3]} }
-      let(:page_item_3)  { {id: page_3.id, slug: page_3.slug, restricted: false, external: page_3.redirects_to_external?, visible: page_3.visible? } }
-      let(:set_of_pages) { [page_item_1] }
-
-      it "stores the new order" do
-        xhr :post, :order, set: set_of_pages.to_json
-        page_1.reload
-        expect(page_1.descendants).to eq([page_2, page_3])
-      end
-
-      context 'with url nesting enabled' do
-        before { Alchemy::Config.stub(get: true) }
-
-        it "updates the pages urlnames" do
-          xhr :post, :order, set: set_of_pages.to_json
-          [page_1, page_2, page_3].map(&:reload)
-          expect(page_1.urlname).to eq("#{page_1.slug}")
-          expect(page_2.urlname).to eq("#{page_1.slug}/#{page_2.slug}")
-          expect(page_3.urlname).to eq("#{page_1.slug}/#{page_2.slug}/#{page_3.slug}")
-        end
-
-        context 'with invisible page in tree' do
-          let(:page_item_2) do
-            {
-              id: page_2.id,
-              slug: page_2.slug,
-              children: [page_item_3],
-              visible: false
-            }
-          end
-
-          it "does not use this pages slug in urlnames of descendants" do
-            xhr :post, :order, set: set_of_pages.to_json
-            [page_1, page_2, page_3].map(&:reload)
-            expect(page_1.urlname).to eq("#{page_1.slug}")
-            expect(page_2.urlname).to eq("#{page_1.slug}/#{page_2.slug}")
-            expect(page_3.urlname).to eq("#{page_1.slug}/#{page_3.slug}")
-          end
-        end
-
-        context 'with external page in tree' do
-          let(:page_item_2) do
-            {
-              id: page_2.id,
-              slug: page_2.slug,
-              children: [page_item_3],
-              external: true
-            }
-          end
-
-          it "does not use this pages slug in urlnames of descendants" do
-            xhr :post, :order, set: set_of_pages.to_json
-            [page_1, page_2, page_3].map(&:reload)
-            expect(page_3.urlname).to eq("#{page_1.slug}/#{page_3.slug}")
-          end
-        end
-
-        context 'with restricted page in tree' do
-          let(:page_2) { FactoryGirl.create(:page, restricted: true) }
-          let(:page_item_2) do
-            {
-              id: page_2.id,
-              slug: page_2.slug,
-              children: [page_item_3],
-              restricted: true
-            }
-          end
-
-          it "updates restricted status of descendants" do
-            xhr :post, :order, set: set_of_pages.to_json
-            page_3.reload
-            expect(page_3.restricted).to be_true
-          end
-        end
-
-        it "creates legacy urls" do
-          xhr :post, :order, set: set_of_pages.to_json
-          [page_2, page_3].map(&:reload)
-          expect(page_2.legacy_urls.size).to eq(1)
-          expect(page_3.legacy_urls.size).to eq(1)
-        end
-      end
-    end
-
     describe "#configure" do
       render_views
 

data/spec/models/page_spec.rb

@@ -1117,124 +1117,6 @@ module Alchemy
       end
     end
 
-    describe "#update_node!" do
-
-      let(:original_url) { "sample-url" }
-      let(:page) { FactoryGirl.create(:page, :language => language, :parent_id => language_root.id, :urlname => original_url, restricted: false) }
-      let(:node) { TreeNode.new(10, 11, 12, 13, "another-url", true) }
-
-      context "when nesting is enabled" do
-        before { Alchemy::Config.stub(:get).with(:url_nesting) { true } }
-
-        context "when page is not external" do
-
-          before { page.stub(redirects_to_external?: false)}
-
-          it "should update all attributes" do
-            page.update_node!(node)
-            page.reload
-            expect(page.lft).to eq(node.left)
-            expect(page.rgt).to eq(node.right)
-            expect(page.parent_id).to eq(node.parent)
-            expect(page.depth).to eq(node.depth)
-            expect(page.urlname).to eq(node.url)
-            expect(page.restricted).to eq(node.restricted)
-          end
-
-          context "when url is the same" do
-            let(:node) { TreeNode.new(10, 11, 12, 13, original_url, true) }
-
-            it "should not create a legacy url" do
-              page.update_node!(node)
-              page.reload
-              expect(page.legacy_urls.size).to eq(0)
-            end
-          end
-
-          context "when url is not the same" do
-            it "should create a legacy url" do
-              page.update_node!(node)
-              page.reload
-              expect(page.legacy_urls.size).to eq(1)
-            end
-          end
-        end
-
-        context "when page is external" do
-
-          before { page.stub(redirects_to_external?: true) }
-
-          it "should update all attributes except url" do
-            page.update_node!(node)
-            page.reload
-            expect(page.lft).to eq(node.left)
-            expect(page.rgt).to eq(node.right)
-            expect(page.parent_id).to eq(node.parent)
-            expect(page.depth).to eq(node.depth)
-            expect(page.urlname).to eq(original_url)
-            expect(page.restricted).to eq(node.restricted)
-          end
-
-          it "should not create a legacy url" do
-            page.update_node!(node)
-            page.reload
-            expect(page.legacy_urls.size).to eq(0)
-          end
-        end
-      end
-
-      context "when nesting is disabled" do
-        before { Alchemy::Config.stub(:get).with(:url_nesting) { false } }
-
-        context "when page is not external" do
-
-          before { page.stub(redirects_to_external?: false)}
-
-          it "should update all attributes except url" do
-            page.update_node!(node)
-            page.reload
-            expect(page.lft).to eq(node.left)
-            expect(page.rgt).to eq(node.right)
-            expect(page.parent_id).to eq(node.parent)
-            expect(page.depth).to eq(node.depth)
-            expect(page.urlname).to eq(original_url)
-            expect(page.restricted).to eq(node.restricted)
-          end
-
-          it "should not create a legacy url" do
-            page.update_node!(node)
-            page.reload
-            expect(page.legacy_urls.size).to eq(0)
-          end
-
-        end
-
-        context "when page is external" do
-
-          before { page.stub(redirects_to_external?: true) }
-
-          before { Alchemy::Config.stub(get: true) }
-
-          it "should update all attributes except url" do
-            page.update_node!(node)
-            page.reload
-            expect(page.lft).to eq(node.left)
-            expect(page.rgt).to eq(node.right)
-            expect(page.parent_id).to eq(node.parent)
-            expect(page.depth).to eq(node.depth)
-            expect(page.urlname).to eq(original_url)
-            expect(page.restricted).to eq(node.restricted)
-          end
-
-          it "should not create a legacy url" do
-            page.update_node!(node)
-            page.reload
-            expect(page.legacy_urls.size).to eq(0)
-          end
-        end
-      end
-    end
-
     describe '#slug' do
       context "with parents path saved in urlname" do
         let(:page) { FactoryGirl.build(:page, urlname: 'root/parent/my-name')}

data/spec/spec_helper.rb

@@ -33,11 +33,6 @@ Capybara.default_selector = :css
 Capybara.register_driver(:rack_test_translated_header) do |app|
   Capybara::RackTest::Driver.new(app, :headers => { 'HTTP_ACCEPT_LANGUAGE' => 'de' })
 end
-if ENV['CI']
-  Capybara.register_driver :poltergeist do |app|
-    Capybara::Poltergeist::Driver.new(app, timeout: 60)
-  end
-end
 Capybara.javascript_driver = :poltergeist
 
 # Load support files
@@ -53,32 +48,15 @@ RSpec.configure do |config|
   config.include Devise::TestHelpers, :type => :controller
   config.include Alchemy::Specs::ControllerHelpers, :type => :controller
   config.include Alchemy::Specs::IntegrationHelpers, :type => :feature
-  config.use_transactional_fixtures = false
-
+  config.use_transactional_fixtures = true
+  # Make sure the database is clean and ready for test
   config.before(:suite) do
-    DatabaseCleaner.clean_with(:truncation)
+    truncate_all_tables
     Alchemy::Seeder.seed!
   end
-
-  # All specs are running in transactions, but feature specs not.
+  # Ensuring that the locale is always resetted to :en before running any tests
   config.before(:each) do
     Alchemy::Site.current = nil
     ::I18n.locale = :en
-    if example.metadata[:type] == :feature
-      DatabaseCleaner.strategy = :truncation
-    else
-      DatabaseCleaner.strategy = :transaction
-    end
-    DatabaseCleaner.start
-  end
-
-  # After each spec the database gets cleaned. (via rollback or truncate for feature specs)
-  # After every feature spec the database gets seeded so the next spec can rely on that data.
-  config.append_after(:each) do
-    DatabaseCleaner.clean
-    if example.metadata[:type] == :feature
-      Alchemy::Seeder.stub(:puts)
-      Alchemy::Seeder.seed!
-    end
   end
 end

data/spec/support/alchemy/integration_helpers.rb

@@ -60,20 +60,6 @@ module Alchemy
         FactoryGirl.create(:admin_user)
       end
 
-      # Capybara actions to create a new element.
-      #
-      # You can pass the name of the desired element, or just use the default "Article".
-      #
-      def create_element!(name = 'Article')
-        within '.alchemy-elements-window' do
-          click_link Alchemy::I18n.t('New Element')
-        end
-        within '.new_alchemy_element' do
-          select(name, from: 'element[name]')
-          click_button 'Add'
-        end
-      end
-
     end
 
   end

data/spec/support/alchemy/test_tweaks.rb

@@ -0,0 +1,31 @@
+# https://gist.github.com/mperham/3049152
+# Fixes Capybara database connection issues
+class ActiveRecord::Base
+  mattr_accessor :shared_connection
+  @@shared_connection = nil
+
+  def self.connection
+    @@shared_connection || ConnectionPool::Wrapper.new(:size => 1) { retrieve_connection }
+  end
+end
+ActiveRecord::Base.shared_connection = ActiveRecord::Base.connection
+
+# fast truncation of all tables that need truncations (select is 10x faster then truncate)
+# http://grosser.it/2012/07/03/rubyactiverecord-fastest-way-to-truncate-test-database/
+def truncate_all_tables
+  config = ActiveRecord::Base.configurations[::Rails.env]
+  connection = ActiveRecord::Base.connection
+  connection.disable_referential_integrity do
+    connection.tables.each do |table_name|
+      next if connection.select_value("SELECT count(*) FROM #{table_name}") == 0
+      case config["adapter"]
+        when "mysql2", "postgresql"
+          connection.execute("TRUNCATE #{table_name}")
+        when "sqlite3"
+          connection.execute("DELETE FROM #{table_name}")
+          connection.execute("DELETE FROM sqlite_sequence where name='#{table_name}'")
+      end
+    end
+    connection.execute("VACUUM") if config["adapter"] == "sqlite3"
+  end
+end

data/vendor/assets/javascripts/jquery_plugins/jquery.ui.nestedSortable.js

@@ -255,14 +255,8 @@
 
       function _recursiveItems(li) {
         var id = ($(li).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
-
-        var restricted = $(li).data("restricted");
-        var slug = $(li).data("slug");
-        var external = $(li).data("external");
-        var visible = $(li).data("visible");
-
         if (id) {
-          var item = {"id": id[2], "slug": slug, "restricted": restricted, "external": external, "visible": visible};
+          var item = {"id":id[2]};
           if ($(li).children(o.listType).children('li').length > 0) {
             item.children = [];
             $(li).children(o.listType).children('li').each(function () {
@@ -397,4 +391,4 @@
   }));
 
   $.ui.nestedSortable.prototype.options = $.extend({}, $.ui.sortable.prototype.options, $.ui.nestedSortable.prototype.options);
-})(jQuery);
+})(jQuery);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.7.5
+  version: 2.8.1
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -551,7 +551,6 @@ files:
 - app/models/alchemy/site.rb
 - app/models/alchemy/site/layout.rb
 - app/models/alchemy/tag.rb
-- app/models/alchemy/tree_node.rb
 - app/models/alchemy/user.rb
 - app/sweepers/alchemy/content_sweeper.rb
 - app/sweepers/alchemy/pages_sweeper.rb
@@ -787,6 +786,7 @@ files:
 - lib/alchemy/filetypes.rb
 - lib/alchemy/i18n.rb
 - lib/alchemy/kaminari/scoped_pagination_url_helper.rb
+- lib/alchemy/language_helpers.rb
 - lib/alchemy/logger.rb
 - lib/alchemy/modules.rb
 - lib/alchemy/mount_point.rb
@@ -918,8 +918,6 @@ files:
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
 - spec/fast_specs.rb
-- spec/features/admin/element_create_feature_spec.rb
-- spec/features/admin/element_trash_feature_spec.rb
 - spec/features/admin/link_overlay_spec.rb
 - spec/features/admin/modules_integration_spec.rb
 - spec/features/admin/pages_controller_spec.rb
@@ -991,6 +989,7 @@ files:
 - spec/support/alchemy/controller_hacks.rb
 - spec/support/alchemy/controller_helpers.rb
 - spec/support/alchemy/integration_helpers.rb
+- spec/support/alchemy/test_tweaks.rb
 - spec/support/ci/install_phantomjs
 - spec/support/factories.rb
 - spec/support/image with spaces.png
@@ -1211,8 +1210,6 @@ test_files:
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
 - spec/fast_specs.rb
-- spec/features/admin/element_create_feature_spec.rb
-- spec/features/admin/element_trash_feature_spec.rb
 - spec/features/admin/link_overlay_spec.rb
 - spec/features/admin/modules_integration_spec.rb
 - spec/features/admin/pages_controller_spec.rb
@@ -1284,6 +1281,7 @@ test_files:
 - spec/support/alchemy/controller_hacks.rb
 - spec/support/alchemy/controller_helpers.rb
 - spec/support/alchemy/integration_helpers.rb
+- spec/support/alchemy/test_tweaks.rb
 - spec/support/ci/install_phantomjs
 - spec/support/factories.rb
 - spec/support/image with spaces.png

data/app/models/alchemy/tree_node.rb

@@ -1,4 +0,0 @@
-module Alchemy
-  class TreeNode < Struct.new(:left, :right, :parent, :depth, :url, :restricted)
-  end
-end

data/spec/features/admin/element_create_feature_spec.rb

@@ -1,18 +0,0 @@
-require 'spec_helper'
-
-describe 'element create feature', js: true do
-  let(:a_page) { FactoryGirl.create(:page) }
-
-  before do
-    authorize_as_admin
-    visit edit_admin_page_path(a_page)
-    expect(page).to have_no_selector('.alchemy-elements-window .element_editor')
-  end
-
-  it "adds a new element to the list" do
-    create_element!
-    expect(page).to have_no_selector(".spinner") # wait until spinner disappears
-    expect(page).to have_selector(".element_editor", count: 1)
-  end
-end
-

data/spec/features/admin/element_trash_feature_spec.rb

@@ -1,21 +0,0 @@
-require 'spec_helper'
-
-describe "element trash feature", js: true do
-  let(:a_page) { FactoryGirl.create(:page) }
-
-  before do
-    authorize_as_admin
-    visit edit_admin_page_path(a_page)
-    create_element! # We want to trash an article element later because it contains a richtext essence
-    expect(page).to have_no_selector(".spinner") # wait until spinner disappears
-  end
-
-  it "removes an element from the list" do
-    expect(page).to have_selector(".element_editor", count: 1)
-    within ".alchemy-elements-window .element_editor:first" do
-      click_link Alchemy::I18n.t("trash element")
-    end
-    expect(page).to have_content Alchemy::I18n.t('Element trashed')
-    expect(page).to have_no_selector(".element_editor")
-  end
-end