pagecord-cli 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf505ffa08cc845661d677e1b4e5175ed12151719a68bf6e36e74899aca6c735
-  data.tar.gz: 11c57b10cf54268f70bec8eab14c4daf2ffb3abc3b10183cbe90e6e3a9bb15a5
+  metadata.gz: 1e49c84bdd83870e36e7d68b218fd211dcae477a6b5b7afca0649785651f7bc2
+  data.tar.gz: c0f1f731273d36f8bc9626c5f5f7b3f596b34ca647187140b20afea957c88e42
 SHA512:
-  metadata.gz: 2d6eabb97a9acb6ee7c3f61f7ccc676d7db740b7b2516583218a0902ca8fc5b4950eeb4143b1315e9adce799193f48c72bcfa9d3e625c91130bee6c3df814186
-  data.tar.gz: 194d199f07c81ef3f6d385179e79222a5dac4b0984a2a470ff5f5ac52f0097992b013f264e443fec601ad1dc37e62ff9566a2bb68bccd82d15a2defc11a5f820
+  metadata.gz: 97a1e5baf19415337cf2a8d0a97bb888394f3550d2b6ce85f29e7039d1aae9ad58b30a5883f1ce63bcae691211c847eb5a84c6a074f4555cb4cf4f57e35fe812
+  data.tar.gz: 54bc9279534fe8ce1210cfa4fb3ce962b273c23ae60654d9e96065372b16bf7211e89868d16fb5cb6a63a07e75563259fe5d9d41acb9ffc1b490528712098c64

data/README.md

@@ -210,9 +210,13 @@ Action Text attachments:
 
 ```markdown
 ![Alt text](photo.jpg)
+![Alt text](my photo.jpg "A caption")
 ![[photo.jpg]]
 ```
 
+The alt text and an optional quoted caption go onto the image. Filenames can
+contain spaces.
+
 Supported local image types are JPEG, PNG, GIF, and WebP. External image URLs
 and HTML `<img>` tags are left alone.
 

data/lib/pagecord_cli/SKILL.md

@@ -65,7 +65,8 @@ pagecord draft notes/idea.md         # save as a draft
 The first run writes a `pagecord_token` into the file's front matter, and later
 runs update that same post. Front matter can set `title`, `slug`, `tags`,
 `published_at`, `canonical_url`, `hidden` and `locale`. Local images written as
-`![alt](photo.jpg)` are uploaded.
+`![alt](photo.jpg "Caption")` are uploaded with their alt text and
+optional caption.
 
 ## Restyling a blog
 

data/lib/pagecord_cli/image_uploads.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
 require "digest"
+require "cgi/escape"
+require "uri"
 
 module PagecordCLI
   class ImageUploads
-    MARKDOWN_IMAGE = /!\[([^\]]*)\]\(([^)]+)\)/
+    MARKDOWN_IMAGE = /!\[([^\]]*)\]\(([^)"]+?)(?:\s+"([^"]*)")?\)/
     OBSIDIAN_IMAGE = /!\[\[([^\]]+)\]\]/
     IMAGE_EXTENSIONS = /\.(jpe?g|png|gif|webp)\z/i
 
@@ -20,8 +22,9 @@ module PagecordCLI
 
     def process
       with_markdown_images = content.gsub(MARKDOWN_IMAGE) do |match|
-        path = Regexp.last_match(2)
-        local_path?(path) ? attachment_tag_for(path) : match
+        alt, path, caption = Regexp.last_match.captures
+        path = decode_path(path)
+        local_path?(path) ? attachment_tag_for(path, alt: alt, caption: caption) : match
       end
 
       with_markdown_images.gsub(OBSIDIAN_IMAGE) do |match|
@@ -32,9 +35,20 @@ module PagecordCLI
 
     private
 
-      def attachment_tag_for(path)
+      def attachment_tag_for(path, alt: nil, caption: nil)
         sgid = cached_sgid(path) || upload(path)
-        %(<action-text-attachment sgid="#{sgid}"></action-text-attachment>)
+        %(<action-text-attachment sgid="#{sgid}"#{attribute("alt", alt)}#{attribute("caption", caption)}></action-text-attachment>)
+      end
+
+      def attribute(name, value)
+        %( #{name}="#{CGI.escapeHTML(value)}") unless value.to_s.empty?
+      end
+
+      # A filename can contain a literal "%", as in 100%.jpg.
+      def decode_path(path)
+        URI.decode_uri_component(path)
+      rescue ArgumentError
+        path
       end
 
       def cached_sgid(path)
@@ -74,7 +88,8 @@ module PagecordCLI
       end
 
       def checksum(path)
-        Digest::SHA256.file(path).hexdigest[0, 16]
+        @checksums ||= {}
+        @checksums[path] ||= Digest::SHA256.file(path).hexdigest[0, 16]
       end
 
       def filename(path)

data/lib/pagecord_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PagecordCLI
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pagecord-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Olly Headey