swage 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1eb99b2b002dccde7c9d242952b711e4d0fc2432b8c46c792e529b22d83e3486
-  data.tar.gz: f4eabce375c4ffe258ee251297915ba55916eeafbac9e120b1929e5c87701ae4
+  metadata.gz: b26199e3851d0480633cf4b44108294d1b542561d5045322bc51e46415f42a35
+  data.tar.gz: f0061b0cba84f1a1b8ff166397b31aa99f773df14ac7d9bad81933c90a8ffb27
 SHA512:
-  metadata.gz: d409d145064d845053c9a91db02fd017877c6d745918f95ce5d59627b4ec588ce6cc6ef6414aa66050169384a10add1f694a9b20c992ac3639e62c6dd44985bf
-  data.tar.gz: 7f16fbe0f753870da630dfc455507bac3734204c0da4efc7fd420a170028ea7af8372227adf39962fdc0e2e0da8a0fbd655758c46834a72e14f3f23ced1cc24f
+  metadata.gz: 0ba5ec928eb9ba6858065ffeb8b2d97393b03ea1e9aa4f46985e0f1b8dd2388df292d8617c09e769f7fb1dca1777bb53d71adc27f50497c1d016e473e626019d
+  data.tar.gz: 66c2252090c03a29bb6cf6830ae1de84a1088e6f581e76920f5f4323ca5dd3ea426369e1ad93795eb5661b0b955c865e4877efc1a529a915e7d1225c80b90ed9

data/lib/generators/swage/install/install_generator.rb

@@ -110,6 +110,10 @@ module Swage::Generators
       template "base_component.rb.tt", File.join(destination_root, "app/components/base.rb"), force: true if @override
     end
 
+    def create_flash_component
+      template "flash.rb.tt", File.join(destination_root, "app/components/flash.rb"), force: true if @override
+    end
+
     def create_base_view
       template "base_view.rb.tt", File.join(destination_root, "app/views/base.rb"), force: true if @override
     end

data/lib/generators/swage/install/templates/application_view.rb.tt

@@ -6,6 +6,8 @@ module Views
       include Phlex::Rails::Helpers::CSRFMetaTags
       include Phlex::Rails::Helpers::StyleSheetLinkTag
       include Phlex::Rails::Helpers::JavaScriptImportmapTags
+      include Phlex::Rails::Helpers::Notice
+      include Phlex::Rails::Helpers::Flash
 
       def initialize(view)
         @view = view
@@ -34,8 +36,19 @@ module Views
             stylesheet_link_tag "tailwind", "data-turbo-track": "reload"
             javascript_importmap_tags
           end
-          body do
-            div id: "body", &block
+          main do
+            div id: "notices" do
+              flash.each do |type, message|
+                var = convert_variants(type)
+                RubyUI::Alert(variant: var) do
+                  RubyUI::AlertTitle { variant_title(var) }
+                  RubyUI::AlertDescription() { message }
+                end
+              end
+            end
+            body do
+              div id: "body", &block
+            end
           end
         end
       end

data/lib/generators/swage/install/templates/flash.rb.tt

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Components
+  class Flash < Components::Base
+    def initialize(flash)
+      @flash = flash
+    end
+
+    # currently doesn't have a close button, but can add it later
+    def view_template(&)
+      div id: "notices" do
+        if block_given?
+          yield
+        else
+          @flash.each do |type, message|
+            var = convert_variants(type)
+            RubyUI::Alert(variant: var) do
+              RubyUI::AlertTitle { variant_title(var) }
+              RubyUI::AlertDescription() { message }
+            end
+          end
+        end
+      end
+    end
+
+    private
+    def convert_variants(var)
+      var = var.to_sym
+      var = case var
+      when :danger, :error, :alert
+        :destructive
+      when :info
+        nil
+      when :notice
+        :success
+      else
+        var
+      end
+    end
+
+    def variant_title(var)
+      case var
+      when nil
+        "Notice"
+      when :destructive
+        "Error"
+      else
+        var.to_s.capitalize
+      end
+    end
+  end
+end

data/lib/generators/swage/install/templates/form.rb.tt

@@ -22,24 +22,59 @@ module Components
           RubyUI::Textarea.new(**attributes) { attributes[:value] }
       end
 
-      def select(*options, multiple: false, **attributes, &)
+      # options is an array of [ label, value ] pairs
+      def select(options, preselect: nil, **attributes)
         attributes.merge! dom_hash(field.dom)
