granite 0.9.9 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c916196599f14f9af76a9a550ffb51e7e4db5fd97deee1cf7cf04135c4bfb217
-  data.tar.gz: 6fc2f4a436734b34eb2096fa063a0d82e6fe6bf58afbb04af07b1a86d82d8727
+  metadata.gz: 8f01fbcec194a3031c22582899a7ff0210d2b621aa149a5ccf7814a3a70540ea
+  data.tar.gz: c763544b18d4feb43a5502df2e661dce313c304f47543978be095e4e72afc863
 SHA512:
-  metadata.gz: 0bd7b860deb8221df8be1e1227df3c71462862a47ba9243ec7ebc3be1972aeaa95b5c14334ab45aa372f7fe45fc89ed7b3af79a9fb52c3ed5f3e3908981611af
-  data.tar.gz: 6f164dc00ce5e56be2bff2bd01f22b49d37996decc05b74816a129f1598451d0dbbb184c1c7d02cac90e52eca80e947e8cba6932dba6842a030ce7801864ba0d
+  metadata.gz: '099c76956322fe11a1118dc25a1fffbc0553018d1abf660d7c6270256f40505a3d93be01e57df0d7502c767c09d961fcf3361a7281315296e6abb9c512a38a9f'
+  data.tar.gz: 9b1b66eca75f4ff623319d1828cbec2b987c36050fb70598a8a14ea7edd760da38eb61c89f0a4de3b706875b68a16dccefe22333c3ac8edbe5b80864e04f4aca

data/app/controllers/granite/controller/translations.rb

@@ -6,7 +6,8 @@ module Granite
       end
 
       def translate(*args, **options)
-        super(*Granite::Translations.scope_translation_args(i18n_scopes, *args, **options))
+        key, options = Granite::Translations.scope_translation_args(i18n_scopes, *args, **options)
+        super(key, **options)
       end
 
       alias t translate

data/lib/granite/action/performing.rb

@@ -42,7 +42,7 @@ module Granite
       # @return [Object] result of execute_perform! method execution or false in case of errors
       def perform(context: nil, **options)
         transaction do
-          valid?(context) && perform_action(options)
+          valid?(context) && perform_action(**options)
         end
       end
 
@@ -94,7 +94,7 @@ module Granite
       def perform_action(raise_errors: false, **options)
         result = run_callbacks(:execute_perform) do
           apply_association_changes!
-          execute_perform!(options)
+          execute_perform!(**options)
         end
         @_action_performed = true
         result || true

data/lib/granite/action/policies.rb

@@ -55,17 +55,17 @@ module Granite
         end
       end
 
-      def try_perform!(*)
+      def try_perform!(*, **)
         authorize!
         super
       end
 
-      def perform(*)
+      def perform(*, **)
         authorize!
         super
       end
 
-      def perform!(*)
+      def perform!(*, **)
         authorize!
         super
       end

data/lib/granite/action/preconditions/base_precondition.rb

@@ -9,7 +9,7 @@ module Granite
         end
 
         def execute!(context)
-          _execute(context) if context.conditions_satisfied?(@options)
+          _execute(context) if context.conditions_satisfied?(**@options)
         end
 
         private

data/lib/granite/action/preconditions.rb

@@ -51,15 +51,7 @@ module Granite
           elsif args.first.is_a?(Class)
             add_precondition(ObjectPrecondition, *args, options)
           else
-            common_options = options.extract!(:if, :unless, :desc, :description)
-            args.each do |type|
-              precondition common_options.merge(type => {})
-            end
-            options.each do |key, value|
-              value = Array.wrap(value)
-              precondition_options = value.extract_options!
-              add_precondition(klass(key), *value, precondition_options.merge!(common_options))
-            end
+            add_preconditions_hash(*args, **options)
           end
         end
 
@@ -72,6 +64,18 @@ module Granite
           end || fail(NameError, "No precondition class for #{key}Precondition")
         end
 
