From 9f8762f1d5e84472b1cae16b063fc79d1de15963 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Mon, 4 Nov 2013 15:55:29 -0800 Subject: The enum value constant isn't used, so rm it for now. --- activerecord/lib/active_record/enum.rb | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/enum.rb b/activerecord/lib/active_record/enum.rb index 72373d5d5a..da6bc87950 100644 --- a/activerecord/lib/active_record/enum.rb +++ b/activerecord/lib/active_record/enum.rb @@ -36,37 +36,27 @@ module ActiveRecord module Enum def enum(definitions) definitions.each do |name, values| - # DIRECTION = { } - const = const_set name.to_s.upcase, {} - name = name.to_sym + enum_values = {} + name = name.to_sym # def direction=(value) self[:direction] = DIRECTION[value] end - define_method "#{name}=" do |value| - self[name] = const[value] - end + define_method("#{name}=") { |value| self[name] = enum_values[value] } # def direction() DIRECTION.key self[:direction] end - define_method name do - const.key self[name] - end + define_method(name) { enum_values.key self[name] } pairs = values.respond_to?(:each_pair) ? values.each_pair : values.each_with_index pairs.each do |value, i| - # DIRECTION[:incoming] = 0 - const[value] = i + enum_values[value] = i # scope :incoming, -> { where direction: 0 } scope value, -> { where name => i } # def incoming?() direction == 0 end - define_method "#{value}?" do - self[name] == i - end + define_method("#{value}?") { self[name] == i } # def incoming! update! direction: :incoming end - define_method "#{value}!" do - update! name => value.to_sym - end + define_method("#{value}!") { update! name => value.to_sym } end end end -- cgit v1.2.3