granite 0.9.9 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c916196599f14f9af76a9a550ffb51e7e4db5fd97deee1cf7cf04135c4bfb217
-  data.tar.gz: 6fc2f4a436734b34eb2096fa063a0d82e6fe6bf58afbb04af07b1a86d82d8727
+  metadata.gz: 6899733124529783eda1187a978475dea09fe5c716349d50f4dbf02f0c70a90c
+  data.tar.gz: 81113bf6131ba438bb21af75c0b870ca3e0f8e07cbd8d754c274c259311ae640
 SHA512:
-  metadata.gz: 0bd7b860deb8221df8be1e1227df3c71462862a47ba9243ec7ebc3be1972aeaa95b5c14334ab45aa372f7fe45fc89ed7b3af79a9fb52c3ed5f3e3908981611af
-  data.tar.gz: 6f164dc00ce5e56be2bff2bd01f22b49d37996decc05b74816a129f1598451d0dbbb184c1c7d02cac90e52eca80e947e8cba6932dba6842a030ce7801864ba0d
+  metadata.gz: 1f6715806d76f01ec2f017c83bacecc3a33dc3ed9099493a2f245f84eadabe87abe5835bcfcb16fda8fc2f5b71022c84053291a1f4d4c829691cfaf216068d46
+  data.tar.gz: ec7f880050ff0a6b7de11d576d22038d5dcca6d0e3e71c2c7a2c4adb59280f153e05210bf7c7e4df519ddada2d5d337c12fdec34c3fddb060cf5dd82520ae3ff

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.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/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/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/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)
   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/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.10.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.10.0
 platform: ruby
 authors:
-- Arkadiy Zabazhanov & friends
+- Toptal Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-21 00:00:00.000000000 Z
+date: 2021-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack