view_component 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '038805cb5a61ac698697344495e23064c227e169079586e1412f43aee0a7abde'
-  data.tar.gz: bb53f4c2407eec96e618aba01f4f35cfa564bfc8738c709af434c16a412457d8
+  metadata.gz: a0dcab293971e6a9548226ecf4120a35eae4ea32765bef59b3cc2d8dd92d376f
+  data.tar.gz: 803b0167794db25dcb023e93dfdfcbd2af3d9442b94885abaf88d66d436986a8
 SHA512:
-  metadata.gz: 7adf9a57806404434ad35b23d4df069dfe2a346cb35945e9103b16197e0f86c2b994d1470334c324ee38365781f5be5742a1e42369309a5d29a15f5f3e8b01c8
-  data.tar.gz: ce7cb220863df4567a97f472fa576fdd96b045aa7ef507c456c69616270195448204a0a6cf01889d177b7430a7fc4f59486af74ad85463927e20427bde3ad996
+  metadata.gz: d643fb3348dfcc799eabd1f066a46530df1181f0e868ce10eaa32112c48929132cd0069460a8f986d15094a1e6b74767ff41361acc01f78d6c31bf25599d40eb
+  data.tar.gz: 9c897a455c1fd51d887e0c0de9648a5b98e2cbabe4d70b1d37f06944ba31fcaba6def9a13b3ffdc81ef65118f5927fd03f3703f6bef99bb4830fbb1a89ff2ab5

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # master
 
+# v2.2.1
+
+* Fix bug where template could not be found if `inherited` was redefined.
+
+    *Joel Hawksley*
+
 # v2.2.0
 
 * Add support for `config.action_view.annotate_template_file_names` (coming in Rails 6.1).

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    view_component (2.2.0)
+    view_component (2.2.1)
       capybara (~> 3)
 
 GEM

data/lib/view_component/base.rb

@@ -148,7 +148,10 @@ module ViewComponent
           child.include Rails.application.routes.url_helpers unless child < Rails.application.routes.url_helpers
         end
 
-        child.source_location = caller_locations(1, 1)[0].absolute_path
+        # 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
 
         super
       end

data/lib/view_component/version.rb

@@ -4,7 +4,7 @@ module ViewComponent
   module VERSION
     MAJOR = 2
     MINOR = 2
-    PATCH = 0
+    PATCH = 1
 
     STRING = [MAJOR, MINOR, PATCH].join(".")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: view_component
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - GitHub Open Source
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2020-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara