view_component 3.21.0 → 4.0.0.alpha1

data/lib/view_component/translatable.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "erb"
-require "set"
 require "i18n"
 require "active_support/concern"
 
@@ -10,19 +9,22 @@ module ViewComponent
     extend ActiveSupport::Concern
 
     HTML_SAFE_TRANSLATION_KEY = /(?:_|\b)html\z/
+    private_constant :HTML_SAFE_TRANSLATION_KEY
+
     TRANSLATION_EXTENSIONS = %w[yml yaml].freeze
+    private_constant :TRANSLATION_EXTENSIONS
 
     included do
-      class_attribute :i18n_backend, instance_writer: false, instance_predicate: false
+      class_attribute :__vc_i18n_backend, instance_writer: false, instance_predicate: false
     end
 
     class_methods do
-      def i18n_scope
-        @i18n_scope ||= virtual_path.sub(%r{^/}, "").gsub(%r{/_?}, ".")
+      def __vc_i18n_scope
+        @__vc_i18n_scope ||= virtual_path.sub(%r{^/}, "").gsub(%r{/_?}, ".")
       end
 
-      def build_i18n_backend
-        return if compiled?
+      def __vc_build_i18n_backend
+        return if __vc_compiled?
 
         # We need to load the translations files from the ancestors so a component
         # can inherit translations from its parent and is able to overwrite them.
@@ -33,31 +35,31 @@ module ViewComponent
         end
 
         # In development it will become nil if the translations file is removed
-        self.i18n_backend = if translation_files.any?
+        self.__vc_i18n_backend = if translation_files.any?
           I18nBackend.new(
-            i18n_scope: i18n_scope,
+            scope: __vc_i18n_scope,
             load_paths: translation_files
           )
         end
       end
 
-      def i18n_key(key, scope = nil)
+      def __vc_i18n_key(key, scope = nil)
         scope = scope.join(".") if scope.is_a? Array
         key = key&.to_s unless key.is_a?(String)
         key = "#{scope}.#{key}" if scope
-        key = "#{i18n_scope}#{key}" if key.start_with?(".")
+        key = "#{__vc_i18n_scope}#{key}" if key.start_with?(".")
         key
       end
 
       def translate(key = nil, **options)
         return key.map { |k| translate(k, **options) } if key.is_a?(Array)
 
-        ensure_compiled
+        __vc_ensure_compiled
 
         locale = options.delete(:locale) || ::I18n.locale
-        key = i18n_key(key, options.delete(:scope))
+        key = __vc_i18n_key(key, options.delete(:scope))
 
-        i18n_backend.translate(locale, key, options)
+        __vc_i18n_backend.translate(locale, key, options)
       end
 
       alias_method :t, :translate
@@ -66,8 +68,8 @@ module ViewComponent
     class I18nBackend < ::I18n::Backend::Simple
       EMPTY_HASH = {}.freeze
 
-      def initialize(i18n_scope:, load_paths:)
-        @i18n_scope = i18n_scope.split(".").map(&:to_sym)
+      def initialize(scope:, load_paths:)
+        @__vc_i18n_scope = scope.split(".").map(&:to_sym)
         @load_paths = load_paths
       end
 
@@ -77,7 +79,7 @@ module ViewComponent
       end
 
       def scope_data(data)
-        @i18n_scope.reverse_each do |part|
+        @__vc_i18n_scope.reverse_each do |part|
           data = {part => data}
         end
         data
@@ -91,19 +93,19 @@ module ViewComponent
     def translate(key = nil, **options)
       raise ViewComponent::TranslateCalledBeforeRenderError if view_context.nil?
 
-      return super unless i18n_backend
+      return super unless __vc_i18n_backend
       return key.map { |k| translate(k, **options) } if key.is_a?(Array)
 
       locale = options.delete(:locale) || ::I18n.locale
-      key = self.class.i18n_key(key, options.delete(:scope))
+      key = self.class.__vc_i18n_key(key, options.delete(:scope))
       as_html = HTML_SAFE_TRANSLATION_KEY.match?(key)
 
       html_escape_translation_options!(options) if as_html
 
-      if key.start_with?(i18n_scope + ".")
+      if key.start_with?(__vc_i18n_scope + ".")
         translated =
           catch(:exception) do
-            i18n_backend.translate(locale, key, options)
+            __vc_i18n_backend.translate(locale, key, options)
           end
 
         # Fallback to the global translations
@@ -119,9 +121,8 @@ module ViewComponent
     end
     alias_method :t, :translate
 
-    # Exposes .i18n_scope as an instance method
-    def i18n_scope
-      self.class.i18n_scope
+    def __vc_i18n_scope
+      self.class.__vc_i18n_scope
     end
 
     private

data/lib/view_component/use_helpers.rb

@@ -12,13 +12,12 @@ module ViewComponent::UseHelpers
       helper_method_name = full_helper_method_name(helper_method, prefix: prefix, source: from)
 
       class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-        def #{helper_method_name}(*args, &block)
+        def #{helper_method_name}(...)
           raise HelpersCalledBeforeRenderError if view_context.nil?
 
           #{define_helper(helper_method: helper_method, source: from)}
         end
       RUBY
-      ruby2_keywords(helper_method_name) if respond_to?(:ruby2_keywords, true)
     end
 
     private
@@ -34,9 +33,9 @@ module ViewComponent::UseHelpers
     end
 
     def define_helper(helper_method:, source:)
-      return "__vc_original_view_context.#{helper_method}(*args, &block)" unless source.present?
+      return "__vc_original_view_context.#{helper_method}(...)" unless source.present?
 
-      "#{source}.instance_method(:#{helper_method}).bind(self).call(*args, &block)"
+      "#{source}.instance_method(:#{helper_method}).bind(self).call(...)"
     end
   end
 end

data/lib/view_component/version.rb

@@ -2,10 +2,10 @@
 
 module ViewComponent
   module VERSION
-    MAJOR = 3
-    MINOR = 21
+    MAJOR = 4
+    MINOR = 0
     PATCH = 0
-    PRE = nil
+    PRE = "alpha1"
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join(".")
   end

data/lib/view_component.rb

@@ -10,7 +10,6 @@ module ViewComponent
   autoload :CaptureCompatibility
   autoload :Compiler
   autoload :CompileCache
-  autoload :ComponentError
   autoload :Config
   autoload :Deprecation
   autoload :InlineTemplate