alchemy_cms 3.1.0.beta6 → 3.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee349e3c1603a85fa273cfbb168e88190db26c8f
-  data.tar.gz: c3288e7a9f128291320f6646dd41ab78f65f23ea
+  metadata.gz: 90a343fa98a444500a06cfbaa172e6bb8c6b4856
+  data.tar.gz: fc1c96763f1a10a0938f54057b5bdc04f81dc002
 SHA512:
-  metadata.gz: a4b86afe18307827a65c0ecff2894ac39df62a39430d8c9da38d455a49ace528caf9a94b0b91b7e93477a2188ea407c21c700f161ac067e11b26411481f6e5f1
-  data.tar.gz: 52dcf130529e8494da6e49babc0ab1bed1ce6e752aea27aaadce37081dee615892f62c4f5ff4cccd3ae00bf32de1ea4e7b001beb848ca08f6d022428a91a1d44
+  metadata.gz: 910b2641a2a94dfd31289b4f3d41f13e5b02f2ae1e543a1f4dc30627c9451500c9e34510058be064fa53de2c576b9bd770ed07f479bc69c0323b479e97c5fa92
+  data.tar.gz: f05aac4f401eb397193dbb5a07a22e279fdb2cae66165b8ca7033e0f2415074f42d0d91e12588c2e44d8f7b2108fa25e1f3fbc62d7e7ce696cff23097778688c

data/app/models/alchemy/element.rb

@@ -269,7 +269,8 @@ module Alchemy
     def update_contents(contents_attributes)
       return true if contents_attributes.nil?
       contents.each do |content|
-        content.update_essence(contents_attributes["#{content.id}"]) || errors.add(:base, :essence_validation_failed)
+        content_hash = contents_attributes["#{content.id}"] || next
+        content.update_essence(content_hash) || errors.add(:base, :essence_validation_failed)
       end
       errors.blank?
     end

data/lib/alchemy/mount_point.rb

@@ -1,3 +1,5 @@
+require 'rails'
+
 module Alchemy
 
   # Utilities for Alchemy's mount point in the host rails app.
@@ -34,7 +36,11 @@ module Alchemy
       private
 
       def routes_file_path
-        Rails.root.join('config/routes.rb')
+        if Rails.root
+          Rails.root.join('config/routes.rb')
+        else
+          'config/routes.rb'
+        end
       end
     end
   end

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
-  VERSION = "3.1.0.beta6"
+  VERSION = "3.1.0.rc1"
 
   def self.version
     VERSION

data/spec/models/element_spec.rb

@@ -411,11 +411,12 @@ module Alchemy
     describe '#update_contents' do
       subject { element.update_contents(params) }
 
-      let(:page)    { build_stubbed(:page) }
-      let(:element) { build_stubbed(:element, page: page) }
-      let(:content) { double(:content, id: 1) }
+      let(:page)     { build_stubbed(:page) }
+      let(:element)  { build_stubbed(:element, page: page) }
+      let(:content1) { double(:content, id: 1) }
+      let(:content2) { double(:content, id: 2) }
 
-      before { allow(element).to receive(:contents).and_return([content]) }
+      before { allow(element).to receive(:contents).and_return([content1]) }
 
       context "with attributes hash is nil" do
         let(:params) { nil }
@@ -423,19 +424,36 @@ module Alchemy
       end
 
       context "with valid attributes hash" do
-        let(:params) { {"#{content.id}" => {body: 'Title'}} }
+        let(:params) { {"#{content1.id}" => {body: 'Title'}} }
+
+        context 'when certain content is not part of the attributes hash (cause it was not filled by the user)' do
+          before do
+            allow(element).to receive(:contents).and_return([content1, content2])
+          end
+
+          it 'does not try to update that content' do
+            expect(content1).to receive(:update_essence).with({body: 'Title'}).and_return(true)
+            expect(content2).to_not receive(:update_essence)
+            subject
+          end
+        end
 
         context 'with passing validations' do
           before do
-            expect(content).to receive(:update_essence).with({body: 'Title'}).and_return(true)
+            expect(content1).to receive(:update_essence).with({body: 'Title'}).and_return(true)
           end
 
           it { is_expected.to be_truthy }
+
+          it "does not add errors" do
+            subject
+            expect(element.errors).to be_empty
+          end
         end
 
         context 'with failing validations' do
           it "adds error and returns false" do
-            expect(content).to receive(:update_essence).with({body: 'Title'}).and_return(false)
+            expect(content1).to receive(:update_essence).with({body: 'Title'}).and_return(false)
             is_expected.to be_falsey
             expect(element.errors).not_to be_empty
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 3.1.0.beta6
+  version: 3.1.0.rc1
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack-page_caching