bs5 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77c7e79d854010df72b9492702bd2983468fb9237d3aecf619f3f6267db8c6fd
-  data.tar.gz: cc4cc0afd6b51f9c7b59ce3b38842255b7b4131640104aa297e9f10a655be51d
+  metadata.gz: 54b572156c8e8680ba3937031736fe9cdb6e2aeaf2ea88cb49b6e26c18e02c35
+  data.tar.gz: 4a4650ceee8e21d32f6a905f00c398e072bb407a4f118cd95488454f9ef61121
 SHA512:
-  metadata.gz: 0cc7b7a7c486b2b7783fbe4970900b9ec009ffcdb32bb9271fce6d15b24ef6ed7a407e6a67bb3a3056d7f3fdd64b1861b58f9baa6e012962ccdd0237d51063de
-  data.tar.gz: 6f5bad0ae1ce081d539855c2249292b2e2dbce5de4ece7d983aba5d31caf6414ff0b8f790a83927653db2c33c02845271ec222bceca6d01d9a5b90dc6f4c7e20
+  metadata.gz: c3be0fb1a7839cafbd9673ee974879fd2e95c13e25c5a0f73a27c278c0f2abb1d4305d7eaf965999e5c5fcd390079d116c9aea297e63c1ce5530fdc3e455deb8
+  data.tar.gz: 73f164bfd36774c565a358e23e294d49b8f386db1450e92a9e73cefd81fa2951b7560705c6e098607a5005e50bf071c094a23d1eacfadf304be61c07995771df

data/app/components/bs5/alert_component.rb

@@ -2,6 +2,8 @@
 
 module Bs5
   class AlertComponent < ViewComponent::Base
+    STYLES = %i[primary secondary success danger warning info light dark].freeze
+
     attr_reader :style, :is_dismissable
 
     include ActiveModel::Validations

data/app/components/bs5/badge_component.rb

@@ -2,6 +2,8 @@
 
 module Bs5
   class BadgeComponent < ViewComponent::Base
+    STYLES = %i[primary secondary success danger warning info light dark].freeze
+
     attr_reader :text, :style
 
     include ActiveModel::Validations

data/app/components/bs5/button_tag_component.rb

@@ -0,0 +1,121 @@
+# frozen_string_literal: true
+
+module Bs5
+  class ButtonTagComponent < ViewComponent::Base
+    STYLES = %i[primary secondary success danger warning info light dark link].freeze
+    SIZES = %i[small large].freeze
+
+    attr_reader :content_or_options, :options, :size
+
+    include ActiveModel::Validations
+    validates :style, style: true
+    validates :size, inclusion: { in: SIZES, valid_sizes: SIZES.to_sentence, allow_nil: true }
+
+    def initialize(content_or_options = nil, options = nil)
+      @content_or_options = content_or_options.dup
+      @options = options.dup
+
+      extract_custom_options
+      merge_default_options
+    end
+
+    def before_render
+      raise errors.full_messages.to_sentence if invalid?
+    end
+
+    def call
+      if content
+        button_tag(content_or_options, options) { content }
+      else
+        button_tag(content_or_options, options)
+      end
+    end
+
+    private
+
+    def extract_custom_options
+      extract_style
+      extract_outline
+      extract_size
+    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
+    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
+    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
+    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
+      end
+    end
+
+    def default_options
+      {
+        class: button_class
+      }
+    end
+
+    def button_class
+      ['btn', contextual_class, size_class].compact.join(' ')
+    end
+
+    def contextual_class
+      ['btn', outline? ? 'outline' : nil, style].compact.join('-')
+    end
+
+    def size_class
+      return unless size?
+
+      x = { large: 'lg', small: 'sm' }[@size]
+
+      "btn-#{x}"
+    end
+
+    def style
+      (@style || 'primary').to_sym
+    end
+
+    def outline?
+      !!@outline
+    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
+    end
+  end
+end

data/app/helpers/bs5/components_helper.rb

@@ -2,29 +2,20 @@
 
 module Bs5
   module ComponentsHelper
-    def bs5_accordion(*args)
-      render AccordionComponent.new(*args) do |accordion|
-        yield accordion if block_given?
-      end
-    end
+    COMPONENTS = %w[accordion alert badge close_button breadcrumb button_tag].freeze
 
-    def bs5_alert(*args)
-      render AlertComponent.new(*args) do
-        yield if block_given?
+    COMPONENTS.each do |name|
+      define_method("bs5_#{name}") do |*args, &block|
+        clazz = "Bs5::#{name.classify}Component".constantize
+        render_component(clazz, *args, &block)
       end
     end
 
