Moving enum_options to ClassyEnum::Collection

kristianmandrup · Jul 14, 2012 · 2fd0c4e · 2fd0c4e
1 parent 54c66d8
commit 2fd0c4e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/lib/classy_enum.rb b/lib/classy_enum.rb
@@ -1,4 +1,4 @@
-require 'classy_enum/conversion'
 require 'classy_enum/collection'
+require 'classy_enum/conversion'
 require 'classy_enum/base'
 require 'classy_enum/attributes'
diff --git a/lib/classy_enum/base.rb b/lib/classy_enum/base.rb
@@ -6,14 +6,13 @@ class Base
     include Conversion
     extend Collection
 
-    class_attribute :enum_options, :base_class
+    class_attribute :base_class
     attr_accessor :owner, :serialize_as_json
 
     class << self
       def inherited(klass)
         if self == ClassyEnum::Base
-          klass.enum_options = []
-          klass.base_class   = klass
+          klass.base_class = klass
         else
 
           # Ensure subclasses follow expected naming conventions
@@ -29,18 +28,17 @@ def inherited(klass)
           # Convert from MyEnumClassNumberTwo to :number_two
           enum = klass.name.gsub(klass.base_class.name, '').underscore.to_sym
 
-          enum_options << klass
-
           # Define attribute methods like two?
           base_class.class_eval do
             define_method "#{enum}?", lambda { attribute?(enum.to_s) }
           end
 
           klass.class_eval do
-            @index = enum_options.size
             @option = enum
           end
         end
+
+        super
       end
 
       # Build a new ClassyEnum child instance

diff --git a/lib/classy_enum/collection.rb b/lib/classy_enum/collection.rb
@@ -1,5 +1,16 @@
 module ClassyEnum
   module Collection
+    def inherited(klass)
+      if self == ClassyEnum::Base
+        klass.class_attribute :enum_options
+        klass.enum_options = []
+      else
+        enum_options << klass
+        klass.instance_variable_set('@index', enum_options.size)
+      end
+
+      super
+    end
 
     # Returns an array of all instantiated enums
     #