enumy 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48c034d7276e26bde26c3ab1af9042e7965f60e6aaf049e30dedb0ed8d288b3e
-  data.tar.gz: 9aa548c28f86f7ae8f2ef0cf994ac989c705665a06212f37cd2fdd56d1228f38
+  metadata.gz: 0c55b6f482c9297c67a5149c3d2c349c89018f89eec176d2e76fdb993bcc6d39
+  data.tar.gz: 0076a894f5661321360342fb1d3264f0e26b86d64858201b308908131a95714a
 SHA512:
-  metadata.gz: 90eb307fa980e73ee36f56fa64ddc98f99d2774d6e7998a80381d84ca94d308b97dc848dac41f5fc91007841374c5b039b53e581f5b5abe164ad7708556c9e30
-  data.tar.gz: 49b0b61bffe6f652cd92f02f7ae940c82ad7c0ee0f16a8923647b1a4a2c85f2496df10f0c13b641ce56da97e8a36523a4244949e2d24533e1a647cf2f01d14c1
+  metadata.gz: 402f4d93a29fcfb54a940c063f95e2d11ba430cca569710e94283e12405a66f9c47df7de77c7cee8e0e1aea718b0ebe01ac53a59273a34a11ada78e05f68de75
+  data.tar.gz: 075243c844f724728cfc7dfc645d68fc24cc3f62e25a0367be9bacadb50918e563ca9fc70cf2198798c79bdd4f9522484b603fe8115c38eb07a0255e21c10824

data/lib/enumy/active_job/serializers/enum_serializer.rb

@@ -6,11 +6,15 @@ module Enumy
       class EnumSerializer < ::ActiveJob::Serializers::ObjectSerializer
 
         def serialize(enum)
-          super({ class: enum.class.name, key: enum.key })
+          super({ class: enum.class.name, key: enum.key.to_s })
         end
 
         def deserialize(hash)
-          hash['class'].constantize.find(hash['key'])
+          hash[:class].constantize.find_by_key(hash[:key])
+        end
+
+        def serialize?(value)
+          value.is_a?(klass)
         end
 
         private

data/lib/enumy/active_model/type/enum.rb

@@ -12,7 +12,11 @@ module Enumy
         end
 
         def serialize(value)
-          value.is_a?(@enum_class) ? value.key : value&.to_s
+          if value.is_a?(@enum_class)
+            value.key.to_s
+          else
+            @enum_class.find_by_key(value&.to_sym) ? value&.to_s : nil
+          end
         end
 
         def deserialize(value)

data/lib/enumy/base.rb

@@ -2,8 +2,8 @@ require_relative 'errors'
 
 module Enumy
   class Base
-    include ActiveModel::Model
-    include ActiveModel::Attributes
+    include ::ActiveModel::Model
+    include ::ActiveModel::Attributes
 
     attribute :key
 
@@ -33,8 +33,10 @@ module Enumy
     class << self
 
       def define(enum)
+        raise ArgumentError, "Expected an object of type `Enumy::Base`, got #{enum.class.name}" unless enum.is_a?(Enumy::Base)
+
         if instances[enum.key]
-          raise ArgumentError, "Enum `#{enum.key.to_s.upcase}` is using a duplicate key `#{enum.key}` for Enum '#{enum.class.name}'."
+          raise Errors::DuplicateEnumInstanceError, "Enum `#{enum.key.to_s.upcase}` is using a duplicate key `#{enum.key}` for Enum '#{enum.class.name}'."
         else
           instances[enum.key] = enum
         end
@@ -54,13 +56,15 @@ module Enumy
       end
 
       def find_by(**args)
+        raise ArgumentError, "`find_by` requires at least one key-value pair" if args.empty?
+
         instances.values.find do |instance|
           args.all? { |attr, value| instance.send(attr) == value }
         end
       end
 
       def model_name
-        @model_name ||= ActiveModel::Name.new(self, nil, self.name.to_s)
+        @model_name ||= ::ActiveModel::Name.new(self, nil, self.name.to_s)
       end
 
       def i18n_scope

data/lib/enumy/errors.rb

