tramway 0.5.1.3 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 168f2a63e4483ba637e614eff3f2e3b2fcd61c52a61da934a6a13883017bbe37
-  data.tar.gz: 904bb0981692516905f77867ba1ca878ba9d26f0e1a5bfb6e85718b4210e96d3
+  metadata.gz: 1a87721a01a922036b8932ac4e7c2f3f74139e1ceb194aaee493634e1b7d7fb0
+  data.tar.gz: 585233b30c8a3043a017a570803c6aa252d724f5084e29addaa1f839cbeb44ce
 SHA512:
-  metadata.gz: f907d004a4177faa23953d355c4cd081985c83f4187080ac2195833317fc3ab49178d5e504628789aab1de76731339e23883c6e201c97c3b87ffcc717add61a6
-  data.tar.gz: 26332774327abca66e8a45f89bc42feea4fbb5cf4c7fd8102448dd996e0b374d80f74188fa81a0666a74431fab6f97686c37ad6921eeffcbb526bc8803bceba7
+  metadata.gz: 9bd1d89f32eee53051ed1212a385a778ac5cdb6f0518d59aebed4ad7a457256af910c0461abbda001f7356abf5241a63333613a47d62963f4db5735e30666dd4
+  data.tar.gz: 2d32787f70305d1419c643e5562d99fc18379c46855a69a82de60cae951d84602b06d12aa30fcea40e7e31a1927084df5b48d2b1820f32fe1b396c026ee2c877

data/app/components/tailwinds/form/multiselect/dropdown_container.html.haml

@@ -1,3 +1,3 @@
-#dropdown.absolute.shadow.top-100.bg-white.z-40.w-full.lef-0.rounded.max-h-select.overflow-y-auto{ data: { action: "click@window->multiselect#closeOnClickOutside" } }
+#dropdown.absolute.shadow.top-11.bg-white.z-40.w-full.lef-0.rounded.max-h-select.overflow-y-auto{ data: { action: "click@window->multiselect#closeOnClickOutside" } }
   .flex.flex-col.w-full
     {{content}}

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

@@ -1,4 +1,4 @@
 .flex.items-center.justify-between
-  %button.bg-red-500.hover:bg-red-700.text-white.font-bold.py-2.px-4.rounded.focus:outline-none.focus:shadow-outline{ type: :submit, name: :commit, **@options }
+  %button.bg-red-500.hover:bg-red-700.text-white.font-bold.py-2.px-4.rounded.focus:outline-none.focus:shadow-outline.cursor-pointer{ type: :submit, name: :commit, **@options }
     = @text
   = @content

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

@@ -2,4 +2,4 @@
   - if @label
     = component('tailwinds/form/label', for: @for) do
       = @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
+  = @input.call @attribute, **@options.merge(class: 'w-full bg-white px-3 py-2 border border-gray-300 rounded focus:outline-none focus:border-red-500 dark:placeholder-gray-400 dark:text-white'), value: @value

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

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

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

@@ -7,11 +7,10 @@ module Tailwinds
     module Item
       # Render button styled with Tailwind using button_to methods
       #
-      class ButtonComponent < TailwindComponent
+      class ButtonComponent < Tailwinds::Nav::ItemComponent
         def initialize(**options)
           @href = options[:href]
           @method = options[:method]
-          @style = 'text-white hover:bg-gray-300 hover:text-gray-800 px-4 py-2 rounded whitespace-nowrap'
           @options = options.except(:href, :method)
         end
       end

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

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

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

@@ -7,10 +7,9 @@ module Tailwinds
     module Item
       # Render button styled with Tailwind using link_to methods
       #
-      class LinkComponent < TailwindComponent
+      class LinkComponent < Tailwinds::Nav::ItemComponent
         def initialize(**options)
           @href = options[:href]
-          @style = 'text-white hover:bg-gray-300 hover:text-gray-800 px-4 py-2 rounded whitespace-nowrap'
           @options = Rules::TurboHtmlAttributesRules.prepare_turbo_html_attributes(options:)
         end
       end

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Tailwinds
+  module Nav
+    # Base class for all Nav::ItemComponent classes
+    #
+    class ItemComponent < TailwindComponent
+      def style
+        @style ||= [
+          'text-white', 'hover:bg-gray-300', 'hover:text-gray-800', 'px-4', 'py-2', 'rounded', 'whitespace-nowrap',
+          'dark:hover:bg-gray-700', 'dark:hover:text-gray-400'
+        ].join(' ')
+      end
+    end
+  end
+end

data/app/components/tailwinds/navbar_component.html.haml

@@ -11,7 +11,7 @@
             - @left_items.each do |item|
               = item
 
-    .hidden.sm:block
+    .block.sm:hidden
       %button#mobile-menu-button.text-white.focus:outline-none
         ☰
 

data/app/components/tailwinds/pagination/first_page_component.html.haml

@@ -2,9 +2,9 @@
   = link_to helpers.t('views.pagination.first').html_safe,
     url,
     remote:,
-    class: pagination_classes(klass: 'first sm:hidden flex')
+    class: pagination_classes(klass: 'first hidden sm:flex')
 
   = link_to '⭰',
     url,
     remote:,
-    class: pagination_classes(klass: 'first hidden sm:flex font-bold')
+    class: pagination_classes(klass: 'first sm:hidden flex font-bold')

data/app/components/tailwinds/pagination/gap_component.html.haml

@@ -1,2 +1,2 @@
-%span.page.gap.px-3.py-2.text-sm.font-medium.text-purple-700.dark:text-white.flex.sm:hidden
+%span.page.gap.px-3.py-2.text-sm.font-medium.text-purple-700.dark:text-white.sm:flex.hidden
   = helpers.t('views.pagination.truncate').html_safe

data/app/components/tailwinds/pagination/last_page_component.html.haml

@@ -2,9 +2,9 @@
   = link_to helpers.t('views.pagination.last').html_safe,
     url,
     remote:,
-    class: pagination_classes(klass: 'last sm:hidden flex')
+    class: pagination_classes(klass: 'last hidden sm:flex')
 
   = link_to '⭲',
     url,
     remote:,
-    class: pagination_classes(klass: 'last hidden sm:flex font-bold')
+    class: pagination_classes(klass: 'last sm:hidden flex font-bold')

data/app/components/tailwinds/pagination/next_page_component.html.haml

@@ -3,10 +3,10 @@
     url,
     rel: 'next',
     remote:,
-    class: pagination_classes(klass: 'next sm:hidden flex')
+    class: pagination_classes(klass: 'next hidden sm:flex')
 
   = link_to '🠖',
     url,
     rel: 'next',
     remote:,
-    class: pagination_classes(klass: 'next hidden sm:flex font-bold')
+    class: pagination_classes(klass: 'next sm:hidden flex font-bold')

data/app/components/tailwinds/pagination/page_component.html.haml

@@ -6,4 +6,4 @@
     url,
     remote:,
     rel: page.rel,
-    class: pagination_classes(klass: 'sm:hidden flex')
+    class: pagination_classes(klass: 'hidden sm:flex')

data/app/components/tailwinds/pagination/prev_page_component.html.haml

@@ -3,10 +3,10 @@
     url,
     rel: 'prev',
     remote:,
-    class: pagination_classes(klass: 'prev sm:hidden flex')
+    class: pagination_classes(klass: 'prev hidden sm:flex')
 
   = link_to '🠔',
     url,
     rel: 'prev',
     remote:,
-    class: pagination_classes(klass: 'prev hidden sm:flex font-bold')
+    class: pagination_classes(klass: 'prev sm:hidden flex font-bold')

data/app/components/tailwinds/table/cell_component.html.haml

@@ -1,2 +1,2 @@
-.div-table-cell.px-6.py-4.font-medium.text-gray-900.whitespace-nowrap.dark:bg-gray-800.dark:text-white.text-xs.sm:text-base
+.div-table-cell.px-6.py-4.font-medium.text-gray-900.whitespace-nowrap.dark:text-white.text-xs.sm:text-base
   = content

data/app/components/tailwinds/table/header_component.html.haml

@@ -1,6 +1,7 @@
-- cols = headers.map { |item| "1fr" }.join(",")
-
-.div-table-row.block.grid.text-white.text-small.gap-4.bg-purple-700.dark:bg-gray-700.dark:text-gray-400{ class: "grid-cols-[#{cols}]" }
-  - headers.each do |header|
-    .div-table-cell.py-4.px-6
-      = header
+.div-table-row.block.grid.text-white.text-small.gap-4.bg-purple-700.dark:bg-gray-700.dark:text-gray-400{ class: "grid-cols-#{headers.count}" }
+  - if headers.any?
+    - headers.each do |header|
+      .div-table-cell.py-4.px-6
+        = header
+  - else
+    = content

