ruby_cms 0.2.1.1 → 1.0.1

data/lib/generators/ruby_cms/templates/javascript/controllers/webauthn_controller.js

@@ -0,0 +1,153 @@
+import { Controller } from "@hotwired/stimulus"
+
+// Base64url <-> ArrayBuffer helpers (WebAuthn wire format).
+function b64urlToBuf(b64url) {
+  const b64 = b64url.replace(/-/g, "+").replace(/_/g, "/")
+  const pad = b64.length % 4 ? "=".repeat(4 - (b64.length % 4)) : ""
+  const bin = atob(b64 + pad)
+  const buf = new Uint8Array(bin.length)
+  for (let i = 0; i < bin.length; i++) buf[i] = bin.charCodeAt(i)
+  return buf.buffer
+}
+
+function bufToB64url(buf) {
+  const bytes = new Uint8Array(buf)
+  let bin = ""
+  for (const b of bytes) bin += String.fromCharCode(b)
+  return btoa(bin).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "")
+}
+
+function csrfToken() {
+  return document.querySelector("meta[name='csrf-token']")?.content
+}
+
+async function postJson(url, body) {
+  const res = await fetch(url, {
+    method: "POST",
+    headers: { "Content-Type": "application/json", "X-CSRF-Token": csrfToken() },
+    body: body ? JSON.stringify(body) : null,
+    cache: "no-store",
+    credentials: "same-origin"
+  })
+  return res.json()
+}
+
+export default class extends Controller {
+  static values = {
+    optionsUrl: String,    // endpoint that returns WebAuthn options
+    callbackUrl: String,   // endpoint that receives the credential
+    conditional: Boolean   // login page: offer the passkey via autofill (conditional UI)
+  }
+
+  connect() {
+    if (this.conditionalValue) this.#startConditional()
+  }
+
+  disconnect() {
+    this._conditionalAbort?.abort()
+  }
+
+  // Conditional UI: lets 1Password / the browser surface the passkey in the
+  // autocomplete menu of a field marked autocomplete="...webauthn", instead of
+  // only offering the password. Waits silently until the user picks the passkey.
+  async #startConditional() {
+    try {
+      if (!window.PublicKeyCredential?.isConditionalMediationAvailable) return
+      if (!(await PublicKeyCredential.isConditionalMediationAvailable())) return
+
+      const options = await postJson(this.optionsUrlValue)
+      options.challenge = b64urlToBuf(options.challenge)
+      if (options.allowCredentials) {
+        options.allowCredentials.forEach(c => (c.id = b64urlToBuf(c.id)))
+      }
+      this._conditionalAbort = new AbortController()
+      const credential = await navigator.credentials.get({
+        publicKey: options,
+        mediation: "conditional",
+        signal: this._conditionalAbort.signal
+      })
+      const result = await postJson(this.callbackUrlValue, {
+        credential: this.#serialize(credential, "authenticatorData")
+      })
+      if (result.redirect) window.location.assign(result.redirect)
+    } catch (e) {
+      // AbortError (user chose another method) / no passkey — silent, button still works.
+    }
+  }
+
+  // Registration: create a new passkey.
+  async register(event) {
+    event.preventDefault()
+    try {
+      const options = await postJson(this.optionsUrlValue)
+      options.challenge = b64urlToBuf(options.challenge)
+      options.user.id = b64urlToBuf(options.user.id)
+      if (options.excludeCredentials) {
+        options.excludeCredentials.forEach(c => (c.id = b64urlToBuf(c.id)))
+      }
+      const credential = await navigator.credentials.create({ publicKey: options })
+      const transports = credential.response.getTransports?.() || []
+      const result = await postJson(this.callbackUrlValue, {
+        credential: this.#serialize(credential, "attestationObject"),
+        transports: transports,
+        nickname: this.element.querySelector("[name=nickname]")?.value
+      })
+      if (result.error) { this.#fail(result.error); return }
+      if (result.redirect) window.location.assign(result.redirect)
+    } catch (e) {
+      this.#fail("Passkey registration was cancelled or failed.")
+      console.error("[webauthn] register failed:", e)
+    }
+  }
+
+  // Login: assert an existing passkey (usernameless).
+  async authenticate(event) {
+    event.preventDefault()
+    this._conditionalAbort?.abort() // stop the autofill request so challenges don't clash
+    try {
+      const options = await postJson(this.optionsUrlValue)
+      options.challenge = b64urlToBuf(options.challenge)
+      if (options.allowCredentials) {
+        options.allowCredentials.forEach(c => (c.id = b64urlToBuf(c.id)))
+      }
+      const credential = await navigator.credentials.get({ publicKey: options })
+      const result = await postJson(this.callbackUrlValue, {
+        credential: this.#serialize(credential, "authenticatorData")
+      })
+      if (result.error) { this.#fail(result.error); return }
+      if (result.redirect) window.location.assign(result.redirect)
+    } catch (e) {
+      this.#fail("Passkey sign-in was cancelled or failed.")
+      console.error("[webauthn] authenticate failed:", e)
+    }
+  }
+
+  #fail(message) {
+    let el = this.element.querySelector("[data-webauthn-error]")
+    if (!el) {
+      el = document.createElement("p")
+      el.setAttribute("data-webauthn-error", "")
+      el.className = "mt-3 text-sm text-red-600"
+      this.element.prepend(el)
+    }
+    el.textContent = message
+  }
+
+  #serialize(credential, extra) {
+    const r = credential.response
+    const out = {
+      id: credential.id,
+      type: credential.type,
+      rawId: bufToB64url(credential.rawId),
+      response: { clientDataJSON: bufToB64url(r.clientDataJSON) }
+    }
+    if (extra === "attestationObject") {
+      out.response.attestationObject = bufToB64url(r.attestationObject)
+    } else {
+      out.response.authenticatorData = bufToB64url(r.authenticatorData)
+      out.response.signature = bufToB64url(r.signature)
+      out.response.userHandle = r.userHandle ? bufToB64url(r.userHandle) : null
+    }
+    return out
+  }
+}

