yummy-guide-generic-administrate 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3caffae44b6ea10fc063a2cc8fb8a3938e3cc42078c4af3bc2a08d4188cf01a
-  data.tar.gz: cea155304d262445a29199f9c5e57c574600508dca66206f49b81b3d3db66fb2
+  metadata.gz: 19e487e3834d936ad510df92a00a47f99447a31efd61145fd31798b5a44cbaec
+  data.tar.gz: ec73a8e829f7533ac79ebe3d4cca687b0d519c6e048940e2978b3ad25d44f0cc
 SHA512:
-  metadata.gz: 6a2e5a4b98e6cea96bfdc9e0cb026212c6ed37f39518800368329cc8ba1fcff202859acb8b3340754b493544b92f33e191d92606de032575c889e436ae39b789
-  data.tar.gz: 669b6a383ff6d184527e7324def8875626dc46dd0b5d9c5d55d3b5f18fd8f4e97188d6a943ffa65e4076a70eefd0389e41abbd7b77d97f9e98466a3c580ecc43
+  metadata.gz: 9d3da1b8ec25f8a3b0e4c01ef625f35a9e2d369c8a2656cb98f0813ec6ffe6343c375cfa91d42038c4d3527eafb3b61cdff8446cb508124a68c585a80fd5f834
+  data.tar.gz: d590ff5f0b427417f86a5951bdb514ab16ee27659ddccbfd22b84737a4f34ce7b78964ae5dc4bd10b4ba075df6363c634f87f274b2489945589fb1df44100561

data/README.md

@@ -355,13 +355,14 @@ dashboard の `FILTER_PATH` / `FILTER_CLEAR_PATH` より優先されます。
     ) %>
 ```
 
-標準 Field は `Text`, `Select`, `Checkbox`, `RadioGroup`, `CheckboxGroup`,
-`DateRange`, `DatetimeRange`, `DatetimeLocalRange`, `Custom` です。
+標準 Field は `Text`, `Select`, `Checkbox`, `RadioGroup`, `BooleanRadioGroup`,
+`CheckboxGroup`, `DateRange`, `DatetimeRange`, `DatetimeLocalRange`, `Custom` です。
 主な option は次のとおりです。
 
 - 共通: `label`, `default`, `if`, `class`, `id`, `placeholder`, `inputmode`, `pattern`
 - 選択系: `collection` または `options`, `select_options`
 - checkbox: `checked_value`, `unchecked_value`
+- boolean radio group: `unspecified_label`, `true_label`, `false_label`
 - checkbox group: `group`
 - range: `from`, `to`, `from_default`, `to_default`, `css_class`
 
@@ -379,6 +380,12 @@ FILTER_ATTRIBUTES = {
     label: "Status",
     collection: ->(_view, locals) { locals[:status_collection] },
     select_options: { include_blank: true }
+  ),
+  visible: YummyGuide::Administrate::Filters::BooleanRadioGroup.with_options(
+    label: "Visible",
+    unspecified_label: "-",
+    true_label: "Visible",
+    false_label: "Hidden"
   )
 }.freeze
 ```

data/lib/yummy_guide/administrate/filters.rb

@@ -152,6 +152,39 @@ module YummyGuide
         end
       end
 
+      class BooleanRadioGroup < Base
+        protected
+
+        def input_cell(view_context, _form, scope, current_values, locals)
+          selected = current_value(current_values).to_s
+          controls = boolean_options(view_context, locals).map do |label, value|
+            value_string = value.to_s
+            id = "#{scope}_#{name}_#{value_string.presence || "unspecified"}".parameterize(separator: "_")
+
+            view_context.content_tag(:label, style: "display: inline-flex; align-items: center; gap: 6px;") do
+              view_context.safe_join([
+                view_context.radio_button_tag("#{scope}[#{name}]", value, selected == value_string, id: id),
+                view_context.content_tag(:span, label)
+              ])
+            end
+          end
+
+          view_context.content_tag(:td) do
+            view_context.content_tag(:div, view_context.safe_join(controls), style: "display: flex; align-items: center; gap: 12px; flex-wrap: wrap;")
+          end
+        end
+
+        private
+
+        def boolean_options(view_context, locals)
+          [
+            [evaluate_option(options.fetch(:unspecified_label, "Unspecified"), view_context, locals), ""],
+            [evaluate_option(options.fetch(:true_label, "true"), view_context, locals), "true"],
+            [evaluate_option(options.fetch(:false_label, "false"), view_context, locals), "false"]
+          ]
+        end
+      end
+
       class CheckboxGroup < Base
         protected
 

data/lib/yummy_guide/administrate/version.rb

@@ -2,6 +2,6 @@
 
 module YummyGuide
   module Administrate
-    VERSION = "0.6.1"
+    VERSION = "0.6.2"
   end
 end

data/spec/yummy_guide/administrate/filter_controls_helper_spec.rb

@@ -49,6 +49,38 @@ RSpec.describe YummyGuide::Administrate::FilterControlsHelper do
       expect(document.at_css('select[name="search_options[status]"] option[selected]')["value"]).to eq("closed")
     end
 
+    # boolean radio group が未指定・true・falseを横並びで描画し、ラベルと選択状態を反映することを確認する
+    it "renders boolean radio group controls with custom labels" do
+      dashboard = Class.new
+      dashboard.const_set(
+        :FILTER_ATTRIBUTES,
+        {
+          visible: YummyGuide::Administrate::Filters::BooleanRadioGroup.with_options(
+            label: "Visible",
+            unspecified_label: "-",
+            true_label: "Visible",
+            false_label: "Hidden"
+          )
+        }.freeze
+      )
+
+      html = helper_host.admin_filter_controls(
+        dashboard: dashboard,
+        path: "/admin/resources",
+        search_options: { visible: "false" }
+      )
+      document = fragment(html)
+
+      wrapper = document.at_css('input[name="search_options[visible]"]').ancestors("div").first
+
+      expect(document.at_css('input[type="radio"][name="search_options[visible]"][value=""]')).to be_present
+      expect(document.at_css('input[type="radio"][name="search_options[visible]"][value="true"]')).to be_present
+      expect(document.at_css('input[type="radio"][name="search_options[visible]"][value="false"]')).to be_present
+      expect(document.at_css('input[type="radio"][name="search_options[visible]"][value="false"]')["checked"]).to eq("checked")
+      expect(wrapper["style"]).to include("display: flex")
+      expect(document.text).to include("-", "Visible", "Hidden")
+    end
+
     # dashboard に定義した FILTER_PATH をフィルター送信先として利用できることを確認する
     it "uses dashboard filter path when no explicit path is passed" do
       dashboard = Class.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yummy-guide-generic-administrate
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - akatsuki-kk