data/app/components/tailwinds/table/row_component.html.haml

@@ -1,11 +1,8 @@
-
 - if cells.any?
-  - cols = cells.count.times.map { |item| "1fr" }.join(",")
-
   -# desktop view
-  = row_tag class: "div-table-row block grid gap-4 bg-white border-b dark:bg-gray-800 dark:border-gray-700 grid-cols-[#{cols}]" do
+  = row_tag class: desktop_row_classes(cells.count) do
     - cells.each do |(_, value)|
-      .div-table-cell.px-6.py-4.font-medium.text-gray-900.whitespace-nowrap.dark:text-white.sm:text-xs.text-base
+      .div-table-cell.px-6.py-4.font-medium.text-gray-900.whitespace-nowrap.dark:text-white.text-xs.sm:text-base
         = value
 
   -# mobile view
@@ -20,7 +17,11 @@
         .text-gray-900.dark:text-white.p-4.text-xs.sm:text-base.inline-block.w-auto
           = value
 - else
-  - cols = Nokogiri::HTML.fragment(content).children.css('> div').count.times.map { |item| "1fr" }.join(",")
+  - cells = Nokogiri::HTML.fragment(content).children.css('div')
 
-  %div{ class: "div-table-row hidden md:grid gap-4 bg-white border-b dark:bg-gray-800 dark:border-gray-700 grid-cols-[#{cols}]" }
-    = content
+  - if href.present?
+    = tag.a href:, class: [desktop_row_classes(cells.count), link_row_classes].join(' ') do
+      = content
+  - else
+    = tag.div class: desktop_row_classes(cells.count) do
+      = content

data/app/components/tailwinds/table/row_component.rb

@@ -9,7 +9,7 @@ module Tailwinds
 
       def row_tag(**options, &)
         if href.present?
-          klass = "#{options[:class] || ''} cursor-pointer dark:hover:bg-gray-700"
+          klass = "#{options[:class] || ''} #{link_row_classes}"
 
           link_to(href, options.merge(class: klass)) do
             yield if block_given?
@@ -20,6 +20,19 @@ module Tailwinds
           end
         end
       end
+
+      # :reek:UtilityFunction { enabled: false }
+      def desktop_row_classes(cells_count)
+        [
+          'div-table-row', 'grid', 'gap-4', 'bg-white', 'border-b', 'last:border-b-0', 'dark:bg-gray-800',
+          'dark:border-gray-700', "grid-cols-#{cells_count}"
+        ].join(' ')
+      end
+      # :reek:UtilityFunction { enabled: true }
+
+      def link_row_classes
+        'cursor-pointer hover:bg-gray-100 dark:hover:bg-gray-700'
+      end
     end
   end
 end

data/app/helpers/tramway/application_helper.rb

@@ -9,7 +9,7 @@ module Tramway
     include Tramway::Helpers::ComponentHelper
 
     def page_title
-      @model_class.model_name.human.pluralize
+      @model_class.model_name.human.pluralize # rubocop:disable Rails/HelperInstanceVariable
     end
   end
 end

data/app/views/tramway/entities/_entity.html.haml

@@ -1,2 +1,3 @@
 - decorator = decorator_class(entity)
-= component 'tailwinds/table/row', cells: decorator.list_attributes.reduce({}) { |hash, attribute| hash.merge! attribute => entity.public_send(attribute) }, href: decorator.decorate(entity).show_path
+- decorated_object = decorator.decorate(entity)
+= component 'tailwinds/table/row', cells: decorator.list_attributes.reduce({}) { |hash, attribute| hash.merge! attribute => decorated_object.public_send(attribute) }, href: decorated_object.show_path

data/app/views/tramway/entities/_list.html.haml

@@ -0,0 +1,25 @@
+- decorator = Tramway::Decorators::NameBuilder.default_decorator_class_name(@model_class)
+- list_attributes = decorator.constantize.list_attributes
+
+.mt-8.w-full
+  - content_for :title, page_title
+
+  .flex.justify-between.items-center.md:mt-4.mt-2
+    %h1.font-bold.text-4xl.dark:text-white
+      = content_for(:title)
+
+    - if Tramway.config.pagination[:enabled]
+      = paginate @entities
+
+  - if list_attributes.empty?
+    %p.text-center.mt-10
+      You should fill class-level method `self.list_attributes` inside your
+      = decorator
+
+  = component 'tailwinds/table' do
+    = component 'tailwinds/table/header', headers: list_attributes.map { |attribute| @model_class.human_attribute_name(attribute) }
+    - @entities.each do |item|
+      = render 'tramway/entities/entity', entity: item
+
+    .flex.mt-4
+      = paginate @entities

data/app/views/tramway/entities/index.html.haml

@@ -1,25 +1 @@
-- decorator = Tramway::Decorators::NameBuilder.default_decorator_class_name(@model_class)
-- list_attributes = decorator.constantize.list_attributes
-
-.mt-8{ class: 'w-2/3' }
-  - content_for :title, page_title
-
-  .flex.justify-between.items-center.md:mt-4.mt-2
-    %h1.font-bold.text-4xl.dark:text-white
-      = page_title
-
-    - if Tramway.config.pagination[:enabled]
-      = paginate @entities
-
-  - if list_attributes.empty?
-    %p.text-center.mt-10
-      You should fill class-level method `self.list_attributes` inside your
-      = decorator
-
-  = component 'tailwinds/table' do
-    = component 'tailwinds/table/header', headers: list_attributes.map { |attribute| @model_class.human_attribute_name(attribute) }
-    - @entities.each do |item|
-      = render 'entity', entity: item
-
-    .flex.mt-4
-      = paginate @entities
+= render 'tramway/entities/list'

data/app/views/tramway/layouts/application.html.haml

@@ -19,7 +19,7 @@
     / Includes all stylesheet files in app/assets/stylesheets
     = stylesheet_link_tag "tailwind", "data-turbo-track": "reload"
 
-  %body.bg-gray-100
+  %body.bg-gray-100.dark:bg-gray-900.text-gray-900.dark:text-white
     = tramway_navbar title: 'Tramway'
 
     .container.mx-auto.p-4.flex.align-center.justify-center

data/config/tailwind.config.js

