enumy 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6dd6a6b997ce941c0d25307a6d58dacbbf37fe400599138b5e5bf19368a50e79
-  data.tar.gz: 333f8abf304d49f44cb298a73cb9aea1a5e35a12727156ec79a1d8edcbb5f126
+  metadata.gz: c5a41d5b566db44a73694cda348ebdafd92ba493df67811989767da5ded37a32
+  data.tar.gz: 650fea0c0613b094a3323122fc6e95b7b0df42e6ee16a748b8f062ab2fb3f712
 SHA512:
-  metadata.gz: 538a40ecabc8d6268a219360af3cbd5c0204b38eb22914ce721c16f7c7b98f14e3738b8714357c7c47ac4b3abda05befd31f53d3dd0b2ed4c94e07bcbde86343
-  data.tar.gz: 1e286b730ff740ce7e04ac2d6c1bbd74918002da2ea5a2ee5c75379e5d0c29e3d7b4ed59fffc59152797cf9b36390fd6db61f41c51353eb86e8f39dedde75998
+  metadata.gz: 0c0bafe3cd2eec7e47741617d0455b208d168559d3a972ca9b800efa1a8edbd1e4a7b451b95ee949d218411696a2deef5a31bcd24029e0e08d138a4faa8c8ce0
+  data.tar.gz: 98f2c6f8d26fcfb6f2067c97ae205807e8cab6835b5fb992fa3ec7f8e0d3f3e63b04eb8417b7ebe5b12be52cf143852007304d0b8ed9c77edff3ff8363284116

data/lib/enumy/enum.rb

@@ -15,7 +15,12 @@ module Enumy
     end
 
     def inspect
-      "#<#{self.class.name} #{attributes.map { |name, value| "#{name}: #{value.inspect}" }.join(', ')}>"
+      attributes = instance_variables.map do |name|
+        value = instance_variable_get(name)
+        "#{name}: #{value.inspect}"
+      end
+
+      "#<#{self.class.name} #{attributes.join(', ')}>"
     end
 
     class << self
@@ -35,7 +40,7 @@ module Enumy
       end
 
       def find(key)
-        find_by(key: key) || raise(Errors::EnumNotFoundError.new("Could not find a `#{self.name}` enum with a `key` of #{key}"))
+        find_by(key: key.to_sym) || raise(Errors::EnumNotFoundError.new("Could not find a `#{self.name}` enum with a `key` of #{key}"))
       end
 
       def find_by(**args)

data/lib/enumy/model.rb

@@ -0,0 +1,47 @@
+require 'enumy/enum'
+require 'enumy/errors'
+
+module Enumy
+  module Model
+
+    def has_enum(name, enum_class:, **options)
+      assert_valid_enum_type!(enum_class)
+      define_enum_methods(name, enum_class, default: options[:default])
+    end
+
+    def assert_valid_enum_value_type!(enum_class, enum)
+      return if enum.nil?
+      raise Errors::InvalidEnumClassError, "Expected instance of `#{enum_class}`, got instance of `#{enum.class}`" unless enum.is_a?(enum_class)
+    end
+
+    private
+
+    def define_enum_methods(name, enum_class, default: nil)
+      assert_valid_enum_value_type!(enum_class, default)
+
+      define_method(name) do
+        instance_variable_set("@#{name}", default) unless instance_variable_defined?("@#{name}")
+        instance_variable_get("@#{name}")
+      end
+
+      define_method("#{name}=") do |value|
+        case value
+        when Enumy::Enum, NilClass
+          self.class.assert_valid_enum_value_type!(enum_class, value)
+          instance_variable_set("@#{name}", value)
+        when String, Symbol
+          enum = enum_class.find(value)
+          instance_variable_set("@#{name}", enum)
+        else
+          raise ArgumentError
+        end
+      end
+    end
+
+    def assert_valid_enum_type!(enum_class)
+      raise Errors::InvalidEnumClassError, "`#{enum_class}` is not a constant" unless enum_class.is_a?(Module)
+      raise Errors::InvalidEnumClassError, "`#{enum_class.name}` does not inherit from `#{Enumy::Enum.name}`" unless enum_class.ancestors.include?(Enumy::Enum)
+    end
+
+  end
+end

data/lib/enumy/rails/enum.rb

