tramway 0.5.2.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bd63f1711a60db98ddc871375d48d7d3e6eaae3d67626dc038146e42395b3e6
-  data.tar.gz: ce50bc57610979a11cbc11feb52958b1a76ff85a7e530a28f872d85973f00e7a
+  metadata.gz: c116b7002a5f382a5b2d54704e425d6a7e2e1a5208cb2eb1f0cd060bf5852718
+  data.tar.gz: 6a183fa879258d651afcd2479265854139dcc8e5da69f9684a331f859274de64
 SHA512:
-  metadata.gz: e3faa9546ca344e73c22cfa4d751375efadcde87dc28a1767ff47954ca014258ea6d6dd065bdc58c8e6abc76d7bffd739e2116c3a306cb1733c20b44a80e39a9
-  data.tar.gz: 1f5cc72ffc449a10248be0b997392a9b17ef61bc37b0198ac9a5283963ad40e4428ddc586410b9faf9a04a5f209e96f21747ca2a8649a060ca0ea63250b453e4
+  metadata.gz: 7765e1c762c50ba2cb543ef79f155f6649cd5c5ac0ee38aa530f9472f0a7024ca489473ac0cf597a30a8fa2c99ce2ed8fde0d62fa34198a7903e3c90e8edfc92
+  data.tar.gz: d136698275286b8188609c2883756a9e338ca6c6faf118166f1374f443ae68ac7ed99849811703f6bf2f70e71d5aaadaec1433d4bec41e70568e27fea015edf1

data/README.md

@@ -26,7 +26,7 @@ gem "view_component"
 OR
 
 ```shell
-bundle add tramway view_component
+bundle add tramway view_component kaminari view_component
 ```
 
 ## Getting Started
@@ -225,7 +225,7 @@ Tramway provides **convenient** form objects for Rails applications. List proper
 class UserForm < Tramway::BaseForm
   properties :email, :password, :first_name, :last_name, :phone
 
-  normalizes :email, ->(value) { value.strip.downcase }
+  normalizes :email, with: ->(value) { value.strip.downcase }
 end
 ```
 

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

@@ -13,6 +13,14 @@ module Tailwinds
                ), &)
       end
 
+      def text_area(attribute, **options, &)
+        render(Tailwinds::Form::TextAreaComponent.new(
+                 input: input(:text_area),
+                 value: get_value(attribute, options),
+                 **default_options(attribute, options)
+               ), &)
+      end
+
       def password_field(attribute, **options, &)
         render(Tailwinds::Form::TextFieldComponent.new(
                  input: input(:password_field),

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

@@ -2,4 +2,4 @@
   - if @label
     = component('tailwinds/form/label', for: @for) do
       = @label
-  = @input.call(@attribute, @collection, { selected: @value }, @options.merge(class: 'bg-white border border-gray-300 text-gray-700 py-2.5 px-2 rounded focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent'))
+  = @input.call(@attribute, @collection, { selected: @value }, @options.merge(class: 'bg-white border border-gray-300 text-gray-700 rounded focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent py-2 px-3'))

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.cursor-pointer{ 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.dark:text-white{ type: :submit, name: :commit, **@options }
     = @text
   = @content

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

@@ -0,0 +1,5 @@
+.mb-4
+  - if @label
+    = component('tailwinds/form/label', for: @for) do
+      = @label
+  = @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'), value: @value

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

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Tailwinds
+  module Form
+    # Tailwind-styled text field
+    class TextAreaComponent < TailwindComponent
+    end
+  end
+end

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

@@ -8,7 +8,7 @@ module Tailwinds
       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'
+          'dark:hover:bg-gray-700', 'dark:hover:text-gray-400', 'dark:text-white'
         ].join(' ')
       end
     end

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

@@ -4,7 +4,7 @@
       .flex.items-center
         - if @title[:text].present?
           = link_to @title[:link] do
-            .text-xl.text-white.font-bold
+            .text-xl.text-white.font-bold.dark:text-white
               = @title[:text]
         - if @left_items.present?
           %ul.block.flex.flex-row.items-center.space-x-4.ml-4

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

@@ -1,27 +1,15 @@
 - if cells.any?
-  -# desktop view
-  = row_tag class: desktop_row_classes(cells.count) do
+  = row_tag class: desktop_row_classes(cells.count), **options do
     - cells.each do |(_, value)|
       .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
-  .div-table-row.xl:hidden.border-b.dark:bg-gray-800.dark:border-gray-700.mb-2{ "data-action" => "click->preview#toggle", "data-controller" => "preview", "data-items" => cells.to_json }
-    .w-full.p-4.bg-purple-100.text-gray-700.dark:bg-gray-700.dark:text-gray-400
-      = cells.values.first
-
-    .flex.overflow-x-auto.whitespace-nowrap
-      - cells.each_with_index do |(_, value), index|
-        - next if index == 0
-
-        .text-gray-900.dark:text-white.p-4.text-xs.sm:text-base.inline-block.w-auto
-          = value
 - else
-  - cells = Nokogiri::HTML.fragment(content).children.css('div')
+  - cells = Nokogiri::HTML.fragment(content).xpath('./*[@class and contains(concat(" ", normalize-space(@class), " "), " div-table-cell ")]')
 
   - if href.present?
-    = tag.a href:, class: [desktop_row_classes(cells.count), link_row_classes].join(' ') do
+    = tag.a href:, class: [desktop_row_classes(cells.count), link_row_classes].join(' '), **options do
       = content
   - else
-    = tag.div class: desktop_row_classes(cells.count) do
+    = tag.div class: desktop_row_classes(cells.count), **options do
       = content

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

@@ -6,6 +6,7 @@ module Tailwinds
     class RowComponent < Tramway::Component::Base
       option :cells, optional: true, default: -> { [] }
       option :href, optional: true
+      option :options, optional: true, default: -> { {} }
 
       def row_tag(**options, &)
         if href.present?

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

@@ -1,4 +1,4 @@
 = helpers.component 'tailwinds/table/row/preview'
 
-.div-table.w-full.text-left.rtl:text-right.text-gray-500.dark:text-gray-400.mt-4
+.div-table.w-full.text-left.rtl:text-right.text-gray-500.dark:text-gray-400.mt-4{ **options }
   = content

data/app/components/tailwinds/table_component.rb

@@ -3,5 +3,6 @@
 module Tailwinds
   # Table component for rendering a table
   class TableComponent < Tramway::Component::Base
+    option :options, optional: true, default: -> { {} }
   end
 end

data/app/controllers/tramway/entities_controller.rb

@@ -11,7 +11,7 @@ module Tramway
     include Rails.application.routes.url_helpers
 
     def index
-      @entities = model_class.page(params[:page])
+      @entities = model_class.order(id: :desc).page(params[:page])
     end
 
     private

data/app/helpers/tramway/application_helper.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'tramway/helpers/component_helper'
+require 'kaminari/helpers/tag'
 
 module Tramway
   # Main helper module for Tramway entities pages

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

@@ -4,12 +4,14 @@
 .mt-8.w-full
   - content_for :title, page_title
 
-  .flex.justify-between.items-center.md:mt-4.mt-2
+  .flex.justify-between.items-center
     %h1.font-bold.text-4xl.dark:text-white
       = content_for(:title)
 
     - if Tramway.config.pagination[:enabled]
-      = paginate @entities
+      = paginate @entities, custom_path_method: "#{@model_class.model_name.plural}_path"
+  .flex.justify-end.mt-2
+    = decorator.constantize.index_header_content.call(@entities) if decorator.constantize.index_header_content.present?
 
   - if list_attributes.empty?
     %p.text-center.mt-10
@@ -21,5 +23,6 @@
     - @entities.each do |item|
       = render 'tramway/entities/entity', entity: item
 
-    .flex.mt-4
-      = paginate @entities
+    - if Tramway.config.pagination[:enabled]
+      .flex.mt-4
+        = paginate @entities, custom_path_method: "#{@model_class.model_name.plural}_path"

data/config/tailwind.config.js

@@ -23,7 +23,11 @@ module.exports = {
     'flex',
     'bg-purple-700',
     'px-6',
+    'px-3',
+    'px-4',
     'py-4',
+    'py-2',
+    'mb-2',
     'dark:placeholder-gray-400',
     'dark:text-white',
     'dark:bg-gray-800',
@@ -41,6 +45,11 @@ module.exports = {
     'hover:bg-gray-100',
     'hover:bg-gray-300',
     'hover:text-gray-800',
+    'mt-8',
+    'justify-between',
+    'space-x-1',
+    'justify-end',
+    'mt-2',
     // pagination
     'bg-white', 'rounded-md', 'hover:bg-purple-100', 'dark:text-white', 'dark:bg-gray-800', 'dark:hover:bg-gray-700',
     // multiselect styles

data/lib/kaminari/helpers/tag.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Kaminari
+  module Helpers
+    # Monkey patch for Kaminari::Helpers::Tag to support :custom_path_method
+    # :reek:InstanceVariableAssumption { enabled: false }
+    class Tag
+      def page_url_for(page)
+        custom_path_method = @options[:custom_path_method]
+
+        if custom_path_method.present?
+          Tramway::Engine.routes.url_helpers.public_send(
+            custom_path_method,
+            @params.except(:controller, :action).merge(page: page)
+          )
+        else
+          params = params_for(page)
+          @template.url_for params.merge(only_path: true)
+        end
+      end
+    end
+  end
+end

data/lib/tramway/base_decorator.rb

@@ -4,6 +4,7 @@ require 'tramway/decorators/name_builder'
 require 'tramway/decorators/association'
 require 'tramway/decorators/collection_decorator'
 require 'tramway/helpers/decorate_helper'
+require 'tramway/helpers/component_helper'
 require 'tramway/utils/render'
 require 'tramway/duck_typing'
 
@@ -15,6 +16,7 @@ module Tramway
     include Tramway::Utils::Render
     include Tramway::DuckTyping::ActiveRecordCompatibility
     include Tramway::Helpers::DecorateHelper
+    include Tramway::Helpers::ComponentHelper
 
     attr_reader :object
 
@@ -23,6 +25,9 @@ module Tramway
     end
 
     class << self
+      include Tramway::Helpers::ComponentHelper
+      include Tramway::Utils::Render
+
       # :reek:NilCheck { enabled: false } because checking for nil is not a type-checking issue but business logic
       def decorate(object_or_array)
         return if object_or_array.nil?
@@ -47,6 +52,10 @@ module Tramway
         []
       end
 
+      def index_header_content
+        nil
+      end
+
       include Tramway::Decorators::AssociationClassMethods
     end
 

data/lib/tramway/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway
 version: !ruby/object:Gem::Version
-  version: 0.5.2.1
+  version: 0.5.3
 platform: ruby
 authors:
 - kalashnikovisme
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-18 00:00:00.000000000 Z
+date: 2025-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anyway_config
@@ -162,6 +162,8 @@ files:
 - app/components/tailwinds/form/select_component.rb
 - app/components/tailwinds/form/submit_button_component.html.haml
 - app/components/tailwinds/form/submit_button_component.rb
+- app/components/tailwinds/form/text_area_component.html.haml
+- app/components/tailwinds/form/text_area_component.rb
 - app/components/tailwinds/form/text_field_component.html.haml
 - app/components/tailwinds/form/text_field_component.rb
 - app/components/tailwinds/nav/item/button_component.html.haml
@@ -210,6 +212,7 @@ files:
 - app/views/tramway/layouts/application.html.haml
 - config/routes.rb
 - config/tailwind.config.js
+- lib/kaminari/helpers/tag.rb
 - lib/rules/turbo_html_attributes_rules.rb
 - lib/tasks/tramway_tasks.rake
 - lib/tramway.rb