spark-component 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1be4ebc3a6ecf66978f87558cbc83f349fcf41e15b4aff6aa9e5609d88b12a5f
-  data.tar.gz: 4a94a2bf74570d0f9cc7b531bb4d815c2e068c92162390d9da08e0885f3e6576
+  metadata.gz: 76d73723f8423e6333f1ff46727f363096ad11cb3dc526c531ddbc8e8c30f0eb
+  data.tar.gz: e302e38f303eb1d0c5ed8d8f591583b591dec48cf006d196194f014236a2899c
 SHA512:
-  metadata.gz: 699b6ed45fd2c908648bdd7a78c09dcb916e1289e414181dbc0efef84b766eae81dd1694511e3ef499e0ae1b9ccb500e3e0154d9ffbd5695847436bd8e59557e
-  data.tar.gz: f588d817b0a446b3dff251c0b8687c6c712131aa50f9d652e0a63199b4a2a1f08ecc06d34678fc6072c28d7c8b966758e30e01568f72b54637376b6f8e826cf3
+  metadata.gz: eec683787307ba6b95a59ee247ed138539375d96aab59b365785ddc23db4d98bde114df66d8a0b16df813861c7a6e6a75c8883a7573c60d5f0b7080996683c27
+  data.tar.gz: af9031efb9b8ef31188bdd60d45025f359ccf201866b8a433c1ea1cfd299fb40ac0de40c15b019e747de55fcbec766ceff2ff66ca2846649f4f8a1e3d500a347

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# v1.1.1 - 2020-01-14
+
+- Fix: When a nested element is referenced it will trigger the parent to yield
+    its block, ensuring that the nested element reference will be instantiated
+    if it is used in the parent's block.
+- Fix: Elements now have a `blank?` method and `present?` returns `!blank?`. It
+    is important to remember, `blank?` and `present?` return false if an element
+    yields nothing. To check for the existence of an element instance, use `nil?`.
+- New: Elements now have access to their own name with the `_name` method.
+
 # v1.1.0 - 2020-01-10
 
 - New: Class method `attribute_default_group` makes it easy to set defaults for multiple attributes based on a single component argument. It's great for theming, where setting `theme: :notice` can set attributes for color, layout, etc.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spark-component (1.1.0)
+    spark-component (1.1.1)
 
 GEM
   remote: https://rubygems.org/
@@ -42,7 +42,7 @@ GEM
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    actionview-component (1.6.1)
+    actionview-component (1.7.0)
     activejob (6.0.1)
       activesupport (= 6.0.1)
       globalid (>= 0.3.6)

data/lib/spark/component/element.rb

@@ -10,7 +10,7 @@ module Spark
       def self.included(base)
         base.extend(Spark::Component::Element::ClassMethods)
 
-        %i[_parent _block view_context].each do |name|
+        %i[_name _parent _block view_context].each do |name|
           base.define_method(:"#{name}=") { |val| instance_variable_set(:"@#{name}", val) }
           base.define_method(:"#{name}")  { instance_variable_get(:"@#{name}") }
         end
@@ -25,6 +25,7 @@ module Spark
         #  - view_context, sets the view context for an element (in Rails)
         #
         unless attrs.nil? || attrs.empty?
+          @_name        = attrs.delete(:_name)
           @_parent      = attrs.delete(:_parent)
           @_block       = attrs.delete(:_block)
           @view_context = attrs.delete(:_view)
@@ -37,13 +38,18 @@ module Spark
       end
 
       def render_self
-        return @content unless @content.nil?
+        return @content if rendered?
 
         @content = render_block(@view_context, &_block)
         validate! if defined?(ActiveModel::Validations)
+        @rendered = true
         @content
       end
 
+      def rendered?
+        @rendered == true
+      end
+
       def render_block(view, &block)
         block_given? ? view.capture(self, &block) : nil
       end
@@ -53,7 +59,11 @@ module Spark
       end
 
       def present?
-        !self.yield.nil?
+        !blank?
+      end
+
+      def blank?
+        self.yield.nil? || self.yield.strip.empty?
       end
 
       private
@@ -169,15 +179,22 @@ module Spark
         #
         def define_element(name:, plural:, multiple:,  klass:)
           define_method_if_able(name) do |attributes = nil, &block|
-            return get_element_variable(multiple ? plural : name) unless block || attributes
+            # When initializing an element, blocks or arguments are passed.
+            # If an element is being referenced without these, it will return its instance
+            # This allows the elemnet method to initailize the object and return its instance
+            # for template rendering.
+            unless block || attributes
+
+              # If an element is called, it will only exist if its parent's block has been exectued
+              # Be sure the block has been executed so that sub elements are initialized
+              self.yield if is_a?(Spark::Component::Element::Base) && !rendered?
+
+              return get_element_variable(multiple ? plural : name)
+            end
 
             attributes ||= {}
             attributes = merge_element_attribute_default(name, attributes)
-            attributes.merge!(
-              _parent: self,
-              _block: block,
-              _view: view_context
-            )
+            attributes.merge!(_name: name, _parent: self, _block: block, _view: view_context)
 
             element = klass.new(attributes)
 

data/lib/spark/component/version.rb

@@ -2,6 +2,6 @@
 
 module Spark
   module Component
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spark-component
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-10 00:00:00.000000000 Z
+date: 2020-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview-component