ilex 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f82da20e01bb5e4051b176bfa0434191271ad11bb8337b1665539a047f3e6a6d
-  data.tar.gz: e68418c30ffe861bae04640a9c7db675c56b69977a27c1432d51683c7cd94166
+  metadata.gz: fbd721cabba89d7f34b23841b6afcfd3d38b79bb35d947a620161e67e6f38cfd
+  data.tar.gz: 3aca8a08c6ae10f7918bcb239bbe103cd03073d18e1c30fc746a509c30c127f9
 SHA512:
-  metadata.gz: 4bdf3430e7a97ed4c184884507d94a023a3ba061d911b0436dddb92f89f6ebbc4302ded795b25eac2bed9ff2c9415e0cfe1d969c20dcfa536ed4c1131d8fa85a
-  data.tar.gz: 1b8a4ae20d0c5e9b2e298cfc62532714c20f0f013d2feee385649f4c0361c0aaa95068c148b0aabe131d406a8125e2fa88146ef17adbdeb3f2fc61e9c896066f
+  metadata.gz: cb7d4800158d6b0dfb093ffd0f44abbb6009bc8bb8c706125e108fe89c5dbff0e16c50a1d8502b12c846416f8986a61d6b7a5fa9c5e52a5ca0f0600ae8df2816
+  data.tar.gz: af85c50eedefbbe3ce29849e07c80f38de08037277a57bc71477bd04d67326d8f8af7ae973fb18ddd93d0b13e11c15acf09d588389a46ad65b843f9808dc84a2

data/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.1.5](https://github.com/joshleblanc/cedar/compare/v0.1.4...v0.1.5) (2021-04-17)
+
+
+### Features
+
+* add helpers for rendering namespaced components ([3b0a5af](https://github.com/joshleblanc/cedar/commit/3b0a5af421e4b4c9a3b45b07b11647df65908552))
+
+
+### Bug Fixes
+
+* allow appending helpers with _component ([7097420](https://github.com/joshleblanc/cedar/commit/7097420d3529533910fd5174af175aae15c16aa0))
+* appease intellisense with unused splat ([854c8a8](https://github.com/joshleblanc/cedar/commit/854c8a8c7f121d4f531bb5a6d56b487f29772bb8))
+* component content wasn't rendering ([041efb2](https://github.com/joshleblanc/cedar/commit/041efb21cbc0760ac94d1fa0093dc57d5185d0d0))
+* override arbre render method ([235763b](https://github.com/joshleblanc/cedar/commit/235763b5820fbcbf7faaee934e14c90f381b128a))
+
 ### [0.1.4](https://github.com/joshleblanc/cedar/compare/v0.1.3...v0.1.4) (2021-04-16)
 
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ilex (0.1.4)
+    ilex (0.1.5)
       arbre
 
 GEM

data/lib/ilex/component.rb

@@ -19,19 +19,25 @@ module Ilex
   module Component
     include Arbre::HTML
 
-    def render(&blk)
+    def render(*args, &blk)
       define_method :call do
         ctx = Context.new(self)
         ctx.instance_eval(&blk).to_s
       end
     end
 
-    def find_component(name)
-      if const_defined?(name)
-        const_get(name)
+    def find_component(name, base_module = nil)
+      target = if base_module
+        base_module
       else
-        if superclass.respond_to?(:find_component)
-          superclass.find_component(name)
+        self
+      end
+
+      if target.const_defined?(name)
+        target.const_get(name)
+      else
+        if target.superclass.respond_to?(:find_component)
+          target.superclass.find_component(name)
         else
           adjusted_name = name.chomp("Component").underscore
           raise(NameError, "undefined local variable or method `#{adjusted_name}` for #{self}")

data/lib/ilex/component_warden.rb

@@ -10,22 +10,28 @@ module Ilex
   class ComponentWarden
     def initialize(component, string)
       @component = component
-      @raw_input = string
+      @input = string.to_s
 
-      @collection = @raw_input.end_with? "_collection"
-      @input = @raw_input.to_s.chomp("_collection")
+      @collection = @input.end_with? "_collection"
+      @nested = @input.include? "__"
+
+      process_input!(@input)
     end
 
     def collection?
       @collection
     end
 
+    def nested?
+      @nested
+    end
+
     def component_name
       "#{@input}_component".camelize
     end
 
     def component_class
-      @component_class ||= @component.class.find_component(component_name)
+      @component_class ||= @component.class.find_component(component_name, @base_module)
     end
 
     def exists?
@@ -36,9 +42,23 @@ module Ilex
       return nil unless exists?
 
       if collection?
-        component_class.with_collection(*args, &block)
+        component_class.with_collection(*args)
       else
-        component_class.new(*args, &block)
+        component_class.new(*args)
+      end
+    end
+
+    private
+
+    def process_input!(input)
+      @input.chomp! "_collection"
+      @input.chomp! "_component"
+
+      if nested?
+        parts = @input.split("__")
+        @input = parts.pop
+
+        @base_module = parts.map(&:camelize).join("::").constantize
       end
     end
   end

data/lib/ilex/context.rb

@@ -7,32 +7,53 @@ module Ilex
   # tags
   class Context < Arbre::Context
 
-    def initialize(component)
-      super({}, component)
-
+    def initialize(component, &blk)
       @component = component
-      @component_wardens = ComponentWardens.new(@component)
+
 
       # Copy all of the instance variables from the component to the context,
       # so we have access to them when rendering
       @component.instance_variables.each do |iv|
         instance_variable_set(iv, @component.instance_variable_get(iv))
       end
+
+      super({}, component, &blk)
     end
 
     def content
       @component.send :content
     end
 
+    def component_wardens
+      @component_wardens ||= ComponentWardens.new(@component)
+    end
+
+    # This is overriding arbre::rails::rendering
+    # It performs the same actions, but returns html_safe on a passed block
+    #
+    # Not 100% sure this is needed, but view_components won't render their
+    # contents without it, when rendered in an arbre tree
+    def render(*args)
+      rendered = helpers.render(*args) do
+        yield.html_safe if block_given?
+      end
+      case rendered
+      when Arbre::Context
+        current_arbre_element.add_child rendered
+      else
+        text_node rendered
+      end
+    end
+
     def respond_to_missing?(method, include_all)
-      @component.respond_to?(method) || @component_wardens[method].exists? || super
+      @component.respond_to?(method) || component_wardens[method].exists? || super
     end
 
     def method_missing(method, *args, &content_block)
       if @component.respond_to?(method)
         @component.send(method, *args, &content_block)
-      elsif @component_wardens[method].exists?
-        render @component_wardens[method].new(*args, &content_block)
+      elsif component_wardens[method].exists?
+        render component_wardens[method].new(*args), &content_block
       else
         super
       end

data/lib/ilex/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ilex
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ilex
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Joshua LeBlanc
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-16 00:00:00.000000000 Z
+date: 2021-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arbre