ree_lib 1.0.73 → 1.0.75

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bc7c01750d09b6274eabf44aa42ab5df1638372eed12a81bf2f79d09caf2920
-  data.tar.gz: 8dd947819db285b9ead46579f4eacb3b482a27fa525f48e0f997f21ac230744e
+  metadata.gz: ce1a7a42b2936e86f44691bec23557e4e04f72e154202ab2a414257fd1fe304a
+  data.tar.gz: aea223cb572a0057a0c2e456c2940a050d6fa344f37297e205215cc2e38f1220
 SHA512:
-  metadata.gz: 498b93f53f71563223d74404aa958ea60618c3513c21a9344ae6c18bce4fd6664113eb47aae7f4626577c632417f355a09252411ebe244921c1443f5846c8e3c
-  data.tar.gz: d1c3ac12551051f7f9b5f71e785e4cbe22bc5854863b8e406c6b3f950ed486043c9f9c2fffc88ce2c95df471aab47f3c3401af2b6c353bffb2c22bd24d867619
+  metadata.gz: b8d8f51cd4fbe458d815568a8d10bb85577f4a62cf13663282fedfc45741917a4855eb0611b011e078c1b9c38256a5a10c9b28641ed65b4e1eedf0b442a47af1
+  data.tar.gz: 41195673e8f6c05f6b367af2ed170f71b06626dcbc88e9742f29b2161902cd5b7395b81deee946900b3e339381e2202c70d6e9c592a680e7b4f829f195cb7e5c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.73)
+    ree_lib (1.0.75)
       binding_of_caller (~> 1.0.0)
       i18n (~> 1.12.0)
       loofah (~> 2.18.0)
@@ -37,10 +37,10 @@ GEM
     loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
+    mini_portile2 (2.8.1)
     msgpack (1.6.0)
-    nokogiri (1.15.4-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-linux)
+    nokogiri (1.13.10)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     oj (3.13.23)
     pg (1.4.6)
@@ -51,7 +51,7 @@ GEM
       rack (>= 1.3)
     rainbow (3.1.1)
     rake (13.0.6)
-    ree (1.0.31)
+    ree (1.0.32)
       commander (~> 4.6.0)
     rexml (3.2.5)
     roda (3.58.0)

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

@@ -2,6 +2,8 @@
 require_relative "value"
 
 class ReeEnum::BaseEnumMapper < ReeMapper::AbstractType
+  attr_reader :enum
+
   def initialize(enum)
     @enum = enum
   end

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

@@ -49,14 +49,12 @@ module ReeEnum
       def register_as_swagger_type
         swagger_type_registrator = ReeSwagger::RegisterType.new
 
-        definition = swagger_definition
-
         [:casters, :serializers].each do |kind|
           swagger_type_registrator.call(
             kind,
             type_for_mapper.class,
-            ->(*) {
-              definition
+            ->(type, _build_schema) {
+              type.enum.swagger_definition
             }
           )
         end
@@ -75,6 +73,8 @@ module ReeEnum
       end
 
       def swagger_definition
+        return @swagger_definition if defined? @swagger_definition
+
         value_type = get_values.value_type
 
         type = if value_type == String
@@ -85,7 +85,7 @@ module ReeEnum
           raise NotImplementedError, "value_type #{value_type} is not supported"
         end
 
-        {
+        @swagger_definition = {
           type: type,
           enum: get_values.each.map(&:value)
         }

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 package_require('ree_enum/dsl')
+package_require('ree_swagger/functions/get_serializer_definition')
 
 RSpec.describe ReeEnum::DSL do
   before do
@@ -57,13 +58,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 +224,14 @@ 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
+
+    swagger_definition_fetcher = ReeSwagger::GetSerializerDefinition.new
+    expect(
+      swagger_definition_fetcher.call(TestReeEnum::Reflexives.type_for_mapper, -> {})
+    ).not_to eq(
+      swagger_definition_fetcher.call(TestReeEnum::ContentTypes.type_for_mapper, -> {})
+    )
   }
 end

data/lib/ree_lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.73
+  version: 1.0.75
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-30 00:00:00.000000000 Z
+date: 2023-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ree