@@ -1,21 +1,4 @@
-const defaultTheme = require('tailwindcss/defaultTheme');
-
 module.exports = {
-  darkMode: 'class',
-  content: [
-    './public/*.html',
-    './app/components/**/*.html.haml',
-    './app/helpers/**/*.rb',
-    './app/javascript/**/*.js',
-    './app/views/**/*.{erb,haml,html,slim}'
-  ],
-  theme: {
-    extend: {
-      screens: {
-        ...defaultTheme.screens,
-      },
-    },
-  },
   safelist: [
     'div-table',
     'div-table-row',
@@ -25,37 +8,42 @@ module.exports = {
     'text-4xl',
     'font-bold',
     'xl:hidden',
-    'grid-cols-[1fr]',
-    'grid-cols-[1fr,1fr]',
-    'grid-cols-[1fr,1fr,1fr]',
-    'grid-cols-[1fr,1fr,1fr,1fr]',
-    'grid-cols-[1fr,1fr,1fr,1fr,1fr]',
-    'grid-cols-[1fr,1fr,1fr,1fr,1fr,1fr]',
-    'grid-cols-[1fr,1fr,1fr,1fr,1fr,1fr,1fr]',
-    'grid-cols-[1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr]',
-    'grid-cols-[1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr]',
-    'grid-cols-[1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr]',
+    'grid-cols-1',
+    'grid-cols-2',
+    'grid-cols-3',
+    'grid-cols-4',
+    'grid-cols-5',
+    'grid-cols-6',
+    'grid-cols-7',
+    'grid-cols-8',
+    'grid-cols-9',
+    'grid-cols-10',
     'text-right',
     'w-2/3',
     'flex',
+    'bg-purple-700',
+    'px-6',
+    'py-4',
+    'dark:placeholder-gray-400',
+    'dark:text-white',
+    'dark:bg-gray-800',
+    'dark:bg-gray-900',
+    'dark:hover:bg-gray-700',
+    'dark:bg-gray-700',
+    'dark:text-gray-400',
+    'dark:hover:bg-gray-700',
+    'dark:hover:text-gray-400',
+    'ml-4',
+    'sm:text-base',
+    'sm:hidden',
+    'sm:flex',
+    'last:border-b-0',
+    'hover:bg-gray-100',
+    'hover:bg-gray-300',
+    'hover:text-gray-800',
+    // pagination
+    'bg-white', 'rounded-md', 'hover:bg-purple-100', 'dark:text-white', 'dark:bg-gray-800', 'dark:hover:bg-gray-700',
     // multiselect styles
-    'absolute', 'shadow', 'top-100', 'z-40', 'w-full', 'lef-0', 'rounded', 'max-h-select', 'overflow-y-auto', 'cursor-pointer', 'rounded-t', 'border-b', 'hover:bg-teal-100', 'items-center', 'border-transparent', 'border-l-2,', 'relative', 'hover:border-teal-100', 'leading-6', 'bg-transparent', 'appearance-none', 'outline-none', 'h-full' , 'justify-center', 'm-1', 'font-medium', 'rounded-full', 'text-teal-700', 'bg-teal-100', 'border', 'border-teal-300', 'text-xs', 'font-normal', 'leading-none', 'max-w-full', 'flex-initial', 'flex-auto', 'flex-row-reverse',, 'flex-col', 'min-w-96', 'w-fit', 'flex-wrap', 'w-8', 'border-l',
-    {
-      pattern: /(text|bg|border)-(purple|blue|gray|yellow|red|white|green)-\d+/,
-      variants: ['dark', 'focus', 'hover', 'dark:hover'],
-    },
-    {
-      pattern: /(text|bg)-(purple|blue|gray|yellow|red|white)/,
-      variants: ['dark', 'focus', 'hover', 'dark:hover'],
-    },
-    {
-      pattern: /(m|p)(l|r|b|t|x|y)-\d+/
-    },
-  ],
-  plugins: [
-    require('@tailwindcss/forms'),
-    require('@tailwindcss/aspect-ratio'),
-    require('@tailwindcss/typography'),
-    require('@tailwindcss/container-queries'),
+    'absolute', 'shadow', 'top-11', 'z-40', 'w-full', 'lef-0', 'rounded', 'max-h-select', 'overflow-y-auto', 'cursor-pointer', 'rounded-t', 'border-b', 'hover:bg-teal-100', 'items-center', 'border-transparent', 'border-l-2,', 'relative', 'hover:border-teal-100', 'leading-6', 'bg-transparent', 'appearance-none', 'outline-none', 'h-full' , 'justify-center', 'm-1', 'font-medium', 'rounded-full', 'text-teal-700', 'bg-teal-100', 'border', 'border-teal-300', 'text-xs', 'font-normal', 'leading-none', 'max-w-full', 'flex-initial', 'flex-auto', 'flex-row-reverse',, 'flex-col', 'min-w-96', 'w-fit', 'flex-wrap', 'w-8', 'border-l',
   ],
-};
+}

data/lib/tramway/configs/entity.rb

@@ -36,7 +36,7 @@ module Tramway
       def pluralized(model_name)
         local_plural = I18n.t("#{name}.many", scope: 'activerecord.plural.models', default: nil)
 
-        local_plural.present? ? local_plural : model_name.pluralize
+        local_plural.presence || model_name.pluralize
       end
 
       def model_class

data/lib/tramway/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway
 version: !ruby/object:Gem::Version
-  version: 0.5.1.3
+  version: 0.5.2
 platform: ruby
 authors:
 - kalashnikovisme
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-21 00:00:00.000000000 Z
+date: 2025-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anyway_config
@@ -101,6 +101,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '9'
+- !ruby/object:Gem::Dependency
+  name: tailwindcss-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: view_component
   requirement: !ruby/object:Gem::Requirement
@@ -154,6 +168,7 @@ files:
 - 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/nav/item_component.rb
 - app/components/tailwinds/navbar_component.html.haml
 - app/components/tailwinds/navbar_component.rb
 - app/components/tailwinds/pagination/base.rb
@@ -190,6 +205,7 @@ files:
 - app/views/kaminari/_paginator.html.haml
 - app/views/kaminari/_prev_page.html.haml
 - app/views/tramway/entities/_entity.html.haml
+- app/views/tramway/entities/_list.html.haml
 - app/views/tramway/entities/index.html.haml
 - app/views/tramway/layouts/application.html.haml
 - config/routes.rb