is-enum 0.8.8.6 → 0.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc6259dd1805baa7fea583b8bb6e81e5856ae2b2146d942d476bb69e290db001
-  data.tar.gz: a7ba17fcf8075b673d7e288f6197c15221f1f7ed99623c62f42ce55ca099ede0
+  metadata.gz: c0ddc5fc81178084615b8ecefe2629365cab7cb581ef050ac510ad72f87cb48f
+  data.tar.gz: 6525100c126385be180955393c8eab86176606367ee49ac3d9d92220a7bd0845
 SHA512:
-  metadata.gz: 539bfe3eb4a52dffddc9eddbf9f6e6c677bc0582df2bb88ccfc3b1b346c9bb7d38ed45b420006ec3aae6a27d3c0d6b287e640f3e04c94b19ff97b1a67a1e3cca
-  data.tar.gz: 51e7ca650044879cd9d4384e63fbfa8d19fdae35aa355ad14e0e007c310ed87ccfddc588095864c0e46962005b7e33d63358a888a860470b633b4cf4b68790bb
+  metadata.gz: 23782da0f945251e7e6c1dc075d525baf07950f2b94332238017d60bc51c00985e6d982bf85e232708b4bb664cc6e8772f8f6be09049ffd4a39047f1d167f46f
+  data.tar.gz: e70bdf7bebf9743200bbce139ca85d6889d23eefa9f2dbe87ba0dd1db374e409c5c42670144a15e116593cf0f61f013edaead5ad36be8a36b9b129448b2a1c78

data/coverage-badge.svg

@@ -2,5 +2,5 @@
 <rect width="100" height="20" fill="#555"/>
 <rect x="63" width="37" height="20" fill="green"/>
 <text x="8" y="14" fill="#fff" font-family="Verdana" font-size="11">coverage</text>
-<text x="66" y="14" fill="#fff" font-family="Verdana" font-size="11">91%</text>
+<text x="66" y="14" fill="#fff" font-family="Verdana" font-size="11">92%</text>
 </svg>

data/lib/is-enum/info.rb

@@ -8,7 +8,7 @@ end
 module IS::Enum::Info
 
   NAME = 'is-enum'
-  VERSION = '0.8.8.6'
+  VERSION = '0.8.10'
   SUMMARY = 'Enum types for Ruby'
   AUTHOR  = 'Ivan Shikhalev'
   HOMEPAGE = 'https://github.com/inat-get/is-enum'

data/lib/is-enum.rb

@@ -129,7 +129,7 @@ class IS::Enum
     # @return [Enumerator, self]
     def each
       return to_enum(__method__) unless block_given?
-      @values.values.sort_by { |v| v.order_no }.each { |v| yield v }
+      values.each { |v| yield v }
       self
     end
 
@@ -162,14 +162,20 @@ class IS::Enum
     # @note Both canonical names and aliases are included. To distinguish,
     #   check {.aliases} for alias keys.
     def to_h
-      result = {}
-      result.merge! @values
-      result.merge! @aliases
+      @values.merge(@aliases)
+    end
+
+    # @param [Range] range
+    # @return [Array<IS::Enum>]
+    def to_a range = nil
+      return values unless range
+      raise ArgumentError, "Invalid 'range' argument: #{ range.inspect }", caller_locations unless range.is_a?(Range)
+      values.select { |item| (range.begin.nil? || item >= range.begin) && (range.end.nil? || item < range.end || (!range.exclude_end? && item == range.end)) }
     end
 
     # @endgroup
 
-    protected
+    private
 
     # @group DSL
 
@@ -190,11 +196,8 @@ class IS::Enum
     #     define :archived, alias: :active
     #   end    
     def define name, order_no = nil, **attrs
-      @mutex ||= Thread::Mutex::new
       @mutex.synchronize do
         @sorted = nil
-        @values ||= {}
-        @aliases ||= {}
         case name
         when String
           name = name.to_sym
@@ -246,26 +249,34 @@ class IS::Enum
     end
 
     # Freezes internal structures, preventing further modifications.
-    # After calling, {.define} will raise +RuntimeError+.
+    # After calling, {.define} will raise +FrozenError+.
     #
     # @return [void]
     def finalize!
-      @mutex ||= Thread::Mutex::new
+      return if finalized?
       @mutex.synchronize do
         @values.freeze
         @aliases.freeze
       end
     end
 
+    def finalized?
+      @values.frozen?
+    end
+
     # @endgroup
 
     # @private
     def inherited subclass
+      super
       @@mutex ||= Thread::Mutex::new
       @@mutex.synchronize do
         @@enums ||= {}
-        @@enums[subclass.name] = subclass
+        @@enums[subclass.name] = subclass if subclass.name
       end
+      subclass.instance_variable_set(:@mutex, Thread::Mutex::new)
+      subclass.instance_variable_set(:@values, {})
+      subclass.instance_variable_set(:@aliases, {})
     end
 
     private :new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: is-enum
 version: !ruby/object:Gem::Version
-  version: 0.8.8.6
+  version: 0.8.10
 platform: ruby
 authors:
 - Ivan Shikhalev