granite 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cf5813f23b963898bbdd4f55d35b2f0699428c657413ee6f18d56713ffcf659
-  data.tar.gz: 48a04a7a60bf1819222728acf33c8bf0a73149d9b9d83b2ea04bc70a2182ec04
+  metadata.gz: d0a4953c8a4a24dfab614a8831bb8b39cda81d4a0b2d7e3ea8f2bb5d3d8eccc4
+  data.tar.gz: 6f1655c4167aef595d7c36fcd0fbde9e72376bd1fec2dafc38e6dc508f4f0417
 SHA512:
-  metadata.gz: b182f94aa37d25756606fe9384a5ea98963279f8a58f84a66a7660fd21a3076b46f6965d56e26d5bc75357431f9bec2dfabb639bd198b0d00529d2567dd21628
-  data.tar.gz: 814dbec1866a2845d869489d82051feb017e4c850460fef1af69f13d31cf6c40fb66dbddec52529e84dfd292acce8bf73bb4479f9f8e2fca42c586c9dd12b2a2
+  metadata.gz: bd0b0f97527283426bdaf8f5d25cf033053f0636958578621c84f5c8fc0c01f70528f1d759213ac0cddbc3327d5b06951b231d18cce3e987c612697dabb90c89
+  data.tar.gz: deff30290527973e4dee79d4584c7ffd5090a80737da57d1efe48e8fcdd89d0e11d220c8b5c81b55f313f2d3ced81b097ab454c67065b6db458629e18924c236

data/lib/generators/granite_generator.rb

@@ -5,11 +5,11 @@ class GraniteGenerator < Rails::Generators::NamedBase
   class_option :collection, type: :boolean, aliases: '-C', desc: 'Generate collection action'
 
   def create_action
-    template 'granite_action.rb.erb', "apq/actions/ba/#{file_path}.rb"
-    template 'granite_business_action.rb.erb', "apq/actions/ba/#{class_path.join('/')}/business_action.rb" unless options.collection?
+    template 'granite_action.rb.erb', "apq/actions/#{file_path}.rb"
+    template 'granite_business_action.rb.erb', "apq/actions/#{class_path.join('/')}/business_action.rb" unless options.collection?
     template 'granite_base_action.rb.erb', 'apq/actions/base_action.rb', skip: true
-    template 'granite_action_spec.rb.erb', "spec/apq/actions/ba/#{file_path}_spec.rb"
-    empty_directory "apq/actions/ba/#{file_path}/#{projector}" if projector
+    template 'granite_action_spec.rb.erb', "spec/apq/actions/#{file_path}_spec.rb"
+    empty_directory "apq/actions/#{file_path}/#{projector}" if projector
   end
 
   private
@@ -18,7 +18,7 @@ class GraniteGenerator < Rails::Generators::NamedBase
     if options.collection?
       'BaseAction'
     else
-      "BA::#{class_path.join('/').camelize}::BusinessAction"
+      "#{class_path.join('/').camelize}::BusinessAction"
     end
   end
 

data/lib/generators/templates/granite_action.rb.erb

@@ -1,4 +1,4 @@
-class BA::<%= class_name %> < <%= base_class_name %>
+class <%= class_name %> < <%= base_class_name %>
 <% if projector -%>
   projector :<%= projector %>
 

data/lib/generators/templates/granite_action_spec.rb.erb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe BA::<%= class_name %> do
+RSpec.describe <%= class_name %> do
 <% if options.collection? -%>
   subject(:action) { described_class.as(performer).new(attributes) }
 

data/lib/generators/templates/granite_business_action.rb.erb

@@ -1,3 +1,3 @@
-class BA::<%= class_path.join('/').camelize %>::BusinessAction < BaseAction
+class <%= class_path.join('/').camelize %>::BusinessAction < BaseAction
   subject :<%= subject_name %>
 end

data/lib/granite/action/performing.rb

@@ -93,7 +93,6 @@ module Granite
 
       def perform_action(raise_errors: false, **options)
         result = run_callbacks(:execute_perform) do
-          apply_association_changes!
           execute_perform!(**options)
         end
         @_action_performed = true

data/lib/granite/action/types/collection.rb

@@ -2,10 +2,18 @@ module Granite
   class Action
     module Types
       class Collection
-        attr_reader :subtype
+        attr_reader :subtype_definition
 
-        def initialize(subtype)
-          @subtype = subtype
+        def initialize(subtype_definition)
+          @subtype_definition = subtype_definition
+        end
+
+        def ensure_type(value)
+          if value.respond_to? :transform_values
+            value.transform_values { |v| subtype_definition.ensure_type(v) }
+          elsif value.respond_to?(:map)
+            value.map { |v| subtype_definition.ensure_type(v) }
+          end
         end
       end
     end

data/lib/granite/base.rb

@@ -1,6 +1,5 @@
 require 'granite/form/model'
 require 'granite/form/model/primary'
-require 'granite/form/model/lifecycle'
 require 'granite/form/model/associations'
 
 require 'granite/translations'

data/lib/granite/represents/attribute.rb

@@ -4,6 +4,11 @@ module Granite
       types = {}
       types[ActiveRecord::Enum::EnumType] = String if defined?(ActiveRecord)
       TYPES = types.freeze
+      GRANITE_COLLECTION_TYPES = [
+        Granite::Form::Model::Attributes::ReferenceMany,
+        Granite::Form::Model::Attributes::Collection,
+        Granite::Form::Model::Attributes::Dictionary
+      ].freeze
       delegate :writer, :reader, :reader_before_type_cast, to: :reflection
 
       def initialize(*_args)
@@ -17,23 +22,12 @@ module Granite
         reference.public_send(writer, read) if reference.respond_to?(writer)
       end
 
-      def typecast(value)
-        return value if value.class == type # rubocop:disable Style/ClassEqualityComparison
-
-        typecaster.call(value, self) unless value.nil?
-      end
-
-      def type
-        return reflection.options[:type] if reflection.options[:type].present?
-
-        granite_form_type || type_from_type_for_attribute || super
-      end
-
-      def typecaster
-        @typecaster ||= begin
-          type_class = type.instance_of?(Class) ? type : type.class
-          @typecaster = Granite::Form.typecaster(type_class.ancestors.grep(Class))
-        end
+      def type_definition
+        @type_definition ||= if reflection.options[:type].present?
+                               build_type_definition(reflection.options[:type])
+                             else
+                               granite_form_type_definition || active_record_type_definition || super
+                             end
       end
 
       def changed?
@@ -54,7 +48,7 @@ module Granite
         return unless reference.respond_to?(reader)
 
         variable_cache(:value) do
-          normalize(enumerize(typecast(defaultize(reference.public_send(reader)))))
+          normalize(enumerize(type_definition.ensure_type(defaultize(reference.public_send(reader)))))
         end
       end
 
@@ -66,31 +60,33 @@ module Granite
         end
       end
 
-      def granite_form_type
+      def granite_form_type_definition
         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 [
-          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 Granite::Form
+        type_definition = build_type_definition(reference_attribute.type)
+        if GRANITE_COLLECTION_TYPES.any? { |klass| reference_attribute.is_a? klass }
+          Granite::Action::Types::Collection.new(type_definition)
+        else
+          type_definition
+        end
       end
 
-      def type_from_type_for_attribute
+      def active_record_type_definition
         return nil unless reference.respond_to?(:type_for_attribute)
 
         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)
+        if TYPES.key?(attribute_type.class)
+          build_type_definition(TYPES[attribute_type.class])
+        elsif attribute_type.respond_to?(:subtype)
+          Granite::Action::Types::Collection.new(convert_active_model_type_to_definition(attribute_type.subtype))
+        else
+          convert_active_model_type_to_definition(attribute_type)
+        end
       end
 
       def attribute_name
@@ -99,10 +95,10 @@ module Granite
         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)
-
-        Granite::Form::Model::Associations::PersistenceAdapters::ActiveRecord::TYPES[attribute_type.type&.to_sym]
+      def convert_active_model_type_to_definition(attribute_type)
+        type = attribute_type.try(:value_class) ||
+          Form::Model::Associations::PersistenceAdapters::ActiveRecord::TYPES[attribute_type.type&.to_sym]
+        build_type_definition(type) if type
       end
     end
   end

data/lib/granite/version.rb

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

data/lib/granite.rb

@@ -25,7 +25,6 @@ require 'granite/dispatcher'
 require 'granite/action'
 require 'granite/projector'
 require 'granite/routing'
-require 'granite/typecasters'
-require 'granite/rails' if defined?(::Rails)
+require 'granite/rails' if defined?(Rails)
 
 Granite::Form.base_concern = Granite::Base

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: granite
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Toptal Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-22 00:00:00.000000000 Z
+date: 2023-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -120,6 +120,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bump
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -390,7 +404,6 @@ files:
 - lib/granite/rspec/raise_validation_error.rb
 - lib/granite/rspec/satisfy_preconditions.rb
 - lib/granite/translations.rb
-- lib/granite/typecasters.rb
 - lib/granite/util.rb
 - lib/granite/version.rb
 - lib/rubocop-granite.rb
@@ -415,7 +428,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Another business actions architecture for Rails apps

data/lib/granite/typecasters.rb

@@ -1,10 +0,0 @@
-require 'granite/form'
-
-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)
-    value.map { |v| typecaster.call(v, attribute) }
-  end
-end