alchemy_cms 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 32cd97a2d51613e7b97f0a369d52fdcea5390b1f
-  data.tar.gz: aa26582f94ed95c780a07773ce7f40c1cca1e391
+SHA256:
+  metadata.gz: a705fbfafc88c6d704d135683860121e0ba587c27e3730db0b99690c39301e4f
+  data.tar.gz: 5e3bd59a9808f2c707570c534304243ea96f1e3f0e5cf3d4403261c00e64aab5
 SHA512:
-  metadata.gz: b95d61495b2bce7683cecbdea814c08673e8688da61f3a690c9fbb6a1ba6560c031e1980377ef7f7e5fff785d334d9c0c7380f6951d4d214c5e4714ceec86f39
-  data.tar.gz: 67022c61db2f6163f64bed4daf2cb5b51001ac424f18581cdf983b5e922db7dfb1c1184a61f819948e9fb8a1643178f1183d8101fda392c7c6db643bd476aede
+  metadata.gz: 95501e7b26788f436d965110aa6c050c5f6b390cf788941411014b3d146f81fd2c75b5ac239dc936b6f07318e8773199476b5b8c4e8c0c9d80a78b0ed47c801d
+  data.tar.gz: ec08999acc7c276fdf275379477977241e24413754a62972d81132ed319b3a1cd58ee5d3e61856a35fc430a88949eb0195a4860410457cd88d70d9b888142a83

data/app/models/alchemy/cell.rb

@@ -58,7 +58,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

@@ -28,7 +28,7 @@ module Alchemy
       #
       def read_definitions_file
         if ::File.exist?(definitions_file_path)
-          ::YAML.safe_load(ERB.new(File.read(definitions_file_path)).result, [Date, Regexp, Symbol], [], 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

@@ -48,7 +48,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

@@ -159,7 +159,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, Symbol], [], 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,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "4.0.0"
+  VERSION = "4.0.1"
 
   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,9 +32,9 @@ 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"
+        puts "\nERROR: Could not read config/alchemy/#{name} file. Please run: `rails generate alchemy:install`"
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-06 00:00:00.000000000 Z
+date: 2018-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -1002,7 +1002,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