marksmith 0.4.7 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62f9a5e002be55fbc62e42fc3165b217d7893f979af1f0eb4aa89ef0d166b277
-  data.tar.gz: 8bce1f20da34493ded4fe5a6e6733eef3959446d5d341dbe7c0e843d407a0075
+  metadata.gz: dbea84daf14b0cab90133771f9d26505444de0aa469d28a0f51d2fdb1994d2c9
+  data.tar.gz: 754e03293a485251d0b5cac5dc48ee1d5214569a884946e3dda554c691a7d51d
 SHA512:
-  metadata.gz: 20b2f362164dbb1f77516357cc6971078dd765af76622ae5a46fb048c5c1922d5f9255ae73a9693a41964ad843fe739790b61fdc1195cef7b9c21c4abedc0767
-  data.tar.gz: a33663a174af96878c6beb88ce67a94a78260a9bcdfc27434e82c67ffc157185135fbcc11f9f77c38589a7c9735d95ab9b81aaa6d2f386634568cd60a062bdee
+  metadata.gz: cfbabde6a50498855311b9dd7a017ac52886387e57b8dfc57d2c0b4c1535beed32f9d4111816ed91904e6cc8873f18ff9b6d5f9f352631a2f3063eb0509ab048
+  data.tar.gz: 0757d7e8d1c6d7c479f75e081aaf7a5fede993ae1a15b03217163f864f3f4627e9db8c9561260b1faa1850e0ae61f5e2a2b0a9e28bc6b077e9caec2c4680fb66

data/README.md

@@ -23,6 +23,13 @@ Temporary live demo here, under the description field: [https://main.avodemo.com
 
 ## Installation
 
+#### Prerequisites
+
+Marksmith integrates with Rails apps using Stimulus controllers and Turbo Streams, so the following must already be installed and configured:
+- [`@hotwired/stimulus` package](https://github.com/hotwired/stimulus)
+- [`@hotwired/turbo` package](https://github.com/hotwired/turbo)
+- [`turbo-rails` gem](https://github.com/hotwired/turbo-rails)
+
 #### 1. Add `marksmith` to your `Gemfile`
 
 Have Bundler add it by running this command:
@@ -187,6 +194,30 @@ Marksmith.configure do |config|
 end
 ```
 
+If you're using `redcarpet`, you can override the default parser flags through configuration. The defaults match the built-in behavior.
+
+```ruby
+# config/initializers/marksmith.rb
+Marksmith.configure do |config|
+  config.parser = "redcarpet"
+  config.redcarpet_options = {
+    underline: false,
+    highlight: false
+  }
+end
+```
+
+Or override individual flags directly:
+
+```ruby
+# config/initializers/marksmith.rb
+Marksmith.configure do |config|
+  config.parser = "redcarpet"
+  config.redcarpet_options.underline = false
+  config.redcarpet_options.highlight = false
+end
+```
+
 ### Add your own renderer
 
 You can completely customize the renderer by overriding the `Marksmith::Renderer` model.

data/app/assets/images/marksmith/svgs/markdown.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 24 24" role="img" class="ms:inline ms:size-4"><script xmlns="" src="chrome-extension://hoklmmgfnpapgjgcpechhaamimifchmp/frame_ant/frame_ant.js"/><title>Markdown icon</title><path d="M22.269 19.385H1.731a1.73 1.73 0 0 1-1.73-1.73V6.345a1.73 1.73 0 0 1 1.73-1.73h20.538a1.73 1.73 0 0 1 1.73 1.73v11.308a1.73 1.73 0 0 1-1.73 1.731zm-16.5-3.462v-4.5l2.308 2.885 2.307-2.885v4.5h2.308V8.078h-2.308l-2.307 2.885-2.308-2.885H3.461v7.847zM21.231 12h-2.308V8.077h-2.307V12h-2.308l3.461 4.039z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 24 24" role="img" class="ms:inline ms:size-4"><title>Markdown icon</title><path d="M22.269 19.385H1.731a1.73 1.73 0 0 1-1.73-1.73V6.345a1.73 1.73 0 0 1 1.73-1.73h20.538a1.73 1.73 0 0 1 1.73 1.73v11.308a1.73 1.73 0 0 1-1.73 1.731zm-16.5-3.462v-4.5l2.308 2.885 2.307-2.885v4.5h2.308V8.078h-2.308l-2.307 2.885-2.308-2.885H3.461v7.847zM21.231 12h-2.308V8.077h-2.307V12h-2.308l3.461 4.039z"/></svg>

data/app/assets/javascripts/list_continuation_controller-full.esm.js

@@ -1,5 +1,5 @@
 /*!
-Marksmith 0.4.7
+Marksmith 0.5.1
 */
 var ListContinuationController = (function () {
     'use strict';

data/app/assets/javascripts/list_continuation_controller-no-stimulus.esm.js

@@ -1,5 +1,5 @@
 /*!
-Marksmith 0.4.7
+Marksmith 0.5.1
 */
 var ListContinuationController = (function (stimulus) {
   'use strict';

data/app/assets/javascripts/marksmith_controller-full.esm.js

@@ -1,5 +1,5 @@
 /*!
-Marksmith 0.4.7
+Marksmith 0.5.1
 */
 var MarksmithController = (function () {
     'use strict';

data/app/assets/javascripts/marksmith_controller-no-stimulus.esm.js

@@ -1,5 +1,5 @@
 /*!
-Marksmith 0.4.7
+Marksmith 0.5.1
 */
 var MarksmithController = (function (stimulus) {
     'use strict';

data/app/assets/stylesheets/marksmith.css

@@ -373,9 +373,6 @@
 .ms\:pointer-events-none {
   pointer-events: none;
 }
-.ms\:-my-px {
-  margin-block: -1px;
-}
 .ms\:prose {
   color: var(--tw-prose-body);
   max-width: 65ch;
@@ -791,6 +788,12 @@
     margin-bottom: 0;
   }
 }
+.ms\:-mt-px {
+  margin-top: -1px;
+}
+.ms\:-mb-px {
+  margin-bottom: -1px;
+}
 .ms\:-ml-px {
   margin-left: -1px;
 }
@@ -817,8 +820,8 @@
   width: 100%;
   height: 100%;
 }
-.ms\:h-\[calc\(100\%\+3px\)\] {
-  height: calc(100% + 3px);
+.ms\:h-\[calc\(100\%\+2px\)\] {
+  height: calc(100% + 2px);
 }
 .ms\:min-h-60 {
   min-height: calc(var(--ms-spacing) * 60);
@@ -856,6 +859,9 @@
 .ms\:items-center {
   align-items: center;
 }
+.ms\:justify-between {
+  justify-content: space-between;
+}
 .ms\:gap-1 {
   gap: calc(var(--ms-spacing) * 1);
 }
@@ -878,6 +884,9 @@
 .ms\:rounded-md {
   border-radius: var(--ms-radius-md);
 }
+.ms\:rounded-none {
+  border-radius: 0;
+}
 .ms\:rounded-t-md {
   border-top-left-radius: var(--ms-radius-md);
   border-top-right-radius: var(--ms-radius-md);
@@ -1130,9 +1139,14 @@
     border-color: var(--ms-color-neutral-500);
   }
 }
-.ms\:\[\.active\]\:bg-neutral-50 {
+.ms\:\[\.active\]\:border-b-transparent {
+  &:is(.active) {
+    border-bottom-color: transparent;
+  }
+}
+.ms\:\[\.active\]\:bg-white {
   &:is(.active) {
-    background-color: var(--ms-color-neutral-50);
+    background-color: var(--ms-color-white);
   }
 }
 .ms\:\[\.active\]\:text-neutral-900 {

data/app/helpers/marksmith/marksmith_helper.rb

@@ -42,11 +42,11 @@ module Marksmith
         "marksmith-toggle-button ms:text-sm ms:hover:bg-neutral-300 ms:text-sm ms:font-medium ms:cursor-pointer ms:text-neutral-500 ms:px-3",
         # borders
         "ms:bg-transparent ms:hover:bg-transparent",
-        "ms:-my-px ms:-ml-px ms:border ms:border-transparent",
-        "ms:h-[calc(100%+3px)] ms:border-b-none",
+        "ms:-mt-px ms:-mb-px ms:-ml-px ms:border ms:border-transparent",
+        "ms:h-[calc(100%+2px)] ms:border-b-none",
         # "ms:border-b-neutral-00",
         # active classes
-        "ms:[.active]:bg-neutral-50 ms:[.active]:text-neutral-900 ms:dark:[.active]:text-neutral-300 ms:[.active]:dark:bg-neutral-800 ms:[.active]:dark:border-neutral-500 ms:[.active]:rounded-t-md ms:[.active]:border-neutral-500",
+        "ms:[.active]:bg-white ms:[.active]:text-neutral-900 ms:dark:[.active]:text-neutral-300 ms:[.active]:dark:bg-neutral-800 ms:[.active]:dark:border-neutral-500 ms:[.active]:rounded-t-md ms:[.active]:border-neutral-500 ms:[.active]:border-b-transparent",
 
       )
     end

data/app/models/marksmith/renderer.rb

@@ -23,17 +23,7 @@ module Marksmith
     def render_redcarpet
       ::Redcarpet::Markdown.new(
         ::Redcarpet::Render::HTML,
-        tables: true,
-        lax_spacing: true,
-        fenced_code_blocks: true,
-        space_after_headers: true,
-        hard_wrap: true,
-        autolink: true,
-        strikethrough: true,
-        underline: true,
-        highlight: true,
-        quote: true,
-        with_toc_data: true
+        Marksmith.configuration.redcarpet_options.to_h
       ).render(@body)
     end
 

data/app/views/marksmith/shared/_editor_pane.html.erb

@@ -2,7 +2,7 @@
   <%= text_area_tag editor.field_name, editor.value,
     id: editor.textarea_id,
     class: class_names(
-      "marksmith-textarea ms:flex ms:flex-1 ms:border-none ms:resize-none ms:focus:outline-none ms:font-mono ms:focus:ring-0 ms:leading-normal ms:p-2 ms:text-sm ms:field-sizing-content ms:min-h-60",
+      "marksmith-textarea ms:flex ms:flex-1 ms:border-none ms:resize-none ms:focus:outline-none ms:font-mono ms:focus:ring-0 ms:leading-normal ms:p-2 ms:text-sm ms:field-sizing-content ms:min-h-60 ms:rounded-none",
       "ms:dark:bg-neutral-800 ms:dark:text-neutral-200",
       editor.classes
     ),

data/app/views/marksmith/shared/_toolbar.html.erb

@@ -1,5 +1,5 @@
 <%= tag.div class: class_names(
-  "marksmith-toolbar ms:flex-1 ms:flex-col-reverse ms:@md:flex-row ms:grow ms:flex  ms:justify-bewteen ms:bg-neutral-50 ms:rounded-t-md ms:gap-y-1",
+  "marksmith-toolbar ms:flex-1 ms:flex-col-reverse ms:@md:flex-row ms:grow ms:flex ms:justify-between ms:bg-neutral-50 ms:rounded-t-md ms:gap-y-1",
   "ms:dark:bg-neutral-700 ms:dark:text-neutral-200"
 ) do %>
   <%= render partial: "marksmith/shared/tabs" %>

data/lib/marksmith/configuration.rb

@@ -1,10 +1,53 @@
 module Marksmith
   class Configuration
-    include ActiveSupport::Configurable
+    class RedcarpetOptions
+      DEFAULTS = {
+        tables: true,
+        lax_spacing: true,
+        fenced_code_blocks: true,
+        space_after_headers: true,
+        hard_wrap: true,
+        autolink: true,
+        strikethrough: true,
+        underline: true,
+        highlight: true,
+        quote: true,
+        with_toc_data: true
+      }.freeze
 
-    config_accessor(:automatically_mount_engine) { true }
-    config_accessor(:mount_path) { "/marksmith" }
-    config_accessor(:parser) { "commonmarker" }
+      DEFAULTS.each do |name, default|
+        class_attribute name, default: default
+      end
+
+      def self.merge(options)
+        options.to_h.each do |key, value|
+          writer = "#{key}="
+
+          unless respond_to?(writer)
+            raise ArgumentError, "Unknown Redcarpet option: #{key}"
+          end
+
+          public_send(writer, value)
+        end
+
+        self
+      end
+
+      def self.to_h
+        DEFAULTS.keys.each_with_object({}) do |key, hash|
+          hash[key] = public_send(key)
+        end
+      end
+    end
+
+    class_attribute :automatically_mount_engine, default: true
+    class_attribute :mount_path, default: "/marksmith"
+    class_attribute :parser, default: "commonmarker"
+    class_attribute :redcarpet_options, default: RedcarpetOptions
+
+    def redcarpet_options=(options)
+      self.class.redcarpet_options = redcarpet_options.merge(options.to_h)
+    end
   end
 
   def self.configuration

data/lib/marksmith/version.rb

@@ -1,3 +1,3 @@
 module Marksmith
-  VERSION = "0.4.7"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marksmith
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.5.1
 platform: ruby
 authors:
 - Adrian Marin