granite 0.11.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a6546b162c712c95bf1c954a99143418186c5392548e7a6f767755d7715854c
-  data.tar.gz: 2cd60295ca235be9d5a561f92777a8a7db2920481f33309c93b6730587df14e3
+  metadata.gz: 17fb5bd6029503d159cdb3e5dd88d0f58961a30e81e1752327bc261733c62df9
+  data.tar.gz: cf15fd7b77203667a28c57ede076ee17a1df1014eca1cf97f15cc6efc2a3755a
 SHA512:
-  metadata.gz: 89dbff44372428da1723b72f28181880a69428845fd6e0665b981fbb9f13e4323176f1b888f93986f15da104618f2674b01f445f21ca13ce6472595bf26009be
-  data.tar.gz: df01fdaec830de6c86fe291a608e7e32df1feefcfe2e92964b435e95505ffd027705e531f912bc5e7ee2a779a88485c7a9a1c439366a01de1bec6a88eda5a3b8
+  metadata.gz: 3540905bc5f0198b002bfd0be1c7a2dca41b594c6a21538c4cfa0763d85fe770fafb45227fb6f28b73e206b63dfe302a3cbe04af97cfe1e1f055f9adaa48f4dc
+  data.tar.gz: f8837fc5c591f9c4169bcf60f6c6c9de8a3158e66c52d961b871f8bfe753f63ee353d7e560fa7fd3cb8667656fb30da01acf2065377ea50d6162f74ce8757202

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,16 +62,14 @@ 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?
 
-          log_errors(collected_errors[1..-1])
+          log_errors(collected_errors[1..])
           fail collected_errors.first
         end
 

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

data/lib/granite/performer_proxy/proxy.rb

@@ -4,6 +4,8 @@ module Granite
     # performer-enabled context.
     #
     class Proxy
+      extend Granite::Ruby3Compatibility
+
       def initialize(klass, performer)
         @klass = klass
         @performer = performer
@@ -13,7 +15,7 @@ module Granite
         "<#{@klass}PerformerProxy #{@performer}>"
       end
 
-      def method_missing(method, *args, &block)
+      ruby2_keywords def method_missing(method, *args, &block)
         if @klass.respond_to?(method)
           @klass.with_proxy_performer(@performer) do
             @klass.public_send(method, *args, &block)

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/projector/helpers.rb

@@ -35,8 +35,7 @@ Do you have #{projector.action_class.name.underscore}##{projector.projector_name
 
       def required_params
         corresponding_route.required_parts
-          .map { |name| [name, action.public_send(name)] }
-          .to_h
+          .to_h { |name| [name, action.public_send(name)] }
       end
 
       def corresponding_route

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/projector_helpers.rb

@@ -30,16 +30,10 @@ module Granite::ProjectorHelpers
 
     private
 
-    def setup_controller
-      singleton_class.class_eval do
-        def controller_class
-        end
-      end
-
-      before do
-        @controller = yield.controller_class.new
-        @controller.class.instance_variable_set(:@controller_path, yield.projector_path)
-        @controller.request = @request
+    def setup_controller(&block)
+      define_method :setup_controller_request_and_response do
+        @controller ||= instance_eval(&block).controller_class.new
+        super()
       end
     end
 

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/ruby3_compatibility.rb

@@ -0,0 +1,15 @@
+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

data/lib/granite/version.rb

@@ -1,3 +1,3 @@
 module Granite
-  VERSION = '0.11.1'.freeze
+  VERSION = '0.13.0'.freeze
 end

data/lib/granite.rb

@@ -5,6 +5,7 @@ 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.11.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Toptal Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-27 00:00:00.000000000 Z
+date: 2022-07-14 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
@@ -364,6 +372,7 @@ 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
@@ -383,14 +392,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.3.17
 signing_key: 
 specification_version: 4
 summary: Another business actions architecture for Rails apps