data/lib/generators/ruby_cms/templates/lib/ruby_cms/cli.rb

@@ -0,0 +1,170 @@
+# frozen_string_literal: true
+
+require "thor"
+
+module RubyCms
+  class CLI < Thor
+    default_task :setup_admin
+
+    desc "setup_admin",
+         "Interactively create or select the first admin user and grant full permissions"
+    def setup_admin
+      RunSetupAdmin.call(shell:)
+    end
+
+    private
+
+    def shell
+      @shell ||= Thor::Shell::Basic.new
+    end
+  end
+
+  # Logic for the interactive first-admin setup. Uses Thor::Shell for prompts.
+  class RunSetupAdmin
+    ADMIN_PERMISSION_KEYS = %w[
+      manage_admin manage_permissions manage_content_blocks manage_visitor_errors manage_analytics
+    ].freeze
+
+    class << self
+      def call(shell: Thor::Shell::Basic.new)
+        new(shell:).call
+      end
+    end
+
+    def initialize(shell:)
+      @shell = shell
+    end
+
+    def call
+      ::Permission.ensure_defaults!
+      user_class = Rails.application.config.ruby_cms.user_class_name.constantize
+      email_attr = user_class.column_names.include?("email_address") ? :email_address : :email
+
+      user = choose_or_create_user(user_class, email_attr)
+      return if user.nil?
+
+      grant_permissions(user)
+      notify_success(user, email_attr)
+    end
+
+    private
+
+    def notify_success(user, email_attr)
+      @shell.say(
+        "\nDone. #{user.public_send(email_attr)} now has all #{::Permission.count} admin permissions.",
+        :green
+      )
+      @shell.say("Visit /admin to sign in.", :green)
+    end
+
+    def choose_or_create_user(user_class, email_attr)
+      users = fetch_recent_users(user_class)
+
+      if users.any?
+        prompt_existing_users(users, email_attr)
+      else
+        @shell.say("\nNo users yet. Create the first admin user.")
+        create_user(user_class, email_attr)
+      end
+    end
+
+    def fetch_recent_users(user_class)
+      user_class.order(id: :asc).limit(20).to_a
+    end
+
+    def prompt_existing_users(users, email_attr)
+      display_users(users, email_attr)
+      choice = ask_for_user_choice(users.size)
+
+      case choice
+      when "0"
+        find_or_create_by_email(users.first.class, email_attr)
+      else
+        select_user_or_fallback(users, choice.to_i, email_attr)
+      end
+    end
+
+    def display_users(users, email_attr)
+      @shell.say("\nExisting users:", :bold)
+      users.each_with_index do |u, i|
+        @shell.say("  #{i + 1}. #{u.public_send(email_attr)}")
+      end
+      @shell.say("  0. Enter another email (or create new user)")
+    end
+
+    def ask_for_user_choice(max)
+      @shell.ask("Select (0–#{max}):", default: "1").to_s.strip
+    end
+
+    def select_user_or_fallback(users, index, email_attr)
+      if index.between?(1, users.size)
+        users[index - 1]
+      else
+        find_or_create_by_email(users.first.class, email_attr)
+      end
+    end
+
+    def find_or_create_by_email(user_class, email_attr)
+      email = @shell.ask("Email:").to_s.strip
+      return nil if email.blank?
+
+      user = user_class.find_by(email_attr => email)
+      if user
+        user
+      else
+        @shell.say("User not found.")
+        create = @shell.yes?("Create new user with this email?", default: true)
+        create ? create_user_with_email(user_class, email_attr, email) : nil
+      end
+    end
+
+    def create_user(user_class, email_attr)
+      email = @shell.ask("Email:").to_s.strip
+      return nil if email.blank?
+
+      create_user_with_email(user_class, email_attr, email)
+    end
+
+    def create_user_with_email(user_class, email_attr, email)
+      password, password_confirmation = ask_password_and_confirmation
+      return nil if password.blank? || password_confirmation.blank?
+
+      attrs = {
+        email_attr => email, password: password,
+        password_confirmation: password_confirmation
+      }
+      user_class.create!(attrs)
+    rescue ActiveRecord::RecordInvalid => e
+      @shell.say("Could not create user: #{e.record.errors.full_messages.to_sentence}", :red)
+      nil
+    end
+
+    def ask_password_and_confirmation
+      password = ask_password("Password:")
+      return [ nil, nil ] if password.blank?
+
+      password_confirmation = ask_password("Password (again):")
+      return [ password, password_confirmation ] unless password != password_confirmation
+
+      @shell.say("Passwords did not match. Aborted.", :red)
+      [ nil, nil ]
+    end
+
+    def ask_password(prompt)
+      if $stdin.respond_to?(:noecho) && $stdin.tty?
+        @shell.say("#{prompt} (hidden)")
+        $stdin.noecho { $stdin.gets&.chomp }.to_s
+      else
+        @shell.ask("#{prompt}:").to_s.strip
+      end
+    end
+
+    # Admin gets EVERY permission (all modules), not just a core subset.
+    def grant_permissions(user)
+      ::Permission.ensure_defaults!
+      ::Permission.find_each do |perm|
+        ::UserPermission.find_or_create_by!(user: user, permission: perm)
+      end
+    end
+  end
+end

