plutonium 0.15.23 → 0.15.24

data/lib/plutonium/ui/display/base.rb

@@ -8,11 +8,11 @@ module Plutonium
 
         class Builder < Builder
           def association_tag(**, &)
-            create_component(Plutonium::UI::Display::Component::AssociationField, :association, **, &)
+            create_component(Plutonium::UI::Display::Component::Association, :association, **, &)
           end
 
           def markdown_tag(**, &)
-            create_component(Plutonium::UI::Display::Component::MarkdownField, :markdown, **, &)
+            create_component(Plutonium::UI::Display::Component::Markdown, :markdown, **, &)
           end
         end
 

data/lib/plutonium/ui/display/component/{association_field.rb → association.rb}

@@ -4,7 +4,7 @@ module Plutonium
   module UI
     module Display
       module Component
-        class AssociationField < Phlexi::Display::Components::Association
+        class Association < Phlexi::Display::Components::Association
           include Plutonium::UI::Component::Methods
 
           def render_value(value)

data/lib/plutonium/ui/display/component/markdown.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require "redcarpet"
+
+module Plutonium
+  module UI
+    module Display
+      module Component
+        class Markdown < Phlexi::Display::Components::Base
+          include Phlexi::Display::Components::Concerns::DisplaysValue
+
+          RENDERER = Redcarpet::Markdown.new(
+            Redcarpet::Render::HTML.new(
+              safe_links_only: true, with_toc_data: true, hard_wrap: true,
+              link_attributes: {rel: :nofollow, target: :_blank}
+            ),
+            autolink: true, tables: true, no_intra_emphasis: true,
+            fenced_code_blocks: true, disable_indented_code_blocks: true,
+            strikethrough: true, space_after_headers: true, superscript: true,
+            footnotes: true, highlight: true, underline: true
+          )
+
+          def render_value(value)
+            article(**attributes) {
+              unsafe_raw(render_markdown(value))
+            }
+          end
+
+          private
+
+          def render_markdown(value)
+            RENDERER.render(
+              ActionController::Base.helpers.sanitize(
+                value,
+                tags: %w[strong em sub sup details summary],
+                attributes: []
+              )
+            )
+          end
+
+          def normalize_value(value)
+            if value.respond_to?(:to_plain_text)
+              value.to_plain_text
+            else
+              value.to_s
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/plutonium/ui/form/base.rb

@@ -10,7 +10,7 @@ module Plutonium
           include Plutonium::UI::Form::Options::InferredTypes
 
           def easymde_tag(**, &)
-            create_component(Plutonium::UI::Form::Components::EasymdeInput, :easymde, **, &)
+            create_component(Plutonium::UI::Form::Components::Easymde, :easymde, **, &)
           end
           alias_method :markdown_tag, :easymde_tag
 
@@ -21,7 +21,7 @@ module Plutonium
           alias_method :select_tag, :slim_select_tag
 
           def flatpickr_tag(**, &)
-            create_component(Plutonium::UI::Form::Components::FlatpickrInput, :flatpickr, **, &)
+            create_component(Plutonium::UI::Form::Components::Flatpickr, :flatpickr, **, &)
           end
         end
 

data/lib/plutonium/ui/form/components/{easymde_input.rb → easymde.rb}

@@ -4,7 +4,7 @@ module Plutonium
   module UI
     module Form
       module Components
-        class EasymdeInput < Phlexi::Form::Components::Base
+        class Easymde < Phlexi::Form::Components::Base
           include Phlexi::Form::Components::Concerns::HandlesInput
 
           def view_template

data/lib/plutonium/ui/form/components/{flatpickr_input.rb → flatpickr.rb}

@@ -4,7 +4,7 @@ module Plutonium
   module UI
     module Form
       module Components
-        class FlatpickrInput < Phlexi::Form::Components::Input
+        class Flatpickr < Phlexi::Form::Components::Input
           private
 
           def build_input_attributes

data/lib/plutonium/version.rb

@@ -1,5 +1,5 @@
 module Plutonium
