values: prepend superclass values

CHANGELOG.md

@@ -1,6 +1,7 @@
-### 0.8.1 (Next)
+### 0.9.0 (Next)
 
 * Your contribution here.
+* [#29](https://github.com/dblock/ruby-enum/pull/29): Added superclass values when enumerating with `Ruby::Enum#values` - [@gi](https://github.com/gi).
 * [#30](https://github.com/dblock/ruby-enum/pull/30): Default value to key - [@gi](https://github.com/gi).
 
 ### 0.8.0 (2020/3/27)

README.md

@@ -210,6 +210,40 @@ Since keys are unique there is no way to map values to keys using `Colors.value(
 Inheriting from a `Ruby::Enum` class, all defined enums in the parent class will be accessible in sub classes as well.
 Sub classes can also provide extra enums as usual.
 
+``` ruby
+class PrimaryColors
+  include Ruby::Enum
+
+  define :RED, 'RED'
+  define :GREEN, 'GREEN'
+  define :BLUE, 'BLUE'
+end
+
+class RainbowColors < PrimaryColors
+  define :ORANGE, 'ORANGE'
+  define :YELLOW, 'YELLOW'
+  define :INIDGO, 'INIDGO'
+  define :VIOLET, 'VIOLET'
+end
+```
+
+``` ruby
+RainbowColors::RED # 'RED'
+RainbowColors::ORANGE # 'ORANGE'
+RainbowColors::YELLOW # 'YELLOW'
+RainbowColors::GREEN # 'GREEN'
+RainbowColors::BLUE # 'BLUE'
+RainbowColors::INIDGO # 'INIDGO'
+RainbowColors::VIOLET # 'VIOLET'
+```
+
+The `values` class method will enumerate the values from all base classes.
+
+``` ruby
+PrimaryColors.values # ['RED', 'GREEN', 'BLUE']
+RainbowColors.values # ['RED', 'ORANGE', 'YELLOW', 'GREEN', 'BLUE', 'INIDGO', 'VIOLET']
+```
+
 ## Contributing
 
 You're encouraged to contribute to this gem. See [CONTRIBUTING](CONTRIBUTING.md) for details.

UPGRADING.md

@@ -0,0 +1,44 @@
+# Upgrading Ruby::Enum
+
+## Upgrading to >= 0.9.0
+
+### Inheritance & `Ruby::Enum.values`
+
+This only applies to classes that inherit from another which is a `Ruby::Enum`.
+
+Prior to version `0.9.0`, the `values` class method would enumerate only the
+values defined in the class.
+
+As of version `0.9.0`, the `values` class method enumerates values defined in
+the entire class heirarchy, ancestors first.
+
+``` ruby
+class PrimaryColors
+  include Ruby::Enum
+
+  define :RED, 'RED'
+  define :GREEN, 'GREEN'
+  define :BLUE, 'BLUE'
+end
+
+class RainbowColors < PrimaryColors
+  define :ORANGE, 'ORANGE'
+  define :YELLOW, 'YELLOW'
+  define :INIDGO, 'INIDGO'
+  define :VIOLET, 'VIOLET'
+end
+```
+
+`gem 'ruby-enum', '< 0.9.0'`
+
+``` ruby
+RainbowColors.values # ['ORANGE', 'YELLOW', 'INIDGO', 'VIOLET']
+```
+
+`gem 'ruby-enum', '>= 0.9.0'`
+
+``` ruby
+RainbowColors.values # ['RED', 'ORANGE', 'YELLOW', 'GREEN', 'BLUE', 'INIDGO', 'VIOLET']
+```
+
+See [#29](https://github.com/dblock/ruby-enum/pull/29) for more information.

lib/ruby-enum/enum.rb

@@ -118,7 +118,13 @@ def keys
 
       # Returns all enum values.
       def values
-        @_enum_hash.values.map(&:value)
+        result = @_enum_hash.values.map(&:value)
+
+        if superclass < Ruby::Enum
+          superclass.values + result
+        else
+          result
+        end
       end
 
       # Iterate over all enumerated values.

lib/ruby-enum/version.rb

@@ -2,6 +2,6 @@
 
 module Ruby
   module Enum
-    VERSION = '0.8.1'
+    VERSION = '0.9.0'
   end
 end

spec/ruby-enum/enum_spec.rb

@@ -187,6 +187,22 @@ class EmptyEnums
         expect(subject::ORANGE).to eq 'orange'
         expect(subject::PINK).to eq 'pink'
       end
+
+      describe '#values' do
+        subject { SecondSubclass.values }
+
+        it 'contains the values from all of the parent classes' do
+          expect(subject).to eq(%w[red green orange pink])
+        end
+      end
+    end
+
+    describe '#values' do
+      subject { FirstSubclass.values }
+
+      it 'contains the values from the parent class' do
+        expect(subject).to eq(%w[red green orange])
+      end
     end
   end