ruby-enum 1.0.0 → 1.1.0

data/lib/ruby-enum/enum.rb

@@ -19,6 +19,9 @@ module Ruby
       base.extend ClassMethods
 
       base.private_class_method(:new)
+
+      base.instance_variable_set(:@_enum_hash, {})
+      base.instance_variable_set(:@_enums_by_value, {})
     end
 
     module ClassMethods

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

@@ -26,10 +26,10 @@ module Ruby
           "\nSummary:\n  #{@summary}" + "\nResolution:\n  #{@resolution}"
         end
 
-        private
-
         BASE_KEY = 'ruby.enum.errors.messages' # :nodoc:
 
+        private
+
         # Given the key of the specific error and the options hash, translate the
         # message.
         #

data/lib/ruby-enum/version.rb

@@ -2,6 +2,6 @@
 
 module Ruby
   module Enum
-    VERSION = '1.0.0'
+    VERSION = '1.1.0'
   end
 end

data/spec/ruby-enum/enum/case_spec.rb

@@ -2,55 +2,56 @@
 
 require 'spec_helper'
 
-RSpec.describe Ruby::Enum::Case do
-  test_enum =
-    Class.new do
-      include Ruby::Enum
-      include Ruby::Enum::Case
-
-      define :RED, :red
-      define :GREEN, :green
-      define :BLUE, :blue
-    end
+module Case
+  class Colors
+    include Ruby::Enum
+    include Ruby::Enum::Case
+
+    define :RED, :red
+    define :GREEN, :green
+    define :BLUE, :blue
+  end
+end
 
+RSpec.describe Ruby::Enum::Case do
   describe '.case' do
     context 'when all cases are defined' do
-      subject { test_enum.case(test_enum::RED, cases) }
+      subject { Case::Colors.case(Case::Colors::RED, cases) }
 
       let(:cases) do
         {
-          [test_enum::RED, test_enum::GREEN] => -> { 'red or green' },
-          test_enum::BLUE => -> { 'blue' }
+          [Case::Colors::RED, Case::Colors::GREEN] => -> { 'red or green' },
+          Case::Colors::BLUE => -> { 'blue' }
         }
       end
 
       it { is_expected.to eq('red or green') }
 
       context 'when the value is nil' do
-        subject { test_enum.case(nil, cases) }
+        subject { Case::Colors.case(nil, cases) }
 
         it { is_expected.to be_nil }
       end
 
       context 'when the value is empty' do
-        subject { test_enum.case('', cases) }
+        subject { Case::Colors.case('', cases) }
 
         it { is_expected.to be_nil }
       end
 
       context 'when the value is the value of the enum' do
-        subject { test_enum.case(:red, cases) }
+        subject { Case::Colors.case(:red, cases) }
 
         it { is_expected.to eq('red or green') }
       end
 
       context 'when the value is used inside the lambda' do
-        subject { test_enum.case(test_enum::RED, cases) }
+        subject { Case::Colors.case(Case::Colors::RED, cases) }
 
         let(:cases) do
           {
-            [test_enum::RED, test_enum::GREEN] => ->(color) { "is #{color}" },
-            test_enum::BLUE => -> { 'blue' }
+            [Case::Colors::RED, Case::Colors::GREEN] => ->(color) { "is #{color}" },
+            Case::Colors::BLUE => -> { 'blue' }
           }
         end
 
@@ -60,12 +61,12 @@ RSpec.describe Ruby::Enum::Case do
 
     context 'when there are mutliple matches' do
       subject do
