alchemy_cms 2.9.0 → 2.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b424447a096b31e81ed5a0d290b0ad668337b5b8
-  data.tar.gz: a7eefe0821effccdd65312b9ac99573ad0784f7f
+  metadata.gz: 3cea20dd64fa70cb769c8efaed115271f6299ac2
+  data.tar.gz: 7765f71df28daf51b5605c9729b88a63a06470c5
 SHA512:
-  metadata.gz: f2b2833ceef66d2a76b6512430f076f6133da8472e9456712d69b3c7f7b0c1531f76f9babbf3d516cbc0e0dd3318aa770ea233099ff20f5b73787ce9bb8587d0
-  data.tar.gz: 4eed6223c08ea0903cd629998c681c5d9117098e69866fccab2e92ff6354663c0b6dbdb68281c38f4c953712b940f2e42557df745b3363c063631fd06035f4d0
+  metadata.gz: bc35cce02f544a78c3166f8dc6d6a4957b0534eb0bc910a570c0417ad2a9ac17935fe81c229b7edd1b50cad26b4c613e813544ac49f3cbc46187e0fd44cd2174
+  data.tar.gz: 8e3a5e4faa7efe8f93b594dd93452fd6d1513c68022f4f5b32ba2b9da48ee4b48373d96d666899063b568db2d640c09189a3beb264f6459c77936bad6e8a72cf

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

@@ -83,16 +83,17 @@ module Alchemy
       end
 
       def order
-        @trashed_elements = []
-        params[:element_ids].each do |element_id|
-          element = Element.find(element_id)
-          if element.trashed?
-            element.page_id = params[:page_id]
-            element.cell_id = params[:cell_id]
-            element.insert_at
-            @trashed_elements << element
+        @trashed_elements = Element.trashed.where(id: params[:element_ids]).pluck(:id)
+        Element.transaction do
+          params[:element_ids].each_with_index do |element_id, idx|
+            # Ensure to set page_id and cell_id to the current page and
+            # cell because of trashed elements could still have old values
+            Element.where(id: element_id).update_all(
+              page_id: params[:page_id],
+              cell_id: params[:cell_id],
+              position: idx + 1
+            )
           end
-          element.move_to_bottom
         end
       end
 

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

@@ -309,7 +309,7 @@ module Alchemy
       #   A children node
       #
       def process_url(ancestors_path, item)
-        default_urlname = (ancestors_path.blank? ? "" : "#{ancestors_path}/") + item['slug']
+        default_urlname = (ancestors_path.blank? ? "" : "#{ancestors_path}/") + item['slug'].to_s
 
         pair = {my_urlname: default_urlname, children_path: default_urlname}
 

data/lib/alchemy/tasks/helpers.rb

@@ -12,12 +12,10 @@ module Alchemy
 
       def database_config
         raise "Could not find #{database_config_file}!" if !File.exists?(database_config_file)
-        @database_config ||= begin
-          config_file = YAML.load_file(database_config_file)
-          config_file.fetch(environment)
-          rescue KeyError
-            raise "Database configuration for #{environment} not found!"
-        end
+        config_file = YAML.load_file(database_config_file)
+        config_file.fetch(environment)
+      rescue KeyError
+        raise "Database configuration for #{environment} not found!"
       end
 
       private

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
-  VERSION = "2.9.0"
+  VERSION = "2.9.1"
 
   def self.version
     VERSION

data/spec/controllers/admin/elements_controller_spec.rb

@@ -106,32 +106,48 @@ module Alchemy
 
     end
 
-    describe "untrashing" do
-
-      before(:each) do
-        @element = FactoryGirl.create(:element, :public => false, :position => nil, :page_id => 58, :cell_id => 32)
-        # Because of a before_create filter it can not be created with a nil position and needs to be trashed here
-        @element.trash!
+    describe "#order" do
+      let(:element_1)   { FactoryGirl.create(:element) }
+      let(:element_2)   { FactoryGirl.create(:element) }
+      let(:element_3)   { FactoryGirl.create(:element) }
+      let(:element_ids) { [element_1.id, element_3.id, element_2.id] }
+
+      it "sets new position for given element ids" do
+        xhr :post, :order, element_ids: element_ids
+        expect(Element.scoped.pluck(:id)).to eq(element_ids)
       end
 
-      it "should set a new position to the element" do
-        post :order, {:element_ids => ["#{@element.id}"], :format => :js}
-        @element.reload
-        @element.position.should_not == nil
-      end
+      context "untrashing" do
+        let(:trashed_element) { FactoryGirl.create(:element, public: false, position: nil, page_id: 58, cell_id: 32) }
 
-      it "should assign the (new) page_id to the element" do
-        post :order, {:element_ids => ["#{@element.id}"], :page_id => 1, :cell_id => nil, :format => :js}
-        @element.reload
-        @element.page_id.should == 1
-      end
+        before do
+          # Because of a before_create filter it can not be created with a nil position and needs to be trashed here
+          trashed_element.trash!
+        end
 
-      it "should assign the (new) cell_id to the element" do
-        post :order, {:element_ids => ["#{@element.id}"], :page_id => 1, :cell_id => 5, :format => :js}
-        @element.reload
-        @element.cell_id.should == 5
-      end
+        it "sets a list of trashed element ids" do
+          xhr :post, :order, element_ids: [trashed_element.id]
+          expect(assigns(:trashed_elements).to_a).to eq [trashed_element.id]
+        end
 
+        it "should set a new position to the element" do
+          xhr :post, :order, element_ids: [trashed_element.id]
+          trashed_element.reload
+          trashed_element.position.should_not == nil
+        end
+
+        it "should assign the (new) page_id to the element" do
+          xhr :post, :order, element_ids: [trashed_element.id], page_id: 1, cell_id: nil
+          trashed_element.reload
+          trashed_element.page_id.should == 1
+        end
+
+        it "should assign the (new) cell_id to the element" do
+          xhr :post, :order, element_ids: [trashed_element.id], page_id: 1, cell_id: 5
+          trashed_element.reload
+          trashed_element.cell_id.should == 5
+        end
+      end
     end
 
     describe '#new' do

data/spec/controllers/admin/pages_controller_spec.rb

@@ -140,6 +140,24 @@ module Alchemy
           end
         end
 
+        context 'with page having number as slug' do
+          let(:page_item_2) do
+            {
+              id: page_2.id,
+              slug: 42,
+              children: [page_item_3]
+            }
+          end
+
+          it "does not raise error" do
+            expect {
+              xhr :post, :order, set: set_of_pages.to_json
+            }.to_not raise_error(TypeError)
+            [page_1, page_2, page_3].map(&:reload)
+            expect(page_3.urlname).to eq("#{page_1.slug}/#{page_2.slug}/#{page_3.slug}")
+          end
+        end
+
         it "creates legacy urls" do
           xhr :post, :order, set: set_of_pages.to_json
           [page_2, page_3].map(&:reload)

data/spec/features/pages_controller_spec.rb

@@ -247,5 +247,16 @@ module Alchemy
 
     end
 
+    context "with invalid byte code char in urlname parameter" do
+      it "should render page not found" do
+        begin
+          visit '/%ed'
+          page.status_code.should == 404
+        rescue ArgumentError
+          # capturing the invalid byte sequence in UTF-8 error
+        end
+      end
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.9.1
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-16 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1099,7 +1099,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails 3