+        def add_preconditions_hash(*args, **options)
+          common_options = options.extract!(:if, :unless, :desc, :description)
+          args.each do |type|
+            precondition common_options.merge(type => {})
+          end
+          options.each do |key, value|
+            value = Array.wrap(value)
+            precondition_options = value.extract_options!
+            add_precondition(klass(key), *value, precondition_options.merge!(common_options))
+          end
+        end
+
         def add_precondition(klass, *args, &block)
           self._preconditions += klass.new(*args, &block)
         end

data/lib/granite/action/translations.rb

@@ -16,7 +16,8 @@ module Granite
       end
 
       def translate(*args, **options)
-        I18n.translate(*Granite::Translations.scope_translation_args(self.class.i18n_scopes, *args, **options))
+        key, options = Granite::Translations.scope_translation_args(self.class.i18n_scopes, *args, **options)
+        I18n.translate(key, **options)
       end
       alias t translate
     end

data/lib/granite/action.rb

@@ -50,20 +50,28 @@ module Granite
     prepend AssignAttributes
 
     handle_exception ActiveRecord::RecordInvalid do |e|
-      errors.messages.deep_merge!(e.record.errors.messages) do |_, this, other|
-        (this + other).uniq
-      end
+      merge_errors(e.record.errors)
     end
 
     handle_exception ActiveData::ValidationError do |e|
-      errors.messages.deep_merge!(e.model.errors.messages) do |_, this, other|
-        (this + other).uniq
-      end
+      merge_errors(e.model.errors)
     end
 
     handle_exception Granite::Action::ValidationError do |e|
-      errors.messages.deep_merge!(e.action.errors.messages) do |_, this, other|
-        (this + other).uniq
+      merge_errors(e.action.errors)
+    end
+
+    if ActiveModel.version < Gem::Version.new('6.1.0')
+      def merge_errors(other_errors)
+        errors.messages.deep_merge!(other_errors.messages) do |_, this, other|
+          (this + other).uniq
+        end
+      end
+    else
+      def merge_errors(other_errors)
+        other_errors.each do |error|
+          errors.import(error) unless errors.added?(error.attribute, error)
+        end
       end
     end
 

data/lib/granite/assign_data.rb

@@ -0,0 +1,40 @@
+module Granite
+  module AssignData
+    DataAssignment = Struct.new(:method, :options)
+
+    extend ActiveSupport::Concern
+
+    included do
+      class_attribute :data_assignments
+      self.data_assignments = []
+
+      alias_method :only_run_validations!, :run_validations!
+      protected :only_run_validations! # rubocop:disable Style/AccessModifierDeclarations
+    end
+
+    module ClassMethods
+      # Defines a callback to call when assigning data from business action to model.
+      # @param methods [Array<Symbol>] list of methods to call
+      # @param block [Proc] a block to call
+      # @option options [Symbol, Proc, Object] :if call methods/block if this condition evaluates to true
+      # @option options [Symbol, Proc, Object] :unless call method/block unless this condition evaluates to true
+      def assign_data(*methods, **options, &block)
+        self.data_assignments += methods.map { |method| DataAssignment.new(method, options) }
+        self.data_assignments += [DataAssignment.new(block, options)] if block
+      end
+    end
+
+    protected
+
+    def assign_data
+      data_assignments.each { |assignment| evaluate(assignment.method) if conditions_satisfied?(**assignment.options) }
+    end
+
+    private
+
+    def run_validations!
+      assign_data
+      super
+    end
+  end
+end

data/lib/granite/base.rb

@@ -5,8 +5,11 @@ require 'active_data/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
+  # embeds_many)
   module Base
     extend ActiveSupport::Concern
 
@@ -19,6 +22,7 @@ module Granite
     include ActiveModel::Validations::Callbacks
 
     include Granite::Util
+    include Granite::AssignData
     include Granite::Represents
   end
 end

data/lib/granite/dispatcher.rb

@@ -25,7 +25,7 @@ class Granite::Dispatcher
   end
 
   def controller(params, *_args)
-    projector(params.slice(:granite_action, :granite_projector).symbolize_keys)&.controller_class
+    projector(*params.values_at(:granite_action, :granite_projector))&.controller_class
   end
 
   def prepare_params!(params, *_args)
