granite 0.14.1 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6a9f12a8fab90e99e863a20803400744a5eb9f0393d4fd8e9242e6d2eca542b
-  data.tar.gz: 54c451903bc4b9b9cebbe7fd07201e8492f0fbaab301d2cbae05e4f7ecc9c6e5
+  metadata.gz: 9d4056c068ce20c44a4951e8f2c6c52be5d37913900c79a32041627c08bc09d9
+  data.tar.gz: 00127702e26bd46b17778e6ead007acce5b59cfbfd1a3b01d315c8286b6b6d36
 SHA512:
-  metadata.gz: bae2c1833fe6f5e04f31a3974c6d7d94afe0a71dca159b73fd53350d30c97fcac26b67330484ade77ee08e1b1bbce0d14cba44e37408dcdde0cccf9085927152
-  data.tar.gz: 618880a543e9c33b448990ebbf3947fab1bbf1ddcad7797dc22f4c22e6f7fbc025ffdfd224b8d321c091bcac07517ad222938cdb68fc76a63e320cc5a5f17768
+  metadata.gz: 611de3a2edf7e5b7e42d2da1b06f35cef0a49c3ff7712c3bffe57a4f0deecd7e3454216dd13617914d211825a34764b223ad8b780537a9d4d0122c7aa0e0e429
+  data.tar.gz: 5273870b5a1a2c0d93deef1a21d3c8f3d40bda27e19588199a6301544d7d454df50243dbd4bedf766988ddf37502e177c727f998d5fabbbfeef4761bd395d31d

data/lib/granite/action/subject.rb

@@ -29,15 +29,20 @@ module Granite
 
           self._subject = name
         end
+
+        def subject?
+          _subject.present?
+        end
+
+        def subject_reflection
+          reflect_on_association(_subject)
+        end
       end
 
       def initialize(*args)
-        if self.class._subject.blank?
-          super
-          return
-        end
+        return super unless self.class.subject? # rubocop:disable Lint/ReturnInVoidContext
 
-        reflection = self.class.reflect_on_association(self.class._subject)
+        reflection = self.class.subject_reflection
         attributes = extract_initialize_attributes(args)
 
         subject_attributes = extract_subject_attributes!(attributes, reflection)

data/lib/granite/action.rb

@@ -72,7 +72,7 @@ module Granite
     else
       def merge_errors(other_errors)
         other_errors.each do |error|
-          errors.import(error) unless errors.added?(error.attribute, error)
+          errors.import(error) unless errors.messages[error.attribute].include?(error.message)
         end
       end
     end

data/lib/granite/represents/attribute.rb

@@ -1,6 +1,10 @@
 module Granite
   module Represents
     class Attribute < ActiveData::Model::Attributes::Attribute
+      types = {}
+      types[ActiveRecord::Enum::EnumType] = String if defined?(ActiveRecord)
+      TYPES = types.freeze
+
       delegate :writer, :reader, :reader_before_type_cast, to: :reflection
 
       def initialize(*_args)
@@ -84,6 +88,7 @@ module Granite
 
         attribute_type = reference.type_for_attribute(name.to_s)
 
+        return TYPES[attribute_type.class] if TYPES.key?(attribute_type.class)
         return Granite::Action::Types::Collection.new(convert_type_to_value_class(attribute_type.subtype)) if attribute_type.respond_to?(:subtype)
 
         convert_type_to_value_class(attribute_type)

data/lib/granite/version.rb

@@ -1,3 +1,3 @@
 module Granite
-  VERSION = '0.14.1'.freeze
+  VERSION = '0.14.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: granite
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.14.2
 platform: ruby
 authors:
 - Toptal Engineering
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-26 00:00:00.000000000 Z
+date: 2022-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -316,8 +316,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.15'
-description: 
-email: 
+description:
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -400,7 +400,7 @@ homepage: https://github.com/toptal/granite
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -416,7 +416,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.33
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Another business actions architecture for Rails apps
 test_files: []