alchemy_cms 3.4.0 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aec4c696d9a0d912eacadd6ed08fe1dd67c0d111
-  data.tar.gz: fe8a26eaf78f62e2f7cfdb52996a4d2f4090ba17
+  metadata.gz: d6fc47d58933cda5c1c866649f035dbcecd8bd62
+  data.tar.gz: 8dd063a59cf51bd55d0c0b591c0ab921dbe35152
 SHA512:
-  metadata.gz: 4b7c23ecbd08aa5b0b38d9bdc4950e6f84e11995421a9f1e40a1c8b8f03bfc2d461586cc22cea73a45a047a101d35ad912c905f7cea7bab444fa1b20dfb796d4
-  data.tar.gz: 8733411d7224af839cb461f501efb405433b2c2d08164ab009031cd3acb7aa2d0525c55c540b6878ed44a3e8ca4df15d7767b335a4eef68a8c7e09b839e942ff
+  metadata.gz: b5b9541605a0518258fddbf65dc47c1a2630b0fbb1227fb744dd922466d199060823cf71ad00a633b87c96a759db4f50dbd5d414f8ce77db4fa1cbc6676f0ec6
+  data.tar.gz: 87329505d7091fb39591e2eacd4a0a9859df62bd8317dd92b1fb183b4cbfb5e571a31fe37d05891e12e3e79b74b99189a9511bf28cd672afb352c4788b71ea71

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## 3.4.1 (2016-08-31)
+
+__Fixed Bugs__
+
+* Remove trailing new lines in the AddImageFileFormatToAlchemyPictures migration. (#1107)
+  If you migrated already, use the `alchemy:upgrade:fix_picture_format` rake task.
+* Don't overwrite the fallback options when rendering a picture (#1113)
+* Fixes the messages mailer views generator (#1118)
+
 ## 3.4.0 (2016-08-02)
 
 __New Features__
@@ -44,7 +53,12 @@ __Fixed Bugs__
 * Generators don't delete directories any more (#850)
 * Some elements crashed the backend's JS when being saved (#1091)
 
-## 3.3.2 (unreleased)
+## 3.3.3 (2016-08-31)
+
+* Fix bug that rendered duplicate nested elements within a cell (#1100)
+* Merge `html_options` in EssenceFile view (#1115)
+
+## 3.3.2 (2016-08-02)
 
 * Use relative url for page preview frame in order to prevent cross origin errors (#1076)
 

data/app/models/alchemy/cell.rb

@@ -28,7 +28,7 @@ module Alchemy
     belongs_to :page
     validates_uniqueness_of :name, scope: 'page_id'
     validates_format_of :name, with: /\A[a-z0-9_-]+\z/
-    has_many :elements, -> { order(:position) }, dependent: :destroy
+    has_many :elements, -> { where(parent_element_id: nil).order(:position) }, dependent: :destroy
 
     class << self
       def definitions

data/app/models/alchemy/essence_picture_view.rb

@@ -14,7 +14,7 @@ module Alchemy
 
     def initialize(content, options = {}, html_options = {})
       @content = content
-      @options = DEFAULT_OPTIONS.update(content.settings).update(options)
+      @options = DEFAULT_OPTIONS.merge(content.settings).merge(options)
       @html_options = html_options
       @essence = content.essence
       @picture = essence.picture

data/app/views/alchemy/essences/_essence_file_view.html.erb

@@ -1,5 +1,6 @@
 <%- cache(content) do -%>
 <%- if attachment = content.ingredient -%>
+<%- html_options = local_assigns.fetch(:html_options, {}) -%>
 <%= link_to(
   content.essence.link_text.presence ||
     content.settings_value(:link_text, local_assigns.fetch(:options, {})) ||
@@ -9,8 +10,10 @@
     name: attachment.urlname,
     format: attachment.suffix
   ),
-  class: content.essence.css_class.presence,
-  title: content.essence.title.presence
+  {
+    class: content.essence.css_class.presence,
+    title: content.essence.title.presence
+  }.merge(html_options)
 ) -%>
 <%- end -%>
 <%- end -%>

data/db/migrate/20160422195310_add_image_file_format_to_alchemy_pictures.rb

@@ -6,7 +6,7 @@ class AddImageFileFormatToAlchemyPictures < ActiveRecord::Migration
       Alchemy::Picture.all.each do |pic|
         begin
           format = pic.image_file.identify('-ping -format "%m"')
-          pic.update_column('image_file_format', format.to_s.downcase)
+          pic.update_column('image_file_format', format.to_s.chomp.downcase)
         rescue Dragonfly::Job::Fetch::NotFound => e
           say(e.message, true)
         end

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
-  VERSION = "3.4.0"
+  VERSION = "3.4.1"
 
   def self.version
     VERSION

data/lib/rails/generators/alchemy/views/views_generator.rb

@@ -3,7 +3,7 @@ require 'rails'
 module Alchemy
   module Generators
     class ViewsGenerator < ::Rails::Generators::Base
-      ALCHEMY_VIEWS = %w(breadcrumb language_links messages navigation)
+      ALCHEMY_VIEWS = %w(breadcrumb language_links messages_mailer navigation)
 
       desc "Generates Alchemy views for #{ALCHEMY_VIEWS.to_sentence}."
 

data/lib/tasks/alchemy/upgrade.rake

@@ -22,5 +22,11 @@ namespace :alchemy do
         puts "No upgrades available."
       end
     end
+
+    task fix_picture_format: [:environment] do
+      Alchemy::Picture.find_each do |picture|
+        picture.update_column(:image_file_format, picture.image_file_format.to_s.chomp)
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.1
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-04 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack-page_caching