data/lib/generators/ruby_cms/templates/lib/ruby_cms/commands_registry.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+module RubyCms
+  # Host apps register runnable commands (usually Rake tasks) shown on Admin → Commands.
+  module CommandsRegistry
+    def registered_commands
+      @registered_commands ||= []
+    end
+
+    def registered_commands=(list)
+      @registered_commands = list
+    end
+
+    CATEGORIES = %w[content maintenance email custom].freeze
+    PARAM_TYPES = %w[toggle text select].freeze
+
+    # Register a button-triggered command for the admin Commands screen.
+    #
+    # @param key [String, Symbol] Unique id (e.g. :copy_en_to_nl)
+    # @param label [String] Button label
+    # @param rake_task [String] Full rake task name, including args in brackets if needed
+    # @param description [String, nil] Optional help text
+    # @param permission [Symbol] Required to run (+can?+); default +:manage_admin+
+    # @param category [String, Symbol] One of CATEGORIES; default "custom"
+    # @param schedule [String, nil] Free-text human-readable schedule (e.g. "Iedere nacht 03:00")
+    # @param params [Array<Hash>] Parameter descriptors. Each: { key:, label:, type: 'toggle'|'text'|'select', default:, options: [..], description: }
+    def register_command(key:, label:, rake_task:, description: nil, permission: :manage_admin,
+                         category: :custom, schedule: nil, params: [])
+      k = key.to_s
+      entry = {
+        key: k,
+        label: label.to_s,
+        rake_task: rake_task.to_s,
+        description: description.to_s.presence,
+        permission: permission.to_sym,
+        category: normalize_category(category),
+        schedule: schedule.to_s.presence,
+        params: Array(params).map { |p| normalize_param(p) }
+      }
+      self.registered_commands = registered_commands.reject { |e| e[:key] == k } + [ entry ]
+      entry
+    end
+
+    def find_command(key)
+      registered_commands.find { |e| e[:key] == key.to_s }
+    end
+
+    private
+
+    def normalize_category(c)
+      v = c.to_s.downcase
+      CATEGORIES.include?(v) ? v : "custom"
+    end
+
+    def normalize_param(p)
+      h = p.respond_to?(:to_h) ? p.to_h : {}
+      h = h.transform_keys(&:to_sym)
+      type = h[:type].to_s
+      type = "text" unless PARAM_TYPES.include?(type)
+      {
+        key: h[:key].to_s,
+        label: h[:label].to_s.presence || h[:key].to_s.humanize,
+        type: type,
+        default: if h.key?(:default)
+                   h[:default]
+                 else
+                   (type == "toggle" ? false : "")
+                 end,
+        options: Array(h[:options]).map(&:to_s),
+        description: h[:description].to_s.presence
+      }
+    end
+  end
+
+  extend CommandsRegistry
+end

