joplin 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74c549d0f51425533265897cf2432dc52bfa866ef89f91bfaeb8565939b6c0ff
-  data.tar.gz: 46b1ee7c947603256778c0df08ba027d964d5451594374323a9a5dd2059f4afa
+  metadata.gz: '09242aa0b4f46f7d69424cb3267766eff3178e5a1ab3bc229c2e47b496427db3'
+  data.tar.gz: bea1752fa435abab2cb0477bc4565795343cdd50f962128439dee822ac5c29a2
 SHA512:
-  metadata.gz: b1c2eefbb3fa1405d54395ab787c9bd69fda22d8f6f84cba0f7efe792f93b70c6a557d09b7059a525e301ef26233cd5dc2d0c0fa4835f400d5b809e06101da95
-  data.tar.gz: 5367467b053246881bc9a4d539641765141984b77de421c7efa31d01509ffe6d7b30c94e2d9d5eabd8962cb5a4ef794dd7433674e20dd9fca4e5c142bf70804b
+  metadata.gz: 72044c7c29a87bb27257c2cfcb4b04e5f9c06ed6679475b0e305bdba635176535fefcbdf3f27151c3d1498f7762700f0e8e9a3a1263731868963db1879047721
+  data.tar.gz: e127bfaf4d7ffc2fb5c20a2d085a5d9eb21921f678976a853f9fcdb3e408696c3f4f29c0cc4db3427720d1d1f5b79d8fdb6be6667db4338fb150c12344d30c90

data/Gemfile

@@ -4,3 +4,5 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in joplin.gemspec
 gemspec
+
+gem "pandoc_binary", "~> 3.1"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    joplin (0.5.2)
+    joplin (1.0.1)
       http (~> 5.1.1)
       sqlite3 (~> 1.6.3)
       thor (~> 1.2.2)
@@ -29,6 +29,7 @@ GEM
     llhttp-ffi (0.4.0)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
+    pandoc_binary (3.1.1)
     public_suffix (5.0.1)
     rake (13.0.6)
     rspec (3.12.0)
@@ -56,6 +57,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 2.0)
   joplin!
+  pandoc_binary (~> 3.1)
   rake (~> 13.0)
   rspec (~> 3.12.0)
 

data/Makefile

@@ -1,3 +1,5 @@
+foo:
+
 test:
 	rake spec
 
@@ -6,6 +8,7 @@ build:
 
 push: clean build
 	gem push *gem
+	git tag `grep VERSION lib/joplin/version.rb | sed -e 's/^.*VERSION = "\(.*\)"/\1/'`
 
 clean:
 	rm -f *gem

data/bin/joplin

@@ -4,6 +4,7 @@ $:.unshift File.expand_path('../lib', __dir__)
 
 require 'joplin'
 require 'thor'
+require 'yaml'
 
 DIVIDER = %(
 
@@ -70,14 +71,33 @@ class MyCLI < Thor
   desc :epub,
        'build a note from a note (help build), write the note, and create an epub from the result. needs pandoc installed'
 
+  long_desc <<-DESC
+    If the building note has a yaml descriptor https://pandoc.org/MANUAL.html#epubs
+    then the epub will end up having the meta data.
+
+    Below is an example note. The for the referenced note are a result from using Joplin's webclipper on https://fiachetti.gitlab.io/mastering-roda/
+
+    ---\n
+    title: Mastering Roda\n
+    author: Federico Iachetti\n
+    rights:   Creative Commons Attribution 4.0 International License\n
+    language: en-US\n
+    ...
+
+    [Mastering Roda](:/ca267a317fa544f99f559040696f1cae)
+  DESC
+
   def epub(id)
+    build_note = Joplin::Note.new(id:)
     note = build(id)
-    write(note.id)
+    note.write
+    build_note.write note.title
     FileUtils.cd note.title
     `pandoc '#{note.title}.md' -o '../#{note.title}.epub' -t epub3 -f markdown+smart --title '#{note.title}' --toc --toc-depth=3 --metadata title='#{note.title}'`
     note.delete!
     FileUtils.cd '..'
     FileUtils.rm_rf note.title
+    abort 'Omg. pandoc failed!' if $?.exitstatus != 0
     puts "OK. Done. Your book is #{note.title}.epub"
   end
 
@@ -92,25 +112,35 @@ class MyCLI < Thor
     token
     note = Joplin::Note.new(id:)
     notes = []
-    title = nil
     note.body.each_line do |line|
-      title = ::Regexp.last_match(1) if line =~ /title: (.*)$/
-      line =~ %r{\(:/(\w+)\)}
+      match = line.match %r{!?\[(.*)?\]\(:/(\w+)\)}
+      next unless match
+      next if match[0][0] == '!'
+
       begin
-        notes.push Joplin::Note.new id: ::Regexp.last_match(1) if ::Regexp.last_match(1) && ::Regexp.last_match(1)
+        notes.push Joplin::Note.new id: match[2]
       rescue Joplin::Note::NotFound
-        puts "Couldn't find note with id #{id} so we skip it"
+        puts "Couldn't find note with id #{id} so we skip it. Maybe an image"
       end
     end
+    yml = extract_yaml_header_for_epub(note)
     new_note = Joplin::Note.new parent_id: note.parent_id
-    new_note.title = title || "built: #{note.title}"
-    new_note.body = notes.map { |n| "\# #{n.title}\n\n#{n.body}" }.join
+    new_note.title = yml ? yml['title'] : "built: #{note.title}"
+    new_note.body = "#{Psych.dump yml}...\n" if yml
+    new_note.body += notes.map { |n| "\# #{n.title}\n\n#{n.body}" }.join
     new_note.save!
     new_note
   end
 
   private
 
+  def extract_yaml_header_for_epub(note)
+    yml = Psych.load note.body
+    return nil unless yml.is_a? Hash
+
+    yml
+  end
+
   def token
     Joplin.token = Joplin.get_token || options[:token]
     return if Joplin.token

data/lib/joplin/version.rb

@@ -1,3 +1,3 @@
 module Joplin
-  VERSION = "1.0.0"
+  VERSION = "1.0.2"
 end

data/lib/joplin.rb

@@ -129,15 +129,15 @@ module Joplin
       end
     end
 
-    def write
-      Dir.mkdir title
-      Dir.mkdir "#{title}/resources"
+    def write(path = nil)
+      dir = path || title
+      FileUtils.mkdir_p "#{dir}/resources"
       body_to_write = String(body) # make a copy
       resources.each do |resource|
-        resource.write "#{title}/resources/#{resource.id}"
+        resource.write "#{dir}/resources/#{resource.id}"
         body_to_write.gsub!(%r{:/#{resource.id}}, "./resources/#{resource.id}")
       end
-      IO.write "#{title}/#{title}.md", body_to_write
+      IO.write "#{dir}/#{title}.md", body_to_write
     end
 
     def to_json(*_args)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: joplin
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Daniel Bretoi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-01 00:00:00.000000000 Z
+date: 2023-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http