@@ -0,0 +1,47 @@
+require 'enumy/rails/initializer_interceptor'
+
+module Enumy
+  module Rails
+    class Enum < Enumy::Enum
+      include Enumy::Rails::InitializerInterceptor
+      include ::ActiveModel::Model
+      include ::ActiveModel::Attributes
+
+      attribute :key
+
+      def initialize(key, **attrs)
+        raise Errors::KeyMissingError.new(self) if key.nil?
+        super(key: key.to_sym, **attrs)
+      end
+
+      def titleize
+        key.to_s.titleize
+      end
+
+      def human_attribute_name(attribute)
+        I18n.t("#{self.class.i18n_scope}.attributes.models.#{self.class.model_name.i18n_key}/#{self.key}.#{attribute}")
+      end
+
+      def name
+        human_attribute_name(:key)
+      end
+
+      def inspect
+        "#<#{self.class.name} #{attributes.map { |name, value| "#{name}: #{value.inspect}" }.join(', ')}>"
+      end
+
+      class << self
+
+        def model_name
+          @model_name ||= ::ActiveModel::Name.new(self, nil, self.name.to_s)
+        end
+
+        def i18n_scope
+          :enum
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -1,3 +1,3 @@
-class ApplicationEnum < Enumy::RailsEnum
+class ApplicationEnum < Enumy::Rails::Enum
 
 end

data/lib/enumy/rails/model.rb

@@ -26,7 +26,7 @@ module Enumy
         if enum_class.nil?
           raise Errors::InvalidEnumClassError, "Could not resolve class `#{class_name.to_s.classify}`"
         elsif !enum_class.ancestors.include?(Enumy::Enum)
-          raise Errors::InvalidEnumClassError, "`#{enum_class.name}` does not inherit from `#{Enumy::Base.name}`"
+          raise Errors::InvalidEnumClassError, "`#{enum_class.name}` does not inherit from `#{Enumy::Enum.name}`"
         end
       end
     end

data/lib/enumy/version.rb

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

data/lib/enumy.rb

@@ -1,8 +1,9 @@
 require 'enumy/version'
 require 'enumy/enum'
+require 'enumy/model'
 
 if defined?(Rails)
-  require 'enumy/rails_enum'
+  require 'enumy/rails/enum'
   require 'enumy/rails/model'
   require 'enumy/rails/generators/enumy/install/install_generator'
   require 'enumy/rails/active_model/type/enum'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enumy
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Bevan Holborn
@@ -59,14 +59,15 @@ files:
 - lib/enumy.rb
 - lib/enumy/enum.rb
 - lib/enumy/errors.rb
+- lib/enumy/model.rb
 - lib/enumy/rails/active_job/serializers/enum_serializer.rb
 - lib/enumy/rails/active_model/type/enum.rb
+- lib/enumy/rails/enum.rb
 - lib/enumy/rails/generators/enumy/install/install_generator.rb
 - lib/enumy/rails/generators/enumy/install/templates/app/enums/application_enum.rb
 - lib/enumy/rails/initializer_interceptor.rb
 - lib/enumy/rails/model.rb
 - lib/enumy/rails/railtie.rb
-- lib/enumy/rails_enum.rb
 - lib/enumy/version.rb
 homepage: https://rubygems.org/gems/enumy
 licenses:

data/lib/enumy/rails_enum.rb

@@ -1,41 +0,0 @@
-require 'enumy/rails/initializer_interceptor'
-
-module Enumy
-  class RailsEnum < Enumy::Enum
-    include Enumy::Rails::InitializerInterceptor
-    include ::ActiveModel::Model
-    include ::ActiveModel::Attributes
-
-    attribute :key
-
-    def initialize(key, **attrs)
-      raise Errors::KeyMissingError.new(self) if key.nil?
-      super(key: key.to_sym, **attrs)
-    end
-
-    def titleize
-      key.to_s.titleize
-    end
-
-    def human_attribute_name(attribute)
-      I18n.t("#{self.class.i18n_scope}.attributes.models.#{self.class.model_name.i18n_key}/#{self.key}.#{attribute}")
-    end
-
-    def name
-      human_attribute_name(:key)
-    end
-
-    class << self
-
-      def model_name
-        @model_name ||= ::ActiveModel::Name.new(self, nil, self.name.to_s)
-      end
-
-      def i18n_scope
-        :enum
-      end
-
-    end
-
-  end
-end