-  VERSION = "0.15.23"
+  VERSION = "0.15.24"
   NEXT_MAJOR_VERSION = VERSION.split(".").tap { |v|
     v[1] = v[1].to_i + 1
     v[2] = 0

data/package-lock.json

@@ -1,16 +1,17 @@
 {
   "name": "@radioactive-labs/plutonium",
-  "version": "0.1.12",
+  "version": "0.1.15",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@radioactive-labs/plutonium",
-      "version": "0.1.12",
+      "version": "0.1.15",
       "license": "MIT",
       "dependencies": {
         "@hotwired/stimulus": "^3.2.2",
         "@hotwired/turbo": "^8.0.4",
+        "dompurify": "^3.2.2",
         "flowbite": "^2.3.0",
         "lodash.debounce": "^4.0.8"
       },
@@ -1868,7 +1869,7 @@
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
       "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/@types/unist": {
@@ -3757,11 +3758,13 @@
       }
     },
     "node_modules/dompurify": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.6.tgz",
-      "integrity": "sha512-cTOAhc36AalkjtBpfG6O8JimdTMWNXjiePT2xQH/ppBGi/4uIpmj8eKyIkMJErXWARyINV/sB38yf8JCLF5pbQ==",
-      "dev": true,
-      "license": "(MPL-2.0 OR Apache-2.0)"
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.2.tgz",
+      "integrity": "sha512-YMM+erhdZ2nkZ4fTNRTSI94mb7VG7uVF5vj5Zde7tImgnhZE3R6YW/IACGIHb2ux+QkEXMhe591N+5jWOmL4Zw==",
+      "license": "(MPL-2.0 OR Apache-2.0)",
+      "optionalDependencies": {
+        "@types/trusted-types": "^2.0.7"
+      }
     },
     "node_modules/domutils": {
       "version": "3.1.0",
@@ -4590,6 +4593,13 @@
         "uuid": "^9.0.1"
       }
     },
+    "node_modules/mermaid/node_modules/dompurify": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.6.tgz",
+      "integrity": "sha512-cTOAhc36AalkjtBpfG6O8JimdTMWNXjiePT2xQH/ppBGi/4uIpmj8eKyIkMJErXWARyINV/sB38yf8JCLF5pbQ==",
+      "dev": true,
+      "license": "(MPL-2.0 OR Apache-2.0)"
+    },
     "node_modules/micromark-util-character": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.0.tgz",

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@radioactive-labs/plutonium",
-  "version": "0.1.12",
+  "version": "0.1.15",
   "description": "Core assets for the Plutonium gem",
   "type": "module",
   "main": "src/js/core.js",
@@ -20,6 +20,7 @@
   "dependencies": {
     "@hotwired/stimulus": "^3.2.2",
     "@hotwired/turbo": "^8.0.4",
+    "dompurify": "^3.2.2",
     "flowbite": "^2.3.0",
     "lodash.debounce": "^4.0.8"
   },

data/src/css/easymde.css

