rbexy 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f380f26df4a04d8cc73a9a65b5abaad571a32670013eabb3465eaa7f08ab1de4
-  data.tar.gz: e729b87a8e1ec2918dce115b240bfbea991a11203d73f003a42cccb972544c93
+  metadata.gz: de2d3389ec5f783be2e913921071bc0920baa342980360445e5756a8d6cd2d72
+  data.tar.gz: 7dfdd99aa0852253e491889010f87c5a2ca828a57b16fe8749d9231135c785a2
 SHA512:
-  metadata.gz: 795cead4247e37aed6d803f430318e8cb5f080ee431fc0f2f6820684b211a0a45d58ea9205b2cbd3c9e94dcf2021fe972596bd48109276334a2b32661813c9ef
-  data.tar.gz: 6ec46d0e829a2d2fb387b45c372cdd2fa5dcb9f04d5e872c8dea637ee9867af964d76eabd1f2b3f83b437db3c4da823359dba0a24bb149d0fae0f3bdfcc15204
+  metadata.gz: a6e669a7babe4bb38c7a31be00c0a98d1035c1c7fec980b713a4bb17a2ba461c127745a7b7fee50f6419830eb7e26bf505243662c08245973fac4a3c0ce20dd4
+  data.tar.gz: 91c71f51bd42958d86a5584a85a0a634fb35306e95e4a022bc82508c2d5d7cb05df901197d276a870bbcab19b6d1d632a0de4a43518d39f2dd9b00b08559f316

data/.gitignore

@@ -1 +1,2 @@
 spec/dummy/log/
+pkg/

data/lib/rbexy/component.rb

@@ -43,11 +43,10 @@ module Rbexy
     end
 
     def call
-      old_lookup_context = view_renderer.lookup_context
-      view_renderer.lookup_context = build_lookup_context(old_lookup_context)
+      replace_lookup_context
       view_renderer.render(self, partial: component_name, &nil)
     ensure
-      view_renderer.lookup_context = old_lookup_context
+      restore_lookup_context
     end
 
     def content
@@ -67,18 +66,26 @@ module Rbexy
 
     private
 
-    attr_reader :view_context, :content_block
+    attr_reader :view_context, :content_block, :old_lookup_context
+
+    def replace_lookup_context
+      return if view_renderer.lookup_context.is_a? Rbexy::Component::LookupContext
+      @old_lookup_context = view_renderer.lookup_context
+      view_renderer.lookup_context = build_lookup_context(old_lookup_context)
+    end
+
+    def restore_lookup_context
+      return unless old_lookup_context
+      view_renderer.lookup_context = old_lookup_context
+      @old_lookup_context = nil
+    end
 
     def build_lookup_context(existing_context)
       paths = existing_context.view_paths.dup.unshift(
         *Rbexy.configuration.template_paths.map { |p| ActionView::OptimizedFileSystemResolver.new(p) }
       )
 
-      LookupContext.new(
-        paths,
-        LookupContext.details_hash(existing_context),
-        Rbexy.configuration.template_prefixes
-      )
+      LookupContext.new(paths, LookupContext.details_hash(existing_context))
     end
 
     def view_renderer

data/lib/rbexy/configuration.rb

@@ -2,14 +2,9 @@ module Rbexy
   class Configuration
     attr_accessor :component_provider
     attr_accessor :template_paths
-    attr_accessor :template_prefixes
 
     def template_paths
       @template_paths ||= []
     end
-
-    def template_prefixes
-      @template_prefixes ||= []
-    end
   end
 end

data/lib/rbexy/version.rb

@@ -1,3 +1,3 @@
 module Rbexy
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbexy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Nick Giancola
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-05 00:00:00.000000000 Z
+date: 2020-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport