alchemy_cms 2.6.2.1 → 2.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 948d15555a14793226d6299ec3ff46b2140554d9
-  data.tar.gz: d36b05919165ec6d164865c451ef078af3b151b7
+  metadata.gz: 2c1c44138b3e7be76b6a952789f4b54045aa8f8a
+  data.tar.gz: c8cd62e435145ef96d4b874ad68b840cbdf8524c
 SHA512:
-  metadata.gz: af33ea6919a6859b03b41905e02c3dd5edf8ac9095efb4f1af077722b6e7dbcf3631201c5a35035370e20a63420c331125995d16b9bfb99bf3dff5cec66b97fe
-  data.tar.gz: cd84e726b6a0cab16516220b7275771c22622661fb33b217f6536ff25d50dacc52594dfae60cb90428cbb4f673be9931820fd043c9ecb25e293ac35c4a747666
+  metadata.gz: 3f3bde0e560a5c53c7305a6371851e31b2a980dae1b49781e98ec3c1129dcfc2542ae8686cb5e02d13378881e50edbdbf0b315e211236bc23d4407867088bb8b
+  data.tar.gz: 6194a45096869a6ae0faed7e4fdad33c88a326e1505bc716c886388ea33efb6ea0e265dbc0275a76fb2973e21138a17fe577cb135b5472c2c283019311b17f44

data/alchemy_cms.gemspec

@@ -57,7 +57,6 @@ POST_INSTALL
   s.add_development_dependency %q<capybara>,               ['~> 2.0.3']
   s.add_development_dependency %q<factory_girl_rails>
   s.add_development_dependency %q<rspec-rails>,            ['~> 2.13.1']
-  s.add_development_dependency %q<sqlite3>
   s.add_development_dependency %q<yard>
   s.add_development_dependency %q<redcarpet>
 

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

@@ -15,6 +15,7 @@ div#flash_notices {
       top: 2*$default-padding;
       @extend .icon-cross:before;
       font-size: 14px;
+      font-family: 'Alchemy Icons';
     }
   }
 }

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

@@ -208,17 +208,19 @@ 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
-        @page_root = Page.language_root_for(session[:language_id])
-
-        # 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
+        rootpage = Page.language_root_for(session[:language_id])
+
+        tree = create_tree(neworder, rootpage)
+
+        Alchemy::Page.transaction do
+          tree.each do |key, node|
+            dbitem = Page.find(key)
+            dbitem.update_node!(node)
+          end
         end
 
         flash[:notice] = _t("Pages order saved")
@@ -248,25 +250,92 @@ module Alchemy
 
     private
 
-      def load_page
-        @page = Page.find(params[:id])
+      # 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
 
-      def pages_from_raw_request
-        request.raw_post.split('&').map { |i| i = {i.split('=')[0].gsub(/[^0-9]/, '') => i.split('=')[1]} }
+      # 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
 
-      # 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
+      # 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
 
+      def pages_from_raw_request
+        request.raw_post.split('&').map { |i| i = {i.split('=')[0].gsub(/[^0-9]/, '') => i.split('=')[1]} }
+      end
     end
   end
 end

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

@@ -164,7 +164,7 @@ module Alchemy
       def pictures_per_page_for_size(size)
         case size
         when 'small'
-          per_page = in_overlay? ? 37 : (per_page_value_for_screen_size * 2.9).floor
+          per_page = in_overlay? ? 25 : (per_page_value_for_screen_size * 2.9).floor
         when 'large'
           per_page = in_overlay? ? 4 : (per_page_value_for_screen_size / 1.7).floor + 1
         else

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

@@ -27,14 +27,7 @@ module Alchemy
       end
 
       def create
