bs5 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c59051b95e71e72c78e941b4fb15915dedfdf4e46564f83bfab206605c84fdc1
-  data.tar.gz: 7d0de3b478c43f569583b2df7937fdc83aa4264bbcf8bc222c3b3fd5f50a99e1
+  metadata.gz: 1d4e64b1fb40e3224c42147923de60bb7233c2c2fbf411674e0bca31c093c837
+  data.tar.gz: 80ef0fe973d5cab69eb75e4834dbaed31c1886d13c4f6586aeed655d0a69ba2a
 SHA512:
-  metadata.gz: 33d60944d67212152aab1a2e4880fe30fd44e8e9028e8ad227d437bab2b7c18780592b1cc5c4ce636cf9defeea7994c87a0edf311f3307d6dc0ebab7ae2bf301
-  data.tar.gz: 517cdbda7eff4f44f4db1b3e62679326c07465c0eb857105905e605ae8535b312fb096d97453b0e92a094431a56d9974cfb56a4a39937eab95a86ef6cba53b67
+  metadata.gz: a4b8e31ace3f99001251e99f0e8c7d2ad8e2320008223c7b346eeca08fcd9e39d2b59c208e181720a2c6e611550a6913e11cc941b0c92a89dffd73b4bf9d615d
+  data.tar.gz: 10bcf562669a15ea680eea134048ab9ee32986e905e28173184ddf044842ac6dafdb507817a3154487e2fa5e567aaa2209313e25752b77e7699df18720adc630

data/README.md

@@ -33,7 +33,7 @@ $ gem install bs5
 Run the following command to setup your project to use Bootstrap 5.
 
     $ rails generate bs5:install
-    
+
 ## Components
 
 ### [Accordion](https://v5.getbootstrap.com/docs/5.0/components/accordion/) ✅
@@ -51,6 +51,7 @@ Run the following command to setup your project to use Bootstrap 5.
   <% end %>
 <%- end %>
 ```
+
 ```
 <%= bs5_accordion(flush: true) do |accordion| %>
   <% accordion.slot(:item, title: 'Accordion Item #1') do %>
@@ -74,21 +75,33 @@ Run the following command to setup your project to use Bootstrap 5.
 ```
 
 ```
-<%= bs5_alert(type: :warning, is_dismissable: true) do %>
+<%= bs5_alert(style: :warning, is_dismissable: true) do %>
   <strong>Holy guacamole!</strong> You should check in on some of those fields below.
 <%- end %>
 ```
 
-### [Badge](https://v5.getbootstrap.com/docs/5.0/components/badge/)
+### [Badge](https://v5.getbootstrap.com/docs/5.0/components/badge/) ✅
 
-### [Breadcrumb](https://v5.getbootstrap.com/docs/5.0/components/breadcrumb/)
+```
+<%= bs5_badge(text: 'New') %>
+```
 
-###[Button](https://v5.getbootstrap.com/docs/5.0/components/buttons/)
+```
+<%= bs5_badge(text: 'Warning', style: :warning) %>
+```
+
+```
+<%= bs5_badge(text: 'Danger', style: :danger, pill: true) %>
+```
+
+
+### [Breadcrumb](https://v5.getbootstrap.com/docs/5.0/components/breadcrumb/)
 
+### [Button](https://v5.getbootstrap.com/docs/5.0/components/buttons/)
 
 ## Previewing components
 
-* http://localhost:3000/rails/view_components
+- http://localhost:3000/rails/view_components
 
 ## Contributing
 

data/app/components/bs5/alert_component.rb

@@ -2,18 +2,13 @@
 
 module Bs5
   class AlertComponent < ViewComponent::Base
-    TYPES = %i[primary secondary success danger warning info light dark].freeze
+    attr_reader :style, :is_dismissable
 
     include ActiveModel::Validations
+    validates :style, style: true
 
-    attr_reader :type, :is_dismissable
-
-    validates :type, inclusion: { in: TYPES, message: lambda do |_, data|
-      "#{data[:value].inspect} is not valid. Try #{TYPES.to_sentence(last_word_connector: ' or ')}."
-    end }
-
-    def initialize(type: :primary, is_dismissable: false)
-      @type = type.to_sym
+    def initialize(style: :primary, is_dismissable: false)
+      @style = style.to_sym
       @is_dismissable = is_dismissable
     end
 
@@ -34,7 +29,7 @@ module Bs5
     end
 
     def contextual_class
-      "alert-#{@type}"
+      "alert-#{@style}"
     end
   end
 end

data/app/components/bs5/badge_component.html.erb

@@ -0,0 +1 @@
+<span class="<%= component_class %>"><%= text %></span>

data/app/components/bs5/badge_component.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Bs5
+  class BadgeComponent < ViewComponent::Base
+    attr_reader :text, :style
+
+    include ActiveModel::Validations
+    validates :style, style: true
+
+    def initialize(text:, style: :secondary, pill: false)
+      @text = text
+      @style = style.to_sym
+      @pill = pill
+    end
+
+    def before_render
+      raise errors.full_messages.to_sentence if invalid?
+    end
+
+    private
+
+    def component_class
+      class_names = ['badge', contextual_class]
+      class_names << %w[rounded-pill] if pill?
+      class_names.join(' ')
+    end
+
+    def pill?
+      @pill
+    end
+
+    def contextual_class
+      class_names = ["bg-#{@style}"]
+      class_names << %w[text-dark] if style.in?(%i[warning info light])
+      class_names.join(' ')
+    end
+  end
+end

data/app/helpers/bs5/components_helper.rb

@@ -2,16 +2,20 @@
 
 module Bs5
   module ComponentsHelper
+    def bs5_accordion(*args)
+      render AccordionComponent.new(*args) do |accordion|
+        yield accordion if block_given?
+      end
+    end
+
     def bs5_alert(*args)
       render AlertComponent.new(*args) do
         yield if block_given?
       end
     end
 
-    def bs5_accordion(*args)
-      render AccordionComponent.new(*args) do |accordion|
-        yield accordion if block_given?
-      end
+    def bs5_badge(*args)
+      render BadgeComponent.new(*args)
     end
   end
 end

data/app/validators/style_validator.rb

@@ -0,0 +1,11 @@
+# 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)
+
+    record.errors.add(attribute, :inclusion, valid_styles: STYLES.to_sentence)
+  end
+end

data/config/locales/en.yml

@@ -0,0 +1,8 @@
+en:
+  activemodel:
+    errors:
+      models:
+        bs5/alert_component:
+          attributes:
+            style:
+              inclusion: "is not included in the list: %{valid_styles}."

data/lib/bs5/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bs5
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Patrick Baselier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-17 00:00:00.000000000 Z
+date: 2020-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -102,13 +102,17 @@ files:
 - app/components/bs5/accordion_component.rb
 - app/components/bs5/alert_component.html.erb
 - app/components/bs5/alert_component.rb
+- app/components/bs5/badge_component.html.erb
+- app/components/bs5/badge_component.rb
 - app/controllers/bs5/application_controller.rb
 - app/helpers/bs5/application_helper.rb
 - app/helpers/bs5/components_helper.rb
 - app/jobs/bs5/application_job.rb
 - app/mailers/bs5/application_mailer.rb
 - app/models/bs5/application_record.rb
+- app/validators/style_validator.rb
 - app/views/layouts/bs5/application.html.erb
+- config/locales/en.yml
 - config/routes.rb
 - lib/bs5.rb
 - lib/bs5/engine.rb