@@ -3,6 +3,7 @@ module Enumy
 
     class EnumNotFoundError < StandardError; end
     class InvalidEnumClassError < NameError; end
+    class DuplicateEnumInstanceError < ArgumentError; end
 
   end
 end

data/lib/enumy/model.rb

@@ -6,7 +6,7 @@ module Enumy
     def has_enum(name, class_name: name, **options)
       enum_class = class_name.to_s.classify.safe_constantize
 
-      assert_valid_enum_type!(enum_class)
+      assert_valid_enum_type!(enum_class, class_name)
       define_enum_attributes(name, enum_class, default: options[:default])
       define_enum_validations(name, enum_class) unless options[:optional]
     end
@@ -21,9 +21,9 @@ module Enumy
       validates name, presence: true, inclusion: { in: enum_class.all }
     end
 
-    def assert_valid_enum_type!(enum_class)
+    def assert_valid_enum_type!(enum_class, class_name)
       if enum_class.nil?
-        raise Errors::InvalidEnumClassError, "Could not resolve class `#{enum_class.name.to_s.classify}`"
+        raise Errors::InvalidEnumClassError, "Could not resolve class `#{class_name.to_s.classify}`"
       elsif !enum_class.ancestors.include?(Enumy::Base)
         raise Errors::InvalidEnumClassError, "`#{enum_class.name}` does not inherit from `#{Enumy::Base.name}`"
       end

data/lib/enumy/{railtie.rb → rails/railtie.rb}

@@ -3,7 +3,9 @@ require 'enumy/active_job/serializers/enum_serializer'
 module Enumy
   class Railtie < Rails::Railtie
     initializer "enumy.register_active_job_serializer" do |app|
-      app.config.active_job.custom_serializers << Enumy::ActiveJob::Serializers::EnumSerializer
+      if Rails::VERSION::MAJOR >= 6
+        app.config.active_job.custom_serializers << Enumy::ActiveJob::Serializers::EnumSerializer
+      end
     end
   end
 end

data/lib/enumy/test_helpers.rb

@@ -0,0 +1,28 @@
+module Enumy
+  module TestHelpers
+    def with_enum_defined(enum_class, enum_instance)
+      enum_class.define(enum_instance)
+
+      yield
+
+      enum_class.send(:instances).delete(enum_instance.key)
+      enum_const_name = enum_class.constants.find { |const_name| enum_class.const_get(const_name) == enum_instance }
+      remove_const(enum_const_name) if enum_const_name
+    end
+
+    def enum_model_class(&block)
+      base_class = Class.new(ApplicationRecord) do
+        extend Enumy::Model
+
+        class << self
+          def name
+            "TempModel"
+          end
+        end
+      end
+
+      base_class.class_exec(&block) if block
+      base_class
+    end
+  end
+end

data/lib/enumy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Enumy
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/lib/enumy.rb

@@ -1,3 +1,5 @@
+require 'enumy/version'
+
 if defined?(ActiveModel)
   require 'enumy/base'
 end
@@ -8,6 +10,6 @@ if defined?(Rails)
   require 'enumy/model'
 
   if defined?(Rails::Railtie)
-    require 'enumy/railtie'
+    require 'enumy/rails/railtie'
   end
 end

metadata

@@ -1,28 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: enumy
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Bevan Holborn
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-26 00:00:00.000000000 Z
+date: 2025-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -37,7 +38,22 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 description: Use Enumeration objects as ActiveRecord like associations
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -50,13 +66,15 @@ files:
 - lib/enumy/generators/enumy/install/install_generator.rb
 - lib/enumy/generators/enumy/install/templates/app/enums/application_enum.rb
 - lib/enumy/model.rb
-- lib/enumy/railtie.rb
+- lib/enumy/rails/railtie.rb
+- lib/enumy/test_helpers.rb
 - lib/enumy/version.rb
 homepage: https://rubygems.org/gems/enumy
 licenses:
 - MIT
 metadata:
   source_code_uri: https://gitlab.com/BevanHolborn/enumy
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -64,14 +82,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.3.27
+signing_key:
 specification_version: 4
 summary: ActiveRecord like enum associations
 test_files: []