granite 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a481550ca7df8de031fb4d8c118fac213c93d5e604217a0012c33b8a9d6b38c7
-  data.tar.gz: 10a9a6b2edce626d410095bede6c239b8745d077389570669cd0594071f127fc
+  metadata.gz: c916196599f14f9af76a9a550ffb51e7e4db5fd97deee1cf7cf04135c4bfb217
+  data.tar.gz: 6fc2f4a436734b34eb2096fa063a0d82e6fe6bf58afbb04af07b1a86d82d8727
 SHA512:
-  metadata.gz: f05bce79f8219eebee3a527aa1cf2ac451c9bac2d5e273123fdf599e050a6ec7000b669c78513bd00124f6b09f8305436dfdbede296b0d906ff3a5e5438151ef
-  data.tar.gz: daf3016428d057e31f14e140823278eb5b9150a43e805def99669269435ab48b1e97f2479d3dfda3c4f11d883e3fe08e7d1949ebdaefe7f47d56e867a6d3d08d
+  metadata.gz: 0bd7b860deb8221df8be1e1227df3c71462862a47ba9243ec7ebc3be1972aeaa95b5c14334ab45aa372f7fe45fc89ed7b3af79a9fb52c3ed5f3e3908981611af
+  data.tar.gz: 6f164dc00ce5e56be2bff2bd01f22b49d37996decc05b74816a129f1598451d0dbbb184c1c7d02cac90e52eca80e947e8cba6932dba6842a030ce7801864ba0d

data/app/controllers/granite/controller.rb

@@ -1,9 +1,9 @@
-require 'granite/projector/translations/helper'
 require 'action_controller'
 
 module Granite
   class Controller < Granite.base_controller_class
-    include Granite::Projector::Translations::Helper
+    include Controller::Translations
+    helper Controller::Translations
 
     singleton_class.__send__(:attr_accessor, :projector_class)
     singleton_class.delegate :projector_path, :projector_name, :action_class, to: :projector_class

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

@@ -0,0 +1,15 @@
+module Granite
+  class Controller
+    module Translations
+      def i18n_scopes
+        Granite::Translations.combine_paths(projector.i18n_scopes, [*action_name, nil])
+      end
+
+      def translate(*args, **options)
+        super(*Granite::Translations.scope_translation_args(i18n_scopes, *args, **options))
+      end
+
+      alias t translate
+    end
+  end
+end

data/lib/granite/action.rb

@@ -12,6 +12,7 @@ require 'granite/action/preconditions'
 require 'granite/action/policies'
 require 'granite/action/projectors'
 require 'granite/action/subject'
+require 'granite/action/translations'
 
 module Granite
   class Action
@@ -39,6 +40,7 @@ module Granite
     end
 
     include Base
+    include Translations
     include Performing
     include Subject
     include Performer
@@ -65,10 +67,6 @@ module Granite
       end
     end
 
-    def self.i18n_scope
-      :granite_action
-    end
-
     # Almost the same as Dirty `#changed?` method, but
     # doesn't check subject reference key
     def attributes_changed?(except: [])

data/lib/granite/action/translations.rb

@@ -0,0 +1,24 @@
+module Granite
+  class Action
+    module Translations
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        def i18n_scope
+          :granite_action
+        end
+
+        def i18n_scopes
+          lookup_ancestors.flat_map do |klass|
+            :"#{klass.i18n_scope}.#{klass.model_name.i18n_key}"
+          end + [nil]
+        end
+      end
+
+      def translate(*args, **options)
+        I18n.translate(*Granite::Translations.scope_translation_args(self.class.i18n_scopes, *args, **options))
+      end
+      alias t translate
+    end
+  end
+end

data/lib/granite/base.rb

@@ -19,7 +19,6 @@ module Granite
     include ActiveModel::Validations::Callbacks
 
     include Granite::Util
-    include Granite::Translations
     include Granite::Represents
   end
 end

data/lib/granite/projector/translations.rb

@@ -1,52 +1,17 @@
 module Granite
   class Projector
     module Translations
-      extend ActiveSupport::Concern
+      include ActionView::Helpers::TranslationHelper
 
-      class TranslationsWrapper
-        include ActionView::Helpers::TranslationHelper
+      def i18n_scopes
+        Granite::Translations.combine_paths(action_class.i18n_scopes, [:"#{projector_name}"])
       end
 
-      def translate(*args)
-        TranslationsWrapper.new.translate(*self.class.scope_translation_args_by_projector(args))
+      def translate(*args, **options)
+        super(*Granite::Translations.scope_translation_args(i18n_scopes, *args, **options))
       end
-      alias t translate
-
-      module ClassMethods
-        def scope_translation_args_by_projector(args, action_name: nil)
-          options = args.extract_options!
-
-          lookups = expand_relative_key(args.first, action_name).map(&:to_sym)
-          lookups += [options[:default]]
-          lookups = lookups.flatten.compact
-
-          key = lookups.shift
-          options[:default] = lookups
-
-          [key, options]
-        end
-
-        private
 