data/lib/{ruby_cms → generators/ruby_cms/templates/lib/ruby_cms}/content_blocks_grouping.rb

@@ -7,22 +7,18 @@ module RubyCms
         published
       end
 
-      def model_name # rubocop:disable Rails/Delegate
-        ::ContentBlock.model_name
-      end
+      delegate :model_name, to: :'::ContentBlock'
     end
 
     class << self
-      # rubocop:disable Rails/Blank -- use plain Ruby for standalone unit specs without Rails
       def group_by_key(collection)
         return [] if collection.nil? || collection.empty?
 
         collection
           .group_by(&:key)
-          .map {|key, blocks| build_row(key, blocks) }
+          .map { |key, blocks| build_row(key, blocks) }
           .sort_by(&:key)
       end
-      # rubocop:enable Rails/Blank
 
       def build_row(key, blocks)
         first = blocks.first

data/lib/{ruby_cms → generators/ruby_cms/templates/lib/ruby_cms}/content_blocks_sync.rb

@@ -18,7 +18,7 @@ module RubyCms
     # @param flatten_keys [Boolean] If true, flatten dot-separated keys into nested structure
     # @return [Hash] Summary of exported blocks per locale
     def export_to_yaml(only_published: true, flatten_keys: false)
-      scope = only_published ? RubyCms::ContentBlock.published : RubyCms::ContentBlock.all
+      scope = only_published ? ::ContentBlock.published : ::ContentBlock.all
       blocks_by_locale = scope.order(:key).group_by(&:locale)
 
       summary = {}
@@ -38,7 +38,7 @@ module RubyCms
     # @param published [Boolean] Set published status for imported blocks
     # @return [Hash] Summary of imported/updated blocks
     def import_from_yaml(locale: nil, create_missing: true, update_existing: true, published: false)
