granite 0.14.0 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0524a0055b0ea48aeab0691a1063cf332455b87094e2a78dbb6b66cc24b168e
-  data.tar.gz: e07a9c6a636eed28916860e213beea548aa92943da442b7d39019b346079e3fc
+  metadata.gz: 9d4056c068ce20c44a4951e8f2c6c52be5d37913900c79a32041627c08bc09d9
+  data.tar.gz: 00127702e26bd46b17778e6ead007acce5b59cfbfd1a3b01d315c8286b6b6d36
 SHA512:
-  metadata.gz: 217ac1d410c18e838f648af770c610b24ad4a28fc70e37514060509b5ac0a9303907912da5a2e7151162df2d842c78cdf3dd4c03e64ae464427bea9707923410
-  data.tar.gz: 2824f499e042ce4df4565d450367ccf3c33b711586c496c752fde675c4a1bd4d2a5810b92c84916603436981ef61c100583d89865e7f5c758c5033fbc3d97e20
+  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/context_proxy/proxy.rb

@@ -3,8 +3,6 @@ module Granite
     # Proxy which wraps the following method calls with BA context.
     #
     class Proxy
-      extend Granite::Ruby3Compatibility
-
       def initialize(klass, context)
         @klass = klass
         @context = context

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.0'.freeze
+  VERSION = '0.14.2'.freeze
 end

data/lib/granite.rb

@@ -1,11 +1,11 @@
 require 'active_support/dependencies'
 require 'action_controller'
+require 'ruby2_keywords'
 
 require 'granite/version'
 require 'granite/config'
 require 'granite/context'
 require 'granite/util'
-require 'granite/ruby3_compatibility'
 
 module Granite
   def self.config

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: granite
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.2
 platform: ruby
 authors:
 - Toptal Engineering
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-19 00:00:00.000000000 Z
+date: 2022-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -78,6 +78,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.16'
+- !ruby/object:Gem::Dependency
+  name: ruby2_keywords
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -302,8 +316,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.15'
-description: 
-email: 
+description:
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -375,7 +389,6 @@ files:
 - lib/granite/rspec/projector_helpers.rb
 - lib/granite/rspec/raise_validation_error.rb
 - lib/granite/rspec/satisfy_preconditions.rb
-- lib/granite/ruby3_compatibility.rb
 - lib/granite/translations.rb
 - lib/granite/typecasters.rb
 - lib/granite/util.rb
@@ -387,7 +400,7 @@ homepage: https://github.com/toptal/granite
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -402,8 +415,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.9
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: Another business actions architecture for Rails apps
 test_files: []

data/lib/granite/ruby3_compatibility.rb

@@ -1,15 +0,0 @@
-module Granite
-  module Ruby3Compatibility
-    # Method definition aimed to provide compatibility between Ruby 2.6 and 3.0
-    # It's being recommended in this article
-    # https://www.ruby-lang.org/en/news/2019/12/12/separation-of-positional-and-keyword-arguments-in-ruby-3-0/
-    #
-    # Example:
-    #
-    # ruby2_keywords def a_method(argument, *args, &block)
-    #   delegating_to_method(argument, *args, &block)
-    # end
-    def ruby2_keywords(*)
-    end
-  end
-end