spark_components 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adf69719858780a0edee031dde8d9cdd609ace50efb21ffd6aa5b6e1e1e676f5
-  data.tar.gz: a218f301a64b629b5ef0b7b949f4c2b73c13d7a98cc89928bdef6079d25a1c98
+  metadata.gz: adcc859e7bb3c58976280b05b17c030842ee61a93452376c8a0de38b00c5da55
+  data.tar.gz: e5b968c9e8bd2317a77edd3883dcf986a1376f821fccaef690d46a380a5c8785
 SHA512:
-  metadata.gz: c95e4981f350450f142a55680496b9d53bcb1569993d63a233fc68ff9c57876e65f3cb8c7309c465127b4536f7bb1e7db2f368c0c361c1dfd256fb6c2512fb21
-  data.tar.gz: 46ee83f856eeab6c5bc6e6b3829850c21e0416a4dae6184ffe05257d5fce40f5809c24320d2a83424853d444609ffd658c37e83eab6c607bf70b337530eeb391
+  metadata.gz: 3307a090147aabd5ae4146148903012d685ddc8c092774c8cfc949c691f34fea43077c2f4b19fffe6b92795c0ac669d3ba50163d0cac00cf3b11b0b71cddb2aa
+  data.tar.gz: 92da07e9a0c368009f2e06a7149b795901de8dc54e66950a71da1b47af60bc37d4e6a2d82e158dd3146ee39052a4137e3e2d2db5e7a3ec8aca914ec176aeb40e

data/lib/spark_components/attributes.rb

@@ -5,25 +5,31 @@ module SparkComponents
     class Hash < Hash
       def prefix; end
 
-      def add(obj = nil)
-        merge!(obj) unless obj.nil?
+      def add(*args)
+        args.each do |arg|
+          arg.is_a?(::Hash) ? merge!(arg) : self[arg.to_sym] = nil
+        end
         self
       end
 
-      # Output all attributes as [base-]name="value"
+      # Output all attributes as [prefix-]name="value"
       def to_s
         each_with_object([]) do |(name, value), array|