-    def bs5_badge(*args)
-      render BadgeComponent.new(*args)
-    end
-
-    def bs5_close_button(*args)
-      render CloseButtonComponent.new(*args)
-    end
+    private
 
-    def bs5_breadcrumb(*args)
-      render BreadcrumbComponent.new(*args) do |breadcrumb|
-        yield breadcrumb if block_given?
+    def render_component(component_clazz, *args)
+      render component_clazz.new(*args) do |c|
+        yield c if block_given?
       end
     end
   end

data/app/validators/style_validator.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
 class StyleValidator < ActiveModel::EachValidator
-  STYLES = %i[primary secondary success danger warning info light dark].freeze
-
   def validate_each(record, attribute, value)
-    return if value.in?(STYLES)
+    return if value.in?(valid_styles = record.class::STYLES)
 
-    record.errors.add(attribute, :inclusion, valid_styles: STYLES.to_sentence)
+    record.errors.add(attribute, :inclusion, valid_styles: valid_styles.to_sentence)
   end
 end

data/app/views/bs5/examples/_buttons.html.erb

@@ -0,0 +1,7 @@
+<h2>Buttons</h2>
+<%= render 'bs5/examples/buttons/default/example' %>
+<%= render 'bs5/examples/buttons/style/example' %>
+<%= render 'bs5/examples/buttons/outline/example' %>
+<%= render 'bs5/examples/buttons/size/example' %>
+<%= render 'bs5/examples/buttons/block_buttons/example' %>
+<%= render 'bs5/examples/buttons/toggle_states/example' %>

data/app/views/bs5/examples/buttons/block_buttons/_example.html.erb

@@ -0,0 +1,5 @@
+<h3>Block buttons</h3>
+<%= bs5_example(snippet: 'buttons/block_buttons/block_buttons') %>
+<%= bs5_example(snippet: 'buttons/block_buttons/responsive_block_buttons_1') %>
+<%= bs5_example(snippet: 'buttons/block_buttons/responsive_block_buttons_2') %>
+<%= bs5_example(snippet: 'buttons/block_buttons/responsive_block_buttons_3') %>

data/app/views/bs5/examples/buttons/block_buttons/block_buttons.html.erb

@@ -0,0 +1,4 @@
+<div class="d-grid gap-2">
+  <%= bs5_button_tag %>
+  <%= bs5_button_tag %>
+</div>

data/app/views/bs5/examples/buttons/block_buttons/responsive_block_buttons_1.html.erb

@@ -0,0 +1,4 @@
+<div class="d-grid gap-2 d-md-block">
+  <%= bs5_button_tag %>
+  <%= bs5_button_tag %>
+</div>

data/app/views/bs5/examples/buttons/block_buttons/responsive_block_buttons_2.html.erb

@@ -0,0 +1,4 @@
+<div class="d-grid gap-2 col-6 mx-auto">
+  <%= bs5_button_tag %>
+  <%= bs5_button_tag %>
+</div>

data/app/views/bs5/examples/buttons/block_buttons/responsive_block_buttons_3.html.erb

@@ -0,0 +1,4 @@
+<div class="d-grid gap-2 d-md-flex justify-content-md-end">
+  <%= bs5_button_tag('Button', class: 'mr-md-2') %>
+  <%= bs5_button_tag %>
+</div>

data/app/views/bs5/examples/buttons/default/_example.html.erb

@@ -0,0 +1,2 @@
+<h3>Example</h3>
+<%= bs5_example(snippet: 'buttons/default/snippet') %>

data/app/views/bs5/examples/buttons/default/snippet.html.erb

@@ -0,0 +1,15 @@
+<%= bs5_button_tag %>
+
+<%= bs5_button_tag 'Reset', type: 'reset' %>
+
+<%= bs5_button_tag 'Button', type: 'button' %>
+
+<%= bs5_button_tag 'Reset', type: 'reset', disabled: true %>
+
+<%= bs5_button_tag(type: 'button') do %>
+  <%= content_tag(:strong, 'Ask me!') %>
+<% end %>
+
+<%= bs5_button_tag 'Save', data: { confirm: 'Are you sure?' } %>
+
+<%= bs5_button_tag 'Checkout', data: { disable_with: 'Please wait...' } %>

data/app/views/bs5/examples/buttons/outline/_example.html.erb

