bs5 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54b572156c8e8680ba3937031736fe9cdb6e2aeaf2ea88cb49b6e26c18e02c35
-  data.tar.gz: 4a4650ceee8e21d32f6a905f00c398e072bb407a4f118cd95488454f9ef61121
+  metadata.gz: ecb9af880ad8e465272d743689c0c470af8c322affb3e77be49bdb360f8b0022
+  data.tar.gz: 3b1517ef64015fa58510b9123cd625735d79e2e7fbbccda4eb161f1f4671e038
 SHA512:
-  metadata.gz: c3be0fb1a7839cafbd9673ee974879fd2e95c13e25c5a0f73a27c278c0f2abb1d4305d7eaf965999e5c5fcd390079d116c9aea297e63c1ce5530fdc3e455deb8
-  data.tar.gz: 73f164bfd36774c565a358e23e294d49b8f386db1450e92a9e73cefd81fa2951b7560705c6e098607a5005e50bf071c094a23d1eacfadf304be61c07995771df
+  metadata.gz: b638dd6760619921caaa399a585a53040501cdb796712c5bf118cc281f5ba65f16637dde70df784adff66839c2b71b91488c64bcd46a0045cc949e82cf8ba995
+  data.tar.gz: f5b36b7a285aad9a6eb2e803d182d5e4126398ae410c9cb2a6dd66674de9474da84ba1db4f6c2202730a6f0b255a3df71762074fb8315c74711f457d3a9331a2

data/app/components/bs5/button_tag_component.rb

@@ -3,17 +3,23 @@
 module Bs5
   class ButtonTagComponent < ViewComponent::Base
     STYLES = %i[primary secondary success danger warning info light dark link].freeze
-    SIZES = %i[small large].freeze
+    DEFAULT_STYLE = :primary
+    SIZES = { small: :sm, large: :lg }.freeze
+    CLASS_PREFIX = 'btn'
 
-    attr_reader :content_or_options, :options, :size
+    attr_reader :content_or_options, :size
 
     include ActiveModel::Validations
     validates :style, style: true
-    validates :size, inclusion: { in: SIZES, valid_sizes: SIZES.to_sentence, allow_nil: true }
+    validates :size, inclusion: { in: SIZES.keys, valid_sizes: SIZES.keys.to_sentence, allow_nil: true }
 
     def initialize(content_or_options = nil, options = nil)
-      @content_or_options = content_or_options.dup
-      @options = options.dup
+      if content_or_options.is_a? Hash
+        self.options = content_or_options
+      else
+        @content_or_options = content_or_options
+        self.options = options
+      end
 
       extract_custom_options
       merge_default_options
@@ -33,6 +39,14 @@ module Bs5
 
     private
 
+    def options=(value)
+      @options = Hash(value).symbolize_keys!
+    end
+
+    def options
+      @options.empty? ? nil : @options
+    end
+
     def extract_custom_options
       extract_style
       extract_outline
@@ -40,68 +54,43 @@ module Bs5
     end
 
     def extract_style
-      if @content_or_options.is_a? Hash
-        @style = @content_or_options.delete(:style)
-        @content_or_options = nil if @content_or_options.empty?
-      elsif @options.is_a? Hash
-        @style = @options.delete(:style)
-        @options = nil if @options.empty?
-      end
+      @style = @options.delete(:style)
     end
 
     def extract_outline
-      if @content_or_options.is_a? Hash
-        @outline = @content_or_options.delete(:outline)
-        @content_or_options = nil if @content_or_options.empty?
-      elsif @options.is_a? Hash
-        @outline = @options.delete(:outline)
-        @options = nil if @options.empty?
-      end
+      @outline = @options.delete(:outline)
     end
 
     def extract_size
-      if @content_or_options.is_a? Hash
-        @size = @content_or_options.delete(:size)
-        @content_or_options = nil if @content_or_options.empty?
-      elsif @options.is_a? Hash
-        @size = @options.delete(:size)
-        @options = nil if @options.empty?
-      end
+      @size = @options.delete(:size)
     end
 
     def merge_default_options
-      if @content_or_options.is_a? Hash
-        deep_merge_and_join @content_or_options, default_options
-      else
-        @options ||= {}
-        deep_merge_and_join @options, default_options
+      @options.deep_merge!(default_options) do |_key, this_val, other_val|
+        [this_val, other_val].join(' ').strip
       end
     end
 
     def default_options
-      {
-        class: button_class
-      }
+      { class: button_class }
     end
 
     def button_class
-      ['btn', contextual_class, size_class].compact.join(' ')
+      [CLASS_PREFIX, contextual_class, size_class].compact.join(' ')
     end
 
     def contextual_class
-      ['btn', outline? ? 'outline' : nil, style].compact.join('-')
+      [CLASS_PREFIX, outline? ? 'outline' : nil, style].compact.join('-')
     end
 
     def size_class
       return unless size?
 
-      x = { large: 'lg', small: 'sm' }[@size]
-
-      "btn-#{x}"
+      [CLASS_PREFIX, SIZES[size]].join('-')
     end
 
     def style
-      (@style || 'primary').to_sym
+      (@style || DEFAULT_STYLE).to_sym
     end
 
     def outline?
@@ -109,13 +98,7 @@ module Bs5
     end
 
     def size?
-      !!@size
-    end
-
-    def deep_merge_and_join(h1, h2)
-      h1.deep_merge!(h2) do |key, this_val, other_val|
-        [this_val, other_val].join(' ').strip
-      end
+      !!size
     end
   end
 end

data/lib/bs5/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bs5
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bs5
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Patrick Baselier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-26 00:00:00.000000000 Z
+date: 2020-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails