tramway 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b43fe918fc6610c50f4ed68ddc2487d295084f931fe77cfcdc5bdb82cc518007
-  data.tar.gz: 1e72ed61a083e7ba35daf01137678e3858f081cb46148acb16b1c2b7999de207
+  metadata.gz: 54d135e0a0a71941eecdbbbf042963727d6b0e13e7a024f1c86f22d099d76feb
+  data.tar.gz: fa8e45c0a89c065df62d580e368b1e73a43a4abd06c9e542d8b8a8706dba24c0
 SHA512:
-  metadata.gz: 86065ebdaf2fe77f1d7599723a42189fa1ac3e49e8de52fd6b94d28911e4060ee9edc5b2f4501a38fc8d1697456c80bd9d8ff9a40ea924154b82303ac728e67e
-  data.tar.gz: bf80442224d4659ca1258258418e1f42490caf20924ea22e6fa6be26ea08e2d567b381fc5a842ef53f9aa2e40537ea1946270d369e256d74989acf14b50dd267
+  metadata.gz: 2b2b51bb24ca9c973ccd2cc3a925c102a2bedc1c1c1daa43c5be00d4563cc6491a521796a00f7cd80c8019718709e41d683c6f69819cd96172af0a5756f9ef29
+  data.tar.gz: 5db00c69d1d90c75d924d30a6989d087affbe2b2de546d774bfb58b732efce5b5a6615bd6801cdcfdd55d9f0c088c34fa2f7223793cd4d0e8c268dd10334a25e

data/app/components/tailwinds/form/builder.rb

@@ -30,7 +30,7 @@ module Tailwinds
         render(Tailwinds::Form::SelectComponent.new(
                  input: input(:select),
                  value: options[:selected] || object.public_send(attribute),
-                 collection:,
+                 collection: explicitly_add_blank_option(collection, options),
                  **default_options(attribute, options)
                ), &)
       end
@@ -53,20 +53,32 @@ module Tailwinds
       def default_options(attribute, options)
         {
           attribute:,
-          label: label(attribute, options),
+          label: label_build(attribute, options),
           for: for_id(attribute),
           options:
         }
       end
 
       # :reek:UtilityFunction
-      def label(attribute, options)
-        options[:label] || attribute.to_s.humanize
+      def label_build(attribute, options)
+        options[:label].presence || attribute.to_s.humanize
       end
 
       def for_id(attribute)
         "#{object_name}_#{attribute}"
       end
+
+      # REMOVE IT. WE MUST UNDERSTAND WHY INCLUDE_BLANK DOES NOT WORK
+      # :reek:UtilityFunction
+      def explicitly_add_blank_option(collection, options)
+        if options[:include_blank]
+          collection = collection.to_a if collection.is_a? Hash
+
+          collection.unshift([nil, ''])
+        else
+          collection
+        end
+      end
     end
   end
 end

data/app/components/tailwinds/form/file_field_component.html.haml

@@ -1,4 +1,5 @@
 .mb-4
-  %label.inline-block.bg-blue-500.hover:bg-blue-700.text-white.font-bold.py-2.px-4.rounded.cursor-pointer.mt-4{ for: @for }
-    = @label
+  - if @label
+    %label.inline-block.bg-blue-500.hover:bg-blue-700.text-white.font-bold.py-2.px-4.rounded.cursor-pointer.mt-4{ for: @for }
+      = @label
   = @input

data/app/components/tailwinds/form/select_component.html.haml

@@ -1,4 +1,5 @@
 .mb-4
-  %label.block.text-gray-700.text-sm.font-bold.mb-2{ for: @for }
-    = @label
+  - if @label
+    %label.block.text-gray-700.text-sm.font-bold.mb-2{ for: @for }
+      = @label
   = @input.call(@attribute, @collection, { selected: @value }, @options.merge(class: 'bg-white border border-gray-300 text-gray-700 py-2 px-2 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent'))

data/app/components/tailwinds/form/text_field_component.html.haml

@@ -1,4 +1,5 @@
 .mb-4
-  %label.block.text-gray-700.text-sm.font-bold.mb-2{ for: @for }
-    = @label
+  - if @label
+    %label.block.text-gray-700.text-sm.font-bold.mb-2{ for: @for }
+      = @label
   = @input.call @attribute, **@options.merge(class: 'w-full px-3 py-2 border border-gray-300 rounded focus:outline-none focus:border-red-500'), value: @value