@@ -39,19 +39,19 @@ class Granite::Dispatcher
       controller(req.params),
       action_name(
         req.request_method_symbol,
-        req.params.slice(:granite_action, :granite_projector, :projector_action).symbolize_keys
+        *req.params.values_at(:granite_action, :granite_projector, :projector_action)
       )
     ]
   end
 
-  memoize def action_name(request_method_symbol, granite_action:, granite_projector:, projector_action: '')
-    projector = projector(granite_action: granite_action, granite_projector: granite_projector)
+  memoize def action_name(request_method_symbol, granite_action, granite_projector, projector_action)
+    projector = projector(granite_action, granite_projector)
     return unless projector
 
-    projector.action_for(request_method_symbol, projector_action)
+    projector.action_for(request_method_symbol, projector_action.to_s)
   end
 
-  memoize def projector(granite_action:, granite_projector:)
+  memoize def projector(granite_action, granite_projector)
     action = business_action(granite_action)
 
     action.public_send(granite_projector) if action.respond_to?(granite_projector)

data/lib/granite/projector/controller_actions.rb

@@ -23,11 +23,11 @@ module Granite
             controller_class.__send__(:define_method, name, &block)
             class_eval <<-METHOD, __FILE__, __LINE__ + 1
               def #{name}_url(options = {})
-                action_url(:#{name}, options.symbolize_keys)
+                action_url(:#{name}, **options.symbolize_keys)
               end
 
               def #{name}_path(options = {})
-                action_path(:#{name}, options.symbolize_keys)
+                action_path(:#{name}, **options.symbolize_keys)
               end
             METHOD
           else

data/lib/granite/projector/translations.rb

@@ -8,7 +8,8 @@ module Granite
       end
 
       def translate(*args, **options)
-        super(*Granite::Translations.scope_translation_args(i18n_scopes, *args, **options))
+        key, options = Granite::Translations.scope_translation_args(i18n_scopes, *args, **options)
+        super(key, **options)
       end
 
       alias t translate

data/lib/granite/represents/attribute.rb

@@ -34,7 +34,7 @@ module Granite
       end
 
       def changed?
-        if reflection.options[:default].present?
+        if reflection.options.key?(:default)
           reference.public_send(reader) != read
         else
           owner.public_send("#{name}_changed?")

data/lib/granite/represents.rb

@@ -13,10 +13,7 @@ module Granite
         fields.each do |field|
           add_attribute Granite::Represents::Reflection, field, options, &block
 
-          before_validation do
-            attribute(field).sync if attribute(field).changed?
-            true
-          end
+          assign_data { attribute(field).sync if attribute(field).changed? }
         end
       end
     end

data/lib/granite/util.rb

@@ -26,7 +26,7 @@ module Granite
     # @option options :if method name or callable
     # @option options :unless method name or callable
     # @return [Boolean] whether conditions are satisfied
-    def conditions_satisfied?(options)
+    def conditions_satisfied?(**options)
       fail ArgumentError, 'You cannot specify both if and unless' if options.key?(:if) && options.key?(:unless)
 
       if options.key?(:if)

data/lib/granite/version.rb

@@ -1,3 +1,3 @@
 module Granite
-  VERSION = '0.9.9'.freeze
+  VERSION = '0.12.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: granite
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.12.0
 platform: ruby
 authors:
-- Arkadiy Zabazhanov & friends
-autorequire: 
+- Toptal Engineering
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-21 00:00:00.000000000 Z
+date: 2021-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -19,7 +19,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,21 +29,21 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: active_data
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +53,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -63,7 +63,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: memoist
   requirement: !ruby/object:Gem::Requirement
@@ -84,20 +84,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        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
@@ -294,8 +302,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.15'
-description: 
-email: 
+description:
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -334,6 +342,7 @@ files:
 - lib/granite/action/translations.rb
 - lib/granite/action/types.rb
 - lib/granite/action/types/collection.rb
+- lib/granite/assign_data.rb
 - lib/granite/base.rb
 - lib/granite/config.rb
 - lib/granite/context.rb
@@ -374,7 +383,7 @@ homepage: https://github.com/toptal/granite
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -389,8 +398,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
-signing_key: 
+rubygems_version: 3.2.29
+signing_key:
 specification_version: 4
 summary: Another business actions architecture for Rails apps
 test_files: []