ree_lib 1.0.73 → 1.0.74

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bc7c01750d09b6274eabf44aa42ab5df1638372eed12a81bf2f79d09caf2920
-  data.tar.gz: 8dd947819db285b9ead46579f4eacb3b482a27fa525f48e0f997f21ac230744e
+  metadata.gz: db0e9f5e3c64d69ff4f6d4d4550ab6563bfe0bc9529333e21a1251503ad562b2
+  data.tar.gz: 02abcd3afb9f8155666b98abdb5a9f833b3affca8038c19b2322ab60be82e2db
 SHA512:
-  metadata.gz: 498b93f53f71563223d74404aa958ea60618c3513c21a9344ae6c18bce4fd6664113eb47aae7f4626577c632417f355a09252411ebe244921c1443f5846c8e3c
-  data.tar.gz: d1c3ac12551051f7f9b5f71e785e4cbe22bc5854863b8e406c6b3f950ed486043c9f9c2fffc88ce2c95df471aab47f3c3401af2b6c353bffb2c22bd24d867619
+  metadata.gz: 07f42d6c784721984a1729cd38412c946fd8924982d98eff0158a91c4ce9f5c80ef94561e0ea9801a0e1df3baa177ef6bf7ae0db5c177c1f2960f118a339d797
+  data.tar.gz: 25c0ae598cdbfee90f4ea991705fd73328188f64f33bd2895635bff5d98dc527c2a209b40fa286208d327f0f50cd6e03e36b192b3b8ea2076166d685b9c227ac

data/lib/ree_lib/packages/ree_enum/package/ree_enum/enumerable.rb

@@ -13,10 +13,16 @@ module ReeEnum::Enumerable
     include ReeEnum::Contractable
 
     RESTRICTED_METHODS = [
-      :setup_enum, :get_values, :get_enum_name,
-      :val, :self, :class, :alias
+      :setup_enum, :get_values, :get_enum_name, :val,
+      :__ENCODING__, :__LINE__, :__FILE__, :BEGIN, :END,
+      :alias, :and, :begin, :break, :case, :class, :def, :defined?,
+      :do, :else, :elsif, :end, :ensure, :false, :for, :if, :in,
+      :module, :next, :nil, :not, :or, :redo, :rescue, :retry, :return,
+      :self, :super, :then, :true, :undef, :unless, :until, :when, :while, :yield
     ].freeze
 
+    ALLOWED_VALUE_TO_METHOD_REGEXP = /^[a-z_]\w*[?!]?$/
+
     def setup_enum(enum_name)
       @values ||= ReeEnum::Values.new(self, enum_name)
     end
@@ -29,25 +35,31 @@ module ReeEnum::Enumerable
       @values&.enum_name
     end
 
-    def val(value, mapped_value = nil, method: value.to_s.to_sym)
+    def val(value, mapped_value = nil, method: nil)
       value = value.to_s if value.is_a?(Symbol)
       mapped_value ||= value
 
+      if method.nil? && value.is_a?(String) && value.match?(ALLOWED_VALUE_TO_METHOD_REGEXP)
+        method = value.to_sym
+      end
+
       if RESTRICTED_METHODS.include?(method)
         raise ArgumentError.new("#{method.inspect} is not allowed as enum method")
       end
 
       enum_value = @values.add(value, mapped_value, method)
 
-      class_eval(<<~RUBY, __FILE__, __LINE__ + 1)
-        def #{method}
-          get_values.by_value(#{value.inspect}.freeze)
-        end
+      if !method.nil?
+        class_eval(<<~RUBY, __FILE__, __LINE__ + 1)
+          def #{method}
+            get_values.by_value(#{value.inspect}.freeze)
+          end
 
-        def self.#{method}
-          get_values.by_value(#{value.inspect}.freeze)
-        end
-      RUBY
+          def self.#{method}
+            get_values.by_value(#{value.inspect}.freeze)
+          end
+        RUBY
+      end
 
       enum_value
     end

data/lib/ree_lib/packages/ree_enum/package/ree_enum/value.rb

@@ -3,7 +3,7 @@
 class ReeEnum::Value
   attr_reader :enum_class, :enum_name, :value, :method, :mapped_value
 
-  contract(Class, Symbol, Or[String, Integer], Or[Integer, String], Symbol => Any)
+  contract(Class, Symbol, Or[String, Integer], Or[Integer, String], Nilor[Symbol] => Any)
   def initialize(enum_class, enum_name, value, mapped_value, method)
     @enum_class = enum_class
     @enum_name = enum_name

data/lib/ree_lib/packages/ree_enum/package/ree_enum/values.rb

@@ -51,7 +51,7 @@ class ReeEnum::Values
     @collection.map(&:inspect).inspect
   end
 
-  contract(Or[String, Integer], Or[Integer, String], Symbol => ReeEnum::Value)
+  contract(Or[String, Integer], Or[Integer, String], Nilor[Symbol] => ReeEnum::Value)
   def add(value, mapped_value, method)
     if @value_type.nil?
       @value_type = value.class
@@ -59,7 +59,7 @@ class ReeEnum::Values
       raise ArgumentError, "#{@klass}: value types should be the same for all enum values"
     end
 
-    if @collection.any? { _1.method == method }
+    if !method.nil? && @collection.any? { _1.method == method }
       raise ArgumentError, "#{@klass}: method #{method.inspect} was already added"
     end
 

data/lib/ree_lib/packages/ree_enum/spec/ree_enum/dsl_spec.rb

@@ -57,13 +57,24 @@ RSpec.describe ReeEnum::DSL do
         val :yourself
       end
 
+      class ContentTypes
+        include ReeEnum::DSL
+
+        enum :content_types
+
+        val "video/mp4"
+        val "image/png"
+
+        register_as_mapper_type
+      end
+
       class TestMapper
         include ReeMapper::DSL
 
         mapper :test_mapper do
+          link :numbers
           link :states
           link :types
-          link :numbers
         end
 
         class Dto
@@ -212,5 +223,7 @@ RSpec.describe ReeEnum::DSL do
     expect(dto.number).to be_a(ReeEnum::Value)
 
     expect(TestReeEnum::Reflexives.myself).to eq(:self)
+
+    expect(TestReeEnum::ContentTypes.method_defined?(:"video/mp4")).to be_falsey
   }
 end

data/lib/ree_lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReeLib
-  VERSION = "1.0.73"
+  VERSION = "1.0.74"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.73
+  version: 1.0.74
 platform: ruby
 authors:
 - Ruslan Gatiyatov