-        if mutliple
-          CheckboxGroup do
-            options.each do |opt|
-              div class: "flex flex-col gap-2" do
-                div class: "flex flex-row items-center gap-2" do
-                  RubyUI::Checkbox(*attributes, id: "select_#{opt}")
-                  FormFieldLabel(for: "select_#{opt}") { opt.capitalize }
-                end
+        attributes[:value] = preselect[1] if preselect
+        RubyUI::Select() do
+          RubyUI::SelectInput(**attributes)
+
+          disabled = {
+            disabled: true,
+            aria: { disabled: "true" }
+          } if attributes[:disabled]
+          RubyUI::SelectTrigger(**disabled) do
+            RubyUI::SelectValue(placeholder: attributes[:placeholder], id: attributes[:id]) { preselect&.at(0) }
+          end
+
+          RubyUI::SelectContent(outlet_id: attributes[:id]) do
+            RubyUI::SelectGroup() do
+              options.each do |opt|
+                RubyUI::SelectItem(value: opt[1]) { opt[0] }
               end
             end
           end
-        else
-          RubyUI::Select(**attributes) do
-            SelectGroup do
-              options.each do |opt|
-                SelectItem(value: opt) { opt.capitalize }
+        end
+      end
+
+      # options is an array of [ label, value ] pairs
+      # alternatively, supply a block for customization
+      def combobox(options = [], multiple: false, **attributes, &block)
+        RubyUI::Combobox(data: attributes[:data]) do
+          RubyUI::ComboboxTrigger(placeholder: attributes[:placeholder])
+          RubyUI::ComboboxPopover() do
+            RubyUI::ComboboxSearchInput(placeholder: attributes[:placeholder])
+            RubyUI::ComboboxList() do
+              RubyUI::ComboboxEmptyState { "No results" }
+              if multiple
+               RubyUI::ComboboxItem() do
+                  RubyUI::ComboboxToggleAllCheckbox(name: "all", value: "all")
+                  span { "Select all" }
+                end
+              end
+              if block_given?
+                yield block
+              else
+                options.each do |opt|
+                  RubyUI::ComboBoxItem() do
+                    if multiple
+                      RubyUI::ComboboxCheckbox(name: attributes[:name, value: opt[1]])
+                    else
+                      RubyUI::ComboboxRadio(name: attributes[:name], value: opt[1])
+                    end
+                    span { opt[0] }
+                  end
+                end
               end
             end
           end

data/lib/generators/swage/install/templates/swage.rb.tt

@@ -26,3 +26,15 @@ module Phlexible::Rails::ButtonToConcerns
     end
   end
 end
+
+module Superform::Rails::StrongParameters
+  protected
+  # don't change passwords if they're blank
+  def permit(form)
+    form_params = params.require(form.key).delete_if do
+      (_1.to_s == "password" || _1.to_s == "password_confirmation") && (_2.nil? || _2.empty?)
+    end
+    assign(form_params, to: form).model
+  end
+end
+

data/lib/generators/swage/scaffold/templates/index.rb.tt

@@ -2,7 +2,6 @@ module Views
   module <%= controller_class_name %>
     class Index < Views::Base
       include Phlexible::Rails::AutoLayout
-      include Phlex::Rails::Helpers::Notice
 
       def initialize(<%= plural_table_name %>: nil)
         @<%= plural_table_name %> = <%= plural_table_name %>
@@ -12,10 +11,6 @@ module Views
 
       def view_template
         div(class: "w-full px-8") do
-          if notice.present?
-            Text(id: "notice") { notice }
-          end
-
           div(class: "flex justify-between items-center mb-10") do
             Heading(level: 1) { "<%= human_name.pluralize %>" }
             Link(href: new_<%= singular_table_name %>_path) { "New <%= human_name.downcase %>" }

data/lib/generators/swage/scaffold/templates/show.rb.tt

@@ -2,7 +2,6 @@ module Views
   module <%= controller_class_name %>
     class Show < Views::Base
       include Phlexible::Rails::AutoLayout
-      include Phlex::Rails::Helpers::Notice
 
       def initialize(<%= singular_table_name %>: nil)
         @<%= singular_table_name %> = <%= singular_table_name %>
@@ -12,10 +11,6 @@ module Views
 
       def view_template
         div(class: "mx-auto md:w-2/3 w-full px-8") do
-          if notice.present?
-            Text(id: "notice") { notice }
-          end
-
           render Partial.new(<%= singular_table_name %>: @<%= singular_table_name %>)
 
           div(class: "mt-8 flex gap-4 border-t pt-6") do

data/lib/swage.rb

@@ -1,3 +1,3 @@
 module Swage
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swage
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ian Wobschall
@@ -112,6 +112,7 @@ files:
 - lib/generators/swage/install/templates/base_component.rb.tt
 - lib/generators/swage/install/templates/base_view.rb.tt
 - lib/generators/swage/install/templates/engine.rb.tt
+- lib/generators/swage/install/templates/flash.rb.tt
 - lib/generators/swage/install/templates/form.rb.tt
 - lib/generators/swage/install/templates/swage.rb.tt
 - lib/generators/swage/install/templates/tw-animate-css.js.tt
@@ -144,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.17
 specification_version: 4
 summary: A Phlex UI library for Rails
 test_files: []