@@ -1,7 +1,7 @@
 /**
 * EasyMDE + CodeMirror Styles
-* Based on easymde v2.18.0
-* Adapted for Tailwind with dark mode support
+* Based on https://cdn.jsdelivr.net/npm/easymde@2.18.0/dist/easymde.min.css
+* Adapted for Flowbite with dark mode support
 */
 
 @layer components {
@@ -304,47 +304,68 @@
   }
 
   .cm-s-easymde .cm-quote {
-    @apply text-green-700 dark:text-green-400;
+    @apply text-gray-900 dark:text-white;
   }
 
   .cm-s-easymde .cm-keyword {
-    @apply text-purple-600 dark:text-purple-400;
+    @apply text-gray-900 dark:text-white;
   }
 
   .cm-s-easymde .cm-atom {
-    @apply text-blue-800 dark:text-blue-300;
+    @apply text-gray-900 dark:text-white;
   }
 
   .cm-s-easymde .cm-number {
-    @apply text-green-800 dark:text-green-300;
+    @apply text-gray-900 dark:text-white;
   }
 
   .cm-s-easymde .cm-def {
-    @apply text-blue-600 dark:text-blue-400;
+    @apply text-gray-900 dark:text-white;
   }
 
   .cm-s-easymde .cm-variable {
-    @apply text-gray-800 dark:text-gray-300;
+    @apply text-gray-900 dark:text-white;
   }
 
   .cm-s-easymde .cm-variable-2 {
-    @apply text-blue-700 dark:text-blue-300;
+    @apply text-gray-900 dark:text-white;
   }
 
   .cm-s-easymde .cm-variable-3 {
-    @apply text-teal-700 dark:text-teal-300;
+    @apply text-gray-900 dark:text-white;
+  }
+
+  .cm-formatting.cm-formatting-list {
+    @apply text-gray-900 dark:text-white;
+  }
+
+  .cm-formatting.cm-formatting-link {
+    @apply text-secondary-900 dark:text-secondary-400 !important;
+  }
+
+  .cm-formatting.cm-formatting-link-string {
+    @apply text-secondary-900 dark:text-secondary-400 !important;
+  }
+
+
+  .cm-s-easymde .cm-string {
+    @apply text-accent-600 dark:text-accent-400;
   }
 
-  .cm-s-easymde .cm-link {
-    @apply text-secondary-700 dark:text-secondary-300;
+  .cm-s-easymde .cm-string.cm-url {
+    @apply text-accent-600 dark:text-accent-400;
   }
 
+  /* .cm-s-easymde .cm-link {
+    @apply text-accent-600 dark:text-accent-400;
+  } */
+
   .cm-s-easymde .cm-url {
-    @apply text-primary-700 dark:text-primary-300;
+    @apply text-gray-900 dark:text-white;
   }
 
   .cm-s-easymde .cm-string-2 {
-    @apply text-orange-600 dark:text-orange-300;
+    @apply text-gray-900 dark:text-white;
   }
 
   .cm-s-easymde .cm-comment {
@@ -360,7 +381,7 @@
   }
 
   .cm-s-easymde .cm-attribute {
-    color: #795da3;
+    @apply text-secondary-600 dark:text-secondary-400;
   }
 
   .cm-s-easymde .cm-error {
@@ -467,19 +488,6 @@
     direction: rtl;
   }
 
-  /* Selection Styles */
-  /* .CodeMirror-line::selection,
-    .CodeMirror-line>span::selection,
-    .CodeMirror-line>span>span::selection {
-        @apply bg-accent-100 dark:bg-accent-900/30;
-    }
-
-    .CodeMirror-line::-moz-selection,
-    .CodeMirror-line>span::-moz-selection,
-    .CodeMirror-line>span>span::-moz-selection {
-        @apply bg-accent-100 dark:bg-accent-900/30;
-    } */
-
   .CodeMirror-selectedtext {
     @apply bg-gray-200/70 dark:bg-gray-600/50;
   }
@@ -553,6 +561,10 @@
     @apply outline-none;
   }
 
+  .cm-tab {
+    @apply inline-block no-underline;
+  }
+
   /* Fix for tab character rendering */
   .cm-tab-wrap-hack:after {
     content: '';
@@ -646,4 +658,69 @@
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;
   }
