alchemy_cms 3.6.3 → 3.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b9e2cce85c52ff12e282cbcd0e4ec72f6b1deb4b
-  data.tar.gz: 47c0b0562f11648f2b262857034e2f1ecd9e2069
+SHA256:
+  metadata.gz: bc38eb1620f05d2aaafa52297a22bb6242829a446e9053173e028f877edac69e
+  data.tar.gz: 5d8d89491e025c49c278e18f8d53e0fc9e93ce93122fe4f05206ff6233d16bcc
 SHA512:
-  metadata.gz: 264fb1b76ecb285e940f1951d99ea57a53879f6d346d5b050ea96fd74fe2f45e68da13219fac61f532ad102d6600f3ef38bae1bd500ae620a34f0980d10acaa9
-  data.tar.gz: 6968929958734e0ed852a9b0f182de6b5123445f32a98a24821be2f5ed472eeb883d580c41cfd28ee9c6b5525059df0f596fed0e7e2109f1e47b053f1e0ce737
+  metadata.gz: 13e0ce03b2791c0baa8f81a3e23a85db40f67685b9b1326493fcdcd9287588bf26bfef545db394f6b44a1a08c9e1fd786624648b7c0531fb66db88f5034d35e8
+  data.tar.gz: 0c85045599a7282c7cf1b80618c78f05f4aff1cd1b2a05381c81163ad35878be6d9dd882976ca1698131c2d13c1e47ff5750ab904f3379fd97ad77b1a8af0c3f

data/Gemfile

@@ -7,7 +7,7 @@ gem 'rack-mini-profiler', group: :development, require: false
 
 gem 'sqlite3' if ENV['DB'].nil? || ENV['DB'] == 'sqlite'
 gem 'mysql2', '~> 0.3.18' if ENV['DB'] == 'mysql'
-gem 'pg'      if ENV['DB'] == 'postgresql'
+gem 'pg',     '~> 0.21'   if ENV['DB'] == 'postgresql'
 gem 'sassc-rails'
 
 group :development, :test do

data/app/models/alchemy/cell.rb

@@ -56,7 +56,7 @@ module Alchemy
       private
 
       def read_yml_file
-        ::YAML.safe_load(ERB.new(File.read(yml_file_path)).result, [], [], true) || []
+        ::YAML.safe_load(ERB.new(File.read(yml_file_path)).result, YAML_WHITELIST_CLASSES, [], true) || []
       end
 
       def yml_file_path

data/app/models/alchemy/element/definitions.rb

@@ -26,7 +26,7 @@ module Alchemy
       #
       def read_definitions_file
         if ::File.exist?(definitions_file_path)
-          ::YAML.safe_load(ERB.new(File.read(definitions_file_path)).result, [Regexp, Date], [], true) || []
+          ::YAML.safe_load(ERB.new(File.read(definitions_file_path)).result, YAML_WHITELIST_CLASSES, [], true) || []
         else
           raise LoadError, "Could not find elements.yml file! Please run `rails generate alchemy:scaffold`"
         end

data/lib/alchemy/config.rb

@@ -46,7 +46,8 @@ module Alchemy
       # If it does not exist, or its empty, it returns an empty Hash.
       #
       def read_file(file)
-        return YAML.load_file(file) || {} if File.exist?(file) # YAML.load_file returns false if file is empty.
+        YAML.safe_load(ERB.new(File.read(file)).result, YAML_WHITELIST_CLASSES, [], true) || {}
+      rescue Errno::ENOENT
         {}
       end
 

data/lib/alchemy/page_layout.rb

@@ -157,7 +157,7 @@ module Alchemy
       #
       def read_definitions_file
         if File.exist?(layouts_file_path)
-          YAML.safe_load(ERB.new(File.read(layouts_file_path)).result, [Date], [], true) || []
+          YAML.safe_load(ERB.new(File.read(layouts_file_path)).result, YAML_WHITELIST_CLASSES, [], true) || []
         else
           raise LoadError, "Could not find page_layouts.yml file! Please run `rails generate alchemy:scaffold`"
         end

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
-  VERSION = "3.6.3"
+  VERSION = "3.6.4"
 
   def self.version
     VERSION

data/lib/alchemy_cms.rb

@@ -1,5 +1,6 @@
 # Instantiate the global Alchemy namespace
 module Alchemy
+  Alchemy::YAML_WHITELIST_CLASSES = %w(Symbol Date Regexp)
 end
 
 # Require globally used external libraries

data/lib/rails/generators/alchemy/base.rb

@@ -32,7 +32,7 @@ module Alchemy
       end
 
       def load_alchemy_yaml(name)
-        YAML.safe_load(ERB.new(File.read("#{Rails.root}/config/alchemy/#{name}")).result, [Regexp], [], true)
+        YAML.safe_load(ERB.new(File.read("#{Rails.root}/config/alchemy/#{name}")).result, YAML_WHITELIST_CLASSES, [], true)
       rescue Errno::ENOENT
         puts "\nERROR: Could not read config/alchemy/#{name} file. Please run: rails generate alchemy:scaffold"
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 3.6.3
+  version: 3.6.4
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-24 00:00:00.000000000 Z
+date: 2018-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -995,7 +995,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails 4