-        test_enum.case(
-          test_enum::RED,
+        Case::Colors.case(
+          Case::Colors::RED,
           {
-            [test_enum::RED, test_enum::GREEN] => -> { 'red or green' },
-            test_enum::RED => -> { 'red' },
-            test_enum::BLUE => -> { 'blue' }
+            [Case::Colors::RED, Case::Colors::GREEN] => -> { 'red or green' },
+            Case::Colors::RED => -> { 'red' },
+            Case::Colors::BLUE => -> { 'blue' }
           }
         )
       end
@@ -76,9 +77,9 @@ RSpec.describe Ruby::Enum::Case do
     context 'when not all cases are defined' do
       it 'raises an error' do
         expect do
-          test_enum.case(
-            test_enum::RED,
-            { [test_enum::RED, test_enum::GREEN] => -> { 'red or green' } }
+          Case::Colors.case(
+            Case::Colors::RED,
+            { [Case::Colors::RED, Case::Colors::GREEN] => -> { 'red or green' } }
           )
         end.to raise_error(Ruby::Enum::Case::ClassMethods::NotAllCasesHandledError)
       end
@@ -87,10 +88,10 @@ RSpec.describe Ruby::Enum::Case do
     context 'when not all cases are defined but :else is specified (default case)' do
       it 'does not raise an error' do
         expect do
-          result = test_enum.case(
-            test_enum::BLUE,
+          result = Case::Colors.case(
+            Case::Colors::BLUE,
             {
-              [test_enum::RED, test_enum::GREEN] => -> { 'red or green' },
+              [Case::Colors::RED, Case::Colors::GREEN] => -> { 'red or green' },
               else: -> { 'blue' }
             }
           )
@@ -103,11 +104,11 @@ RSpec.describe Ruby::Enum::Case do
     context 'when a superfluous case is defined' do
       it 'raises an error' do
         expect do
-          test_enum.case(
-            test_enum::RED,
+          Case::Colors.case(
+            Case::Colors::RED,
             {
-              [test_enum::RED, test_enum::GREEN] => -> { 'red or green' },
-              test_enum::BLUE => -> { 'blue' },
+              [Case::Colors::RED, Case::Colors::GREEN] => -> { 'red or green' },
+              Case::Colors::BLUE => -> { 'blue' },
               :something => -> { 'green' }
             }
           )

data/spec/ruby-enum/enum_spec.rb

@@ -2,22 +2,28 @@
 
 require 'spec_helper'
 
-class Colors
-  include Ruby::Enum
+describe Ruby::Enum do
+  class Colors
+    include Ruby::Enum
 
-  define :RED, 'red'
-  define :GREEN, 'green'
-end
+    define :RED, 'red'
+    define :GREEN, 'green'
+  end
 
-class FirstSubclass < Colors
-  define :ORANGE, 'orange'
-end
+  class FirstSubclass < Colors
+    define :ORANGE, 'orange'
+  end
 
-class SecondSubclass < FirstSubclass
-  define :PINK, 'pink'
-end
+  class SecondSubclass < FirstSubclass
+    define :PINK, 'pink'
+  end
+
+  class OtherSecondSubclass < FirstSubclass
+    include Ruby::Enum
+
+    define :MAGENTA, 'magenta'
+  end
 
-describe Ruby::Enum do
   it 'returns an enum value' do
     expect(Colors::RED).to eq 'red'
     expect(Colors::GREEN).to eq 'green'
@@ -158,6 +164,24 @@ describe Ruby::Enum do
     it 'returns values' do
       expect(Colors.values).to eq(%w[red green])
     end
+
+    context 'when a subclass is defined' do
+      it 'returns all values' do
+        expect(FirstSubclass.values).to eq(%w[red green orange])
+      end
+    end
+
+    context 'when a subclass of a subclass is defined' do
+      it 'returns all values' do
+        expect(SecondSubclass.values).to eq(%w[red green orange pink])
+      end
+    end
+
+    context 'when a subclass of a subclass is defined with redundant module inclusion' do
+      it 'returns all values' do
+        expect(OtherSecondSubclass.values).to eq(%w[red green orange magenta])
+      end
+    end
   end
 
   describe '#to_h' do
@@ -218,6 +242,47 @@ describe Ruby::Enum do
     end
   end
 
+  describe 'Reloading enum definition' do
+    it 'can be lazy reloaded' do
+      class_body = proc do
+        include Ruby::Enum
+
+        define :BUZZ_CUT, 'buzz_cut'
+      end
+
+      hair_styles = Class.new(&class_body)
+
+      expect { hair_styles.class_eval(&class_body) }.not_to raise_error
+    end
+
+    context 'when a subclass is defined' do
+      it 'NEEDS to include Ruby::Enum explicitly to be lazy reloaded' do
+        hair_styles = Class.new do
+          include Ruby::Enum
+
+          define :BUZZ_CUT, 'buzz_cut'
+        end
+
+        broken_subclass_body = proc do
+          define :PONYTAIL, 'ponytail'
+        end
+        broken_subclass = Class.new(hair_styles, &broken_subclass_body)
+        expect { broken_subclass.class_eval(&broken_subclass_body) }
+          .to raise_error Ruby::Enum::Errors::DuplicateKeyError, /PONYTAIL/
+
+        subclass_body = proc do
+          include Ruby::Enum
+
+          define :PONYTAIL, 'ponytail'
+        end
+        more_hair_styles = Class.new(hair_styles, &subclass_body)
+
+        expect { more_hair_styles.class_eval(&subclass_body) }.not_to raise_error
+        expect(more_hair_styles.values).to eq(%w[buzz_cut ponytail])
+      end
+    end
+  end
+
   describe 'Given a class that has not defined any enums' do
     class EmptyEnums
       include Ruby::Enum
@@ -250,29 +315,23 @@ describe Ruby::Enum do
     end
 
     context 'when defining a 2 level depth subclass' do
-      subject { SecondSubclass }
-
       it 'contains its own enums and all the enums defined in the parent classes' do
-        expect(subject::RED).to eq 'red'
-        expect(subject::GREEN).to eq 'green'
-        expect(subject::ORANGE).to eq 'orange'
-        expect(subject::PINK).to eq 'pink'
+        expect(SecondSubclass::RED).to eq 'red'
+        expect(SecondSubclass::GREEN).to eq 'green'
+        expect(SecondSubclass::ORANGE).to eq 'orange'
+        expect(SecondSubclass::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])
+          expect(SecondSubclass.values).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])
+        expect(FirstSubclass.values).to eq(%w[red green orange])
       end
     end
   end
@@ -280,41 +339,40 @@ describe Ruby::Enum do
   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)
