ruby-enum 0.8.0 → 0.9.0

data/lib/ruby-enum/enum.rb

@@ -22,7 +22,7 @@ module Ruby
       # === Parameters
       # [key] Enumerator key.
       # [value] Enumerator value.
-      def define(key, value)
+      def define(key, value = key)
         @_enum_hash ||= {}
         @_enums_by_value ||= {}
 
@@ -118,7 +118,13 @@ module Ruby
 
       # 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.

data/lib/ruby-enum/errors/base.rb

@@ -39,7 +39,7 @@ module Ruby
         #
         # Returns a localized error message string.
         def translate(key, options)
-          ::I18n.translate("#{BASE_KEY}.#{key}", { locale: :en }.merge(options)).strip
+          ::I18n.translate("#{BASE_KEY}.#{key}", **{ locale: :en }.merge(options)).strip
         end
 
         # Create the problem.

data/lib/ruby-enum/version.rb

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

data/spec/ruby-enum/enum_spec.rb

@@ -187,6 +187,35 @@ describe Ruby::Enum do
         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
+
+  describe 'default value' do
+    class Default
+      include Ruby::Enum
+      define :KEY
+    end
+
+    subject { Default::KEY }
+
+    it 'equals the key' do
+      expect(subject).to eq(:KEY)
     end
   end
 
@@ -195,17 +224,25 @@ describe Ruby::Enum do
       include Ruby::Enum
       define :created, 'Created'
       define :published, 'Published'
+      define :undefined
     end
     subject { States }
     it 'behaves like an enum' do
       expect(subject.created).to eq 'Created'
       expect(subject.published).to eq 'Published'
+      expect(subject.undefined).to eq :undefined
 
       expect(subject.key?(:created)).to be true
       expect(subject.key('Created')).to eq :created
 
       expect(subject.value?('Created')).to be true
       expect(subject.value(:created)).to eq 'Created'
+
+      expect(subject.key?(:undefined)).to be true
+      expect(subject.key(:undefined)).to eq :undefined
+
+      expect(subject.value?(:undefined)).to be true
+      expect(subject.value(:undefined)).to eq :undefined
     end
   end
 end

data/spec/spec_helper.rb

@@ -3,6 +3,10 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'rubygems'
+
+require 'simplecov'
+SimpleCov.start
+
 require 'rspec'
 require 'ruby-enum'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-enum
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Daniel Doubrovkine
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-27 00:00:00.000000000 Z
+date: 2021-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -24,7 +24,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email: dblock@dblock.org
 executables: []
 extensions: []
@@ -32,12 +32,44 @@ extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - CONTRIBUTING.md
+- Dangerfile
 - Gemfile
 - Gemfile.lock
 - LICENSE.md
 - README.md
 - RELEASING.md
 - Rakefile
+- UPGRADING.md
+- coverage/assets/0.12.3/DataTables-1.10.20/images/sort_asc.png
+- coverage/assets/0.12.3/DataTables-1.10.20/images/sort_asc_disabled.png
+- coverage/assets/0.12.3/DataTables-1.10.20/images/sort_both.png
+- coverage/assets/0.12.3/DataTables-1.10.20/images/sort_desc.png
+- coverage/assets/0.12.3/DataTables-1.10.20/images/sort_desc_disabled.png
+- coverage/assets/0.12.3/application.css
+- coverage/assets/0.12.3/application.js
+- coverage/assets/0.12.3/colorbox/border.png
+- coverage/assets/0.12.3/colorbox/controls.png
+- coverage/assets/0.12.3/colorbox/loading.gif
+- coverage/assets/0.12.3/colorbox/loading_background.png
+- coverage/assets/0.12.3/favicon_green.png
+- coverage/assets/0.12.3/favicon_red.png
+- coverage/assets/0.12.3/favicon_yellow.png
+- coverage/assets/0.12.3/images/ui-bg_flat_0_aaaaaa_40x100.png
+- coverage/assets/0.12.3/images/ui-bg_flat_75_ffffff_40x100.png
+- coverage/assets/0.12.3/images/ui-bg_glass_55_fbf9ee_1x400.png
+- coverage/assets/0.12.3/images/ui-bg_glass_65_ffffff_1x400.png
+- coverage/assets/0.12.3/images/ui-bg_glass_75_dadada_1x400.png
+- coverage/assets/0.12.3/images/ui-bg_glass_75_e6e6e6_1x400.png
+- coverage/assets/0.12.3/images/ui-bg_glass_95_fef1ec_1x400.png
+- coverage/assets/0.12.3/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+- coverage/assets/0.12.3/images/ui-icons_222222_256x240.png
+- coverage/assets/0.12.3/images/ui-icons_2e83ff_256x240.png
+- coverage/assets/0.12.3/images/ui-icons_454545_256x240.png
+- coverage/assets/0.12.3/images/ui-icons_888888_256x240.png
+- coverage/assets/0.12.3/images/ui-icons_cd0a0a_256x240.png
+- coverage/assets/0.12.3/loading.gif
+- coverage/assets/0.12.3/magnify.png
+- coverage/index.html
 - lib/config/locales/en.yml
 - lib/ruby-enum.rb
 - lib/ruby-enum/enum.rb
@@ -47,6 +79,7 @@ files:
 - lib/ruby-enum/errors/uninitialized_constant_error.rb
 - lib/ruby-enum/version.rb
 - lib/ruby_enum.rb
+- pkg/ruby-enum-0.8.0.gem
 - ruby-enum.gemspec
 - spec/ruby-enum/enum_spec.rb
 - spec/ruby-enum/version_spec.rb
@@ -55,7 +88,7 @@ homepage: http://github.com/dblock/ruby-enum
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -71,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Enum-like behavior for Ruby.
 test_files: []