data/app/components/tailwinds/nav/item/button_component.html.haml

@@ -0,0 +1,3 @@
+%li
+  = button_to @href, method: @method, class: @style, **@options do
+    = content

data/app/components/tailwinds/nav/item/button_component.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'rules/turbo_html_attributes_rules'
+
+module Tailwinds
+  module Nav
+    module Item
+      # Render button styled with Tailwind using button_to methods
+      #
+      class ButtonComponent < TailwindComponent
+        def initialize(**options)
+          @href = options[:href]
+          @method = options[:method]
+          @style = 'text-white hover:bg-red-300 px-4 py-2 rounded'
+          @options = options.except(:href, :method)
+        end
+      end
+    end
+  end
+end

data/app/components/tailwinds/nav/item/link_component.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'rules/turbo_html_attributes_rules'
+
+module Tailwinds
+  module Nav
+    module Item
+      # Render button styled with Tailwind using link_to methods
+      #
+      class LinkComponent < TailwindComponent
+        def initialize(**options)
+          @href = options[:href]
+          @style = 'text-white hover:bg-red-300 px-4 py-2 rounded'
+          @options = Rules::TurboHtmlAttributesRules.prepare_turbo_html_attributes(options:)
+        end
+      end
+    end
+  end
+end

data/lib/tramway/navbar.rb

@@ -37,9 +37,9 @@ module Tramway
       raise 'You cannot provide an argument and a code block at the same time' if provided_url_and_block?(url, &block)
 
       rendered_item = if url.present?
-                        render_ignoring_block(text_or_url, url, options)
+                        render_ignoring_block(text_or_url, url, **options)
                       else
-                        render_using_block(text_or_url, options, &block)
+                        render_using_block(text_or_url, **options, &block)
                       end
 
       @items[@filling] << rendered_item
@@ -69,16 +69,24 @@ module Tramway
       @filling = nil
     end
 
-    def render_ignoring_block(text_or_url, url, options)
+    def render_ignoring_block(text_or_url, url, method: nil, **options)
       options.merge!(href: url)
 
-      context.render(Tailwinds::Nav::ItemComponent.new(**options)) { text_or_url }
+      if method.present? && method.to_sym != :get
+        context.render(Tailwinds::Nav::Item::ButtonComponent.new(method:, **options)) { text_or_url }
+      else
+        context.render(Tailwinds::Nav::Item::LinkComponent.new(method:, **options)) { text_or_url }
+      end
     end
 
-    def render_using_block(text_or_url, options, &block)
+    def render_using_block(text_or_url, method: nil, **options, &block)
       options.merge!(href: text_or_url)
 
-      context.render(Tailwinds::Nav::ItemComponent.new(**options), &block)
+      if method.present? && method.to_sym != :get
+        context.render(Tailwinds::Nav::Item::ButtonComponent.new(method:, **options), &block)
+      else
+        context.render(Tailwinds::Nav::Item::LinkComponent.new(method:, **options), &block)
+      end
     end
   end
 end

data/lib/tramway/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tramway
-  VERSION = '0.4.4'
+  VERSION = '0.4.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - kalashnikovisme
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-07 00:00:00.000000000 Z
+date: 2024-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -102,8 +102,10 @@ files:
 - app/components/tailwinds/form/submit_button_component.rb
 - app/components/tailwinds/form/text_field_component.html.haml
 - app/components/tailwinds/form/text_field_component.rb
-- app/components/tailwinds/nav/item_component.html.haml
-- app/components/tailwinds/nav/item_component.rb
+- app/components/tailwinds/nav/item/button_component.html.haml
+- app/components/tailwinds/nav/item/button_component.rb
+- app/components/tailwinds/nav/item/link_component.html.haml
+- app/components/tailwinds/nav/item/link_component.rb
 - app/components/tailwinds/navbar_component.html.haml
 - app/components/tailwinds/navbar_component.rb
 - app/views/kaminari/_first_page.html.haml

data/app/components/tailwinds/nav/item_component.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require 'rules/turbo_html_attributes_rules'
-
-module Tailwinds
-  module Nav
-    # Render button styled with Tailwind using button_to or link_to methods
-    #
-    class ItemComponent < TailwindComponent
-      def initialize(**options)
-        @href = options[:href]
-        @style = 'text-white hover:bg-red-300 px-4 py-2 rounded'
-        @options = Rules::TurboHtmlAttributesRules.prepare_turbo_html_attributes(options:)
-      end
-    end
-  end
-end