granite 0.14.1 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6a9f12a8fab90e99e863a20803400744a5eb9f0393d4fd8e9242e6d2eca542b
-  data.tar.gz: 54c451903bc4b9b9cebbe7fd07201e8492f0fbaab301d2cbae05e4f7ecc9c6e5
+  metadata.gz: 2cf5813f23b963898bbdd4f55d35b2f0699428c657413ee6f18d56713ffcf659
+  data.tar.gz: 48a04a7a60bf1819222728acf33c8bf0a73149d9b9d83b2ea04bc70a2182ec04
 SHA512:
-  metadata.gz: bae2c1833fe6f5e04f31a3974c6d7d94afe0a71dca159b73fd53350d30c97fcac26b67330484ade77ee08e1b1bbce0d14cba44e37408dcdde0cccf9085927152
-  data.tar.gz: 618880a543e9c33b448990ebbf3947fab1bbf1ddcad7797dc22f4c22e6f7fbc025ffdfd224b8d321c091bcac07517ad222938cdb68fc76a63e320cc5a5f17768
+  metadata.gz: b182f94aa37d25756606fe9384a5ea98963279f8a58f84a66a7660fd21a3076b46f6965d56e26d5bc75357431f9bec2dfabb639bd198b0d00529d2567dd21628
+  data.tar.gz: 814dbec1866a2845d869489d82051feb017e4c850460fef1af69f13d31cf6c40fb66dbddec52529e84dfd292acce8bf73bb4479f9f8e2fca42c586c9dd12b2a2

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)
@@ -61,7 +66,7 @@ module Granite
 
         self.subject = args.first unless args.empty?
         fail SubjectNotFoundError, self.class unless subject
-      rescue ActiveData::AssociationTypeMismatch
+      rescue Granite::Form::AssociationTypeMismatch
         raise SubjectTypeMismatchError.new(self.class, args.first.class.name, reflection.klass)
       end
 

data/lib/granite/action/transaction_manager.rb

@@ -75,7 +75,7 @@ module Granite
 
         def log_errors(errors)
           errors.each do |error|
-            ActiveData.config.logger.error "Unhandled error in callback: #{error.inspect}\n#{error.backtrace.join("\n")}"
+            Granite::Form.config.logger.error "Unhandled error in callback: #{error.inspect}\n#{error.backtrace.join("\n")}"
           end
         end
       end

data/lib/granite/action.rb

@@ -1,4 +1,4 @@
-require 'active_data'
+require 'granite/form'
 require 'active_record/errors'
 require 'active_record/validations'
 require 'active_support/callbacks'
@@ -27,7 +27,7 @@ module Granite
     end
 
     # We are using a lot of stacked additional logic for `assign_attributes`
-    # At least, represented and nested attributes modules in ActiveData
+    # At least, represented and nested attributes modules in Granite::Form
     # are having such a method redefiniions. Both are prepended to the
     # Granite action, so we have to prepend our patch as well in order
     # to put it above all other, so it will handle the attributes first.
@@ -55,7 +55,7 @@ module Granite
       merge_errors(e.record.errors)
     end
 
-    handle_exception ActiveData::ValidationError do |e|
+    handle_exception Granite::Form::ValidationError do |e|
       merge_errors(e.model.errors)
     end
 
@@ -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/base.rb

@@ -1,24 +1,24 @@
-require 'active_data/model'
-require 'active_data/model/primary'
-require 'active_data/model/lifecycle'
-require 'active_data/model/associations'
+require 'granite/form/model'
+require 'granite/form/model/primary'
+require 'granite/form/model/lifecycle'
+require 'granite/form/model/associations'
 
 require 'granite/translations'
 require 'granite/represents'
 require 'granite/assign_data'
 
 module Granite
-  # Base included in Granite::Action, but also used by ActiveData when building data objects (e.g. when using
+  # Base included in Granite::Action, but also used by Granite::Form when building data objects (e.g. when using
   # embeds_many)
   module Base
     extend ActiveSupport::Concern
 
     include ActiveSupport::Callbacks
-    include ActiveData::Model
-    include ActiveData::Model::Representation
-    include ActiveData::Model::Dirty
-    include ActiveData::Model::Associations
-    include ActiveData::Model::Primary
+    include Granite::Form::Model
+    include Granite::Form::Model::Representation
+    include Granite::Form::Model::Dirty
+    include Granite::Form::Model::Associations
+    include Granite::Form::Model::Primary
     include ActiveModel::Validations::Callbacks
 
     include Granite::Util

