ruby-enum 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0424fcb26d8fc260165a669fa7be1d83e41a3a8e967ad606c5eb72abb656b349
-  data.tar.gz: 2ea8e9dc094a9612447679c7d5bebf88ac466b1c1b9a5f666d3ce5a8d0981965
+  metadata.gz: 88bc6a484035b5bf6320f56b55e573780d64ede93a81127a594b3f38bf4dbad8
+  data.tar.gz: 7813d05c00cdf651b05888c570a56d0a605d9ba26e0e6b3f6b7ee4d05c5ff4c9
 SHA512:
-  metadata.gz: 024aac1db4f01d3528a1130817e3db22e7e413d598e99d5dc333a040057896129420193731cec1706922a5c462322809e4e6ce5de2d871f1d2492e67990b56ab
-  data.tar.gz: c8a5b49346df275afd18502410a9e24a5806fdfdb0d31d2a7a53783edf8b592b3fe27789ca19d26f32d3937142f40c561b2a9d87ef5cff66e9aa7d05c3054cf6
+  metadata.gz: 8ee8693a456dfb16c72efbae23afeae3f6436b2244b0ce0c86ccfc55c605485a8147ea7e2c03c0b5fe00d9972c3d519980e8f289aade9bbedfa64b4b7c072ddb
+  data.tar.gz: fbc8f0d5fc535b857f1d4f54bd2e0a9b57467eaba3b1b2cacca98d92319dcc383e7c6f643ea9984700f7936a63de56d5e2b99470672bd9362963a866c3756732

data/CHANGELOG.md

@@ -1,10 +1,15 @@
-### 1.2.0 (2026/8/14)
+### 1.2.1 (2026/08/15)
+
+* [#62](https://github.com/dblock/ruby-enum/issues/62): Fixed `values`, `value?` and `key` to not return a superclass' overridden value when a subclass redefines a key, matching the behavior of `to_h` and other methods - [@dblock](https://github.com/dblock).
+* [#64](https://github.com/dblock/ruby-enum/pull/64): Updated copyright year to 2026 - [@dblock](https://github.com/dblock).
+
+### 1.2.0 (2026/08/14)
 
 * [#49](https://github.com/dblock/ruby-enum/issues/49): Fixed `NoMethodError` on `keys`, `values`, `key?`, `value?`, `key`, `value`, `to_h`, `parse` and `each` when a subclass defines no enums of its own - [@dblock](https://github.com/dblock).
 * [#49](https://github.com/dblock/ruby-enum/issues/49): `keys`, `key?`, `value?`, `key`, `value`, `to_h`, `parse` and `each` now include enums defined in a superclass, matching the existing behavior of `values` - [@dblock](https://github.com/dblock).
 * [#61](https://github.com/dblock/ruby-enum/pull/61): Document performance overhead in README, add `rake benchmark:basic` - [@dblock](https://github.com/dblock).
 
-### 1.1.0 (2026/6/20)
+### 1.1.0 (2026/06/20)
 
 * [#56](https://github.com/dblock/ruby-enum/pull/56): Fix `DuplicateKeyError` when the enum class is reloaded - [@flvrone](https://github.com/flvrone).
 * [#54](https://github.com/dblock/ruby-enum/pull/54): Add support for Ruby 4.0 - [@dblock](https://github.com/dblock).

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby-enum (1.2.0)
+    ruby-enum (1.2.1)
 
 GEM
   remote: http://rubygems.org/

data/LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2013-2021 Daniel Doubrovkine.
+Copyright (c) 2013-2026 Daniel Doubrovkine.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -357,7 +357,7 @@ You're encouraged to contribute to ruby-enum. See [CONTRIBUTING](CONTRIBUTING.md
 
 ## Copyright and License
 
-Copyright (c) 2013-2021, Daniel Doubrovkine and [Contributors](CHANGELOG.md).
+Copyright (c) 2013-2026, Daniel Doubrovkine and [Contributors](CHANGELOG.md).
 
 This project is licensed under the [MIT License](LICENSE.md).
 

data/lib/ruby-enum/enum.rb

@@ -124,15 +124,9 @@ module Ruby
         _enum_hash.values.map(&:key)
       end
 
-      # Returns all enum values.
+      # Returns all enum values, including those defined in a superclass.
       def values
-        result = _own_enum_hash.values.map(&:value)
-
-        if superclass < Ruby::Enum
-          superclass.values + result
-        else
-          result
-        end
+        _enum_hash.values.map(&:value)
       end
 
       # Iterate over all enumerated values, including those defined in a superclass.
@@ -186,12 +180,16 @@ module Ruby
       # Returns the enums-by-value hash for this class merged with all of its
       # superclasses, with values defined in this class taking precedence over
       # those inherited from a superclass.
+      #
+      # Derived from _enum_hash (keyed by key) rather than merged directly by
+      # value, so that a superclass' stale value for a key overridden in this
+      # class doesn't linger, e.g. when a subclass redefines a key with a new
+      # value, the superclass' old value should no longer be found via value?
+      # or key.
       def _enums_by_value
-        @_enums_by_value ||= if superclass < Ruby::Enum
-                               superclass.send(:_enums_by_value).merge(_own_enums_by_value)
-                             else
-                               _own_enums_by_value
-                             end
+        @_enums_by_value ||= _enum_hash.each_with_object({}) do |(_key, enum), hash|
+          hash[enum.value] = enum
+        end
       end
 
       def upper?(s)

data/lib/ruby-enum/version.rb

@@ -2,6 +2,6 @@
 
 module Ruby
   module Enum
-    VERSION = '1.2.0'
+    VERSION = '1.2.1'
   end
 end

data/spec/ruby-enum/enum_spec.rb

@@ -432,8 +432,15 @@ describe Ruby::Enum do
         expect(SubclassRedefiningParentKey.to_h).to eq(RED: 'crimson', GREEN: 'green')
       end
 
-      it 'includes both the parent and its own redefined value in values' do
-        expect(SubclassRedefiningParentKey.values).to eq(%w[red green crimson])
+      it "does not include the parent's overridden value, only its own redefined value, in values" do
+        expect(SubclassRedefiningParentKey.values).to eq(%w[crimson green])
+      end
+
+      it "does not recognize the parent's overridden value via value? or key" do
+        expect(SubclassRedefiningParentKey.value?('red')).to be false
+        expect(SubclassRedefiningParentKey.key('red')).to be_nil
+        expect(SubclassRedefiningParentKey.value?('crimson')).to be true
+        expect(SubclassRedefiningParentKey.key('crimson')).to eq :RED
       end
 
       it "the parent class' own value is unaffected" do

data/spec_i18n/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    ruby-enum (1.2.0)
+    ruby-enum (1.2.1)
 
 GEM
   remote: http://rubygems.org/
@@ -39,7 +39,7 @@ CHECKSUMS
   rspec-expectations (3.13.5)
   rspec-mocks (3.13.8)
   rspec-support (3.13.7)
-  ruby-enum (1.2.0)
+  ruby-enum (1.2.1)
 
 BUNDLED WITH
   4.0.6

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-enum
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Daniel Doubrovkine
@@ -43,6 +43,7 @@ files:
 - pkg/ruby-enum-0.8.0.gem
 - pkg/ruby-enum-0.9.0.gem
 - pkg/ruby-enum-1.1.0.gem
+- pkg/ruby-enum-1.2.0.gem
 - ruby-enum.gemspec
 - spec/ruby-enum/enum/case_spec.rb
 - spec/ruby-enum/enum_spec.rb