+
+  /* Typography Styles */
+  .cm-s-easymde .cm-header {
+    @apply text-gray-900 dark:text-white;
+  }
+
+  /* Focus/Selection Styles */
+  .CodeMirror-line::selection,
+  .CodeMirror-line>span::selection,
+  .CodeMirror-line>span>span::selection {
+    @apply bg-primary-100 dark:bg-primary-900/30;
+  }
+
+  .CodeMirror-line::-moz-selection,
+  .CodeMirror-line>span::-moz-selection,
+  .CodeMirror-line>span>span::-moz-selection {
+    @apply bg-primary-100 dark:bg-primary-900/30;
+  }
+
+  /* Tag Match Styles */
+  .CodeMirror-matchingtag {
+    @apply bg-yellow-200/30 dark:bg-yellow-900/30;
+  }
+
+  /* Search Highlight Styles */
+  .cm-searching {
+    @apply bg-yellow-200/40 dark:bg-yellow-900/40;
+  }
+
+  /* Ruler Styles */
+  .CodeMirror-rulers {
+    @apply absolute inset-x-0 -top-[50px] bottom-0 overflow-hidden;
+  }
+
+  .CodeMirror-ruler {
+    @apply border-l border-gray-300 dark:border-gray-600 top-0 bottom-0 absolute;
+  }
+
+  /* Editor Preview Full */
+  .editor-preview-full {
+    @apply absolute w-full h-full top-0 left-0 z-[7] overflow-auto hidden box-border;
+  }
+
+  /* Add active state for full preview */
+  .editor-preview-active {
+    @apply block;
+  }
+
+  /* Preview content specific styles */
+  .editor-preview-full {
+    @apply p-2.5 bg-gray-50 dark:bg-gray-900 format dark:format-invert format-primary max-w-none;
+  }
+
+  .editor-preview-full>p {
+    @apply mt-0;
+  }
+
+  .editor-preview-full pre {
+    @apply bg-gray-100 dark:bg-gray-800 mb-2.5;
+  }
+
+  .editor-preview-full table td,
+  .editor-preview-full table th {
+    @apply border border-gray-300 dark:border-gray-600 p-1.5;
+  }
 }

data/src/css/slim_select.css