@@ -0,0 +1,2 @@
+<h3>Outline</h3>
+<%= bs5_example(snippet: 'buttons/outline/snippet') %>

data/app/views/bs5/examples/buttons/outline/snippet.html.erb

@@ -0,0 +1,19 @@
+<%= bs5_button_tag 'Primary', style: :primary, outline: true %>
+
+<%= bs5_button_tag 'Secondary', style: :secondary, outline: true %>
+
+<%= bs5_button_tag 'Success', style: :success, outline: true %>
+
+<%= bs5_button_tag 'Danger', style: :danger, outline: true %>
+
+<%= bs5_button_tag(style: :warning, outline: true, type: 'button') do %>
+  <%= content_tag(:strong, 'Warning') %>
+<% end %>
+
+<%= bs5_button_tag 'Info', style: :info, outline: true %>
+
+<%= bs5_button_tag 'Light', style: :light, outline: true %>
+
+<%= bs5_button_tag 'Dark', style: :dark, outline: true %>
+
+<%= bs5_button_tag 'Link', style: :link, outline: true %>

data/app/views/bs5/examples/buttons/size/_example.html.erb

@@ -0,0 +1,3 @@
+<h3>Sizes</h3>
+<%= bs5_example(snippet: 'buttons/size/large') %>
+<%= bs5_example(snippet: 'buttons/size/small') %>

data/app/views/bs5/examples/buttons/size/large.html.erb

@@ -0,0 +1,3 @@
+<%= bs5_button_tag 'Large button', style: :primary, size: :large %>
+
+<%= bs5_button_tag 'Large button', style: :secondary, size: :large %>

data/app/views/bs5/examples/buttons/size/small.html.erb

@@ -0,0 +1,3 @@
+<%= bs5_button_tag 'Small button', style: :primary, size: :small %>
+
+<%= bs5_button_tag 'Small button', style: :secondary, size: :small %>

data/app/views/bs5/examples/buttons/style/_example.html.erb

@@ -0,0 +1,2 @@
+<h3>Style</h3>
+<%= bs5_example(snippet: 'buttons/style/snippet') %>

data/app/views/bs5/examples/buttons/style/snippet.html.erb

@@ -0,0 +1,19 @@
+<%= bs5_button_tag 'Primary', style: :primary %>
+
+<%= bs5_button_tag 'Secondary', style: :secondary %>
+
+<%= bs5_button_tag 'Success', style: :success %>
+
+<%= bs5_button_tag 'Danger', style: :danger %>
+
+<%= bs5_button_tag(style: :warning, type: 'button') do %>
+  <%= content_tag(:strong, 'Warning') %>
+<% end %>
+
+<%= bs5_button_tag 'Info', style: :info %>
+
+<%= bs5_button_tag 'Light', style: :light %>
+
+<%= bs5_button_tag 'Dark', style: :dark %>
+
+<%= bs5_button_tag 'Link', style: :link %>

data/app/views/bs5/examples/buttons/toggle_states/_example.html.erb

@@ -0,0 +1,2 @@
+<h3>Toggle states</h3>
+<%= bs5_example(snippet: 'buttons/toggle_states/snippet') %>

data/app/views/bs5/examples/buttons/toggle_states/snippet.html.erb

@@ -0,0 +1,3 @@
+<%= bs5_button_tag('Toggle button', data: { toggle: 'button' }, autocomplete: 'off') %>
+<%= bs5_button_tag('Active toggle button', class: 'active', data: { toggle: 'button' }, autocomplete: 'off', aria: { pressed: true }) %>
+<%= bs5_button_tag('Disabled toggle button', data: { toggle: 'button' }, autocomplete: 'off', disabled: true) %>

data/app/views/bs5/examples/index.html.erb

@@ -7,6 +7,7 @@
         <li>Badge</li>
         <li>Close button</li>
         <li>Breadcrumb</li>
+        <li>Buttons</li>
         </ul>
       </div>
     </div>
@@ -17,5 +18,6 @@
       <%= render 'badge' %>
       <%= render 'close_button' %>
       <%= render 'breadcrumb' %>
+      <%= render 'buttons' %>
     </div>
   </div>

data/config/definitions.rb

