rbexy 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8c0ebb095f668e7b85fbd14fe770be07fc9f42565b7f71a02e4001a5a0c88c6
-  data.tar.gz: 4670b8929fba14f2cdb197eca4c9d72f37ecdef6d1e84d33d43f18bdb09b0a07
+  metadata.gz: a6728982815c307bb37a495c3d11450e9582bf1cd17eef5306c9e940c0c36eea
+  data.tar.gz: 5fdfa1cc3c5fc70b573aa730f827b2f5d38b8031f1adc6344b31926ce520b4af
 SHA512:
-  metadata.gz: 8e9920411ff9198828488d984cfd9e69c67e1ced6600a48d701c01153c4bc06419aaac58d2395ab61676798e9bb0a45137f40788d293fade0c0344c596e60c06
-  data.tar.gz: 3da407f7258c3d2f2ef33a157747f6bf0f9ac945ebf801ec064430d80237f802ae7deac36de07a905b055dc9bd7f1958e80774a57f73d036a931a1c4cdac8b81
+  metadata.gz: 46385e65a3cd976497efd8d6db789eee4a2c73668e085dd6772d8c6a9a835783f6bb80ef923463af97cfec5d5625fffd641229a5a97a1c24e024b75d996969af
+  data.tar.gz: 025e25a41d9cc5e848342c668721cdef046ab13e5cff9737acc69a66eaca6cdd3ac06493bfcbb42b735fcbd6e7ae243e8a65588d648d3442924306944addb714

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbexy (1.0.2)
+    rbexy (1.1.0)
       actionview (>= 6.0, < 7.0)
       activesupport (>= 6.0, < 7.0)
 

data/lib/rbexy.rb

@@ -8,6 +8,7 @@ module Rbexy
   autoload :HashMash, "rbexy/hash_mash"
   autoload :ComponentTagBuilder, "rbexy/component_tag_builder"
   autoload :ViewContextHelper, "rbexy/view_context_helper"
+  autoload :ComponentContext, "rbexy/component_context"
   autoload :Configuration, "rbexy/configuration"
 
   ContextNotFound = Class.new(StandardError)

data/lib/rbexy/component.rb

@@ -54,17 +54,6 @@ module Rbexy
       content_block ? content_block.call : ""
     end
 
-    def create_context(name, value)
-      rbexy_context.last[name] = value
-    end
-
-    def use_context(name)
-      index = rbexy_context.rindex { |c| c.has_key?(name) }
-      index ?
-        rbexy_context[index][name] :
-        raise(ContextNotFound, "no parent context `#{name}`")
-    end
-
     def compiled_method_container
       Rbexy::Component
     end

data/lib/rbexy/component_context.rb

@@ -0,0 +1,18 @@
+module Rbexy
+  module ComponentContext
+    def rbexy_context
+      @rbexy_context ||= [{}]
+    end
+
+    def create_context(name, value)
+      rbexy_context.last[name] = value
+    end
+
+    def use_context(name)
+      index = rbexy_context.rindex { |c| c.has_key?(name) }
+      index ?
+        rbexy_context[index][name] :
+        raise(ContextNotFound, "no parent context `#{name}`")
+    end
+  end
+end

data/lib/rbexy/rails/controller_helper.rb

@@ -4,14 +4,21 @@ module Rbexy
   module Rails
     module ControllerHelper
       extend ActiveSupport::Concern
+      include ComponentContext
 
       def rbexy_component_provider; end
 
+      included do
+        helper ViewContextHelper
+        helper_method :rbexy_component_provider
+        helper_method :rbexy_context, :create_context, :use_context
+      end
+
       class_methods do
         def inherited(klass)
           super
           Rbexy.configuration.template_paths.each do |path|
-            prepend_view_path(Rbexy::Rails::ComponentTemplateResolver.new(path))
+            prepend_view_path(ComponentTemplateResolver.new(path))
           end
         end
       end

data/lib/rbexy/rails/engine.rb

@@ -4,25 +4,21 @@ module Rbexy
   module Rails
     class Engine < ::Rails::Engine
       initializer "rbexy" do |app|
-        template_handler = ::Rails.version.to_f >= 6.0 ?
-          proc { |template, source| Rbexy.compile(source) } :
-          proc { |template| Rbexy.compile(template.source) }
+        template_handler = proc { |template, source| Rbexy.compile(source) }
 
         ActionView::Template.register_template_handler(:rbx, template_handler)
 
         ActiveSupport.on_load :action_controller_base do
-          helper Rbexy::ViewContextHelper
-          helper_method :rbexy_component_provider
           include ControllerHelper
         end
 
         if defined?(ViewComponent)
-          ViewComponent::Base.include Rbexy::ViewContextHelper
+          ViewComponent::Base.include ViewContextHelper
         end
 
         Rbexy.configure do |config|
           require "rbexy/component_providers/rbexy_provider"
-          config.component_provider = Rbexy::ComponentProviders::RbexyProvider.new
+          config.component_provider = ComponentProviders::RbexyProvider.new
           config.template_paths << ::Rails.root.join("app", "components")
           config.enable_context = true
         end

data/lib/rbexy/runtime.rb

@@ -8,6 +8,7 @@ module Rbexy
     include ActionView::Context
     include ActionView::Helpers::TagHelper
     include ViewContextHelper
+    include ComponentContext
 
     DefaultTagBuilder = ActionView::Helpers::TagHelper::TagBuilder
 

data/lib/rbexy/version.rb

@@ -1,3 +1,3 @@
 module Rbexy
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

data/lib/rbexy/view_context_helper.rb

@@ -4,10 +4,6 @@ module Rbexy
       @rbexy_tag ||= Runtime.create_tag_builder(self)
     end
 
-    def rbexy_context
-      @rbexy_context ||= [{}]
-    end
-
     def rbexy_prep_output(*value)
       return if value.length == 0
       value = value.first

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbexy
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Nick Giancola
@@ -205,6 +205,7 @@ files:
 - lib/rbexy.rb
 - lib/rbexy/component.rb
 - lib/rbexy/component/backtrace_cleaner.rb
+- lib/rbexy/component_context.rb
 - lib/rbexy/component_providers/namespaced_rbexy_provider.rb
 - lib/rbexy/component_providers/rbexy_provider.rb
 - lib/rbexy/component_providers/view_component_provider.rb