lib/enum_ish/base.rb in enum_ish-1.5.1 vs lib/enum_ish/base.rb in enum_ish-1.6.0
- old
+ new
@@ -12,14 +12,14 @@
class_attribute :_enum_ish_enums
self._enum_ish_enums = {}
end
class_methods do
- def enum_ish(name, map, config = {})
- enum = Enum.new(name, map, config)
+ def enum_ish(name, map, setting = {})
+ enum = Enum.new(name, map, Config.defaults.merge(setting))
self._enum_ish_enums = _enum_ish_enums.merge(name.to_sym => enum)
- if defined?(ActiveRecord::Base) && self.ancestors.include?(ActiveRecord::Base)
+ if defined?(ActiveRecord::Base) && ancestors.include?(ActiveRecord::Base)
ActiveRecordDefiner.new(self).define(enum)
else
Definer.new(self).define(enum)
end
end