@@ -0,0 +1,31 @@
+# The following comments fill some of the gaps in Solargraph's understanding of
+# Rails apps. Since they're all in YARD, they get mapped in Solargraph but
+# ignored at runtime.
+#
+# You can put this file anywhere in the project, as long as it gets included in
+# the workspace maps. It's recommended that you keep it in a standalone file
+# instead of pasting it into an existing one.
+#
+# @!parse
+#   class ActionController::Base
+#     include ActionController::MimeResponds
+#     extend ActiveSupport::Callbacks::ClassMethods
+#     extend AbstractController::Callbacks::ClassMethods
+#   end
+#   class ActiveRecord::Base
+#     extend ActiveRecord::QueryMethods
+#     extend ActiveRecord::FinderMethods
+#     extend ActiveRecord::Associations::ClassMethods
+#     extend ActiveRecord::Inheritance::ClassMethods
+#     include ActiveRecord::Persistence
+#   end
+# @!override ActiveRecord::FinderMethods#find
+#   @overload find(id)
+#     @param id [Integer]
+#     @return [self]
+#   @overload find(list)
+#     @param list [Array]
+#     @return [Array<self>]
+#   @overload find(*args)
+#     @return [Array<self>]
+#   @return [self, Array<self>]

data/config/locales/en.yml

@@ -6,3 +6,9 @@ en:
           attributes:
             style:
               inclusion: "is not included in the list: %{valid_styles}."
+        bs5/button_tag_component:
+          attributes:
+            style:
+              inclusion: "is not included in the list: %{valid_styles}."
+            size:
+              inclusion: "is not included in the list: %{valid_sizes}."

data/lib/bs5/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bs5
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Patrick Baselier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-22 00:00:00.000000000 Z
+date: 2020-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -134,6 +134,7 @@ files:
 - app/components/bs5/badge_component.rb
 - app/components/bs5/breadcrumb_component.html.erb
 - app/components/bs5/breadcrumb_component.rb
+- app/components/bs5/button_tag_component.rb
 - app/components/bs5/close_button_component.html.erb
 - app/components/bs5/close_button_component.rb
 - app/components/bs5/example_component.html.erb
@@ -149,6 +150,7 @@ files:
 - app/views/bs5/examples/_alert.html.erb
 - app/views/bs5/examples/_badge.html.erb
 - app/views/bs5/examples/_breadcrumb.html.erb
+- app/views/bs5/examples/_buttons.html.erb
 - app/views/bs5/examples/_close_button.html.erb
 - app/views/bs5/examples/accordion/default/_example.html.erb
 - app/views/bs5/examples/accordion/default/snippet.html.erb
@@ -170,6 +172,22 @@ files:
 - app/views/bs5/examples/badge/style/snippet.html.erb
 - app/views/bs5/examples/breadcrumb/default/_example.html.erb
 - app/views/bs5/examples/breadcrumb/default/snippet.html.erb
+- app/views/bs5/examples/buttons/block_buttons/_example.html.erb
+- app/views/bs5/examples/buttons/block_buttons/block_buttons.html.erb
+- app/views/bs5/examples/buttons/block_buttons/responsive_block_buttons_1.html.erb
+- app/views/bs5/examples/buttons/block_buttons/responsive_block_buttons_2.html.erb
+- app/views/bs5/examples/buttons/block_buttons/responsive_block_buttons_3.html.erb
+- app/views/bs5/examples/buttons/default/_example.html.erb
+- app/views/bs5/examples/buttons/default/snippet.html.erb
+- app/views/bs5/examples/buttons/outline/_example.html.erb
+- app/views/bs5/examples/buttons/outline/snippet.html.erb
+- app/views/bs5/examples/buttons/size/_example.html.erb
+- app/views/bs5/examples/buttons/size/large.html.erb
+- app/views/bs5/examples/buttons/size/small.html.erb
+- app/views/bs5/examples/buttons/style/_example.html.erb
+- app/views/bs5/examples/buttons/style/snippet.html.erb
+- app/views/bs5/examples/buttons/toggle_states/_example.html.erb
+- app/views/bs5/examples/buttons/toggle_states/snippet.html.erb
 - app/views/bs5/examples/close_button/default/_example.html.erb
 - app/views/bs5/examples/close_button/default/snippet.html.erb
 - app/views/bs5/examples/close_button/disabled/_example.html.erb
@@ -178,6 +196,7 @@ files:
 - app/views/bs5/examples/close_button/white/snippet.html.erb
 - app/views/bs5/examples/index.html.erb
 - app/views/layouts/bs5/application.html.erb
+- config/definitions.rb
 - config/locales/en.yml
 - config/routes.rb
 - lib/bs5.rb