-          name = [prefix, name].compact.join("-")
-          array << %(#{name.dasherize}="#{value}") unless value.nil?
-        end.join(" ").html_safe
+          if value.is_a?(Attributes::Hash)
+            # Flatten nested hashs and inject them unless empty
+            value = value.to_s
+            array << value unless value.empty?
+          else
+            name = [prefix, name].compact.join("-").gsub(/[\W_]+/, "-")
+            array << %(#{name}="#{value}") unless value.nil?
+          end
+        end.sort.join(" ")
       end
 
-      def collapse
-        each_with_object({}) do |(name, value), obj|
-          name = [prefix, name].compact.join("-")
-          name = name.downcase.gsub(/[\W_]+/, "-")
-          obj[name] = value unless value.nil? || value.is_a?(String) && value.empty?
-        end
+      # Easy assess to create a new Attributes::Hash
+      def new(*args)
+        new_obj = self.class.new
+        new_obj.add(*args)
       end
     end
 
@@ -57,7 +63,7 @@ module SparkComponents
       # Ensure base class is the first element in the classes array.
       #
       def base=(klass)
-        return if klass.blank?
+        return if klass.nil? || klass.empty?
 
         if @base_set
           self[0] = klass
@@ -79,11 +85,117 @@ module SparkComponents
       end
 
       def add(*args)
-        push(*args.uniq.reject { |a| a.nil? || include?(a) })
+        push(*args.flatten.uniq.reject { |a| a.nil? || include?(a) })
+        self
+      end
+
+      # Easy assess to create a new Attributes::Classname
+      def new(*args)
+        new_arr = self.class.new
+
+        unless args.empty?
+          new_arr.base = args.shift
+          new_arr.add(*args)
+        end
+
+        new_arr
+      end
+
+      def join_class(name, separator = "-")
+        raise(SparkComponents::Attributes::Error, "Base class not defined for `join_class(#{name}, …)`") if base.nil?
+
+        [base, name].join(separator)
+      end
+
+      def to_s
+        join(" ")
+      end
+    end
+
+    class Tag
+      attr_reader :attrs
+
+      def initialize(obj = {})
+        @attrs = Attributes::Hash.new
+        merge!(obj)
+      end
+
+      def root(obj = {})
+        attrs.add(obj) unless obj.empty?
+        attrs
+      end
+
+      def aria(obj = {})
+        attrs[:aria] ||= Aria.new
+        attrs[:aria].add(obj) unless obj.empty?
+        attrs[:aria]
+      end
+
+      def data(obj = {})
+        attrs[:data] ||= Data.new
+        attrs[:data].add(obj) unless obj.empty?
+        attrs[:data]
+      end
+
+      def classnames(*args)
+        attrs[:class] ||= Classname.new
+        attrs[:class].add(*args) unless args.empty?
+        attrs[:class]
+      end
+
+      def add_class(*args)
+        classnames.add(*args)
+      end
+
+      def base_class(name)
+        classnames.base = name unless name.nil?
+        classnames.base
+      end
+
+      def join_class(*args)
+        classnames.join_class(*args)
+      end
+
+      def new(obj = {})
+        self.class.new(obj)
+      end
+
+      # Ensure each attribute is distinct
+      def dup
+        new(attrs.each_with_object(Attributes::Hash.new) do |(k, v), obj|
+          obj[k] = v.dup
+        end)
+      end
+
+      def merge!(obj = {})
+        merge_obj(self, obj)
+      end
+
+      def merge(obj = {})
+        merge_obj(dup, obj)
+      end
+
+      def merge_obj(tag, obj = {})
+        # If merging another Tag, extract attrs to merge
+        obj = obj.attrs if obj.is_a?(Tag)
+
+        obj.each do |key, val|
+          if val.is_a?(Classname)
+            # preserve object state
+            tag.attrs[:class] = val
+          else
+            case key.to_sym
+            when :class then tag.classnames.add(val)
+            when :data, :aria then tag.send(key).add(val)
+            else; tag.attrs[key] = val
+            end
+          end
+        end
+        tag
       end
 
       def to_s
-        join(" ").html_safe
+        attrs.to_s
       end
     end
   end

data/lib/spark_components/element.rb

@@ -15,10 +15,6 @@ module SparkComponents
       @attributes ||= {}
     end
 
-    def self.themes
-      @themes ||= {}
-    end
-
     def self.elements
       @elements ||= {}
     end
@@ -45,48 +41,38 @@ module SparkComponents
       end
     end
 
-    def self.base_class(name)
-      tag_attributes[:class].base = name
+    def self.base_class(name = nil)
+      tag_attrs.base_class(name)
     end
 
     def self.add_class(*args)
-      tag_attributes[:class].add(*args)
-    end
-
-    def self.add_theme(hash)
-      themes.merge!(hash)
-      return if attributes[:theme]
-
-      if hash.key?(:default)
-        attribute(theme: :default)
-      else
-        attribute(:theme)
-      end
+      tag_attrs.add_class(*args)
     end
 
     def self.data_attr(*args)
-      set_attr(:data, *args)
+      tag_attrs.data(attribute(*args))
     end
 
     def self.aria_attr(*args)
-      set_attr(:aria, *args)
+      arg = attribute(*args)
+      tag_attrs.aria(arg)
     end
 
-    def self.tag_attr(*args)
-      set_attr(:tag, *args)
+    def self.root_attr(*args)
+      tag_attrs.root(attribute(*args))
     end
 
-    def self.set_attr(name, *args)
-      tag_attributes[name].add(attribute(*args))
+    def self.tag_attrs
+      @tag_attrs ||= SparkComponents::Attributes::Tag.new
     end
 
-    def self.tag_attributes
-      @tag_attributes ||= {
-        class: SparkComponents::Attributes::Classname.new,
-        data: SparkComponents::Attributes::Data.new,
-        aria: SparkComponents::Attributes::Aria.new,
-        tag: SparkComponents::Attributes::Hash.new
-      }
+    def self.validates_choice(name, choices)
+      validates(name,
+                inclusion: {
+                  presence: true,
+                  in: choices,
+                  message: "\"%{value}\" is not a valid option. Options include: #{choices.join(', ')}"
+                })
     end
 
     # rubocop:disable Metrics/AbcSize
@@ -144,22 +130,18 @@ module SparkComponents
     def self.inherited(subclass)
       attributes.each { |name, options| subclass.set_attribute(name, options.dup) }
       elements.each   { |name, options| subclass.elements[name] = options.dup }
-      subclass.themes.merge!(themes)
 
-      subclass.tag_attributes.merge!(tag_attributes.each_with_object({}) do |(k, v), obj|
-        obj[k] = v.dup
-      end)
+      subclass.tag_attrs.merge!(tag_attrs.dup)
     end
 
     def initialize(view, attributes = nil, &block)
       @view = view
       attributes ||= {}
-      initialize_tag_attributes
-      assign_tag_attributes(attributes)
+      initialize_tag_attrs
+      assign_tag_attrs(attributes)
       initialize_attributes(attributes)
       initialize_elements
       extend_view_methods
-      initialize_themes
       after_init
       @yield = block_given? ? @view.capture(self, &block) : nil
       validate!
@@ -177,8 +159,8 @@ module SparkComponents
       @parents.last
     end
 
-    def classnames
-      @tag_attributes[:class]
+    def classnames(*args)
+      @tag_attrs.classnames(*args)
     end
 
     def base_class(name = nil)
@@ -187,33 +169,27 @@ module SparkComponents
     end
 
     def add_class(*args)
-      classnames.add(*args)
+      classnames(*args)
     end
 
-    def join_class(name, separator: "-")
-      [base_class, name].join(separator) unless base_class.nil?
+    def join_class(*args)
+      classnames.join_class(*args)
     end
 
     def data_attr(*args)
-      @tag_attributes[:data].add(*args)
+      @tag_attrs.data(*args)
     end
 
     def aria_attr(*args)
-      @tag_attributes[:aria].add(*args)
+      @tag_attrs.aria(*args)
     end
 
-    def tag_attr(*args)
-      @tag_attributes[:tag].add(*args)
+    def root_attr(*args)
+      @tag_attrs.root(*args)
     end
 
-    def attrs(add_class: true)
-      atr = Attributes::Hash.new
-      # attrtiubte order: id, class, data-, aria-, misc tag attributes
-      atr[:class] = classnames if add_class
-      atr.merge!(data_attr.collapse)
-      atr.merge!(aria_attr.collapse)
-      atr.merge!(tag_attr)
-      atr
+    def tag_attrs
+      @tag_attrs.attrs
     end
 
     def to_s
@@ -230,9 +206,9 @@ module SparkComponents
     protected
 
     # Set tag attribute values from from parameters
-    def update_attr(name)
-      %i[aria data tag].each do |el|
-        @tag_attributes[el][name] = get_instance_variable(name) if @tag_attributes[el].key?(name)
+    def update_tag_attr(name)
+      %i[aria data root].each do |el|
+        @tag_attrs.send(el)[name] = get_instance_variable(name) if @tag_attrs.send(el).key?(name)
       end
     end
 
@@ -240,40 +216,23 @@ module SparkComponents
       @view.render(partial: file, object: self)
     end
 
-    def initialize_tag_attributes
-      @tag_attributes = self.class.tag_attributes.each_with_object({}) do |(name, options), obj|
-        obj[name] = options.dup
-      end
+    def initialize_tag_attrs
+      @tag_attrs = self.class.tag_attrs.dup
     end
 
-    def assign_tag_attributes(attributes)
+    # Assign tag attributes from arguments
+    def assign_tag_attrs(attributes)
       # support default data, class, and aria attribute names
       data_attr(attributes.delete(:data)) if attributes[:data]
       aria_attr(attributes.delete(:aria)) if attributes[:aria]
       add_class(*attributes.delete(:class)) if attributes[:class]
-      tag_attr(attributes.delete(:splat)) if attributes[:splat]
+      root_attr(attributes.delete(:splat)) if attributes[:splat]
     end
 
     def initialize_attributes(attributes)
       self.class.attributes.each do |name, options|
         set_instance_variable(name, attributes[name] || (options[:default] && options[:default].dup))
-        update_attr(name)
-      end
-    end
-
-    # Add a class based on the chosen theme
-    def initialize_themes
-      themes = self.class.themes.stringify_keys
-      return if themes.empty? || @theme.nil?
-
-      theme = @theme.to_s
-
-      if !themes.key?(theme)
-        theme_list = self.class.themes.keys.map(&:inspect).join(", ")
-        msg = "Unsupported theme: #{@theme.inspect} is not a valid theme. Try: #{theme_list}."
-        return raise(SparkComponents::Error, msg)
-      else
-        add_class themes[theme]
+        update_tag_attr(name)
       end
     end
 
@@ -291,7 +250,7 @@ module SparkComponents
 
     # Define common view methods to "alias"
     def view_methods
-      %i[tag content_tag image_tag concat content_for link_to component]
+      %i[tag content_tag image_tag concat content_for link_to component capture]
     end
 
     def extend_view_methods

data/lib/spark_components/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SparkComponents
-  VERSION = "1.2.2"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spark_components
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-26 00:00:00.000000000 Z
+date: 2019-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -77,7 +77,7 @@ files:
 - lib/spark_components/railtie.rb
 - lib/spark_components/version.rb
 - lib/tasks/components_tasks.rake
-homepage: https://github.com/imathis/spark_components
+homepage: https://github.com/spark-engine/components
 licenses:
 - MIT
 metadata: {}