minenum 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e30a7b63806d1b89941d7297d647ff2c023ec029f703e4522d4575f4bffa356e
-  data.tar.gz: 627051960b7b12cb639b4a11255bb570037dfa1c427ff2ea80ca4f5ef047a416
+  metadata.gz: 3b0b250f9cdf2dc9e1b04c2147dbfed357c486a5a65ef3c47a2b588d661ec830
+  data.tar.gz: fc97171ca4d6569198cb6b0e1f0496968acba322d4cf36074c8b0bfedc8fd117
 SHA512:
-  metadata.gz: 2b8856a071493ce14759178492992bf0578e75a71b6d10d992573caba2979b8d3027fd7b1a80f34639e598f575479ee776dfd39c5c28fefdd67003d6f94679a8
-  data.tar.gz: 6eddef5145f0b90c81d0a188a62dbad5fb171f9cb5b21adcc0ab854fba993e35306c498ffad9955f912d84cdace9fc55849a78076beb381377fbd2ebd8f5bff9
+  metadata.gz: 0675e25518f01f6c8ddfc02468025b23bb3b16cddf2ddb8aa9605573c7f04d4ee332f0085b0a141cd7f23b49c78cd3a7ed7f25b3020f307f00bec2f11306bf54
+  data.tar.gz: 8ac83aa20381a9ec0c8620ecadcb5b367257ab321e472fd2b23a342802daf9665b5022b757fa6889d75b80774f8368ebf18d21ae9d61998c61b69214e6b67e5a

data/lib/minenum/model.rb

@@ -31,27 +31,36 @@ module Minenum
   module Model
     def self.included(base)
       base.extend ClassMethods
-      base.include InstanceMethods
     end
 
     module AccessorAdder # :nodoc:
-      def add(model_class, methods_module, reflection)
-        add_singleton_method(model_class, reflection.name)
+      def add(model_class, methods_module, reflections, reflection)
+        add_singleton_method(model_class, reflection, reflection.name)
+        add_enum_method(methods_module, reflections) unless methods_module.method_defined?(:_minenum_enum)
 
         add_getter(methods_module, reflection.name)
         add_setter(methods_module, reflection.name)
 
-        model_class._minenum_reflections[reflection.name] = reflection
+        reflections[reflection.name] = reflection
       end
       module_function :add
 
-      def add_singleton_method(model_class, name)
-        model_class.class_eval <<~RUBY, __FILE__, __LINE__ + 1
-          def self.#{name}                              # def self.size
-            _minenum_reflections[:'#{name}'].enum_class #   _minenum_reflections[:'size'].enum_class
-          end                                           # end
-        RUBY
+      def add_singleton_method(model_class, reflection, name)
+        model_class.singleton_class.define_method(name) do
+          reflection.enum_class
+        end
+      end
+
+      def add_enum_method(methods_module, reflections)
+        methods_module.module_eval do
+          define_method(:_minenum_enum) do |name|
+            @_minenum_enum ||= {}
+            @_minenum_enum[name.to_sym] ||= reflections[name.to_sym].build_enum(self)
+          end
+          private :_minenum_enum
+        end
       end
+      module_function :add_singleton_method, :add_enum_method
 
       def add_getter(methods_module, name)
         methods_module.module_eval <<~RUBY, __FILE__, __LINE__ + 1
@@ -68,13 +77,12 @@ module Minenum
           end                                       # end
         RUBY
       end
-      module_function :add_singleton_method, :add_getter, :add_setter
+      module_function :add_getter, :add_setter
     end
 
     module ClassMethods # :nodoc:
-      def enum(name, values, adapter_builder: Enum::Adapter::LocalInstanceVariableAccessor)
-        reflection = Reflection.new(self, name, values, adapter_builder: adapter_builder)
-        AccessorAdder.add(self, enum_methods_module, reflection)
+      def enum(name, values)
+        _minenum_enum(name, values, _minenum_methods_module, _minenum_reflections)
       end
 
       def _minenum_reflections
@@ -83,22 +91,20 @@ module Minenum
 
       private
 
-      def enum_methods_module
-        @enum_methods_module ||= begin
+      def _minenum_enum(name, values, methods_module, reflections, adapter_builder: nil)
+        adapter_builder ||= Enum::Adapter::LocalInstanceVariableAccessor
+
+        reflection = Reflection.new(self, name, values, adapter_builder: adapter_builder)
+        AccessorAdder.add(self, methods_module, reflections, reflection)
+      end
+
+      def _minenum_methods_module
+        @_minenum_methods_module ||= begin
           mod = Module.new
           include mod
           mod
         end
       end
     end
-
-    module InstanceMethods # :nodoc:
-      private
-
-      def _minenum_enum(name)
-        @_minenum_enum ||= {}
-        @_minenum_enum[name.to_sym] ||= self.class._minenum_reflections[name.to_sym].build_enum(self)
-      end
-    end
   end
 end

data/lib/minenum/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Minenum
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/sig/minenum/model/reflection.rbs

@@ -9,7 +9,7 @@ module Minenum
 
       attr_reader adapter_builder: untyped
 
-      def initialize: (untyped, String | Symbol, Hash[untyped, untyped], ?adapter_builder: Minenum::Enum::Adapter::_AdapterBuilder) -> void
+      def initialize: (untyped, String | Symbol, Hash[untyped, untyped], ?adapter_builder: untyped) -> void
       def name: -> Symbol
       def enum_class: -> untyped
       def build_enum: (untyped) -> untyped

data/sig/minenum/model.rbs

@@ -1,29 +1,26 @@
 module Minenum
   module Model
     module AccessorAdder
-      def self?.add: (untyped, untyped, Minenum::Model::Reflection) -> void
-      def self?.add_singleton_method: (untyped, Symbol) -> void
+      def self?.add: (untyped, untyped, Hash[Symbol, Minenum::Model::Reflection], Minenum::Model::Reflection) -> void
+      def self?.add_singleton_method: (untyped, Minenum::Model::Reflection, Symbol) -> void
+      def self?.add_enum_method: (untyped, Hash[Symbol, Minenum::Model::Reflection]) -> void
       def self?.add_getter: (untyped, Symbol) -> void
       def self?.add_setter: (untyped, Symbol) -> void
+
+      def self?.define_method: (Symbol) { (Symbol) -> void } -> void
+      def self?.private: (Symbol) -> void
     end
 
     module ClassMethods
-      def enum: (String | Symbol name, Hash[String | Symbol, untyped], ?adapter_builder: Minenum::Enum::Adapter::_AdapterBuilder) -> void
+      def enum: (String | Symbol, Hash[String | Symbol, untyped]) -> void
       def _minenum_reflections: -> Hash[Symbol, untyped]
 
       private
 
-      def enum_methods_module: -> Module
+      def _minenum_enum: (String | Symbol, Hash[String | Symbol, untyped], Module, Hash[Symbol, Minenum::Model::Reflection], ?adapter_builder: untyped) -> void
+      def _minenum_methods_module: -> Module
 
       def include: (Module) -> self
     end
-
-    module InstanceMethods
-      private
-
-      def _minenum_enum: (Symbol) -> untyped
-
-      def self._minenum_reflections: -> Hash[Symbol, untyped]
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minenum
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Loose Coupling
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-03 00:00:00.000000000 Z
+date: 2024-06-06 00:00:00.000000000 Z
 dependencies: []
 description: Enum for Ruby
 email: