view_component 2.48.0 → 2.49.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3abce9e08dcb71614178ed68b9c8443211ff78790911057752d8fda6fbb194b7
-  data.tar.gz: 3ac0a8ff1d7cafd2eb12e04a24f1d8f3362675833e4fda780bc238b8fc5ed41f
+  metadata.gz: 8feda954b97fc366da967bee72554a1975a40f50aef0cbd1cde6f83f97547d49
+  data.tar.gz: 92312db0824d58d24ee8f74f56c3a14e961f03fc71bb1669b1a529fedfb225f3
 SHA512:
-  metadata.gz: dba31d0d37e73b7a1e26863d167f5d1eaefb8c5f53d9f542e47667090802b5f53b5c6b9c4b0a9188bf76f42d375c5d7a2cd3024065620aa9ff40b15911706cb8
-  data.tar.gz: f329872b25f36fe8fa0d018c2a5847ed0b6e47b095d16a27e89d2b0c7180f938d09730d0868405483a8e7c4fe4075afed56927a018b7a273ac4c94950d174fac
+  metadata.gz: 1ff56022e2212300d6ae5f8ea8700364fc5675354476b1830e05885c6f4beff3f7b75d6733531eea10aa1b0830917e025686bf17af89606ed2e457aaf1004f73
+  data.tar.gz: 5d8dddd267a4a627af6ba0a07507d9d0c2dd2ae38da92f542a690e2fa3052bdc56aa37488e1fde440c9a064b825f0ef1db3ec838f06eba4a4598b4e8c95e315f

data/docs/CHANGELOG.md

@@ -7,6 +7,36 @@ title: Changelog
 
 ## main
 
+## 2.49.0
+
+* Fix path handling for evaluated view components that broke in Ruby 3.1.
+
+    *Adam Hess*
+
+* Fix support for the `default:` option for a global translation.
+
+    *Elia Schito*
+
+* Ensure i18n scope is a symbol to protect lookups.
+
+    *Simon Fish*
+
+* Small update to preview docs to include rspec mention.
+
+    *Leigh Halliday*
+
+* Small improvements to collection iteration docs.
+
+    *Brian O'Rourke*
+
+* Add good and bad examples to `ViewComponents in practice`.
+
+    *Joel Hawksley*
+
+* Add Ruby 3.1 and Rails 7.0 to CI
+
+    *Peter Goldstein*
+
 ## 2.48.0
 
 * Correct path in example test command in Contributing docs.

data/lib/view_component/base.rb

@@ -401,7 +401,7 @@ module ViewComponent
         # Derive the source location of the component Ruby file from the call stack.
         # We need to ignore `inherited` frames here as they indicate that `inherited`
         # has been re-defined by the consuming application, likely in ApplicationComponent.
-        child.source_location = caller_locations(1, 10).reject { |l| l.label == "inherited" }[0].absolute_path
+        child.source_location = caller_locations(1, 10).reject { |l| l.label == "inherited" }[0].path
 
         # Removes the first part of the path and the extension.
         child.virtual_path = child.source_location.gsub(

data/lib/view_component/instrumentation.rb

@@ -5,14 +5,16 @@ require "active_support/notifications"
 module ViewComponent # :nodoc:
   module Instrumentation
     def self.included(mod)
-      mod.prepend(self)
+      mod.prepend(self) unless ancestors.include?(ViewComponent::Instrumentation)
     end
 
     def render_in(view_context, &block)
       ActiveSupport::Notifications.instrument(
         "!render.view_component",
-        name: self.class.name,
-        identifier: self.class.identifier
+        {
+          name: self.class.name,
+          identifier: self.class.identifier
+        }
       ) do
         super(view_context, &block)
       end

data/lib/view_component/translatable.rb

@@ -41,7 +41,7 @@ module ViewComponent
       EMPTY_HASH = {}.freeze
 
       def initialize(i18n_scope:, load_paths:)
-        @i18n_scope = i18n_scope.split(".")
+        @i18n_scope = i18n_scope.split(".").map(&:to_sym)
         @load_paths = load_paths
       end
 
@@ -70,21 +70,25 @@ module ViewComponent
       key = key&.to_s unless key.is_a?(String)
       key = "#{i18n_scope}#{key}" if key.start_with?(".")
 
-      translated =
-        catch(:exception) do
-          i18n_backend.translate(locale, key, options)
+      if key.start_with?(i18n_scope + ".")
+        translated =
+          catch(:exception) do
+            i18n_backend.translate(locale, key, options)
+          end
+
+        # Fallback to the global translations
+        if translated.is_a? ::I18n::MissingTranslation
+          return super(key, locale: locale, **options)
         end
 
-      # Fallback to the global translations
-      if translated.is_a? ::I18n::MissingTranslation
-        return super(key, locale: locale, **options)
-      end
+        if HTML_SAFE_TRANSLATION_KEY.match?(key)
+          translated = translated.html_safe # rubocop:disable Rails/OutputSafety
+        end
 
-      if HTML_SAFE_TRANSLATION_KEY.match?(key)
-        translated = translated.html_safe # rubocop:disable Rails/OutputSafety
+        translated
+      else
+        super(key, locale: locale, **options)
       end
-
-      translated
     end
     alias :t :translate
 

data/lib/view_component/version.rb

@@ -3,7 +3,7 @@
 module ViewComponent
   module VERSION
     MAJOR = 2
-    MINOR = 48
+    MINOR = 49
     PATCH = 0
 
     STRING = [MAJOR, MINOR, PATCH].join(".")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: view_component
 version: !ruby/object:Gem::Version
-  version: 2.48.0
+  version: 2.49.0
 platform: ruby
 authors:
 - GitHub Open Source
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-14 00:00:00.000000000 Z
+date: 2022-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -373,7 +373,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: View components for Rails