From 8264701355ef2fffa194732f6318a9ca180216d6 Mon Sep 17 00:00:00 2001 From: Vitaly Tatarintsev Date: Mon, 4 Nov 2013 16:42:22 +0200 Subject: [PATCH] Replace `class_eval` with `define_method` for enum https://github.com/rails/rails/commit/db41eb8a6ea88b854bf5cd11070ea4245e1639c5#commitcomment-4502683 --- activerecord/lib/active_record/enum.rb | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/activerecord/lib/active_record/enum.rb b/activerecord/lib/active_record/enum.rb index d6d1a8c9a2..3baaea7268 100644 --- a/activerecord/lib/active_record/enum.rb +++ b/activerecord/lib/active_record/enum.rb @@ -42,10 +42,14 @@ def enum(definitions) const_set const_name, {} # def direction=(value) self[:direction] = DIRECTION[value] end - class_eval "def #{name}=(value) self[:#{name}] = #{const_name}[value] end" + define_method "#{name}=" do |value| + self[:"#{name}"] = const_name[value] + end # def direction() DIRECTION.key self[:direction] end - class_eval "def #{name}() #{const_name}.key self[:#{name}] end" + define_method name do + const_name.key self[:"#{name}"] + end pairs = values.respond_to?(:each_pair) ? values.each_pair : values.each_with_index pairs.each do |value, i| @@ -56,10 +60,14 @@ def enum(definitions) scope value, -> { where name => i } # def incoming?() direction == 0 end - class_eval "def #{value}?() self[:#{name}] == #{i} end" + define_method "#{value}?" do + self[:"#{name}"] == i + end # def incoming! update! direction: :incoming end - class_eval "def #{value}!() update! #{name}: :#{value} end" + define_method "#{value}!" do + update! :"#{name}" => :"#{value}" + end end end end -- GitLab