From 6d540d135f8a542bbcbf0b2fa5da39f3d572d5f0 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Mon, 4 Nov 2013 13:40:16 -0200 Subject: Fix failures related to enum changes Commit 6e4a810f51b9ed2468b92247ef5568cc9d6dbcc0 changed the implementation from class_eval to define_method, but missed the access to the constant versus the access to the constant name. --- activerecord/lib/active_record/enum.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/enum.rb b/activerecord/lib/active_record/enum.rb index 3baaea7268..f22ff2c472 100644 --- a/activerecord/lib/active_record/enum.rb +++ b/activerecord/lib/active_record/enum.rb @@ -36,25 +36,23 @@ module ActiveRecord module Enum def enum(definitions) definitions.each do |name, values| - const_name = name.to_s.upcase - # DIRECTION = { } - const_set const_name, {} + const = const_set name.to_s.upcase, {} # def direction=(value) self[:direction] = DIRECTION[value] end define_method "#{name}=" do |value| - self[:"#{name}"] = const_name[value] + self[:"#{name}"] = const[value] end # def direction() DIRECTION.key self[:direction] end define_method name do - const_name.key self[:"#{name}"] + const.key self[:"#{name}"] end pairs = values.respond_to?(:each_pair) ? values.each_pair : values.each_with_index pairs.each do |value, i| # DIRECTION[:incoming] = 0 - const_get(const_name)[value] = i + const[value] = i # scope :incoming, -> { where direction: 0 } scope value, -> { where name => i } -- cgit v1.2.3