data/lib/granite/represents/attribute.rb

@@ -1,6 +1,9 @@
 module Granite
   module Represents
-    class Attribute < ActiveData::Model::Attributes::Attribute
+    class Attribute < Granite::Form::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)
@@ -23,13 +26,13 @@ module Granite
       def type
         return reflection.options[:type] if reflection.options[:type].present?
 
-        active_data_type || type_from_type_for_attribute || super
+        granite_form_type || type_from_type_for_attribute || super
       end
 
       def typecaster
         @typecaster ||= begin
           type_class = type.instance_of?(Class) ? type : type.class
-          @typecaster = ActiveData.typecaster(type_class.ancestors.grep(Class))
+          @typecaster = Granite::Form.typecaster(type_class.ancestors.grep(Class))
         end
       end
 
@@ -63,36 +66,43 @@ module Granite
         end
       end
 
-      def active_data_type
-        return nil unless reference.is_a?(ActiveData::Model)
+      def granite_form_type
+        return nil unless reference.is_a?(Granite::Form::Model)
 
         reference_attribute = reference.attribute(name)
 
         return nil if reference_attribute.nil?
 
         return Granite::Action::Types::Collection.new(reference_attribute.type) if [
-          ActiveData::Model::Attributes::ReferenceMany,
-          ActiveData::Model::Attributes::Collection,
-          ActiveData::Model::Attributes::Dictionary
+          Granite::Form::Model::Attributes::ReferenceMany,
+          Granite::Form::Model::Attributes::Collection,
+          Granite::Form::Model::Attributes::Dictionary
         ].any? { |klass| reference_attribute.is_a? klass }
 
-        reference_attribute.type # TODO: create `type_for_attribute` method inside of ActiveData
+        reference_attribute.type # TODO: create `type_for_attribute` method inside of Granite::Form
       end
 
       def type_from_type_for_attribute
         return nil unless reference.respond_to?(:type_for_attribute)
 
-        attribute_type = reference.type_for_attribute(name.to_s)
+        attribute_type = reference.type_for_attribute(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)
       end
 
+      def attribute_name
+        return name if ActiveModel.version >= Gem::Version.new('6.1.0')
+
+        reference.class.attribute_aliases[name.to_s] || name
+      end
+
       def convert_type_to_value_class(attribute_type)
         return attribute_type.value_class if attribute_type.respond_to?(:value_class)
 
-        ActiveData::Model::Associations::PersistenceAdapters::ActiveRecord::TYPES[attribute_type.type&.to_sym]
+        Granite::Form::Model::Associations::PersistenceAdapters::ActiveRecord::TYPES[attribute_type.type&.to_sym]
       end
     end
   end

data/lib/granite/represents/reflection.rb

@@ -2,7 +2,7 @@ require 'granite/represents/attribute'
 
 module Granite
   module Represents
-    class Reflection < ActiveData::Model::Attributes::Reflections::Represents
+    class Reflection < Granite::Form::Model::Attributes::Reflections::Represents
       class << self
         def build(target, generated_methods, name, *args, &block)
           options = args.last

data/lib/granite/typecasters.rb

@@ -1,7 +1,7 @@
-require 'active_data'
+require 'granite/form'
 
-ActiveData.typecaster('Granite::Action::Types::Collection') do |value, attribute|
-  typecaster = ActiveData.typecaster(attribute.type.subtype)
+Granite::Form.typecaster('Granite::Action::Types::Collection') do |value, attribute|
+  typecaster = Granite::Form.typecaster(attribute.type.subtype)
   if value.respond_to? :transform_values
     value.transform_values { |v| typecaster.call(v, attribute) }
   elsif value.respond_to?(:map)

data/lib/granite/version.rb

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

data/lib/granite.rb

@@ -28,4 +28,4 @@ require 'granite/routing'
 require 'granite/typecasters'
 require 'granite/rails' if defined?(::Rails)
 
-ActiveData.base_concern = Granite::Base
+Granite::Form.base_concern = Granite::Base

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: granite
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.15.0
 platform: ruby
 authors:
 - Toptal Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-26 00:00:00.000000000 Z
+date: 2022-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -31,19 +31,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '7.1'
 - !ruby/object:Gem::Dependency
-  name: active_data
+  name: granite-form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement