tramway 2.2.3.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4ac0f8b16c48697499fff448ea5c1afd8f10a7edb23f3202c7b2e27270ad5d5
-  data.tar.gz: 409afb51bb0244d2bbcf609d0ce0b4a8a3b408b1daf1b1e0adc109f827a2ca49
+  metadata.gz: 16dea01fb21b124c9230e27238eb4d7f4f872d3e4348b9b16ca79e48e4ad1ac8
+  data.tar.gz: 8dfbda56fba27bb45e93e8048823f8b32adce01a5f8e8412608e13c694022005
 SHA512:
-  metadata.gz: 521e251f67fe5e7157ff3256c77da7372174578b936b742055ad6cc7e7337a297df74487076bd189b24a5f1634775e481c4067b62fba2bde9213f654c7143173
-  data.tar.gz: 4812134f889e1dd2b943cbd317ce3a1b097b78cf5460a50d86dc9d4dca082844913e8b37732fc572c2982058bb419c447dc43c673bb20c14768800bb22ef5e69
+  metadata.gz: 64e58a748628c72a579964e6c604695a29711b28a673eae560922dc2dd5c179116767a2026e15a9d898dc773ac62ee92b3afc4c2b94c921933c1e8b1bac57260
+  data.tar.gz: 83b5e8825a9ef8592ea244ab883e363136b9b77281b3c42ff5d256818e33a9330a683fb3074b1c902c27cf014a1f852a5f3a788f152d0af8a133648b1c4681fe

data/README.md

@@ -272,13 +272,17 @@ method name and the remaining keys are passed as named arguments.
 
 ```ruby
 class UserForm < Tramway::BaseForm
-  properties :email, :about_me
+  properties :email, :about_me, :user_type
 
   fields email: :email,
     name: :text,
     about_me: {
       type: :text_area,
       rows: 5
+    },
+    user_type: {
+      type: :select,
+      collection: ['regular', 'user']
     }
 end
 ```

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

@@ -9,23 +9,6 @@ module Tailwinds
           classic: 'div-table-cell md:block first:block hidden px-6 py-4 font-medium text-gray-100 text-base'
         )
       end
-
-      def around_render
-        ensure_view_context_accessor
-        previous_flag = view_context.tramway_inside_cell
-        view_context.tramway_inside_cell = true
-        yield
-      ensure
-        view_context.tramway_inside_cell = previous_flag
-      end
-
-      private
-
-      def ensure_view_context_accessor
-        return if view_context.respond_to?(:tramway_inside_cell=)
-
-        view_context.singleton_class.attr_accessor :tramway_inside_cell
-      end
     end
   end
 end

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

@@ -44,6 +44,24 @@ module Tailwinds
           classic: 'div-table-cell px-6 py-4 font-medium text-gray-100 text-xs sm:text-base'
         )
       end
+
+      def around_render
+        ensure_view_context_accessor
+        previous_flag = view_context.tramway_inside_cell
+        view_context.tramway_inside_cell = href.present?
+
+        yield
+      ensure
+        view_context.tramway_inside_cell = previous_flag
+      end
+
+      private
+
+      def ensure_view_context_accessor
+        return if view_context.respond_to?(:tramway_inside_cell=)
+
+        view_context.singleton_class.attr_accessor :tramway_inside_cell
+      end
     end
   end
 end

data/docs/AGENTS.md

@@ -358,6 +358,70 @@ In case you implementing API, use `api` namespaces for forms and decorators.
 ### Rule 25
 DO NOT use `#{model_name}_params` method with `permit` method inside controllers. When you use `tramway_form`, it's unnecessary.
 
+### Rule 26
+DO NOT create new private methods in the controller for business logic stuff. Use service objects instead.
+Create `app/services/base_service.rb` if it does not exist.
+
+```ruby
+class BaseService
+  extend Dry::Initializer[undefined: false]
+  include Dry::Monads[:do, :result]
+
+  def self.call(...)
+    new(...).call
+  end
+end
+```
+
+And instead of this in a controller
+
+```ruby
+  def create
+    user = tramway_form User.new
+
+    if user.submit params[:user]
+      notify_admin user
+
+      # other stuff
+    else
+    end
+  end
+
+  private
+
+  def notify_admin(user)
+    # stuff
+  end
+```
+
+Make this
+
+*app/services/notify_admin.rb*
+```ruby
+class NotifyAdmin < BaseService
+  option :user
+
+  def call
+    # stuff
+  end
+end
+```
+
+and in a controller
+
+```
+  def create
+    user = tramway_form User.new
+
+    if user.submit params[:user]
+      NotifyAdmin.call user:
+
+      # other stuff
+    else
+    end
+  end
+```
+
 ## Controller Patterns
 
 - Keep actions short and explicit with guard clauses.

data/lib/tramway/forms/fields.rb

@@ -7,7 +7,25 @@ module Tramway
       # Class methods for defining fields
       module ClassMethods
         def fields(**attributes)
-          @fields.merge! attributes
+          attributes.any? ? __set_fields(attributes) : __fields
+        end
+
+        def __set_fields(attributes)
+          attributes.each do |(attribute, field_data)|
+            @fields.merge! attribute => field_data
+          end
+        end
+
+        def __fields
+          @fields.merge(__ancestor_fields)
+        end
+
+        def __ancestor_fields(klass = superclass)
+          superklass = klass.superclass
+
+          return {} unless superklass.respond_to?(:fields)
+
+          klass.fields.merge(__ancestor_fields(superklass))
         end
 
         def __initialize_fields(subclass)

data/lib/tramway/utils/field.rb

@@ -4,27 +4,47 @@ module Tramway
   module Utils
     # Provides dynamic field rendering
     module Field
-      def tramway_field(field_type, attribute, **, &)
-        if field_type.is_a?(Hash)
-          name = field_name(field_type[:type])
-          value = field_type[:value]&.call
+      def tramway_field(field_data, attribute, **options, &)
+        input_type = field_type(field_data)
+        input_name = field_name input_type
+        input_options = field_options(field_data).merge(options)
 
-          hash = { value:, **field_type.except(:type, :value) }.compact
+        case input_type.to_sym
+        when :select, :multiselect
+          collection = input_options.delete(:collection)
 
-          public_send(name, attribute, **hash, **, &)
+          public_send(input_name, attribute, collection, **input_options, &)
         else
-          public_send(field_name(field_type), attribute, **, &)
+          public_send(input_name, attribute, **input_options, &)
         end
       end
 
       private
 
-      def field_name(field_type)
-        case field_type.to_sym
+      def field_name(field_data)
+        case field_data.to_sym
         when :text_area, :select, :multiselect
-          field_type
+          field_data
         else
-          "#{field_type}_field"
+          "#{field_data}_field"
+        end
+      end
+
+      def field_type(field_data)
+        if field_data.is_a?(Hash)
+          field_data[:type]
+        else
+          field_data
+        end
+      end
+
+      def field_options(field_data)
+        if field_data.is_a?(Hash)
+          value = field_data[:value]&.call
+
+          field_data.merge(value:).except(:type)
+        else
+          {}
         end
       end
     end

data/lib/tramway/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway
 version: !ruby/object:Gem::Version
-  version: 2.2.3.3
+  version: 2.2.4
 platform: ruby
 authors:
 - kalashnikovisme