+      expect(Default::KEY).to eq(:KEY)
     end
   end
 
   describe 'non constant definitions' do
     class States
       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(States.created).to eq 'Created'
+      expect(States.published).to eq 'Published'
+      expect(States.undefined).to eq :undefined
 
-      expect(subject.key?(:created)).to be true
-      expect(subject.key('Created')).to eq :created
+      expect(States.key?(:created)).to be true
+      expect(States.key('Created')).to eq :created
 
-      expect(subject.value?('Created')).to be true
-      expect(subject.value(:created)).to eq 'Created'
+      expect(States.value?('Created')).to be true
+      expect(States.value(:created)).to eq 'Created'
 
-      expect(subject.key?(:undefined)).to be true
-      expect(subject.key(:undefined)).to eq :undefined
+      expect(States.key?(:undefined)).to be true
+      expect(States.key(:undefined)).to eq :undefined
 
-      expect(subject.value?(:undefined)).to be true
-      expect(subject.value(:undefined)).to eq :undefined
+      expect(States.value?(:undefined)).to be true
+      expect(States.value(:undefined)).to eq :undefined
     end
   end
 end

data/spec/spec_helper.rb

@@ -4,8 +4,8 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'rubygems'
 
-require 'simplecov'
-SimpleCov.start
+require 'coveralls'
+Coveralls.wear!
 
 require 'rspec'
 require 'ruby-enum'

data/spec_i18n/spec/i18n_spec.rb

@@ -2,18 +2,20 @@
 
 require 'spec_helper'
 
-test_class = Class.new do
-  include Ruby::Enum
+module I18n
+  class Colors
+    include Ruby::Enum
 
-  define :RED, 'red'
-  define :GREEN, 'green'
+    define :RED, 'red'
+    define :GREEN, 'green'
+  end
 end
 
 describe Ruby::Enum do
   context 'when the i18n gem is not loaded' do
     it 'raises UninitializedConstantError on an invalid constant' do
       expect do
-        test_class::ANYTHING
+        I18n::Colors::ANYTHING
       end.to raise_error Ruby::Enum::Errors::UninitializedConstantError, /ruby.enum.errors.messages.uninitialized_constant.summary/
     end
 
@@ -24,7 +26,7 @@ describe Ruby::Enum do
 
       it 'raises DuplicateKeyError' do
         expect do