-      locales_to_process = locale ? [locale.to_sym] : I18n.available_locales
+      locales_to_process = locale ? [ locale.to_sym ] : I18n.available_locales
       summary = { created: 0, updated: 0, skipped: 0, errors: [] }
 
       locales_to_process.each do |loc|
@@ -139,7 +139,7 @@ module RubyCms
 
       if flatten_keys && key_str.include?(".")
         merge_nested_hash(target_hash, unflatten_key(key_str, content))
-        return 0
+        return 1
       end
 
       return 0 if target_hash[key_str] == content
@@ -203,7 +203,7 @@ module RubyCms
         flatten_hash(namespace_data)
       else
         # Filter out non-content-block keys (like activemodel, etc.)
-        filtered = locale_data[locale_key].reject {|k, _v| reserved_keys.include?(k.to_s) }
+        filtered = locale_data[locale_key].reject { |k, _v| reserved_keys.include?(k.to_s) }
         flatten_hash(filtered)
       end
     end
@@ -256,8 +256,6 @@ module RubyCms
         aliases: true
       }
 
-      return YAML.safe_load_file(path, **opts) if YAML.respond_to?(:safe_load_file)
-
       YAML.safe_load_file(path, **opts)
     end
 
@@ -271,7 +269,7 @@ module RubyCms
     end
 
     def import_block(key, content, locale, create_missing:, update_existing:, published:)
-      block = RubyCms::ContentBlock.find_by(key: key, locale: locale.to_s)
+      block = ::ContentBlock.find_by(key: key, locale: locale.to_s)
       return import_new_block(key, content, locale, published) if block.nil? && create_missing
       return { action: :skipped, error: nil } if block.nil?
       return { action: :skipped, error: nil } unless update_existing
@@ -280,7 +278,7 @@ module RubyCms
     end
 
     def import_new_block(key, content, locale, published)
