enumy 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a8f5d0cfe99364e910e316dd0a1080b7bdb0ec998b1a9005e07605a8060a491
-  data.tar.gz: a55d33d3c9b41bb26bd6392fb61f34fd2ef5466964320d4788d285080962126f
+  metadata.gz: 1a689cb6b3ba13db003f6153785b947d8b383a85f4fb87f74ed82040f719ea27
+  data.tar.gz: 4b92c048f83b60fe675f90ca1821f01d66ca7b776685da87b236c8038104243f
 SHA512:
-  metadata.gz: bc82b788dbe3f917aacb120eda3e36dbcb7bb24c832e077b2379a8393f03d94e765dab0d8a16062d9c3fdad1ed181b259292a55bf592a8899372b236e2c86093
-  data.tar.gz: 453d1f643652560edafe31b52d0fc0a7092b7c034175c0549f4b6b6d87504b2187608e6e0d88cb1b83b2f86979ee8a67119326a3cebf1fa135aac5f596a6608b
+  metadata.gz: b1ad2c5b6c85515fdb9b89732a35c395349dff98dd64bd841b03cf9cf27416a33337f5972a4ecbff46674a6a9806ae748307eb4e4313aa6312de1e328c593b14
+  data.tar.gz: 60612de7768fa499577575acc8e60b1f0d23351a66eb9f9618cb006938e0820ce7247a4e742bdd9aca36adb3c197260446efdc7633dc2b2771720e46babe1585

data/lib/enumy/base.rb

@@ -3,13 +3,16 @@ require_relative 'errors'
 module Enumy
   class Base
     include ActiveModel::Model
+    include ActiveModel::Attributes
 
-    attr_accessor :id
-    attr_accessor :name
+    attribute :id, :integer
+    attribute :name
 
-    def initialize(id = nil, name = nil)
-      @id = id
-      @name = name
+    def initialize(id, name, **attrs)
+      raise ArgumentError, "#{self.class.name.upcase} enum requires an `id`" if id.nil?
+      raise ArgumentError, "#{self.class.name.upcase} enum requires a `name`" if name.nil?
+
+      super(id: id, name: name, **attrs)
     end
 
     def human_attribute_name(attribute)
@@ -20,7 +23,7 @@ module Enumy
 
       def register(enum)
         if instances[enum.id]
-          warn "Enum `#{enum.name.to_s.upcase}` is using a duplicate id `#{enum.id}` for Enum '#{enum.class.name}'. Ignoring the duplicate."
+          raise ArgumentError, "Enum `#{enum.name.to_s.upcase}` is using a duplicate id `#{enum.id}` for Enum '#{enum.class.name}'."
         else
           instances[enum.id] = enum
         end
@@ -31,7 +34,7 @@ module Enumy
       end
 
       def find(id)
-        find_by_id(id) || raise(Errors::EnumNotFoundError.new)
+        find_by_id(id) || raise(Errors::EnumNotFoundError.new("Could not find a `#{name}` enum with an `id` of #{id}"))
       end
 
       def find_by_id(id)
@@ -45,7 +48,7 @@ module Enumy
       end
 
       def model_name
-        @model_name ||= ActiveModel::Name.new(self.class, nil, name.to_s)
+        @model_name ||= ActiveModel::Name.new(self, nil, name.to_s)
       end
 
       def i18n_scope
@@ -61,4 +64,4 @@ module Enumy
     end
 
   end
-end
+end

data/lib/enumy/model.rb

@@ -5,21 +5,46 @@ module Enumy
   module Model
     def belongs_to_enum(name, class_name: name, default: nil)
       enum_class = class_name.to_s.classify.safe_constantize
-      raise Errors::InvalidEnumClassError if enum_class.nil? || !enum_class.ancestors.include?(Enumy::Base)
+      
+      if enum_class.nil?
+        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`"
+      end
 
       define_method "#{name}=" do |enum|
-        return nil unless self.has_attribute?("#{name}_id")
-        instance_variable_set("@#{name}", self.send("#{name}_id=", enum.id))
+        raise NameError, "Enum `#{enum_class.name}` expected #{self.class.name} to have attribute `#{name}_id`." unless self.has_attribute?("#{name}_id")
+
+        if enum
+          raise Errors::InvalidEnumClassError, "Expected an enum of type `#{enum_class.name}`, got `#{enum.class.name}`" if enum_class != enum.class
+          self.send("#{name}_id=", enum.id)
+        else
+          self.send("#{name}_id=", nil)
+        end
+
+        instance_variable_set("@#{name}", enum)
       end
 
       define_method "#{name}" do
         enum = instance_variable_get("@#{name}")
         return enum if enum
-        return nil unless self.has_attribute?("#{name}_id") && self.send("#{name}_id")
+
+        raise NameError, "Enum `#{enum_class.name}` expected #{self.class.name} to have attribute `#{name}_id`." unless self.has_attribute?("#{name}_id")
+        return nil unless self.send("#{name}_id")
         instance_variable_set("@#{name}", enum_class.find(self.send("#{name}_id")))
       end
 
-      after_initialize -> { self.send("#{name}=", default) if self.send("#{name}").nil? && default.present? }
+      define_method "#{name}_id=" do |new_id|
+        super(new_id)
+
+        if new_id
+          instance_variable_set("@#{name}", enum_class.find(new_id))
+        else
+          instance_variable_set("@#{name}", nil)
+        end
+      end
+
+      after_initialize -> { self.send("#{name}=", default) if self.has_attribute?("#{name}_id") && self.send("#{name}").nil? && default.present? }
     end
   end
-end
+end

data/lib/enumy/version.rb

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

data/lib/generators/enumy/install/templates/app/enums/application_enum.rb

@@ -1,10 +1,3 @@
 class ApplicationEnum < Enumy::Base
-  include ActiveModel::Attributes
 
-  attribute :id, :integer
-  attribute :name, :symbol
-
-  def initialize(id, name, **attrs)
-    super(id: id, name: name, **attrs)
-  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: enumy
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Bevan Holborn
 bindir: bin
 cert_chain: []
-date: 2025-01-14 00:00:00.000000000 Z
+date: 2025-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake