shoelace-rails 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bf02de3fbe6ef35ad4c464e666bd7ace7bf0c2e673b0767afea4d6b87522749
-  data.tar.gz: 73abb906c86ffc3f4a945f73f3a97e3cd335c1cb4245b82362cf53c3587619d5
+  metadata.gz: 7a2dfd18c31e8151980211fe86c5911629f795652e2662315055695f31b7e2d6
+  data.tar.gz: a2c224c7c8ba4fd199d9190d77e37246650753f9c76d29156c25b4754c65018b
 SHA512:
-  metadata.gz: 1e7a5bca7b14951f97b54c9de1be69698ceebb63a421be912cc8f692ebec8ed075ebdf58a4fbc9d9200c296e3150ae63f41f6a6a40f62fc368c1a54044905a9b
-  data.tar.gz: 5d09b9294065025cb30762a152c3b037739790a8b16ff5e2178bcb98afc0592756447ba0273967450783e11fbfd9863be5e11027a61074ed622e35d380a95dc5
+  metadata.gz: 8a78a2537a9851beb4f9d7e33214e51fbff8c3539cef0d244951b6ac36d7f0837a84129a8dfe36a46f8e7eec8f474e65b9a45078abde2a508b3a3b90f5322060
+  data.tar.gz: 5a99554ecd05cd33ffbe41929984a82828961db94ac3f4a4c796e6685bff57c08afef96ed8d8c58e055edaada87e2e0be0ebc5761b870bec74164a476c7e36e6

data/CHANGELOG.md

@@ -1,28 +1,49 @@
-## v0.3.0
+## v0.4.1
 
-_<sup>released at 2023-01-05 08:47:12 UTC</sup>_
+_<sup>released at 2023-03-21 05:01:50 UTC</sup>_
+
+#### 🐞Bug Fixes
+
+- Fixes a bug where `FormHelper` may not be defined when someone loads `ActionView` too early (d91ed3b595c01ce2dfc471b12b14311e0660d3d7)
+- Fixes a bug where the Shoelace rake tasks blow up when the project does not depend on Sprockets or Propshaft (0e64cd6dc38a037171be04eaf1d3f59c3c8529eb, 75adf831b1faa7f5d1faeed26e672d4bc89b9513)
+
+## [v0.4.0](https://github.com/yuki24/shoelace-rails/tree/v0.4.0)
+
+_<sup>released at 2023-01-07 07:23:50 UTC</sup>_
+
+#### 🚨 Breaking Changes
+
+- No longer works with `2.0.0-beta.88` and below.
+
+#### ⭐️ Features
+
+- Support Shoelace.style `2.0.0-beta.88`.
+
+## [v0.3.0](https://github.com/yuki24/shoelace-rails/tree/v0.3.0)
+
+_<sup>released at 2023-01-05 08:49:23 UTC</sup>_
 
 #### Features
 
