tdiary 5.6.0 → 5.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (285) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +7 -0
  3. data/Gemfile.lock +61 -59
  4. data/doc/HOWTO-authenticate-in-rack.md +3 -3
  5. data/doc/HOWTO-make-theme.md +3 -3
  6. data/js/00default.js +22 -12
  7. data/js/caretposition.js +1 -0
  8. data/js/draft.js +228 -51
  9. data/js/image.js +126 -29
  10. data/js/preview.js +12 -50
  11. data/js/update.js +54 -0
  12. data/js/update_preview.js +79 -0
  13. data/lib/aws/pa_api.rb +7 -7
  14. data/lib/tdiary/admin.rb +66 -3
  15. data/lib/tdiary/cli.rb +14 -10
  16. data/lib/tdiary/core_ext.rb +46 -8
  17. data/lib/tdiary/dispatcher/update_main.rb +6 -0
  18. data/lib/tdiary/io/plugin_pstore.rb +2 -1
  19. data/lib/tdiary/plugin/00default.rb +3 -0
  20. data/lib/tdiary/rack/auth/basic.rb +72 -9
  21. data/lib/tdiary/tasks/auth.rake +2 -4
  22. data/lib/tdiary/tasks/release.rake +5 -4
  23. data/lib/tdiary/version.rb +1 -1
  24. data/lib/tdiary.rb +3 -0
  25. data/misc/plugin/amazon.rb +48 -11
  26. data/misc/plugin/amazon_rakuten.rb +79 -0
  27. data/misc/plugin/draft.rb +83 -0
  28. data/misc/plugin/en/image.rb +5 -0
  29. data/misc/plugin/en/makerss.rb +4 -0
  30. data/misc/plugin/en/preview.rb +0 -2
  31. data/misc/plugin/image.rb +19 -13
  32. data/misc/plugin/ja/makerss.rb +3 -0
  33. data/misc/plugin/ja/preview.rb +0 -2
  34. data/misc/plugin/makerss.rb +5 -4
  35. data/misc/plugin/my-sequel.rb +1 -0
  36. data/misc/plugin/preview.rb +0 -8
  37. data/theme/base.css +32 -2
  38. data/theme/conf.css +60 -0
  39. data/theme/default/default.css +33 -8
  40. data/vendor/bundle/ruby/3.4.0/cache/bcrypt-3.1.22.gem +0 -0
  41. data/vendor/bundle/ruby/3.4.0/cache/date-3.6.0.gem +0 -0
  42. data/vendor/bundle/ruby/3.4.0/cache/fastimage-2.4.3.gem +0 -0
  43. data/vendor/bundle/ruby/3.4.0/cache/net-imap-0.6.8.gem +0 -0
  44. data/vendor/bundle/ruby/3.4.0/cache/net-protocol-0.4.0.gem +0 -0
  45. data/vendor/bundle/ruby/3.4.0/cache/net-smtp-0.5.2.gem +0 -0
  46. data/vendor/bundle/ruby/3.4.0/cache/pstore-0.3.0.gem +0 -0
  47. data/vendor/bundle/ruby/3.4.0/cache/rack-3.2.8.gem +0 -0
  48. data/vendor/bundle/ruby/3.4.0/extensions/x86_64-linux/3.4.0/bcrypt-3.1.22/bcrypt_ext.so +0 -0
  49. data/vendor/bundle/ruby/3.4.0/extensions/x86_64-linux/3.4.0/bcrypt-3.1.22/gem_make.out +28 -0
  50. data/vendor/bundle/ruby/3.4.0/extensions/x86_64-linux/3.4.0/cgi-0.5.2/cgi/escape.so +0 -0
  51. data/vendor/bundle/ruby/3.4.0/extensions/x86_64-linux/3.4.0/cgi-0.5.2/gem_make.out +6 -6
  52. data/vendor/bundle/ruby/3.4.0/extensions/x86_64-linux/3.4.0/date-3.6.0/date_core.so +0 -0
  53. data/vendor/bundle/ruby/3.4.0/extensions/x86_64-linux/3.4.0/date-3.6.0/gem.build_complete +0 -0
  54. data/vendor/bundle/ruby/3.4.0/extensions/x86_64-linux/3.4.0/date-3.6.0/gem_make.out +26 -0
  55. data/vendor/bundle/ruby/3.4.0/extensions/x86_64-linux/3.4.0/date-3.6.0/mkmf.log +140 -0
  56. data/vendor/bundle/ruby/3.4.0/gems/bcrypt-3.1.22/CHANGELOG +127 -0
  57. data/vendor/bundle/ruby/3.4.0/gems/bcrypt-3.1.22/COPYING +28 -0
  58. data/vendor/bundle/ruby/3.4.0/gems/bcrypt-3.1.22/README.md +192 -0
  59. data/vendor/bundle/ruby/3.4.0/gems/bcrypt-3.1.22/ext/jruby/bcrypt_jruby/BCrypt.java +926 -0
  60. data/vendor/bundle/ruby/3.4.0/gems/bcrypt-3.1.22/ext/mri/Makefile +273 -0
  61. data/vendor/bundle/ruby/3.4.0/gems/bcrypt-3.1.22/ext/mri/bcrypt_ext.c +125 -0
  62. data/vendor/bundle/ruby/3.4.0/gems/bcrypt-3.1.22/ext/mri/crypt.c +57 -0
  63. data/vendor/bundle/ruby/3.4.0/gems/bcrypt-3.1.22/ext/mri/crypt.h +24 -0
  64. data/vendor/bundle/ruby/3.4.0/gems/bcrypt-3.1.22/ext/mri/crypt_blowfish.c +903 -0
  65. data/vendor/bundle/ruby/3.4.0/gems/bcrypt-3.1.22/ext/mri/crypt_blowfish.h +27 -0
  66. data/vendor/bundle/ruby/3.4.0/gems/bcrypt-3.1.22/ext/mri/crypt_gensalt.c +124 -0
  67. data/vendor/bundle/ruby/3.4.0/gems/bcrypt-3.1.22/ext/mri/crypt_gensalt.h +30 -0
  68. data/vendor/bundle/ruby/3.4.0/gems/bcrypt-3.1.22/ext/mri/extconf.rb +22 -0
  69. data/vendor/bundle/ruby/3.4.0/gems/bcrypt-3.1.22/ext/mri/ow-crypt.h +43 -0
  70. data/vendor/bundle/ruby/3.4.0/gems/bcrypt-3.1.22/ext/mri/wrapper.c +554 -0
  71. data/vendor/bundle/ruby/3.4.0/gems/bcrypt-3.1.22/ext/mri/x86.S +203 -0
  72. data/vendor/bundle/ruby/3.4.0/gems/bcrypt-3.1.22/lib/bcrypt/engine.rb +134 -0
  73. data/vendor/bundle/ruby/3.4.0/gems/bcrypt-3.1.22/lib/bcrypt/error.rb +22 -0
  74. data/vendor/bundle/ruby/3.4.0/gems/bcrypt-3.1.22/lib/bcrypt/password.rb +106 -0
  75. data/vendor/bundle/ruby/3.4.0/gems/bcrypt-3.1.22/lib/bcrypt.rb +16 -0
  76. data/vendor/bundle/ruby/3.4.0/gems/bcrypt-3.1.22/lib/bcrypt_ext.so +0 -0
  77. data/vendor/bundle/ruby/3.4.0/gems/cgi-0.5.2/ext/cgi/escape/Makefile +3 -3
  78. data/vendor/bundle/ruby/3.4.0/gems/cgi-0.5.2/lib/cgi/escape.so +0 -0
  79. data/vendor/bundle/ruby/3.4.0/gems/{date-3.5.1 → date-3.6.0}/ext/date/Makefile +4 -4
  80. data/vendor/bundle/ruby/3.4.0/gems/{date-3.5.1 → date-3.6.0}/ext/date/date_core.c +293 -77
  81. data/vendor/bundle/ruby/3.4.0/gems/{date-3.5.1 → date-3.6.0}/ext/date/date_parse.c +14 -4
  82. data/vendor/bundle/ruby/3.4.0/gems/{date-3.5.1 → date-3.6.0}/ext/date/date_strptime.c +13 -13
  83. data/vendor/bundle/ruby/3.4.0/gems/{date-3.5.1 → date-3.6.0}/ext/date/extconf.rb +6 -0
  84. data/vendor/bundle/ruby/3.4.0/gems/{date-3.5.1 → date-3.6.0}/lib/date.rb +1 -1
  85. data/vendor/bundle/ruby/3.4.0/gems/date-3.6.0/lib/date_core.so +0 -0
  86. data/vendor/bundle/ruby/3.4.0/gems/{fastimage-2.4.1 → fastimage-2.4.3}/lib/fastimage/fastimage_parsing/avif.rb +1 -0
  87. data/vendor/bundle/ruby/3.4.0/gems/{fastimage-2.4.1 → fastimage-2.4.3}/lib/fastimage/fastimage_parsing/fiber_stream.rb +6 -1
  88. data/vendor/bundle/ruby/3.4.0/gems/{fastimage-2.4.1 → fastimage-2.4.3}/lib/fastimage/fastimage_parsing/heic.rb +1 -0
  89. data/vendor/bundle/ruby/3.4.0/gems/{fastimage-2.4.1 → fastimage-2.4.3}/lib/fastimage/fastimage_parsing/iso_bmff.rb +15 -5
  90. data/vendor/bundle/ruby/3.4.0/gems/{fastimage-2.4.1 → fastimage-2.4.3}/lib/fastimage/fastimage_parsing/jxl.rb +1 -0
  91. data/vendor/bundle/ruby/3.4.0/gems/{fastimage-2.4.1 → fastimage-2.4.3}/lib/fastimage/version.rb +1 -1
  92. data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/Gemfile +3 -3
  93. data/vendor/bundle/ruby/3.4.0/gems/net-imap-0.6.8/README.md +103 -0
  94. data/vendor/bundle/ruby/3.4.0/gems/net-imap-0.6.8/Rakefile +74 -0
  95. data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/command_data.rb +13 -10
  96. data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/config/attr_accessors.rb +2 -2
  97. data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/config/attr_type_coercion.rb +14 -26
  98. data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/config.rb +63 -3
  99. data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/esearch_result.rb +2 -2
  100. data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/fetch_data.rb +5 -5
  101. data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/response_data.rb +79 -79
  102. data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/response_parser/parser_utils.rb +1 -1
  103. data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/response_parser.rb +2 -1
  104. data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/sasl/client_adapter.rb +6 -6
  105. data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/search_result.rb +4 -6
  106. data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/sequence_set.rb +413 -52
  107. data/vendor/bundle/ruby/3.4.0/gems/net-imap-0.6.8/lib/net/imap/utils.rb +49 -0
  108. data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap.rb +195 -46
  109. data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/rakelib/rdoc.rake +24 -0
  110. data/vendor/bundle/ruby/3.4.0/gems/{net-protocol-0.3.0 → net-protocol-0.4.0}/lib/net/protocol.rb +38 -23
  111. data/vendor/bundle/ruby/3.4.0/gems/{net-smtp-0.5.1 → net-smtp-0.5.2}/lib/net/smtp.rb +5 -8
  112. data/vendor/bundle/ruby/3.4.0/gems/{pstore-0.2.1 → pstore-0.3.0}/lib/pstore.rb +52 -31
  113. data/vendor/bundle/ruby/3.4.0/gems/{pstore-0.2.1 → pstore-0.3.0}/pstore.gemspec +1 -0
  114. data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/CHANGELOG.md +34 -0
  115. data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/multipart/parser.rb +7 -2
  116. data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/multipart/uploaded_file.rb +1 -0
  117. data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/request.rb +5 -2
  118. data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/static.rb +1 -1
  119. data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/version.rb +1 -1
  120. data/vendor/bundle/ruby/3.4.0/specifications/bcrypt-3.1.22.gemspec +33 -0
  121. data/vendor/bundle/ruby/3.4.0/specifications/{date-3.5.1.gemspec → date-3.6.0.gemspec} +3 -3
  122. data/vendor/bundle/ruby/3.4.0/specifications/{fastimage-2.4.1.gemspec → fastimage-2.4.3.gemspec} +3 -3
  123. data/vendor/bundle/ruby/3.4.0/specifications/{net-imap-0.6.6.gemspec → net-imap-0.6.8.gemspec} +3 -3
  124. data/vendor/bundle/ruby/3.4.0/specifications/{net-protocol-0.3.0.gemspec → net-protocol-0.4.0.gemspec} +2 -2
  125. data/vendor/bundle/ruby/3.4.0/specifications/{net-smtp-0.5.1.gemspec → net-smtp-0.5.2.gemspec} +4 -4
  126. data/vendor/bundle/ruby/3.4.0/specifications/{pstore-0.2.1.gemspec → pstore-0.3.0.gemspec} +3 -2
  127. data/vendor/bundle/ruby/3.4.0/specifications/{rack-3.2.7.gemspec → rack-3.2.8.gemspec} +2 -2
  128. data/views/preview.rhtml +2 -1
  129. data/views/preview.rhtml.en +2 -1
  130. data/views/update.rhtml +10 -1
  131. data/views/update.rhtml.en +10 -1
  132. metadata +242 -200
  133. data/misc/plugin/amp.rb +0 -118
  134. data/vendor/bundle/ruby/3.4.0/cache/date-3.5.1.gem +0 -0
  135. data/vendor/bundle/ruby/3.4.0/cache/fastimage-2.4.1.gem +0 -0
  136. data/vendor/bundle/ruby/3.4.0/cache/net-imap-0.6.6.gem +0 -0
  137. data/vendor/bundle/ruby/3.4.0/cache/net-protocol-0.3.0.gem +0 -0
  138. data/vendor/bundle/ruby/3.4.0/cache/net-smtp-0.5.1.gem +0 -0
  139. data/vendor/bundle/ruby/3.4.0/cache/pstore-0.2.1.gem +0 -0
  140. data/vendor/bundle/ruby/3.4.0/cache/rack-3.2.7.gem +0 -0
  141. data/vendor/bundle/ruby/3.4.0/extensions/x86_64-linux/3.4.0/date-3.5.1/date_core.so +0 -0
  142. data/vendor/bundle/ruby/3.4.0/extensions/x86_64-linux/3.4.0/date-3.5.1/gem_make.out +0 -24
  143. data/vendor/bundle/ruby/3.4.0/extensions/x86_64-linux/3.4.0/date-3.5.1/mkmf.log +0 -93
  144. data/vendor/bundle/ruby/3.4.0/gems/date-3.5.1/lib/date_core.so +0 -0
  145. data/vendor/bundle/ruby/3.4.0/gems/net-imap-0.6.6/README.md +0 -77
  146. data/vendor/bundle/ruby/3.4.0/gems/net-imap-0.6.6/Rakefile +0 -24
  147. data/views/amp.rhtml +0 -34
  148. /data/vendor/bundle/ruby/3.4.0/extensions/x86_64-linux/3.4.0/{date-3.5.1 → bcrypt-3.1.22}/gem.build_complete +0 -0
  149. /data/vendor/bundle/ruby/3.4.0/gems/{date-3.5.1 → date-3.6.0}/BSDL +0 -0
  150. /data/vendor/bundle/ruby/3.4.0/gems/{date-3.5.1 → date-3.6.0}/COPYING +0 -0
  151. /data/vendor/bundle/ruby/3.4.0/gems/{date-3.5.1 → date-3.6.0}/README.md +0 -0
  152. /data/vendor/bundle/ruby/3.4.0/gems/{date-3.5.1 → date-3.6.0}/ext/date/date_strftime.c +0 -0
  153. /data/vendor/bundle/ruby/3.4.0/gems/{date-3.5.1 → date-3.6.0}/ext/date/date_tmx.h +0 -0
  154. /data/vendor/bundle/ruby/3.4.0/gems/{date-3.5.1 → date-3.6.0}/ext/date/prereq.mk +0 -0
  155. /data/vendor/bundle/ruby/3.4.0/gems/{date-3.5.1 → date-3.6.0}/ext/date/zonetab.h +0 -0
  156. /data/vendor/bundle/ruby/3.4.0/gems/{date-3.5.1 → date-3.6.0}/ext/date/zonetab.list +0 -0
  157. /data/vendor/bundle/ruby/3.4.0/gems/{fastimage-2.4.1 → fastimage-2.4.3}/MIT-LICENSE +0 -0
  158. /data/vendor/bundle/ruby/3.4.0/gems/{fastimage-2.4.1 → fastimage-2.4.3}/README.md +0 -0
  159. /data/vendor/bundle/ruby/3.4.0/gems/{fastimage-2.4.1 → fastimage-2.4.3}/lib/fastimage/fastimage.rb +0 -0
  160. /data/vendor/bundle/ruby/3.4.0/gems/{fastimage-2.4.1 → fastimage-2.4.3}/lib/fastimage/fastimage_parsing/bmp.rb +0 -0
  161. /data/vendor/bundle/ruby/3.4.0/gems/{fastimage-2.4.1 → fastimage-2.4.3}/lib/fastimage/fastimage_parsing/exif.rb +0 -0
  162. /data/vendor/bundle/ruby/3.4.0/gems/{fastimage-2.4.1 → fastimage-2.4.3}/lib/fastimage/fastimage_parsing/gif.rb +0 -0
  163. /data/vendor/bundle/ruby/3.4.0/gems/{fastimage-2.4.1 → fastimage-2.4.3}/lib/fastimage/fastimage_parsing/ico.rb +0 -0
  164. /data/vendor/bundle/ruby/3.4.0/gems/{fastimage-2.4.1 → fastimage-2.4.3}/lib/fastimage/fastimage_parsing/image_base.rb +0 -0
  165. /data/vendor/bundle/ruby/3.4.0/gems/{fastimage-2.4.1 → fastimage-2.4.3}/lib/fastimage/fastimage_parsing/jpeg.rb +0 -0
  166. /data/vendor/bundle/ruby/3.4.0/gems/{fastimage-2.4.1 → fastimage-2.4.3}/lib/fastimage/fastimage_parsing/jxlc.rb +0 -0
  167. /data/vendor/bundle/ruby/3.4.0/gems/{fastimage-2.4.1 → fastimage-2.4.3}/lib/fastimage/fastimage_parsing/png.rb +0 -0
  168. /data/vendor/bundle/ruby/3.4.0/gems/{fastimage-2.4.1 → fastimage-2.4.3}/lib/fastimage/fastimage_parsing/psd.rb +0 -0
  169. /data/vendor/bundle/ruby/3.4.0/gems/{fastimage-2.4.1 → fastimage-2.4.3}/lib/fastimage/fastimage_parsing/stream_util.rb +0 -0
  170. /data/vendor/bundle/ruby/3.4.0/gems/{fastimage-2.4.1 → fastimage-2.4.3}/lib/fastimage/fastimage_parsing/svg.rb +0 -0
  171. /data/vendor/bundle/ruby/3.4.0/gems/{fastimage-2.4.1 → fastimage-2.4.3}/lib/fastimage/fastimage_parsing/tiff.rb +0 -0
  172. /data/vendor/bundle/ruby/3.4.0/gems/{fastimage-2.4.1 → fastimage-2.4.3}/lib/fastimage/fastimage_parsing/type_parser.rb +0 -0
  173. /data/vendor/bundle/ruby/3.4.0/gems/{fastimage-2.4.1 → fastimage-2.4.3}/lib/fastimage/fastimage_parsing/webp.rb +0 -0
  174. /data/vendor/bundle/ruby/3.4.0/gems/{fastimage-2.4.1 → fastimage-2.4.3}/lib/fastimage.rb +0 -0
  175. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/BSDL +0 -0
  176. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/COPYING +0 -0
  177. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/LICENSE.txt +0 -0
  178. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/docs/styles.css +0 -0
  179. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/authenticators.rb +0 -0
  180. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/config/attr_inheritance.rb +0 -0
  181. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/config/attr_version_defaults.rb +0 -0
  182. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/connection_state.rb +0 -0
  183. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/data_encoding.rb +0 -0
  184. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/deprecated_client_options.rb +0 -0
  185. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/errors.rb +0 -0
  186. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/flags.rb +0 -0
  187. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/response_reader.rb +0 -0
  188. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/sasl/anonymous_authenticator.rb +0 -0
  189. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/sasl/authentication_exchange.rb +0 -0
  190. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/sasl/authenticators.rb +0 -0
  191. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/sasl/cram_md5_authenticator.rb +0 -0
  192. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/sasl/digest_md5_authenticator.rb +0 -0
  193. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/sasl/external_authenticator.rb +0 -0
  194. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/sasl/gs2_header.rb +0 -0
  195. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/sasl/login_authenticator.rb +0 -0
  196. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/sasl/oauthbearer_authenticator.rb +0 -0
  197. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/sasl/plain_authenticator.rb +0 -0
  198. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/sasl/protocol_adapters.rb +0 -0
  199. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/sasl/scram_algorithm.rb +0 -0
  200. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/sasl/scram_authenticator.rb +0 -0
  201. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/sasl/stringprep.rb +0 -0
  202. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/sasl/xoauth2_authenticator.rb +0 -0
  203. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/sasl.rb +0 -0
  204. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/sasl_adapter.rb +0 -0
  205. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/stringprep/nameprep.rb +0 -0
  206. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/stringprep/saslprep.rb +0 -0
  207. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/stringprep/saslprep_tables.rb +0 -0
  208. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/stringprep/tables.rb +0 -0
  209. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/stringprep/trace.rb +0 -0
  210. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/stringprep.rb +0 -0
  211. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/uidplus_data.rb +0 -0
  212. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/lib/net/imap/vanished_data.rb +0 -0
  213. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/net-imap.gemspec +0 -0
  214. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/rakelib/benchmarks.rake +0 -0
  215. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/rakelib/rfcs.rake +0 -0
  216. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/rakelib/saslprep.rake +0 -0
  217. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/rakelib/string_prep_tables_generator.rb +0 -0
  218. /data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.6.6 → net-imap-0.6.8}/sample/net-imap.rb +0 -0
  219. /data/vendor/bundle/ruby/3.4.0/gems/{net-protocol-0.3.0 → net-protocol-0.4.0}/BSDL +0 -0
  220. /data/vendor/bundle/ruby/3.4.0/gems/{net-protocol-0.3.0 → net-protocol-0.4.0}/COPYING +0 -0
  221. /data/vendor/bundle/ruby/3.4.0/gems/{net-protocol-0.3.0 → net-protocol-0.4.0}/README.md +0 -0
  222. /data/vendor/bundle/ruby/3.4.0/gems/{net-smtp-0.5.1 → net-smtp-0.5.2}/LICENSE.txt +0 -0
  223. /data/vendor/bundle/ruby/3.4.0/gems/{net-smtp-0.5.1 → net-smtp-0.5.2}/NEWS.md +0 -0
  224. /data/vendor/bundle/ruby/3.4.0/gems/{net-smtp-0.5.1 → net-smtp-0.5.2}/README.md +0 -0
  225. /data/vendor/bundle/ruby/3.4.0/gems/{net-smtp-0.5.1 → net-smtp-0.5.2}/lib/net/smtp/auth_cram_md5.rb +0 -0
  226. /data/vendor/bundle/ruby/3.4.0/gems/{net-smtp-0.5.1 → net-smtp-0.5.2}/lib/net/smtp/auth_login.rb +0 -0
  227. /data/vendor/bundle/ruby/3.4.0/gems/{net-smtp-0.5.1 → net-smtp-0.5.2}/lib/net/smtp/auth_plain.rb +0 -0
  228. /data/vendor/bundle/ruby/3.4.0/gems/{net-smtp-0.5.1 → net-smtp-0.5.2}/lib/net/smtp/auth_xoauth2.rb +0 -0
  229. /data/vendor/bundle/ruby/3.4.0/gems/{net-smtp-0.5.1 → net-smtp-0.5.2}/lib/net/smtp/authenticator.rb +0 -0
  230. /data/vendor/bundle/ruby/3.4.0/gems/{net-smtp-0.5.1 → net-smtp-0.5.2}/net-smtp.gemspec +0 -0
  231. /data/vendor/bundle/ruby/3.4.0/gems/{pstore-0.2.1 → pstore-0.3.0}/BSDL +0 -0
  232. /data/vendor/bundle/ruby/3.4.0/gems/{pstore-0.2.1 → pstore-0.3.0}/COPYING +0 -0
  233. /data/vendor/bundle/ruby/3.4.0/gems/{pstore-0.2.1 → pstore-0.3.0}/Gemfile +0 -0
  234. /data/vendor/bundle/ruby/3.4.0/gems/{pstore-0.2.1 → pstore-0.3.0}/README.md +0 -0
  235. /data/vendor/bundle/ruby/3.4.0/gems/{pstore-0.2.1 → pstore-0.3.0}/Rakefile +0 -0
  236. /data/vendor/bundle/ruby/3.4.0/gems/{pstore-0.2.1 → pstore-0.3.0}/bin/console +0 -0
  237. /data/vendor/bundle/ruby/3.4.0/gems/{pstore-0.2.1 → pstore-0.3.0}/bin/setup +0 -0
  238. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/CONTRIBUTING.md +0 -0
  239. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/MIT-LICENSE +0 -0
  240. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/README.md +0 -0
  241. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/SPEC.rdoc +0 -0
  242. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/auth/abstract/handler.rb +0 -0
  243. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/auth/abstract/request.rb +0 -0
  244. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/auth/basic.rb +0 -0
  245. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/bad_request.rb +0 -0
  246. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/body_proxy.rb +0 -0
  247. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/builder.rb +0 -0
  248. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/cascade.rb +0 -0
  249. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/common_logger.rb +0 -0
  250. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/conditional_get.rb +0 -0
  251. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/config.rb +0 -0
  252. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/constants.rb +0 -0
  253. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/content_length.rb +0 -0
  254. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/content_type.rb +0 -0
  255. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/deflater.rb +0 -0
  256. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/directory.rb +0 -0
  257. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/etag.rb +0 -0
  258. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/events.rb +0 -0
  259. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/files.rb +0 -0
  260. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/head.rb +0 -0
  261. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/headers.rb +0 -0
  262. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/lint.rb +0 -0
  263. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/lock.rb +0 -0
  264. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/media_type.rb +0 -0
  265. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/method_override.rb +0 -0
  266. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/mime.rb +0 -0
  267. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/mock.rb +0 -0
  268. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/mock_request.rb +0 -0
  269. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/mock_response.rb +0 -0
  270. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/multipart/generator.rb +0 -0
  271. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/multipart.rb +0 -0
  272. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/null_logger.rb +0 -0
  273. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/query_parser.rb +0 -0
  274. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/recursive.rb +0 -0
  275. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/reloader.rb +0 -0
  276. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/response.rb +0 -0
  277. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/rewindable_input.rb +0 -0
  278. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/runtime.rb +0 -0
  279. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/sendfile.rb +0 -0
  280. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/show_exceptions.rb +0 -0
  281. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/show_status.rb +0 -0
  282. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/tempfile_reaper.rb +0 -0
  283. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/urlmap.rb +0 -0
  284. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack/utils.rb +0 -0
  285. /data/vendor/bundle/ruby/3.4.0/gems/{rack-3.2.7 → rack-3.2.8}/lib/rack.rb +0 -0
