From c9e68dd8749426078b2c3dd6f8d5ff360a83693c Mon Sep 17 00:00:00 2001 From: Aysar Date: Fri, 30 May 2014 10:02:07 -0400 Subject: [PATCH] Allow :class_name and :defaults flag usage at once --- lib/rails-settings/configuration.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/rails-settings/configuration.rb b/lib/rails-settings/configuration.rb index 7a275e92..dbb4b0b5 100644 --- a/lib/rails-settings/configuration.rb +++ b/lib/rails-settings/configuration.rb @@ -25,7 +25,7 @@ def initialize(*args, &block) def key(name, options={}) raise ArgumentError.new("has_settings: Symbol expected, but got a #{name.class}") unless name.is_a?(Symbol) - raise ArgumentError.new("has_settings: Option :defaults expected, but got #{options.keys.join(', ')}") unless options.blank? || (options.keys == [:defaults]) + raise ArgumentError.new("has_settings: Option :defaults expected, but got #{options.keys.join(', ')}") unless options.blank? || (options.keys == [:defaults,:class_name]) @klass.default_settings[name] = (options[:defaults] || {}).stringify_keys.freeze end end