rails_sorbet_enum 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96bafabeef49a552e30d79d812f9be8fd0a647fbe5502fe8c5c31cef92509297
-  data.tar.gz: f77529b1c8592ee3e5756e9de84373ad2a241477448f6bf78c5b06de73a0b1c8
+  metadata.gz: 0613df17774d270cebd8ded39b2791dada2c9ea7af876336f5abc124c4d7aa1e
+  data.tar.gz: e984af52994438d8fe2242f615b0e2b46aec4dbbabf0369f49945750de32b19a
 SHA512:
-  metadata.gz: 2f68bc575101df45bf6c82e3b855fba15b03a148576516a88686883f4dec45f89429d9c1911b041134da2d4d9820a21d73e9f26ff4a087f559b0329e72a09bfe
-  data.tar.gz: b66f0e77ad304f584f0d38872aeef8990eb34f4333142b9e75eb673d9051818e207ddc1f195ad197847a216384e0cb46c0d63e05eda97f4cafe553097bd1e76c
+  metadata.gz: e19cc7054f62b63dd31bc2f4f08ccaa49b6a7f4596a4c20cdf7106484aa15d88fae8f82ec6efcd0c4143e97960a51c2f2318759798026aff4c1c564a12a2ba83
+  data.tar.gz: 64baa1e994b0a4623d8c03e7a31e84cd2f4459b4e37f758da1e63387d2cde134476c0b9fa1cfd8c81e24e03f1e1451c69c6d31d8f78cd5c50f0cfe383eb9b60e

data/.rubocop.yml

@@ -5,9 +5,15 @@ AllCops:
   NewCops: enable
   TargetRubyVersion: 3.1
 
+Layout/ArgumentAlignment:
+  EnforcedStyle: with_fixed_indentation
+
 Metrics/AbcSize:
   Enabled: false
 
+Metrics/BlockLength:
+  Enabled: false
+
 Metrics/MethodLength:
   Enabled: false
 

data/lib/rails_sorbet_enum/concern.rb

@@ -7,7 +7,6 @@ require "sorbet-runtime"
 
 module RailsSorbetEnum
   # Concern allows ActiveRecord models to use typechecked Sorbet T::Enums
-  # with backing ActiveRecord::Enum fields
   module Concern
     extend ActiveSupport::Concern
 
@@ -18,22 +17,27 @@ module RailsSorbetEnum
 
       include ::ActiveRecord::Enum
 
-      sig { params(name: Symbol, type: T.class_of(T::Enum)).void }
-      def sorbet_enum(name, type)
+      sig do
+        params(
+          name: Symbol,
+          type: T.class_of(T::Enum),
+          presence: T::Boolean
+        ).void
+      end
+      def sorbet_enum(name, type, presence: true)
         sorbet_enum_attributes << [name, type]
 
         # The Rails enum values are the serialized T::Enum ones
-        T.unsafe(self).enum(name, type.values.map(&:serialize).index_with(&:to_s))
+        serialize(name, coder: Serializer.new(type))
 
-        T.unsafe(self).define_method("#{name}_enum") do
-          val = T.unsafe(self).public_send(name)
-          return unless val
+        validates name,
+          presence: presence,
+          inclusion: { in: type.values, allow_blank: !presence }
 
-          type.deserialize(val)
-        end
+        T.unsafe(self).define_method("#{name}=") do |arg|
+          raise ArgumentError, "expected #{type.name} but got #{arg.class}" if arg && arg.class != type
 
-        T.unsafe(self).define_method("#{name}_enum=") do |arg|
-          T.unsafe(self).public_send("#{name}=", arg.serialize)
+          super(arg)
         end
       end
 

data/lib/rails_sorbet_enum/require.rb

@@ -3,3 +3,4 @@
 
 require_relative "version"
 require_relative "concern"
+require_relative "serializer"

data/lib/rails_sorbet_enum/serializer.rb

@@ -0,0 +1,31 @@
+# typed: strict
+# frozen_string_literal: true
+
+module RailsSorbetEnum
+  class Serializer
+    extend T::Sig
+
+    sig { params(object_class: T.class_of(T::Enum)).void }
+    def initialize(object_class)
+      @object_class = object_class
+    end
+
+    sig { params(obj: T.untyped).returns(String) }
+    def dump(obj)
+      case obj
+      when T::Enum
+        obj.serialize
+      else
+        raise ActiveRecord::SerializationTypeMismatch,
+          "expected #{@object_class.name} and got #{obj.class}"
+      end
+    end
+
+    sig { params(str: T.nilable(String)).returns(T.nilable(T::Enum)) }
+    def load(str)
+      return if str.nil?
+
+      @object_class.try_deserialize(str)
+    end
+  end
+end

data/lib/rails_sorbet_enum/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module RailsSorbetEnum
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/tapioca/dsl/compilers/rails_sorbet_enum_compiler.rb

@@ -31,7 +31,7 @@ module Tapioca
           root.create_path(constant) do |klass|
             klass.create_module(RBI_MODULE_NAME) do |methods_mod|
               T.unsafe(constant).sorbet_enum_attributes.each do |enum_name, enum_type|
-                return_type =
+                type_with_nilability =
                   if T.unsafe(constant).column_for_attribute(enum_name).null
                     "T.nilable(#{enum_type.name})"
                   else
@@ -39,13 +39,9 @@ module Tapioca
                   end
 
                 methods_mod.create_method(
-                  "#{enum_name}_enum",
-                  return_type: return_type
-                )
-                methods_mod.create_method(
-                  "#{enum_name}_enum=",
+                  "#{enum_name}=",
                   parameters: [
-                    create_param("value", type: enum_type.name)
+                    create_param("value", type: type_with_nilability)
                   ],
                   return_type: "void"
                 )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_sorbet_enum
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Franklin Hu
@@ -81,6 +81,7 @@ files:
 - lib/rails_sorbet_enum.rb
 - lib/rails_sorbet_enum/concern.rb
 - lib/rails_sorbet_enum/require.rb
+- lib/rails_sorbet_enum/serializer.rb
 - lib/rails_sorbet_enum/version.rb
 - lib/tapioca/dsl/compilers/rails_sorbet_enum_compiler.rb
 - sig/rails_sorbet_enum.rbs