-          test_class.class_eval do
+          I18n::Colors.class_eval do
             define :RED, 'some'
           end
         end.to raise_error Ruby::Enum::Errors::DuplicateKeyError, /ruby.enum.errors.messages.duplicate_key.message/
@@ -38,7 +40,7 @@ describe Ruby::Enum do
 
       it 'raises a DuplicateValueError' do
         expect do
-          test_class.class_eval do
+          I18n::Colors.class_eval do
             define :Other, 'red'
           end
         end.to raise_error Ruby::Enum::Errors::DuplicateValueError, /ruby.enum.errors.messages.duplicate_value.summary/

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-enum
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Daniel Doubrovkine
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-10 00:00:00.000000000 Z
+date: 2026-06-20 00:00:00.000000000 Z
 dependencies: []
 description:
 email: dblock@dblock.org
@@ -56,6 +56,35 @@ files:
 - 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/assets/0.13.2/DataTables-1.10.20/images/sort_asc.png
+- coverage/assets/0.13.2/DataTables-1.10.20/images/sort_asc_disabled.png
+- coverage/assets/0.13.2/DataTables-1.10.20/images/sort_both.png
+- coverage/assets/0.13.2/DataTables-1.10.20/images/sort_desc.png
+- coverage/assets/0.13.2/DataTables-1.10.20/images/sort_desc_disabled.png
+- coverage/assets/0.13.2/application.css
+- coverage/assets/0.13.2/application.js
+- coverage/assets/0.13.2/colorbox/border.png
+- coverage/assets/0.13.2/colorbox/controls.png
+- coverage/assets/0.13.2/colorbox/loading.gif
+- coverage/assets/0.13.2/colorbox/loading_background.png
+- coverage/assets/0.13.2/favicon_green.png
+- coverage/assets/0.13.2/favicon_red.png
+- coverage/assets/0.13.2/favicon_yellow.png
+- coverage/assets/0.13.2/images/ui-bg_flat_0_aaaaaa_40x100.png
+- coverage/assets/0.13.2/images/ui-bg_flat_75_ffffff_40x100.png
+- coverage/assets/0.13.2/images/ui-bg_glass_55_fbf9ee_1x400.png
+- coverage/assets/0.13.2/images/ui-bg_glass_65_ffffff_1x400.png
+- coverage/assets/0.13.2/images/ui-bg_glass_75_dadada_1x400.png
+- coverage/assets/0.13.2/images/ui-bg_glass_75_e6e6e6_1x400.png
+- coverage/assets/0.13.2/images/ui-bg_glass_95_fef1ec_1x400.png
+- coverage/assets/0.13.2/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+- coverage/assets/0.13.2/images/ui-icons_222222_256x240.png
+- coverage/assets/0.13.2/images/ui-icons_2e83ff_256x240.png
+- coverage/assets/0.13.2/images/ui-icons_454545_256x240.png
+- coverage/assets/0.13.2/images/ui-icons_888888_256x240.png
+- coverage/assets/0.13.2/images/ui-icons_cd0a0a_256x240.png
+- coverage/assets/0.13.2/loading.gif
+- coverage/assets/0.13.2/magnify.png
 - coverage/index.html
 - lib/config/locales/en.yml
 - lib/ruby-enum.rb
@@ -68,13 +97,14 @@ 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
+- pkg/ruby-enum-0.9.0.gem
 - ruby-enum.gemspec
 - spec/ruby-enum/enum/case_spec.rb
 - spec/ruby-enum/enum_spec.rb
 - spec/ruby-enum/version_spec.rb
 - spec/spec_helper.rb
 - spec_i18n/Gemfile
-- spec_i18n/Gemfile.lock
 - spec_i18n/Rakefile
 - spec_i18n/spec/i18n_spec.rb
 - spec_i18n/spec/spec_helper.rb
@@ -98,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.5.1
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Enum-like behavior for Ruby.

data/spec_i18n/Gemfile.lock

@@ -1,35 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    ruby-enum (1.0.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    diff-lcs (1.5.0)
-    rake (13.1.0)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
-
-PLATFORMS
-  arm64-darwin-22
-  ruby
-
-DEPENDENCIES
-  rake
-  rspec (~> 3.0)
-  ruby-enum!
-
-BUNDLED WITH
-   2.5.1