data/js/draft.js CHANGED
@@ -1,6 +1,7 @@
1
1
  /*
2
2
  * draft.js: save draft data to Web Storage automatically
3
- *
3
+ * and keep a copy of them on the server
4
+ *
4
5
  * Copyright (c) MATSUOKA Kohei <http://www.machu.jp/>
5
6
  * Distributed under the GPL2 or any later version.
6
7
  */
@@ -8,70 +9,151 @@ $(function() {
8
9
 
9
10
  if (!localStorage) { return; }
10
11
 
11
- var Draft = function(storage, text) {
12
+ var Draft = function(storage, text, server, form) {
12
13
  // 保存先のストレージ
13
14
  this.storage = storage;
15
+ // このページのフォーム(追記か編集かと、その日付)
16
+ this.form = form;
14
17
  // 下書きの保存件数
15
- this.maxCount = 10;
18
+ this.maxCount = server.max;
16
19
  // 下書き一覧
17
20
  this.items = [];
21
+ // このページで編集している下書きの ID
22
+ this.current = null;
23
+ // 最後に保存したテキストエリアの内容
24
+ this.text = text;
25
+ // サーバーにある下書きの ID と更新日時
26
+ this.synced = {};
18
27
 
19
- this.initialize(text);
28
+ this.initialize(text, server);
20
29
  };
21
30
 
22
31
  Draft.prototype = {
23
- // ローカルストレージから下書きを読み込む
24
- initialize: function(text) {
25
- this.items = this.storage.drafts ? JSON.parse(this.storage.drafts) : new Array();
26
- // 下書きに空の日記・テキストエリアと同じ日記が存在すれば削除する
27
- this.items = $.grep(this.items, function(item, index) {
28
- // 改行と空白文字を無視して比較(プレビュー時に末尾へ改行が付加されるため)
29
- if (item.value == "" || DraftUtils.trim(item.value) == DraftUtils.trim(text)) {
30
- return false;
32
+ // ローカルストレージの下書きにサーバーの下書きを統合する
33
+ initialize: function(text, server) {
34
+ var items = this.storage.drafts ? JSON.parse(this.storage.drafts) : new Array();
35
+ var synced = this.synced;
36
+ $.each(items, function(index, item) {
37
+ if (!item.id) { item.id = DraftUtils.newId(); }
38
+ });
39
+ $.each(server.drafts, function(index, remote) {
40
+ synced[remote.id] = remote.date;
41
+ var local = DraftUtils.find(items, remote.id);
42
+ if (!local) {
43
+ items.push(remote);
44
+ } else if (local.date < remote.date) {
45
+ local.date = remote.date;
46
+ local.value = remote.value;
47
+ local.form = remote.form;
31
48
  }
32
- return true;
33
49
  });
34
- this.save(text, true);
50
+ // 空の下書きと、日記として投稿済みの下書きを削除する
51
+ this.items = $.grep(items, function(item) {
52
+ return typeof item.value == "string" && DraftUtils.trim(item.value) != "" &&
53
+ $.inArray(item.id, server.deleted) < 0;
54
+ });
55
+ this.truncate();
56
+ // テキストエリアと同じ下書きがあれば、それを続けて編集する
57
+ // 改行と空白文字を無視して比較(プレビュー時に末尾へ改行が付加されるため)
58
+ var trimmed = DraftUtils.trim(text);
59
+ var same = $.grep(this.items, function(item) {
60
+ return DraftUtils.trim(item.value) == trimmed;
61
+ });
62
+ if (trimmed != "" && same.length > 0) {
63
+ this.current = same.pop().id;
64
+ }
65
+ this.store();
35
66
  // console.log("Draft.initialized");
36
67
  },
37
68
 
38
- // ローカルストレージに下書きを保存する
39
- // append が true の場合は、下書き一覧の末尾に追加する
40
- // append が false の場合は、最後の下書きに上書きする
41
- save: function(text, append) {
42
- if (!append) {
43
- this.items.pop();
44
- }
45
- this.items.push({
46
- date: new Date().getTime(),
47
- value: text
48
- });
49
- // 最大でmaxCount件数の履歴を保持
50
- if (this.items.length > this.maxCount) {
51
- this.items.shift();
69
+ // 編集している下書きを更新する
70
+ // テキストエリアの内容が変わっていなければ何もしない
71
+ save: function(text) {
72
+ if (text == this.text) { return; }
73
+ this.text = text;
74
+ if (DraftUtils.trim(text) == "") { return; }
75
+ var item = DraftUtils.find(this.items, this.current);
76
+ if (item) {
77
+ this.items.splice($.inArray(item, this.items), 1);
78
+ } else {
79
+ item = { id: DraftUtils.newId() };
80
+ this.current = item.id;
52
81
  }
53
- this.storage.drafts = JSON.stringify(this.items);
82
+ item.date = new Date().getTime();
83
+ item.value = text;
84
+ item.form = this.form;
85
+ this.items.push(item);
86
+ this.truncate();
87
+ this.store();
54
88
  },
55
89
 
56
- // 下書き一覧から index 番目の下書きを取得する
57
- // 取得した下書きは一覧の末尾に移動する
58
- load: function(index) {
59
- var item = this.items.splice(index, 1)[0];
60
- this.items.push(item);
90
+ // 指定した下書きを読み込み、それを続けて編集する
91
+ load: function(id) {
92
+ var item = DraftUtils.find(this.items, id);
93
+ if (!item) { return null; }
94
+ this.current = item.id;
95
+ this.text = item.value;
61
96
  return item.value;
62
97
  },
63
98
 
64
- // 下書きのタイトル一覧の配列を返す(表示用)
99
+ // サーバーにまだ無い版の下書き一覧を返す
100
+ pending: function() {
101
+ var synced = this.synced;
102
+ return $.grep(this.items, function(item) {
103
+ return !(synced[item.id] >= item.date);
104
+ });
105
+ },
106
+
107
+ // サーバーへ保存した下書きを記録する
108
+ markSynced: function(items) {
109
+ var synced = this.synced;
110
+ $.each(items, function(index, item) {
111
+ synced[item.id] = item.date;
112
+ });
113
+ },
114
+
115
+ // 編集している下書きを保存した日時と、サーバーにある版の日時を返す
116
+ saved: function() {
117
+ var item = DraftUtils.find(this.items, this.current);
118
+ if (!item) { return null; }
119
+ return { local: item.date, server: this.synced[item.id] };
120
+ },
121
+
122
+ // このフォームで書いた最新の下書きを、テキストエリアと異なり勧めるのを断られていなければ返す
123
+ // 別の日や、追記と編集の間で勧めると、復元してそのまま登録したときに日記が重複したり消えたりする
124
+ latest: function() {
125
+ var form = this.form;
126
+ var item = $.grep(this.items, function(item) { return item.form == form; }).pop();
127
+ if (!item || DraftUtils.trim(item.value) == DraftUtils.trim(this.text) ||
128
+ item.dismissed == item.date) { return null; }
129
+ return item;
130
+ },
131
+
132
+ // 指定した下書きのこの版を、次から勧めない
133
+ dismiss: function(id) {
134
+ var item = DraftUtils.find(this.items, id);
135
+ if (!item) { return; }
136
+ item.dismissed = item.date;
137
+ this.store();
138
+ },
139
+
140
+ // 最大でmaxCount件数の履歴を保持
141
+ truncate: function() {
142
+ this.items.sort(function(a, b) { return a.date - b.date; });
143
+ this.items = this.items.slice(-this.maxCount);
144
+ },
145
+
146
+ store: function() {
147
+ this.storage.drafts = JSON.stringify(this.items);
148
+ },
149
+
150
+ // 下書きの ID とタイトルの一覧を返す(表示用)
65
151
  // タイトルは textarea の先頭1行目 + 更新日時
66
152
  titles: function() {
67
153
  return $.map(this.items, function(item) {
68
- var date = new Date(item.date);
69
- date = DraftUtils.dateToString(date);
70
- var title = "No-Name";
71
- if (item.value && typeof item.value == "string") {
72
- title = item.value.match(/.*/)[0];
73
- }
74
- return title + " (" + date + ")";
154
+ var date = DraftUtils.dateToString(new Date(item.date));
155
+ var title = item.value.match(/.*/)[0] || "No-Name";
156
+ return { id: item.id, title: title + " (" + date + ")" };
75
157
  });
76
158
  }
77
159
 
@@ -96,9 +178,22 @@ var DraftUtils = {
96
178
  return s;
97
179
  }
98
180
  },
181
+ // 日時を HH:MM 形式に変換する(今日でなければ YYYY-mm-dd HH:MM 形式)
182
+ timeToString: function(date) {
183
+ var text = DraftUtils.dateToString(date).slice(0, -3);
184
+ var today = DraftUtils.dateToString().slice(0, 10);
185
+ return text.slice(0, 10) == today ? text.slice(11) : text;
186
+ },
99
187
  // 文字列から改行と空白文字を取り除く
100
188
  trim: function(str) {
101
189
  return str.replace(/\s+/g, "");
190
+ },
191
+ // 下書きの ID を作る(サーバーが受け付けるのは英小文字と数字のみ)
192
+ newId: function() {
193
+ return new Date().getTime().toString(36) + Math.random().toString(36).slice(2, 10);
194
+ },
195
+ find: function(items, id) {
196
+ return $.grep(items, function(item) { return item.id == id; })[0];
102
197
  }
103
198
  };
104
199
 
@@ -108,42 +203,124 @@ var DraftUtils = {
108
203
 
109
204
  // 保存対象のテキストエリア
110
205
  var textarea = $("[name=body]");
206
+ // 日記の更新フォーム
207
+ var form = textarea.closest("form");
208
+ // 追記か編集かと、フォームを開いた日付(例: "replace:20261008")
209
+ var formKey = (form.find("[name=replace]").length ? "replace:" : "append:") +
210
+ (form.find("[name=old]").val() || "");
111
211
  // 下書き一覧を表示するセレクトボックス
112
212
  var select = $("[name=drafts]");
213
+ // 下書きを保存した時刻の表示
214
+ // ボタンより上に置くと、ボタンを押したときの change で表示が増えてボタンがずれ、クリックが外れる
215
+ var status = $("<p/>").addClass("draft-status").appendTo(form);
216
+ // 表示する文言
217
+ var label = $tDiary.plugin.draft.label;
113
218
  // 自動保存の間隔(ミリ秒)
114
219
  var autoSaveInterval = 5 * 1000;
220
+ // サーバーへ保存する間隔(ミリ秒)
221
+ var syncInterval = $tDiary.plugin.draft.interval * 1000;
115
222
 
116
- var draft = new Draft(localStorage, textarea.val());
223
+ var draft = new Draft(localStorage, textarea.val(), $tDiary.plugin.draft.server, formKey);
224
+ var syncing = false;
117
225
 
118
226
  // 下書き保存
119
227
  saveDraft = function() {
120
228
  draft.save(textarea.val());
121
229
  showSelectForm(true);
230
+ showSaved();
122
231
  };
123
232
  // 下書き読み込み
124
233
  loadDraft = function() {
125
- textarea.val(draft.load(select.val()));
234
+ var value = draft.load(select.val());
235
+ if (value != null) {
236
+ textarea.focus();
237
+ $.replaceText(textarea[0], value, 0, textarea.val().length);
238
+ }
126
239
  showSelectForm(false);
240
+ showSaved();
241
+ };
242
+ // サーバーに無い下書きをサーバーへ保存
243
+ syncDraft = function(keepalive) {
244
+ var items = $.map(draft.pending(), function(item) {
245
+ return { id: item.id, date: item.date, value: item.value, form: item.form };
246
+ });
247
+ if (syncing || items.length == 0) { return; }
248
+ var params = new URLSearchParams();
249
+ params.append("plugin", "draft");
250
+ params.append("plugin_draft_sync", JSON.stringify(items));
251
+ form.find("[name=csrf_protection_key]").each(function() {
252
+ params.append("csrf_protection_key", $(this).val());
253
+ });
254
+ syncing = true;
255
+ fetch(form.attr("action"), { method: "POST", body: params, keepalive: keepalive })
256
+ .then(function(response) {
257
+ if (response.ok) {
258
+ draft.markSynced(items);
259
+ showSaved();
260
+ }
261
+ }, function() {})
262
+ .then(function() { syncing = false; });
127
263
  };
128
264
  // 下書き選択用のセレクトボックスを描画
129
- showSelectForm = function(keepIndex) {
130
- var index = select.val();
265
+ showSelectForm = function(keepSelection) {
266
+ var selected = select.val();
131
267
  select.empty();
132
- $.each(draft.titles(), function(i, title) {
133
- select.append($("<option/>").attr("value", i).text(title));
134
- select.val(i);
268
+ $.each(draft.titles(), function(i, item) {
269
+ select.append($("<option/>").attr("value", item.id).text(item.title));
135
270
  });
136
- if (keepIndex) {
137
- select.val(index);
271
+ if (!(keepSelection && selected)) {
272
+ selected = draft.current || select.children().last().val();
138
273
  }
274
+ select.val(selected);
275
+ };
276
+ // 下書きを保存した時刻を、このブラウザとサーバーに分けて表示
277
+ showSaved = function() {
278
+ var saved = draft.saved();
279
+ if (!saved) { return; }
280
+ var local = DraftUtils.timeToString(new Date(saved.local));
281
+ var server = saved.server ? DraftUtils.timeToString(new Date(saved.server)) : label.unsent;
282
+ status.text(label.saved.replace("%local", local).replace("%server", server));
283
+ };
284
+ // 本文と異なる新しい下書きがあれば、テキストエリアの上で復元を勧める
285
+ offerDraft = function() {
286
+ var item = draft.latest();
287
+ if (!item) { return; }
288
+ var title = DraftUtils.find(draft.titles(), item.id).title;
289
+ var notice = $("<p/>").addClass("draft-notice")
290
+ .text(label.found.replace("%title", function() { return title; }));
291
+ notice.append(" ", $("<button type='button'/>").text(label.restore).click(function() {
292
+ select.val(item.id);
293
+ loadDraft();
294
+ notice.remove();
295
+ }));
296
+ notice.append(" ", $("<button type='button'/>").text(label.dismiss).click(function() {
297
+ draft.dismiss(item.id);
298
+ notice.remove();
299
+ }));
300
+ textarea.before(notice);
139
301
  };
140
302
 
141
303
  // DOMイベント設定
142
304
  $("#draft_load").click(loadDraft);
143
305
  setInterval(saveDraft, autoSaveInterval);
306
+ setInterval(function() { syncDraft(false); }, syncInterval);
144
307
  textarea.change(saveDraft);
308
+ // タブを閉じる・切り替える前に保存する
309
+ $(document).on("visibilitychange", function() {
310
+ if (document.visibilityState == "hidden") {
311
+ saveDraft();
312
+ syncDraft(true);
313
+ }
314
+ });
315
+ // 日記として投稿する下書きをサーバーに知らせる
316
+ form.submit(function() {
317
+ saveDraft();
318
+ $("[name=plugin_draft_id]").val(draft.current || "");
319
+ });
145
320
 
146
321
  showSelectForm(false);
322
+ showSaved();
323
+ offerDraft();
147
324
  // console.log("ready");
148
325
 
149
326
  });
data/js/image.js CHANGED
@@ -18,20 +18,57 @@ $(function(){
18
18
  $(this).css('cursor', 'default');
19
19
  })
20
20
  .on('click', '.image-img', function(){
21
- var idx = this.id.replace('image-index-', '');
22
- var w = $('#image-info-' + idx + ' .image-width').text();
23
- var h = $('#image-info-' + idx + ' .image-height').text();
24
- $('#body').insertAtCaret($.makePluginTag('image', function(){
25
- return [idx, "'" + $tDiary.plugin.image.alt + "'", 'nil', '[' + w + ',' + h + ']']
26
- }));
21
+ $('#body').insertAtCaret(imageTag(this));
27
22
  });
28
-
23
+
24
+ var imageTag = function(img, context){
25
+ var idx = img.id.replace('image-index-', '');
26
+ var w = $('#image-info-' + idx + ' .image-width', context).text();
27
+ var h = $('#image-info-' + idx + ' .image-height', context).text();
28
+ return $.makePluginTag('image', function(){
29
+ return [idx, "'" + $tDiary.plugin.image.alt + "'", 'nil', '[' + w + ',' + h + ']']
30
+ });
31
+ };
32
+
33
+ var imageFiles = function(files){
34
+ return $.grep(files, function(file){
35
+ return /^image\//.test(file.type);
36
+ });
37
+ };
38
+
39
+ var shrink = function(file){
40
+ if(!window.createImageBitmap || file.type == 'image/gif'){
41
+ return Promise.resolve(file);
42
+ }
43
+ return createImageBitmap(file, {imageOrientation: 'from-image'}).then(function(bitmap){
44
+ var scale = Math.min(1, $tDiary.plugin.image.resize / Math.max(bitmap.width, bitmap.height));
45
+ var type = file.type == 'image/png' && scale == 1 ? 'image/png' : 'image/jpeg';
46
+ var canvas = document.createElement('canvas');
47
+ canvas.width = Math.max(1, Math.round(bitmap.width * scale));
48
+ canvas.height = Math.max(1, Math.round(bitmap.height * scale));
49
+ var context = canvas.getContext('2d');
50
+ if(type == 'image/jpeg'){
51
+ context.fillStyle = '#fff';
52
+ context.fillRect(0, 0, canvas.width, canvas.height);
53
+ }
54
+ context.drawImage(bitmap, 0, 0, canvas.width, canvas.height);
55
+ bitmap.close();
56
+ return new Promise(function(resolve){
57
+ canvas.toBlob(function(blob){
58
+ resolve(blob || file);
59
+ }, type, 0.85);
60
+ });
61
+ }).catch(function(){
62
+ return file;
63
+ });
64
+ };
65
+
29
66
  var ImagePlugin = function(url){
30
67
  this.url =url;
31
68
  };
32
69
  ImagePlugin.prototype = {
33
- upload: function(formData, callback){
34
- $.ajax({
70
+ upload: function(formData){
71
+ return $.ajax({
35
72
  url: this.url,
36
73
  type: 'post',
37
74
  data: formData,
@@ -41,9 +78,6 @@ $(function(){
41
78
  $('#plugin-image-addimage input[type="submit"]').attr('disabled', 'disabled');
42
79
  $('#plugin-image-uploading').show();
43
80
  },
44
- success: function(data){
45
- callback(data);
46
- },
47
81
  complete: function(){
48
82
  $('#plugin-image-addimage input[type="submit"]').removeAttr('disabled');
49
83
  $('#plugin-image-uploading').hide();
@@ -74,40 +108,95 @@ $(function(){
74
108
  }
75
109
  e.preventDefault();
76
110
 
77
- uploadFiles(this.plugin_image_file.files);
111
+ uploadFiles($.makeArray(this.plugin_image_file.files));
78
112
  this.reset();
79
113
  return false;
80
114
  });
81
115
 
116
+ var replaceMarker = function(marker, text){
117
+ var body = $('#body').get(0);
118
+ var start = body.value.indexOf(marker);
119
+ if(start < 0){
120
+ if(text){
121
+ $('#body').insertAtCaret(text);
122
+ }
123
+ return;
124
+ }
125
+ $.replaceText(body, text, start, start + marker.length);
126
+ };
127
+
128
+ var uploads = 0;
129
+ var uploading = Promise.resolve();
82
130
  var uploadFiles = function(files) {
83
- var formData = new FormData();
84
- formData.append('plugin', 'image');
85
- $.each($('#plugin-image-addimage input[type="hidden"]'), function(){
86
- formData.append($(this).attr('name'), $(this).val());
87
- });
88
- $.each(files, function(i, file){
89
- formData.append('plugin_image_file', file);
90
- });
131
+ if(!files.length){
132
+ return false;
133
+ }
134
+ var marker = '[Uploading image ' + (++uploads) + '...]';
135
+ $('#body').insertAtCaret(marker);
136
+ uploading = uploading.then(function(){
137
+ return files.reduce(function(shrunk, file){
138
+ return shrunk.then(function(images){
139
+ return shrink(file).then(function(image){
140
+ return images.concat([image]);
141
+ });
142
+ });
143
+ }, Promise.resolve([]));
144
+ }).then(function(images){
145
+ var formData = new FormData();
146
+ formData.append('plugin', 'image');
147
+ formData.append('plugin_image_addimage', 'true');
148
+ formData.append('date', $tDiary.plugin.image.date);
149
+ $('form.update [name=csrf_protection_key]').first().each(function(){
150
+ formData.append(this.name, this.value);
151
+ });
152
+ $.each(images, function(i, image){
153
+ formData.append('plugin_image_file', image, image.name || (image.type == 'image/png' ? 'image.png' : 'image.jpg'));
154
+ });
91
155
 
92
- var imagePlugin = new ImagePlugin($(this).attr('action'));
93
- imagePlugin.upload(formData, function(result){
156
+ var imagePlugin = new ImagePlugin($('form.update').attr('action'));
157
+ return imagePlugin.upload(formData);
158
+ }).then(function(result){
159
+ var list = $('#plugin-image-delimage', result).parents('div.form');
160
+ var tags = $.map(list.find('.image-img[data-added]'), function(img){
161
+ return imageTag(img, list);
162
+ });
163
+ if(!tags.length){
164
+ throw new Error('no image was saved');
165
+ }
94
166
  $('#plugin-image-delimage').parents('div.form').remove();
95
167
  $('<div>')
96
168
  .attr({
97
169
  'class': 'form'
98
170
  })
99
- .append($('#plugin-image-delimage', result).parents('div.form').html())
171
+ .append(list.html())
100
172
  .insertBefore('#plugin-image-addimage');
101
173
  var timestamp = new Date().getTime();
102
174
  $.each($('#plugin-image-delimage img'), function(){
103
175
  $(this).attr('src', $(this).attr('src') + '?' + timestamp);
104
176
  });
177
+ replaceMarker(marker, tags.join("\n"));
178
+ }).catch(function(error){
179
+ replaceMarker(marker, '');
180
+ console.error(error);
181
+ alert($tDiary.plugin.image.failed);
105
182
  });
106
183
  return false;
107
184
  };
108
185
 
109
- $('#plugin-image-delimage')
110
- .on('submit', function(e){
186
+ $('#body').on('paste', function(e){
187
+ var clipboard = e.originalEvent.clipboardData;
188
+ if(!clipboard || $.inArray('text/plain', clipboard.types) >= 0){
189
+ return;
190
+ }
191
+ var files = imageFiles(clipboard.files);
192
+ if(files.length){
193
+ e.preventDefault();
194
+ $.replaceText(this, '', this.selectionStart, this.selectionEnd);
195
+ uploadFiles(files);
196
+ }
197
+ });
198
+
199
+ $(document).on('submit', '#plugin-image-delimage', function(e){
111
200
  e.preventDefault();
112
201
 
113
202
  var ids = $.map($('#image-table input[name="plugin_image_id"]:checked'), function(i){
@@ -117,7 +206,6 @@ $(function(){
117
206
  imagePlugin.remove($(this).serialize() + '&plugin=image', function(){
118
207
  $.each(ids, function(i, id){
119
208
  $('#image-index-' + id).parent().fadeOut();
120
- $('#image-info-' + id).fadeOut();
121
209
  });
122
210
  });
123
211
  return false;
@@ -147,14 +235,23 @@ $(function(){
147
235
  $('#plugin_image_dnd').hide();
148
236
  $(this).css('border', 'dashed 3px #CCC');
149
237
  $('#plugin-image-addimage form').show();
150
- var files = e.originalEvent.dataTransfer.files;
151
- uploadFiles(files);
238
+ uploadFiles($.makeArray(e.originalEvent.dataTransfer.files));
152
239
  return false;
153
240
  })
154
241
  .text($tDiary.plugin.image.drop_here)
155
242
  .hide()
156
243
  .appendTo('#plugin-image-addimage');
157
244
 
245
+ $('#body').on('drop', function(e){
246
+ var files = imageFiles(e.originalEvent.dataTransfer.files);
247
+ if(files.length){
248
+ e.preventDefault();
249
+ $('#plugin_image_dnd').hide();
250
+ $('#plugin-image-addimage form').show();
251
+ uploadFiles(files);
252
+ }
253
+ });
254
+
158
255
  var dnd_timer = false;
159
256
  $('body')
160
257
  .on('dragenter', function() {
data/js/preview.js CHANGED
@@ -6,64 +6,26 @@
6
6
  */
7
7
  $(function() {
8
8
 
9
- var previewButton = $('input[name*="preview"]');
10
- var intervalRate = 1;
11
-
12
- $tDiary.plugin.preview.reload = function() {
13
- previewButton.prop("disabled", true);
14
- $.post(
15
- 'update.rb',
16
- $('form.update').serialize() + "&appendpreview=1",
17
- function(data) {
18
- var previewContent = $(data).find('div.autopagerize_page_element');
19
- if (previewContent.length != 0) {
20
- $('div.autopagerize_page_element').replaceWith(previewContent);
21
- intervalRate = 1;
22
- } else {
23
- intervalRate *= 2;
24
- console.info('[preview.js] update failed, the next update will be after '
25
- + $tDiary.plugin.preview.interval * intervalRate + 'sec.');
26
- }
27
- $('div.day')
28
- .css('flex', "1 1 " + $tDiary.plugin.preview.minWidth / 2 + "px");
29
- },
30
- 'html'
31
- )
32
- .fail(function() {
33
- intervalRate *= 2;
34
- console.info('[preview.js] update failed, the next update will be after '
35
- + $tDiary.plugin.preview.interval * intervalRate + 'sec.');
36
- })
37
- .always(function() {
38
- previewButton.prop("disabled", false);
39
- setTimeout($tDiary.plugin.preview.reload,
40
- $tDiary.plugin.preview.interval * 1000 * intervalRate);
41
- });
42
- }
43
-
44
- if ($('div.autopagerize_page_element').length == 0) {
45
- $('div.update').before(
46
- '<div class="day autopagerize_page_element">'
47
- );
9
+ var update = $('div.update');
10
+ var day = update.prevAll('div.day').first();
11
+ if (day.length == 0) {
12
+ day = $('<div class="day autopagerize_page_element"></div>').insertBefore(update);
13
+ $tDiary.preview.refresh();
48
14
  }
49
15
 
50
16
  $('<div class="preview-container"></div>')
51
17
  .css('display', 'flex')
52
18
  .css('flex-flow', 'row-reverse wrap')
53
19
  .insertAfter('h1')
54
- .append($('div.day'));
55
- $('div.day')
20
+ .append(day, update);
21
+ day.add(update)
56
22
  .css('flex', "1 1 " + $tDiary.plugin.preview.minWidth / 2 + "px");
57
23
  $("div.whole-content").css('max-width', 'none');
58
24
 
59
- // プレビューボタンを押した時もajaxで更新するよう設定
60
- previewButton.click(
61
- function(event) {
62
- event.preventDefault();
63
- $tDiary.plugin.preview.reload();
64
- }
65
- );
66
-
67
- $tDiary.plugin.preview.reload();
25
+ var timer;
26
+ $('#body').closest('form').on('input', function() {
27
+ clearTimeout(timer);
28
+ timer = setTimeout($tDiary.preview.refresh, 1000);
29
+ });
68
30
 
69
31
  });