-        def expand_relative_key(key, action_name = nil)
-          return [key] unless key.is_a?(String) && key.start_with?('.')
-
-          base_keys = extract_base_keys(key, action_name)
-
-          action_class.lookup_ancestors.map do |klass|
-            base_keys.map do |base_key|
-              :"#{klass.i18n_scope}.#{klass.model_name.i18n_key}.#{base_key}"
-            end
-          end.flatten + base_keys
-        end
-
-        def extract_base_keys(key, action_name)
-          undotted_key = key.sub(/^\./, '')
-          base_keys = [:"#{projector_name}.#{undotted_key}"]
-          base_keys.unshift :"#{projector_name}.#{action_name}.#{undotted_key}" if action_name
-          base_keys
-        end
-      end
+      alias t translate
     end
   end
 end

data/lib/granite/routing/mapper.rb

@@ -5,8 +5,8 @@ module Granite
   module Routing
     module Mapper
       def granite(projector_path, **options)
-        route = Route.new(projector_path, options.extract!(:path, :as, :projector_prefix))
-        Declarer.declare(self, route, options)
+        route = Route.new(projector_path, **options.extract!(:path, :as, :projector_prefix))
+        Declarer.declare(self, route, **options)
       end
     end
   end

data/lib/granite/translations.rb

@@ -1,19 +1,14 @@
 module Granite
-  module Translations
-    extend ActiveSupport::Concern
-
-    def translate(*args)
-      I18n.translate(*self.class.scope_translation_args(args))
-    end
-    alias t translate
-
-    module ClassMethods
-      def scope_translation_args(args)
-        options = args.extract_options!
+  class Translations
+    class << self
+      def combine_paths(paths1, paths2)
+        paths1.flat_map do |path1|
+          paths2.map { |path2| [*path1, *path2].join('.') }
+        end
+      end
 
-        lookups = expand_relative_key(args.first).map(&:to_sym)
-        lookups += [options[:default]]
-        lookups = lookups.flatten.compact
+      def scope_translation_args(scopes, key, *, **options)
+        lookups = expand_relative_key(scopes, key) + Array(options[:default])
 
         key = lookups.shift
         options[:default] = lookups
@@ -23,14 +18,10 @@ module Granite
 
       private
 
-      def expand_relative_key(key)
+      def expand_relative_key(scopes, key)
         return [key] unless key.is_a?(String) && key.start_with?('.')
 
-        base_key = key.sub(/^\./, '')
-
-        lookup_ancestors.map do |klass|
-          :"#{klass.i18n_scope}.#{klass.model_name.i18n_key}.#{base_key}"
-        end.flatten + [base_key]
+        combine_paths(scopes, [key.sub(/^\./, '')]).map(&:to_sym)
       end
     end
   end

data/lib/granite/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: granite
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - Arkadiy Zabazhanov & friends
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-28 00:00:00.000000000 Z
+date: 2021-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -302,6 +302,7 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - app/controllers/granite/controller.rb
+- app/controllers/granite/controller/translations.rb
 - config/rubocop-default.yml
 - lib/generators/USAGE
 - lib/generators/granite/install_controller_generator.rb
@@ -330,6 +331,7 @@ files:
 - lib/granite/action/transaction.rb
 - lib/granite/action/transaction_manager.rb
 - lib/granite/action/transaction_manager/transactions_stack.rb
+- lib/granite/action/translations.rb
 - lib/granite/action/types.rb
 - lib/granite/action/types/collection.rb
 - lib/granite/base.rb
@@ -344,8 +346,6 @@ files:
 - lib/granite/projector/error.rb
 - lib/granite/projector/helpers.rb
 - lib/granite/projector/translations.rb
-- lib/granite/projector/translations/helper.rb
-- lib/granite/projector/translations/view_helper.rb
 - lib/granite/rails.rb
 - lib/granite/represents.rb
 - lib/granite/represents/attribute.rb
@@ -389,7 +389,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.9
 signing_key: 
 specification_version: 4
 summary: Another business actions architecture for Rails apps

data/lib/granite/projector/translations/helper.rb

@@ -1,22 +0,0 @@
-require 'granite/projector/translations/view_helper'
-
-module Granite
-  class Projector
-    module Translations
-      module Helper
-        extend ActiveSupport::Concern
-
-        included do
-          delegate :scope_translation_args_by_projector, to: :projector_class
-          helper_method :scope_translation_args_by_projector
-          helper ViewHelper
-        end
-
-        def translate(*args)
-          super(*scope_translation_args_by_projector(args, action_name: action_name))
-        end
-        alias t translate
-      end
-    end
-  end
-end

data/lib/granite/projector/translations/view_helper.rb

@@ -1,12 +0,0 @@
-module Granite
-  class Projector
-    module Translations
-      module ViewHelper
-        def translate(*args)
-          super(*scope_translation_args_by_projector(args, action_name: action_name))
-        end
-        alias t translate
-      end
-    end
-  end
-end