granite 0.11.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c87ec932a4c14889c6de808acc812dc2eac40bda53454aa5b737176a3b02c01
-  data.tar.gz: 57c47008c125ec1283bddb6e407b94be2099e1a6e02f909751de03ecbe0669c6
+  metadata.gz: 52d8a88997b67bfb217a38ca0cc018dc73643b9bc3c6a6cae2360faba4df0733
+  data.tar.gz: c544a8f9581989a4bb9aa46e31bba7ea41ad69275475d68dfb94ccffb12302e2
 SHA512:
-  metadata.gz: fca3402fa5593057b236362bdb6050c30f65b1f65dc7e48699ca0179e31005f8c74b1e613a901ae2211869fc2d28ad091fd008b350e7a61c5ba5807528929f98
-  data.tar.gz: 604bb52620145a6b23c37ca2a8e35250504171a7ce308371c4c4e964a83d7b5ce4d971ff8841ed3f607a3041ff31a9e9ce1058b46a8335811c1ed15411fd959b
+  metadata.gz: 2b66c8f502e7010349f5a75cdcd641010ee415797c7ae91e1b6b292501910e1001ba102280f407b75863eef3851eaff7e4c851fd03620930af340929ceeac61c
+  data.tar.gz: '08d61d57ebe13e3e40176d93a2dc4554606c998e8855f498338707faa455ad03e90cefee322141e6679e5a2c37ce27ab485646e166834c01d4a4ac364f557eae'

data/lib/granite/action/exceptions_handling.rb

@@ -7,7 +7,7 @@ module Granite
         class_attribute :_exception_handlers, instance_writer: false
         self._exception_handlers = {}
 
-        protected :_exception_handlers # rubocop:disable Style/AccessModifierDeclarations
+        protected :_exception_handlers
       end
 
       module ClassMethods

data/lib/granite/action/preconditions.rb

@@ -98,8 +98,8 @@ module Granite
       end
 
       # Adds passed error message and options to `errors` object
-      def decline_with(*args)
-        errors.add(:base, *args)
+      def decline_with(*args, **kwargs)
+        errors.add(:base, *args, **kwargs)
         failed_preconditions << args.first
       end
 

data/lib/granite/action/projectors.rb

@@ -85,13 +85,13 @@ module Granite
           _projectors.store(name, options, &block)
 
           class_eval <<-METHOD, __FILE__, __LINE__ + 1
-            def self.#{name}
-              _projectors.fetch(:#{name})
-            end
-
-            def #{name}
-              @#{name} ||= self.class._projectors.fetch(:#{name}).new(self)
-            end
+            def self.#{name}                                                # def self.foo
+              _projectors.fetch(:#{name})                                   #   _projectors.fetch(:foo)
+            end                                                             # end
+                                                                            #
+            def #{name}                                                     # def foo
+              @#{name} ||= self.class._projectors.fetch(:#{name}).new(self) #   @foo ||= self.class._projectors.fetch(:foo).new(self)
+            end                                                             # end
           METHOD
         end
       end

data/lib/granite/action/transaction_manager.rb

@@ -62,11 +62,9 @@ module Granite
           collected_errors = []
 
           callbacks.reverse_each do |callback|
-            begin
-              callback.respond_to?(:run_callbacks) ? callback.run_callbacks(:commit) : callback.call
-            rescue StandardError => e
-              collected_errors << e
-            end
+            callback.respond_to?(:run_callbacks) ? callback.run_callbacks(:commit) : callback.call
+          rescue StandardError => e
+            collected_errors << e
           end
 
           return unless collected_errors.any?

data/lib/granite/action/translations.rb

@@ -17,7 +17,7 @@ module Granite
 
       def translate(*args, **options)
         key, options = Granite::Translations.scope_translation_args(self.class.i18n_scopes, *args, **options)
-        I18n.translate(key, **options)
+        I18n.t(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

@@ -1,6 +1,6 @@
 module Granite
   module AssignData
-    DataAssignment = Struct.new(:method, :options)
+    DataAssignment = Struct.new(:method, :options) # rubocop:disable Lint/StructNewOverride
 
     extend ActiveSupport::Concern
 
@@ -9,7 +9,7 @@ module Granite
       self.data_assignments = []
 
       alias_method :only_run_validations!, :run_validations!
-      protected :only_run_validations! # rubocop:disable Style/AccessModifierDeclarations
+      protected :only_run_validations!
     end
 
     module ClassMethods
@@ -24,15 +24,17 @@ module Granite
       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
-
-    def assign_data
-      data_assignments.each { |assignment| evaluate(assignment.method) if conditions_satisfied?(**assignment.options) }
-    end
   end
 end

data/lib/granite/projector/controller_actions.rb

@@ -22,13 +22,13 @@ module Granite
             self.controller_actions = controller_actions.merge(name.to_sym => options)
             controller_class.__send__(:define_method, name, &block)
             class_eval <<-METHOD, __FILE__, __LINE__ + 1
-              def #{name}_url(options = {})
-                action_url(:#{name}, **options.symbolize_keys)
-              end
-
-              def #{name}_path(options = {})
-                action_path(:#{name}, **options.symbolize_keys)
-              end
+              def #{name}_url(options = {})                     # def foo_url(options = {}
+                action_url(:#{name}, **options.symbolize_keys)  #   action_url(:foo, **options.symbolize_keys)
+              end                                               # end
+                                                                #
+              def #{name}_path(options = {})                    # def foo_path(options = {})
+                action_path(:#{name}, **options.symbolize_keys) #   action_path(:foo, **options.symbolize_keys)
+              end                                               # end
             METHOD
           else
             controller_actions[name.to_sym]

data/lib/granite/represents/attribute.rb

@@ -15,7 +15,7 @@ module Granite
       end
 
       def typecast(value)
-        return value if value.class == type
+        return value if value.class == type # rubocop:disable Style/ClassEqualityComparison
 
         typecaster.call(value, self) unless value.nil?
       end
@@ -28,13 +28,13 @@ module Granite
 
       def typecaster
         @typecaster ||= begin
-                          type_class = type.instance_of?(Class) ? type : type.class
-                          @typecaster = ActiveData.typecaster(type_class.ancestors.grep(Class))
-                        end
+          type_class = type.instance_of?(Class) ? type : type.class
+          @typecaster = ActiveData.typecaster(type_class.ancestors.grep(Class))
+        end
       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/rspec/raise_validation_error.rb

@@ -23,14 +23,12 @@ RSpec::Matchers.define :raise_validation_error do
   end
 
   match do |block|
-    begin
-      block.call
-      false
-    rescue Granite::Action::ValidationError => e
-      @details = e.errors.details
-      @details_being_checked = @details[@attribute || :base]
-      @result = @details_being_checked&.any? { |x| x[:error] == @error_type }
-    end
+    block.call
+    false
+  rescue Granite::Action::ValidationError => e
+    @details = e.errors.details
+    @details_being_checked = @details[@attribute || :base]
+    @result = @details_being_checked&.any? { |x| x[:error] == @error_type }
   end
 
   description do

data/lib/granite/version.rb

@@ -1,3 +1,3 @@
 module Granite
-  VERSION = '0.11.0'.freeze
+  VERSION = '0.12.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: granite
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Toptal Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-27 00:00:00.000000000 Z
+date: 2022-03-07 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: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -244,42 +252,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.78.0
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.78.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: '2.13'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.37.0
+        version: '2.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.37.0
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -383,14 +391,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Another business actions architecture for Rails apps