-      block = RubyCms::ContentBlock.new(
+      block = ::ContentBlock.new(
         key: key,
         locale: locale.to_s,
         content: content.to_s,

data/lib/{ruby_cms → generators/ruby_cms/templates/lib/ruby_cms}/dashboard_blocks.rb

@@ -31,8 +31,8 @@ module RubyCms
       data: data
     }
 
-    self.dashboard_registry = dashboard_registry.reject {|e| e[:key] == normalized_key }
-    self.dashboard_registry += [entry]
+    self.dashboard_registry = dashboard_registry.reject { |e| e[:key] == normalized_key }
+    self.dashboard_registry += [ entry ]
 
     register_dashboard_setting!(entry)
     entry
@@ -40,9 +40,9 @@ module RubyCms
 
   def self.visible_dashboard_blocks(user: nil)
     dashboard_registry
-      .select {|e| e[:enabled] }
-      .select {|e| dashboard_block_visible?(e, user:) }
-      .sort_by {|e| [e[:section] == :stats ? 0 : 1, e[:order], e[:label]] }
+      .select { |e| e[:enabled] }
+      .select { |e| dashboard_block_visible?(e, user:) }
+      .sort_by { |e| [ e[:section] == :stats ? 0 : 1, e[:order], e[:label] ] }
   rescue StandardError => e
     Rails.logger.error("[RubyCMS] Error filtering dashboard blocks: #{e.message}") if defined?(Rails.logger)
     []

data/lib/{ruby_cms → generators/ruby_cms/templates/lib/ruby_cms}/icons.rb

@@ -16,7 +16,7 @@ module RubyCms
 
       document_duplicate: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" ' \
                           'd="M8 7v8a2 2 0 002 2h6M8 7V5a2 2 0 012-2h4.586a1 1 0 01.707.293l4.414 4.414' \
-                          'a1 1 0 01.293.707V15a2 2 0 01-2 2h-2M8 7H6a2 2 0 00-2 2v10a2 2 0 002 2h8a2 2 ' \
+                          "a1 1 0 01.293.707V15a2 2 0 01-2 2h-2M8 7H6a2 2 0 00-2 2v10a2 2 0 002 2h8a2 2 " \
                           '0 002-2v-2"></path>',
 
       chart_bar: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" ' \
@@ -26,7 +26,7 @@ module RubyCms
 
       shield_check: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" ' \
                     'd="M9 12l2 2 4-4m5.618-4.016A11.955 11.955 0 0112 2.944a11.955 11.955 0 01' \
-                    '-8.618 3.04A12.02 12.02 0 003 9c0 5.591 3.824 10.29 9 11.622 5.176-1.332 ' \
+                    "-8.618 3.04A12.02 12.02 0 003 9c0 5.591 3.824 10.29 9 11.622 5.176-1.332 " \
                     '9-6.03 9-11.622 0-1.042-.133-2.052-.382-3.016z"></path>',
 
       exclamation_triangle: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" ' \
@@ -39,13 +39,13 @@ module RubyCms
 
       cog_6_tooth: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" ' \
                    'd="M9.594 3.94c.09-.542.56-.94 1.11-.94h2.593c.55 0 1.02.398 1.11.94l.213 ' \
-                   '1.281c.063.374.313.686.645.87.074.04.147.083.22.127.324.196.72.257 1.075.124l1.217-.456a1.125 ' \
-                   '1.125 0 011.37.49l1.296 2.247a1.125 1.125 0 01-.26 1.431l-1.003.827c-.293.24-.438.613-.431.992a6.759 ' \
-                   '6.759 0 010 .255c-.007.378.138.75.43.99l1.005.828c.424.35.534.954.26 1.43l-1.298 2.247a1.125 1.125 ' \
-                   '0 01-1.369.491l-1.217-.456c-.355-.133-.75-.072-1.076.124a6.57 6.57 0 01-.22.128c-.331.183-.581.495-.644.869l-.213 ' \
-                   '1.28c-.09.543-.56.941-1.11.941h-2.594c-.55 0-1.02-.398-1.11-.94l-.213-1.281c-.062-.374-.312-.686-.644-.87a6.52 ' \
-                   '6.52 0 01-.22-.127c-.325-.196-.72-.257-1.076-.124l-1.217.456a1.125 1.125 0 01-1.369-.49l-1.297-2.247a1.125 ' \
-                   '1.125 0 01.26-1.431l1.004-.827c.292-.24.437-.613.43-.992a6.932 6.932 0 010-.255c.007-.378-.138-.75-.43-.99l-1.004-.828a1.125 ' \
+                   "1.281c.063.374.313.686.645.87.074.04.147.083.22.127.324.196.72.257 1.075.124l1.217-.456a1.125 " \
+                   "1.125 0 011.37.49l1.296 2.247a1.125 1.125 0 01-.26 1.431l-1.003.827c-.293.24-.438.613-.431.992a6.759 " \
+                   "6.759 0 010 .255c-.007.378.138.75.43.99l1.005.828c.424.35.534.954.26 1.43l-1.298 2.247a1.125 1.125 " \
+                   "0 01-1.369.491l-1.217-.456c-.355-.133-.75-.072-1.076.124a6.57 6.57 0 01-.22.128c-.331.183-.581.495-.644.869l-.213 " \
+                   "1.28c-.09.543-.56.941-1.11.941h-2.594c-.55 0-1.02-.398-1.11-.94l-.213-1.281c-.062-.374-.312-.686-.644-.87a6.52 " \
+                   "6.52 0 01-.22-.127c-.325-.196-.72-.257-1.076-.124l-1.217.456a1.125 1.125 0 01-1.369-.49l-1.297-2.247a1.125 " \
+                   "1.125 0 01.26-1.431l1.004-.827c.292-.24.437-.613.43-.992a6.932 6.932 0 010-.255c.007-.378-.138-.75-.43-.99l-1.004-.828a1.125 " \
                    '1.125 0 01-.26-1.43l1.297-2.247a1.125 1.125 0 011.37-.491l1.216.456c.356.133.751.072 1.076-.124.072-.044.146-.087.22-.128.332-.183.582-.495.644-.869l.214-1.281z"></path>' \
                    '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z"></path>',
 
@@ -84,6 +84,15 @@ module RubyCms
       list_bullet: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" ' \
                    'd="M4 6h16M4 10h16M4 14h16M4 18h16"></path>',
 
+      clipboard_document_list: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" ' \
+                               'd="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4"></path>',
+
+      bolt: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" ' \
+            'd="M13 10V3L4 14h7v7l9-11h-7z"></path>',
+
+      arrow_path: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" ' \
+                  'd="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15"></path>',
+
       plus_circle: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" ' \
                    'd="M12 9v3m0 0v3m0-3h3m-3 0H9m12 0a9 9 0 11-18 0 9 9 0 0118 0z"></path>',
 
@@ -99,7 +108,29 @@ module RubyCms
                    'd="M12 15v2m-6 4h12a2 2 0 002-2v-6a2 2 0 00-2-2H6a2 2 0 00-2 2v6a2 2 0 002 2zm10-10V7a4 4 0 00-8 0v4h8z"></path>',
 
       currency_dollar: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" ' \
-                       'd="M12 8c-1.657 0-3 .895-3 2s1.343 2 3 2 3 .895 3 2-1.343 2-3 2m0-8c1.11 0 2.08.402 2.599 1M12 8V7m0 1v8m0 0v1m0-1c-1.11 0-2.08-.402-2.599-1M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path>'
+                       'd="M12 8c-1.657 0-3 .895-3 2s1.343 2 3 2 3 .895 3 2-1.343 2-3 2m0-8c1.11 0 2.08.402 2.599 1M12 8V7m0 1v8m0 0v1m0-1c-1.11 0-2.08-.402-2.599-1M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path>',
+
+      calendar: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" ' \
+                'd="M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"></path>',
+
+      calendar_days: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" ' \
+                     'd="M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"></path>' \
+                     '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M7 11h2v2H7zm4 0h2v2h-2zm4 0h2v2h-2zM7 15h2v2H7zm4 0h2v2h-2z"></path>',
+
+      trophy: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" ' \
+              'd="M11.049 2.927c.3-.921 1.603-.921 1.902 0l1.519 4.674a1 1 0 00.95.69h4.915c.969 0 1.371 1.24.588 1.81l-3.976 2.888a1 1 0 00-.363 1.118l1.518 4.674c.3.922-.755 1.688-1.538 1.118l-3.976-2.888a1 1 0 00-1.176 0l-3.976 2.888c-.783.57-1.838-.197-1.538-1.118l1.518-4.674a1 1 0 00-.363-1.118l-3.976-2.888c-.784-.57-.38-1.81.588-1.81h4.914a1 1 0 00.951-.69l1.519-4.674z"></path>',
+
+      currency_euro: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" ' \
+                     'd="M14.121 15.536c-1.171 1.952-3.07 1.952-4.242 0-1.172-1.953-1.172-5.119 0-7.072 1.171-1.952 3.07-1.952 4.242 0M8 10.5h4m-4 3h4m9-1.5a9 9 0 11-18 0 9 9 0 0118 0z"></path>',
+
+      newspaper: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" ' \
+                 'd="M19 20H5a2 2 0 01-2-2V6a2 2 0 012-2h10a2 2 0 012 2v1m2 13a2 2 0 01-2-2V7m2 13a2 2 0 002-2V9a2 2 0 00-2-2h-2m-4-3H9M7 16h6M7 8h6v4H7V8z"></path>',
+
+      at_symbol: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" ' \
+                 'd="M16 12a4 4 0 10-8 0 4 4 0 008 0zm0 0v1.5a2.5 2.5 0 005 0V12a9 9 0 10-9 9m4.5-1.206a8.959 8.959 0 01-4.5 1.207"></path>',
+
+      table_cells: '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" ' \
+                   'd="M3 10h18M3 14h18m-9-4v8m-7 0h14a2 2 0 002-2V8a2 2 0 00-2-2H5a2 2 0 00-2 2v8a2 2 0 002 2z"></path>'
     }.freeze
 
     def self.resolve(name_or_svg)