-- No longer requires the `sl-form` component (`4fdbfa15`)
-- The `#text_area` method now accepts a block (`5092dc1c`)
-- Allow overriding the value attribute for `<sl-select>` (`1f38be73`)
-- Auto-display labels whenever possible (`c1e3a950`)
-- `<sl-select>` now always has a label by default (`f9fb5f0c`)
-- Support Ruby 3.2 (`b286cbc1`)
-- Add `#sl_button_to` (`e1bdedba`)
-- Add `#sl_icon_tag` (`8a2187a2`)
-- Add `#sl_avatar_tag` (`77dccdb2`)
-- Allow using the `Shoelace::FormBuilder` in a cleaner way (`43dea330`)
+- No longer requires the `sl-form` component ([<tt>4fdbfa1</tt>](https://github.com/yuki24/shoelace-rails/commit/4fdbfa15fa10db9e7240378ca34ebcc494d18f1a))
+- The `#text_area` method now accepts a block ([<tt>5092dc1</tt>](https://github.com/yuki24/shoelace-rails/commit/5092dc1cbc7e8e74552451450804baa378ab1f11))
+- Allow overriding the value attribute for `<sl-select>` ([<tt>1f38be7</tt>](https://github.com/yuki24/shoelace-rails/commit/1f38be73e3335c10e846393ebcf5155d155b00b2))
+- Auto-display labels whenever possible ([<tt>c1e3a95</tt>](https://github.com/yuki24/shoelace-rails/commit/c1e3a950c3e8ac4238ed3e83e4d87467a68eb91f))
+- `<sl-select>` now always has a label by default ([<tt>f9fb5f0</tt>](https://github.com/yuki24/shoelace-rails/commit/f9fb5f0cd74d179241be51510fa1c306481946c9))
+- Support Ruby 3.2 ([<tt>b286cbc</tt>](https://github.com/yuki24/shoelace-rails/commit/b286cbc18930218ab5c82bd8648a51e9c6ce53db))
+- Add `#sl_button_to` ([<tt>e1bdedb</tt>](https://github.com/yuki24/shoelace-rails/commit/e1bdedba4656d89a82c78641644490085da1fa37))
+- Add `#sl_icon_tag` ([<tt>8a2187a</tt>](https://github.com/yuki24/shoelace-rails/commit/8a2187a2800771512fccf2c8231378a77be59df4))
+- Add `#sl_avatar_tag` ([<tt>77dccdb</tt>](https://github.com/yuki24/shoelace-rails/commit/77dccdb24cfc014bd997ffb66ad89ff95afb3ef7))
+- Allow using the `Shoelace::FormBuilder` in a cleaner way ([<tt>43dea33</tt>](https://github.com/yuki24/shoelace-rails/commit/43dea3309c3e0cf9d9b43b6957f6e54ad9497c9f))
 
 #### Bug Fixes
 
-- Fixes a bug where the gem rake tasks are not loaded (`115bfb3d`)
-- Fixes a bug where values are not properly passed in to `<sl-textarea>` (`3d163845`)
-- Make sure yarn install is always executed before copying shoelace assets (`98018a27`)
-- Fixes a bug where the `@object` needs to respond to `#errors` (`bb981ed0`)
-- Fixes a bug where the `size` attr is ignored by the `#text_area` method (`8bc4c378`)
-- Fixes a bug where unchecked checkbox values are not captured (`dc658bea`)
+- Fixes a bug where the gem rake tasks are not loaded ([<tt>115bfb3</tt>](https://github.com/yuki24/shoelace-rails/commit/115bfb3d81ca19b5b922a5fb32f46adb1d6e8544))
+- Fixes a bug where values are not properly passed in to `<sl-textarea>` ([<tt>3d16384</tt>](https://github.com/yuki24/shoelace-rails/commit/3d16384554bd4a6143e28e483f8d6bee8fb2e073))
+- Make sure yarn install is always executed before copying shoelace assets ([<tt>98018a2</tt>](https://github.com/yuki24/shoelace-rails/commit/98018a27a29ddc9ff2c2fa066bbe986709803a1d))
+- Fixes a bug where the `@object` needs to respond to `#errors` ([<tt>bb981ed</tt>](https://github.com/yuki24/shoelace-rails/commit/bb981ed05825707cef89d70a7d1699c12cd0ba9b))
+- Fixes a bug where the `size` attr is ignored by the `#text_area` method ([<tt>8bc4c37</tt>](https://github.com/yuki24/shoelace-rails/commit/8bc4c3784a458e7fc9c18a143578b2cbf588e9e7))
+- Fixes a bug where unchecked checkbox values are not captured ([<tt>dc658be</tt>](https://github.com/yuki24/shoelace-rails/commit/dc658bea9fc4d4205dacdfe133b091c5a5edf14c))
 
 ## [v0.2.0](https://github.com/yuki24/shoelace-rails/tree/v0.2.0)
 

data/README.md

@@ -2,6 +2,11 @@
 
 The `shoelace-rails` gem adds useful helper methods for [Shoelace.style](https://shoelace.style), the design system.
 
+## Compatibility with Shoelace
+
+* **For Shoelace version >= 2.0.0-beta.88, use the gem version `0.4.0` or above**.
+* For Shoelace version <= 2.0.0-beta.87, use the gem version `0.3.0`.
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/app/helpers/shoelace/form_helper.rb

@@ -2,9 +2,6 @@
 
 module Shoelace
   module FormHelper
-    mattr_accessor :invalid_input_class_name
-    self.invalid_input_class_name = nil
-
     class ShoelaceInputField < ActionView::Helpers::Tags::TextField #:nodoc:
       attr_reader :field_type
 
@@ -21,7 +18,7 @@ module Shoelace
 
         options["size"] = options["maxlength"] unless options.key?("size")
         options["type"] ||= field_type
-        options["class"] ||= [options["class"], Shoelace::FormHelper.invalid_input_class_name].compact.join(" ") if @object.respond_to?(:errors) && @object.errors[@method_name].present?
+        options["class"] ||= [options["class"], Shoelace.invalid_input_class_name].compact.join(" ") if @object.respond_to?(:errors) && @object.errors[@method_name].present?
 
         add_default_name_and_id(options)
 
@@ -274,7 +271,7 @@ module Shoelace
       content_tag('sl-input', '', { "type" => "text", "name" => name, "id" => sanitize_to_id(name), "value" => value }.update(options.stringify_keys), &block)
     end
 
-    # Returns a string of +<sl-menu-item>+ tags, like +options_for_select+, but prepends a +<sl-menu-label>+ tag to
+    # Returns a string of +<sl-option>+ tags, like +options_for_select+, but prepends a +<small>+ tag to
     # each group.
     def grouped_sl_options_for_select(grouped_options, options)
       body = "".html_safe
@@ -283,14 +280,14 @@ module Shoelace
         label, values = container
 
         body.safe_concat(DIVIDER_TAG) if index > 0
-        body.safe_concat(content_tag("sl-menu-label", label)) if label.present?
+        body.safe_concat(content_tag("small", label)) if label.present?
         body.safe_concat(sl_options_for_select(values, options))
       end
 
       body
     end
 
-    # Accepts an enumerable (hash, array, enumerable, your type) and returns a string of +sl-menu-item+ tags. Given
+    # Accepts an enumerable (hash, array, enumerable, your type) and returns a string of +sl-option+ tags. Given
     # an enumerable where the elements respond to +first+ and +last+ (such as a two-element array), the “lasts” serve
     # as option values and the “firsts” as option text.
     def sl_options_for_select(enumerable, options = nil)
@@ -306,11 +303,11 @@ module Shoelace
         html_attributes[:disabled] ||= disabled.include?(value)
         html_attributes[:value] = value
 
-        tag_builder.content_tag_string('sl-menu-item', text, html_attributes)
+        tag_builder.content_tag_string('sl-option', text, html_attributes)
       end.join("\n").html_safe
     end
 
-    # Returns a string of +<sl-menu-item>+ tags compiled by iterating over the collection and assigning the result of
+    # Returns a string of +<sl-option>+ tags compiled by iterating over the collection and assigning the result of
     # a call to the +value_method+ as the option value and the +text_method+ as the option text.
     def sl_options_from_collection_for_select(collection, value_method, text_method, selected = nil)
       options = collection.map do |element|

data/lib/shoelace/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Shoelace
   module Rails
-    VERSION = "0.3.0"
+    VERSION = "0.4.1"
   end
 end

data/lib/shoelace/railtie.rb

@@ -3,6 +3,9 @@
 require 'action_dispatch/middleware/static'
 
 module Shoelace
+  mattr_accessor :invalid_input_class_name
+  self.invalid_input_class_name = nil
+
   # The only reason this class exists is to clarify that we have a custom static file server after
   # `ActionDispatch::Static`. We could just use `ActionDispatch::Static` directly, but it would make the result of
   # `rake middleware` more difficult to understand, as the output would look like:
@@ -43,7 +46,7 @@ module Shoelace
 
     initializer "shoelace.form_helper" do |app|
       ActiveSupport.on_load :action_view do
-        Shoelace::FormHelper.invalid_input_class_name = app.config.shoelace.invalid_input_class_name
+        Shoelace.invalid_input_class_name = app.config.shoelace.invalid_input_class_name
       end
     end
 

data/lib/shoelace/testing.rb

@@ -7,7 +7,7 @@ module Shoelace
       select_element.click
 
       within select_element do
-        find('sl-menu-item', text: option_text).click
+        find('sl-option', text: option_text).click
       end
 
       select_element
@@ -19,7 +19,7 @@ module Shoelace
       select_element.click
       within select_element do
         options_to_select.each do |option_text|
-          find('sl-menu-item', text: option_text).click
+          find('sl-option', text: option_text).click
         end
       end
 

data/lib/tasks/shoelace.rake

@@ -13,8 +13,12 @@ namespace :shoelace do
 end
 
 # Make sure `yarn install` is run before running `shoelace:icons:copy`.
-Rake::Task["shoelace:icons:copy"].enhance(["javascript:build"])
+if Rake::Task.task_defined?("javascript:build")
+  Rake::Task["shoelace:icons:copy"].enhance(["javascript:build"])
+end
 
 if Rake::Task.task_defined?("assets:precompile")
   Rake::Task["assets:precompile"].enhance(["shoelace:icons:copy"])
+else
+  Rake::Task.define_task('assets:precompile' => ['shoelace:icons:copy'])
 end

data/test/dummy_app/app/views/layouts/application.html.erb

@@ -21,8 +21,8 @@
       }
     </style>
 
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@shoelace-style/shoelace@2.0.0-beta.87/dist/themes/light.css">
-    <script type="module" src="https://cdn.jsdelivr.net/npm/@shoelace-style/shoelace@2.0.0-beta.87/dist/shoelace.js"></script>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@shoelace-style/shoelace@2.0.0-beta.88/dist/themes/light.css">
+    <script type="module" src="https://cdn.jsdelivr.net/npm/@shoelace-style/shoelace@2.0.0-beta.88/dist/shoelace.js"></script>
 
     <% if request.path.include?("hotwire") %>
       <%= javascript_pack_tag 'hotwire' %>

data/test/helpers/form_helper_test.rb

@@ -282,9 +282,9 @@ class FormHelperTest < ActionView::TestCase
     sl_form_for(User.new, url: "/") do |form|
       assert_dom_equal <<~HTML, form.select(:name, users)
         <sl-select label="Name" name="user[name]" id="user_name">
-          <sl-menu-item value="1">Yuki Nishijima</sl-menu-item>
-          <sl-menu-item value="2">Matz</sl-menu-item>
-          <sl-menu-item value="3">Koichi Sasada</sl-menu-item>
+          <sl-option value="1">Yuki Nishijima</sl-option>
+          <sl-option value="2">Matz</sl-option>
+          <sl-option value="3">Koichi Sasada</sl-option>
         </sl-select>
       HTML
     end
@@ -300,9 +300,9 @@ class FormHelperTest < ActionView::TestCase
     sl_form_for(User.new, url: "/") do |form|
       assert_dom_equal <<~HTML, form.select(:name, users, {}, { value: 3 })
         <sl-select label="Name" value="3" name="user[name]" id="user_name">
-          <sl-menu-item value="1">Yuki Nishijima</sl-menu-item>
-          <sl-menu-item value="2">Matz</sl-menu-item>
-          <sl-menu-item value="3">Koichi Sasada</sl-menu-item>
+          <sl-option value="1">Yuki Nishijima</sl-option>
+          <sl-option value="2">Matz</sl-option>
+          <sl-option value="3">Koichi Sasada</sl-option>
         </sl-select>
       HTML
     end
@@ -318,9 +318,9 @@ class FormHelperTest < ActionView::TestCase
     sl_form_for(User.new, url: "/") do |form|
       assert_dom_equal <<~HTML, form.select(:name, users, selected: 3, disabled: 1)
         <sl-select label="Name" name="user[name]" id="user_name">
-          <sl-menu-item value="1" disabled="disabled">Yuki Nishijima</sl-menu-item>
-          <sl-menu-item value="2">Matz</sl-menu-item>
-          <sl-menu-item value="3" checked="checked">Koichi Sasada</sl-menu-item>
+          <sl-option value="1" disabled="disabled">Yuki Nishijima</sl-option>
+          <sl-option value="2">Matz</sl-option>
+          <sl-option value="3" checked="checked">Koichi Sasada</sl-option>
         </sl-select>
       HTML
     end
@@ -336,9 +336,9 @@ class FormHelperTest < ActionView::TestCase
     sl_form_for(User.new, url: "/") do |form|
       assert_dom_equal <<~HTML, form.select(:name, users, {}, { multiple: true })
         <sl-select label="Name" name="user[name][]" id="user_name" multiple="multiple">
-          <sl-menu-item value="1">Yuki Nishijima</sl-menu-item>
-          <sl-menu-item value="2">Matz</sl-menu-item>
-          <sl-menu-item value="3">Koichi Sasada</sl-menu-item>
+          <sl-option value="1">Yuki Nishijima</sl-option>
+          <sl-option value="2">Matz</sl-option>
+          <sl-option value="3">Koichi Sasada</sl-option>
         </sl-select>
       HTML
     end
@@ -358,12 +358,12 @@ class FormHelperTest < ActionView::TestCase
     sl_form_for(User.new, url: "/") do |form|
       assert_dom_equal <<~HTML, form.select(:name, users)
         <sl-select label="Name" name="user[name]" id="user_name">
-          <sl-menu-label>Main maintainers</sl-menu-label>
-          <sl-menu-item value="2">Matz</sl-menu-item>
-          <sl-menu-item value="3">Koichi Sasada</sl-menu-item>
+          <small>Main maintainers</small>
+          <sl-option value="2">Matz</sl-option>
+          <sl-option value="3">Koichi Sasada</sl-option>
           <sl-divider></sl-divider>
-          <sl-menu-label>Default gem maintainers</sl-menu-label>
-          <sl-menu-item value="1">Yuki Nishijima</sl-menu-item>
+          <small>Default gem maintainers</small>
+          <sl-option value="1">Yuki Nishijima</sl-option>
         </sl-select>
       HTML
     end
@@ -383,12 +383,12 @@ class FormHelperTest < ActionView::TestCase
     sl_form_for(User.new(name: 2), url: "/") do |form|
       assert_dom_equal <<~HTML, form.select(:name, users)
         <sl-select label="Name" name="user[name]" id="user_name" value="2">
-          <sl-menu-label>Main maintainers</sl-menu-label>
-          <sl-menu-item value="2" checked="checked">Matz</sl-menu-item>
-          <sl-menu-item value="3">Koichi Sasada</sl-menu-item>
+          <small>Main maintainers</small>
+          <sl-option value="2" checked="checked">Matz</sl-option>
+          <sl-option value="3">Koichi Sasada</sl-option>
           <sl-divider></sl-divider>
-          <sl-menu-label>Default gem maintainers</sl-menu-label>
-          <sl-menu-item value="1">Yuki Nishijima</sl-menu-item>
+          <small>Default gem maintainers</small>
+          <sl-option value="1">Yuki Nishijima</sl-option>
         </sl-select>
       HTML
     end
@@ -404,9 +404,9 @@ class FormHelperTest < ActionView::TestCase
     sl_form_for(User.new, url: "/") do |form|
       assert_dom_equal <<~HTML, form.collection_select(:name, users, :first, :last)
         <sl-select label="Name" name="user[name]" id="user_name">
-          <sl-menu-item value="1">Yuki Nishijima</sl-menu-item>
-          <sl-menu-item value="2">Matz</sl-menu-item>
-          <sl-menu-item value="3">Koichi Sasada</sl-menu-item>
+          <sl-option value="1">Yuki Nishijima</sl-option>
+          <sl-option value="2">Matz</sl-option>
+          <sl-option value="3">Koichi Sasada</sl-option>
         </sl-select>
       HTML
     end
@@ -422,9 +422,9 @@ class FormHelperTest < ActionView::TestCase
     sl_form_for(User.new(name: "2"), url: "/") do |form|
       assert_dom_equal <<~HTML, form.collection_select(:name, users, :first, :last)
         <sl-select label="Name" name="user[name]" id="user_name" value="2">
-          <sl-menu-item value="1">Yuki Nishijima</sl-menu-item>
-          <sl-menu-item value="2" checked="checked">Matz</sl-menu-item>
-          <sl-menu-item value="3">Koichi Sasada</sl-menu-item>
+          <sl-option value="1">Yuki Nishijima</sl-option>
+          <sl-option value="2" checked="checked">Matz</sl-option>
+          <sl-option value="3">Koichi Sasada</sl-option>
         </sl-select>
       HTML
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoelace-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Yuki Nishijima
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-05 00:00:00.000000000 Z
+date: 2023-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -193,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Rails view helpers Shoelace.style, the design system.