@@ -1,3 +1,9 @@
+/**
+* Slim Select Styles
+* Based on https://cdn.jsdelivr.net/npm/slim-select@2.10.0/dist/slimselect.min.css
+* Adapted for Flowbite with dark mode support
+*/
+
 @layer components {
   :root {
     --ss-primary-color: theme('colors.primary.500');

data/src/js/controllers/easymde_controller.js

@@ -1,14 +1,52 @@
 import { Controller } from "@hotwired/stimulus"
+import DOMPurify from 'dompurify';
+import { marked } from 'marked';
 
 // Connects to data-controller="easymde"
 export default class extends Controller {
   connect() {
     console.log(`easymde connected: ${this.element}`)
-    self.easyMDE = new EasyMDE({ element: this.element })
+    self.easyMDE = new EasyMDE(this.#buildOptions())
+    this.element.setAttribute("data-action", "turbo:morph-element->easymde#reconnect")
   }
 
   disconnect() {
     self.easyMDE.toTextArea()
     self.easyMDE = null
   }
+
+  reconnect() {
+    this.disconnect()
+    this.connect()
+  }
+
+  #buildOptions() {
+    let options = {
+      element: this.element,
+      promptURLs: true,
+      spellChecker: false,
+      // Override the default preview renderer
+      previewRender: (plainText) => {
+        // First sanitize the input to remove any undesired HTML
+        const cleanedText = DOMPurify.sanitize(plainText, {
+          ALLOWED_TAGS: ['strong', 'em', 'sub', 'sup', 'details', 'summary'],
+          ALLOWED_ATTR: []
+        });
+
+        // Then convert markdown to HTML
+        const cleanedHTML = marked(cleanedText);
+
+        // Finally, another pass, since marked does not sanitize html
+        return DOMPurify.sanitize(cleanedHTML, { USE_PROFILES: { html: true } })
+      }
+    }
+    if (this.element.attributes.id.value) {
+      options.autosave = {
+        enabled: true,
+        uniqueId: this.element.attributes.id.value,
+        delay: 1000,
+      }
+    }
+    return options
+  }
 }

data/src/js/controllers/flatpickr_controller.js

@@ -5,6 +5,7 @@ export default class extends Controller {
   connect() {
     console.log(`flatpickr connected: ${this.element}`)
     self.picker = new flatpickr(this.element, this.#buildOptions())
+    this.element.setAttribute("data-action", "turbo:morph-element->flatpickr#reconnect")
   }
 
   disconnect() {
@@ -12,6 +13,11 @@ export default class extends Controller {
     self.picker = null
   }
 
+  reconnect() {
+    this.disconnect()
+    this.connect()
+  }
+
   #buildOptions() {
     let options = { altInput: true }
     if (this.element.attributes.type.value == "datetime-local") {

data/src/js/controllers/slim_select_controller.js

@@ -7,10 +7,16 @@ export default class extends Controller {
     self.slimSelect = new SlimSelect({
       select: this.element
     })
+    this.element.setAttribute("data-action", "turbo:morph-element->slim-select#reconnect")
   }
 
   disconnect() {
     self.slimSelect.destroy()
     self.slimSelect = null
   }
+
+  reconnect() {
+    this.disconnect()
+    this.connect()
+  }
 }

data/tailwind.options.js

@@ -29,42 +29,44 @@ export const theme = {
     typography: ({ theme }) => ({
       primary: {
         css: {
-          '--tw-prose-body': theme('colors.secondary.700'),
-          '--tw-prose-headings': theme('colors.secondary.900'),
-          '--tw-prose-lead': theme('colors.secondary.600'),
-          '--tw-prose-links': theme('colors.primary.600'),
-          '--tw-prose-bold': theme('colors.secondary.900'),
-          '--tw-prose-counters': theme('colors.primary.500'),
-          '--tw-prose-bullets': theme('colors.primary.500'),
-          '--tw-prose-hr': theme('colors.primary.200'),
-          '--tw-prose-quotes': theme('colors.secondary.900'),
-          '--tw-prose-quote-borders': theme('colors.primary.300'),
-          '--tw-prose-captions': theme('colors.secondary.700'),
-          '--tw-prose-code': theme('colors.secondary.900'),
+          '--tw-prose-body': theme('colors.gray.900'),
+          '--tw-prose-headings': theme('colors.gray.900'),
+          '--tw-prose-lead': theme('colors.gray.600'),
+          '--tw-prose-links': theme('colors.primary.700'),
+          '--tw-prose-bold': theme('colors.gray.900'),
+          '--tw-prose-counters': theme('colors.gray.600'),
+          '--tw-prose-bullets': theme('colors.gray.600'),
+          '--tw-prose-hr': theme('colors.gray.200'),
+          '--tw-prose-quotes': theme('colors.gray.900'),
+          '--tw-prose-quote-borders': theme('colors.gray.300'),
+          '--tw-prose-captions': theme('colors.gray.700'),
+          '--tw-prose-code': theme('colors.gray.900'),
           '--tw-prose-code-bg': theme('colors.primary.50'),
           '--tw-prose-pre-code': theme('colors.primary.100'),
-          '--tw-prose-pre-bg': theme('colors.secondary.900'),
-          '--tw-prose-th-borders': theme('colors.primary.300'),
-          '--tw-prose-td-borders': theme('colors.primary.200'),
-          '--tw-prose-th-bg': theme('colors.primary.50'),
+          '--tw-prose-pre-bg': theme('colors.gray.900'),
+          '--tw-prose-th-borders': theme('colors.gray.300'),
+          '--tw-prose-td-borders': theme('colors.gray.200'),
+          '--tw-prose-th-bg': theme('colors.gray.100'),
+
           // Dark mode
-          '--tw-prose-invert-body': theme('colors.primary.200'),
-          '--tw-prose-invert-headings': theme('colors.white'),
-          '--tw-prose-invert-lead': theme('colors.primary.300'),
-          '--tw-prose-invert-links': theme('colors.primary.400'),
-          '--tw-prose-invert-bold': theme('colors.white'),
-          '--tw-prose-invert-counters': theme('colors.primary.400'),
-          '--tw-prose-invert-bullets': theme('colors.primary.600'),
-          '--tw-prose-invert-hr': theme('colors.primary.700'),
-          '--tw-prose-invert-quotes': theme('colors.primary.100'),
-          '--tw-prose-invert-quote-borders': theme('colors.primary.700'),
-          '--tw-prose-invert-captions': theme('colors.primary.400'),
-          '--tw-prose-invert-code': theme('colors.white'),
-          '--tw-prose-invert-pre-code': theme('colors.primary.300'),
-          '--tw-prose-invert-pre-bg': 'rgb(0 0 0 / 50%)',
-          '--tw-prose-invert-th-borders': theme('colors.primary.600'),
-          '--tw-prose-invert-td-borders': theme('colors.primary.700'),
-          '--tw-prose-invert-th-bg': theme('colors.primary.700'),
+          '--tw-prose-invert-body': theme('colors.white'),
+          '--tw-prose-invert-headings': theme('colors.secondary.100'),
+          '--tw-prose-invert-lead': theme('colors.secondary.400'),
+          '--tw-prose-invert-links': theme('colors.primary.500'),
+          '--tw-prose-invert-bold': theme('colors.secondary.100'),
+          '--tw-prose-invert-counters': theme('colors.gray.400'),
+          '--tw-prose-invert-bullets': theme('colors.gray.400'),
+          '--tw-prose-invert-hr': theme('colors.primary.800'),
+          '--tw-prose-invert-quotes': theme('colors.secondary.100'),
+          '--tw-prose-invert-quote-borders': theme('colors.gray.500'),
+          '--tw-prose-invert-captions': theme('colors.secondary.300'),
+          '--tw-prose-invert-code': theme('colors.secondary.100'),
+          '--tw-prose-invert-code-bg': theme('colors.primary.950'),
+          '--tw-prose-invert-pre-code': theme('colors.primary.900'),
+          '--tw-prose-invert-pre-bg': theme('colors.secondary.100'),
+          '--tw-prose-invert-th-borders': theme('colors.gray.600'),
+          '--tw-prose-invert-td-borders': theme('colors.gray.700'),
+          '--tw-prose-invert-th-bg': theme('colors.gray.800'),
         },
       },
     }),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plutonium
 version: !ruby/object:Gem::Version
-  version: 0.15.23
+  version: 0.15.24
 platform: ruby
 authors:
 - Stefan Froelich
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-30 00:00:00.000000000 Z
+date: 2024-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -1400,16 +1400,16 @@ files:
 - lib/plutonium/ui/component/kit.rb
 - lib/plutonium/ui/component/methods.rb
 - lib/plutonium/ui/display/base.rb
-- lib/plutonium/ui/display/component/association_field.rb
-- lib/plutonium/ui/display/component/markdown_field.rb
+- lib/plutonium/ui/display/component/association.rb
+- lib/plutonium/ui/display/component/markdown.rb
 - lib/plutonium/ui/display/resource.rb
 - lib/plutonium/ui/display/theme.rb
 - lib/plutonium/ui/dyna_frame/content.rb
 - lib/plutonium/ui/dyna_frame/host.rb
 - lib/plutonium/ui/empty_card.rb
 - lib/plutonium/ui/form/base.rb
-- lib/plutonium/ui/form/components/easymde_input.rb
-- lib/plutonium/ui/form/components/flatpickr_input.rb
+- lib/plutonium/ui/form/components/easymde.rb
+- lib/plutonium/ui/form/components/flatpickr.rb
 - lib/plutonium/ui/form/concerns/renders_nested_resource_fields.rb
 - lib/plutonium/ui/form/interaction.rb
 - lib/plutonium/ui/form/options/inferred_types.rb

data/lib/plutonium/ui/display/component/markdown_field.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-require "redcarpet"
-
-module Plutonium
-  module UI
-    module Display
-      module Component
-        class MarkdownField < Phlexi::Display::Components::Base
-          include Phlexi::Display::Components::Concerns::DisplaysValue
-
-          RENDERER = Redcarpet::Markdown.new(Redcarpet::Render::HTML, autolink: true, tables: true)
-
-          def render_value(value)
-            article(**attributes) do
-              unsafe_raw RENDERER.render(value)
-            end
-          end
-
-          private
-
-          def normalize_value(value)
-            if value.respond_to?(:to_plain_text)
-              value.to_plain_text
-            else
-              value.to_s
-            end
-          end
-        end
-      end
-    end
-  end
-end