uchi 0.1.8 → 0.2.0

data/lib/uchi/repository.rb

@@ -52,9 +52,13 @@ module Uchi
 
     # Returns an array of fields to show on the edit page.
     #
+    # @param record [Object, nil] The record being edited. When provided, fields with a
+    #   visibility condition are filtered by it. When omitted, all edit fields are returned.
     # @return [Array<Uchi::Field>]
-    def fields_for_edit
-      fields_for(:edit)
+    def fields_for_edit(record: nil)
+      return fields_for(:edit) if record.nil?
+
+      fields_for(:edit).select { |field| field.visible_for?(record) }
     end
 
     # Returns an array of fields to show on the index page.
@@ -66,16 +70,24 @@ module Uchi
 
     # Returns an array of fields to show on the new page.
     #
+    # @param record [Object, nil] The record being created. When provided, fields with a
+    #   visibility condition are filtered by it. When omitted, all new fields are returned.
     # @return [Array<Uchi::Field>]
-    def fields_for_new
-      fields_for(:new)
+    def fields_for_new(record: nil)
+      return fields_for(:new) if record.nil?
+
+      fields_for(:new).select { |field| field.visible_for?(record) }
     end
 
     # Returns an array of fields to show on the show page.
     #
+    # @param record [Object, nil] The record being shown. When provided, fields with a
+    #   visibility condition are filtered by it. When omitted, all show fields are returned.
     # @return [Array<Uchi::Field>]
-    def fields_for_show
-      fields_for(:show)
+    def fields_for_show(record: nil)
+      return fields_for(:show) if record.nil?
+
+      fields_for(:show).select { |field| field.visible_for?(record) }
     end
 
     def find_all(search: nil, scope: model.all, sort_order: default_sort_order)
@@ -188,7 +200,7 @@ module Uchi
     end
 
     def apply_sort_order(query, sort_order)
-      field_to_sort_by = fields.find { |field| field.name == sort_order.name }
+      field_to_sort_by = fields.find { |field| field.name == sort_order.column }
       return query unless field_to_sort_by
 
       if field_to_sort_by.sortable.respond_to?(:call)

data/lib/uchi/sort_order.rb

@@ -1,6 +1,7 @@
 module Uchi
+  # Encapsulates the sort order selected by a user.
   class SortOrder
-    attr_reader :name, :direction
+    attr_reader :column, :direction
 
     class << self
       def from_params(params)
@@ -20,15 +21,19 @@ module Uchi
     end
 
     def apply(query)
-      query.order(name => direction)
+      if column.respond_to?(:asc)
+        query.order(ascending? ? column.asc : column.desc)
+      else
+        query.order(column => direction)
+      end
     end
 
     def descending?
       direction == :desc
     end
 
-    def initialize(name, direction)
-      @name = name.to_sym
+    def initialize(column, direction)
+      @column = column.respond_to?(:asc) ? column : column.to_sym
       @direction = direction.to_sym
     end
   end

data/lib/uchi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uchi
-  VERSION = "0.1.8"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uchi
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - Jakob Skjerning
@@ -71,6 +71,7 @@ files:
 - app/assets/stylesheets/uchi/uchi.css
 - app/assets/tailwind/uchi.css
 - app/components/uchi/field/base.rb
+- app/components/uchi/field/base/show.html.erb
 - app/components/uchi/field/belongs_to.rb
 - app/components/uchi/field/belongs_to/edit.html.erb
 - app/components/uchi/field/belongs_to/index.html.erb
@@ -86,7 +87,6 @@ files:
 - app/components/uchi/field/date.rb
 - app/components/uchi/field/date/edit.html.erb
 - app/components/uchi/field/date/index.html.erb
-- app/components/uchi/field/date/show.html.erb
 - app/components/uchi/field/date_time.rb
 - app/components/uchi/field/date_time/edit.html.erb
 - app/components/uchi/field/date_time/index.html.erb
@@ -113,15 +113,16 @@ files:
 - app/components/uchi/field/number.rb
 - app/components/uchi/field/number/edit.html.erb
 - app/components/uchi/field/number/index.html.erb
-- app/components/uchi/field/number/show.html.erb
+- app/components/uchi/field/select.rb
+- app/components/uchi/field/select/edit.html.erb
+- app/components/uchi/field/select/index.html.erb
+- app/components/uchi/field/select/show.html.erb
 - app/components/uchi/field/string.rb
 - app/components/uchi/field/string/edit.html.erb
 - app/components/uchi/field/string/index.html.erb
-- app/components/uchi/field/string/show.html.erb
 - app/components/uchi/field/text.rb
 - app/components/uchi/field/text/edit.html.erb
 - app/components/uchi/field/text/index.html.erb
-- app/components/uchi/field/text/show.html.erb
 - app/components/uchi/flowbite/breadcrumb.rb
 - app/components/uchi/flowbite/breadcrumb_home.rb
 - app/components/uchi/flowbite/breadcrumb_item.rb

data/app/components/uchi/field/date/show.html.erb

@@ -1 +0,0 @@
-<%= field.value(record) %>

data/app/components/uchi/field/number/show.html.erb

@@ -1 +0,0 @@
-<%= field.value(record) %>

data/app/components/uchi/field/string/show.html.erb

@@ -1 +0,0 @@
-<%= field.value(record) %>

data/app/components/uchi/field/text/show.html.erb

@@ -1 +0,0 @@
-<%= field.value(record) %>