-        @user = User.new(params[:user])
-        if @user.save
-          if @user.role == "registered" && params[:send_credentials]
-            Notifications.registered_user_created(@user).deliver
-          elsif params[:send_credentials]
-            Notifications.admin_user_created(@user).deliver
-          end
-        end
+        @user = User.create(params[:user])
         render_errors_or_redirect(
           @user,
           admin_users_path,
@@ -50,9 +43,6 @@ module Alchemy
         else
           @user.update_without_password(params[:user])
         end
-        if params[:send_credentials]
-          Notifications.admin_user_created(@user).deliver
-        end
         render_errors_or_redirect(
           @user,
           admin_users_path,

data/app/controllers/alchemy/users_controller.rb

@@ -18,9 +18,6 @@ module Alchemy
     def create
       @user = User.new(params[:user])
       if @user.save
-        if params[:send_credentials]
-          Notifications.admin_user_created(@user).deliver
-        end
         flash[:notice] = _t('Successfully signup admin user')
         sign_in :user, @user
         redirect_to admin_dashboard_path

data/app/models/alchemy/page.rb

@@ -54,8 +54,8 @@ module Alchemy
     attr_accessor :do_not_validate_language
 
     before_save :set_language_code, :unless => :systempage?
-    before_save :set_restrictions_to_child_pages, :if => :restricted_changed?, :unless => :systempage?
-    before_save :inherit_restricted_status, :if => proc { parent && parent.restricted? }, :unless => :systempage?
+    before_save :inherit_restricted_status, if: -> { parent && parent.restricted? }, unless: :systempage?
+    after_update :set_restrictions_to_child_pages, unless: :systempage?
     after_update :create_legacy_url, :if => :urlname_changed?, :unless => :redirects_to_external?
 
     scope :language_roots, where(:language_root => true)
@@ -305,14 +305,10 @@ module Alchemy
       self.public_was != self.public
     end
 
+    # Sets my restricted value to all child pages
+    #
     def set_restrictions_to_child_pages
-      descendants.each do |child|
-        child.update_attributes(:restricted => self.restricted?)
-      end
-    end
-
-    def inherit_restricted_status
-      self.restricted = parent.restricted?
+      descendants.update_all(restricted: self.restricted?)
     end
 
     def contains_feed?
@@ -321,7 +317,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
 
     # Returns the first published child
@@ -377,6 +373,25 @@ module Alchemy
       self.save
     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
 
     def next_or_previous(direction = :next, options = {})
@@ -407,5 +422,11 @@ module Alchemy
       legacy_urls.find_or_create_by_urlname(:urlname => urlname_was)
     end
 
+    # Sets my restricted status to parent's restricted status
+    #
+    def inherit_restricted_status
+      self.restricted = parent.restricted?
+    end
+
   end
 end

data/app/models/alchemy/tree_node.rb

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

data/app/models/alchemy/user.rb

@@ -18,11 +18,15 @@ module Alchemy
       :password,
       :password_confirmation,
       :roles,
+      :send_credentials,
       :tag_list
     )
 
+    attr_accessor :send_credentials
+
     has_many :folded_pages
 
+    validates_uniqueness_of :login
     validates_presence_of :roles
 
     # Unlock all locked pages before destroy and before the user gets logged out.
@@ -33,6 +37,8 @@ module Alchemy
       end
     end
 
+    after_save :deliver_welcome_mail, if: -> { send_credentials }
+
     scope :admins, where(arel_table[:roles].matches("%admin%")) # not pleased with that approach
     # mysql regexp word matching would be much nicer, but it's not included in SQLite functions per se.
     # scope :admins, where("#{table_name}.roles REGEXP '[[:<:]]admin[[:>:]]'")
@@ -153,5 +159,15 @@ module Alchemy
       self.class.logged_in_timeout
     end
 
+    # Delivers a welcome mail depending from user's role.
+    #
+    def deliver_welcome_mail
+      if has_role?('author') || has_role?('editor') || has_role?('admin')
+        Notifications.admin_user_created(self).deliver
+      else
+        Notifications.registered_user_created(self).deliver
+      end
+    end
+
   end
 end

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}" %>">
+<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? %>">
   <div class="sitemap_page<%= page.locked ? ' locked' : '' %>" name="<%= page.name %>">
     <div class="sitemap_left_images">
       <%= sitemapFolderLink(page) unless page.children.blank? || @sorting %>

data/app/views/alchemy/admin/resources/_date.html.erb

@@ -0,0 +1,8 @@
+<td class="label"><%= f.label attribute[:name] %></td>
+<td class="input">
+  <%= f.text_field(
+    attribute[:name],
+    type: 'date',
+    value: l(resource_instance_variable.send(attribute[:name]) || Time.now, format: :datepicker)
+  ) %>
+</td>

data/app/views/alchemy/admin/resources/_datetime.html.erb

@@ -1,2 +1 @@
-<td class="label"><%= f.label attribute[:name] %></td>
-<td class="input"><%= f.text_field attribute[:name], :type => :date -%></td>
+<%= render 'date', attribute: attribute, f: f %>

data/app/views/alchemy/admin/users/_table.html.erb

@@ -57,8 +57,8 @@
   <tr>
     <td>&nbsp;</td>
     <td class="checkbox long">
-      <%= check_box_tag('send_credentials', true, @user.new_record?) %>
-      <%= label_tag('send_credentials', _t('Send email with credentials')) %>
+      <%= f.check_box(:send_credentials, checked: @user.new_record?) %>
+      <%= f.label(:send_credentials) %>
     </td>
   </tr>
   <tr>

data/config/locales/alchemy.de.yml

@@ -280,7 +280,6 @@ de:
     "Select all": "Alle auswählen"
     "Select an content": "Wählen Sie einen Inhalt aus"
     "Select style": "Stilvorlage"
-    "Send email with credentials": "Sende Benutzerdaten per Email"
     "Send reset instructions": "Anweisungen senden"
     "Show Elements Window": "Elementeliste anzeigen"
     "Show Preview Window": "Seitenvorschau anzeigen"
@@ -940,6 +939,7 @@ de:
         password_confirmation: "Passwort Bestätigung"
         roles: "Benutzerrollen"
         tag_list: Tags
+        send_credentials: "Sende Benutzerdaten per E-Mail"
 
       alchemy/site:
         name: "Bezeichnung"

data/config/locales/alchemy.en.yml

@@ -674,6 +674,7 @@ en:
         password: "Password"
         password_confirmation: "Password confirmation"
         role: "Userrole"
+        send_credentials: "Send email with credentials"
 
       alchemy/site:
         host: primary Host

data/lib/alchemy/version.rb

@@ -1,6 +1,6 @@
 module Alchemy
 
-  VERSION = "2.6.2.1"
+  VERSION = "2.6.3"
 
   def self.version
     VERSION

data/spec/controllers/admin/pages_controller_spec.rb

@@ -37,6 +37,95 @@ module Alchemy
 
     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