soywiki 0.3.6 → 0.3.7

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.
data/README.markdown CHANGED
@@ -199,30 +199,35 @@ When you're on a wiki page and you want to see all the other wiki pages
199
199
  that link in to it, press `,M`. If there is only one page that links in,
200
200
  you'll be taken there automatically.
201
201
 
202
- * `,o` opens the first web hyperlink on or after the cursor in the default external web browser
203
- * `,O` opens the first web hyperlink on or after the cursor in Vim using `netrw`
202
+ * `,o` opens the first web hyperlink under or after the cursor in the default external web browser
203
+ * `ENTER` opens the web hyperlink under the cursor in the default external web browser
204
+ * `,O` opens the web hyperlink under the cursor in a vertical split window
205
+ * `CTRL-w f` opens the web hyperlink under the cursor in a normal split window
206
+ * `gf` opens the web hyperlink under the cursor in the same Vim window
204
207
 
205
- `,o` opens the next hyperlink on or after the cursor. These are the URLs
206
- that begin with http:// or https://. You can also use `ENTER` when the
207
- cursor is over a web hyperlink.
208
+ `,o` opens the next web hyperlink on or after the cursor in your default
209
+ external web browser. Web hyperlinks are the URLs that begin with
210
+ http:// or https://. You can also use `ENTER` when the cursor is over a
211
+ web hyperlink.
208
212
 
209
213
  Under the covers, SoyWiki uses the command `gnome-open` or `open` to
210
- launch your web browser. This should cover Linux Gnome desktop and OS X
211
- users. You can change the command SoyWiki uses to open a hyperlink by
212
- adding this to your `~/.vimrc`:
214
+ launch your external web browser. This should cover Linux Gnome desktop
215
+ and OS X users. You can change the command SoyWiki uses to open a
216
+ hyperlink by adding this to your `~/.vimrc`:
213
217
 
214
218
  let g:SoyWiki#browser_command = "your browser command here"
215
219
 
216
220
  If your Vim has `netrw` installed, you can open a hyperlink directly in
217
- same Vim window by putting the cursor on a web hyperlink and typing `,O`
218
- (capital O). This will open the webpage in a vertical split window,
219
- using `elinks` or whatever browser you set as your `g:netrw_http_cmd`.
220
- See `:help netrw` for more information.
221
+ Vim by putting the cursor on a web hyperlink and typing `gf`, `CTRL-W f`
222
+ or `,O` (capital O). All these commands open the webpage inside your Vim
223
+ session using `elinks` or whatever browser you set as your
224
+ `g:netrw_http_cmd`. See `:help netrw` for more information.
221
225
 
222
- Tip: I personally like using `netrw` (configured to use elinks) a lot
223
- more than using a conventional web browser, because it lets me keep all
224
- my URL bookmarks in regular text files and open, clip, and annotate them
225
- all in SoyWiki and Vim.
226
+ Tip: I personally prefer using `netrw` (configured to use elinks) to
227
+ launching URLs in an external web browser. This lets me keep all my URL
228
+ bookmarks in regular text files and open, clip, and annotate them all in
229
+ SoyWiki and Vim. Using `netrw` helps your text editor rather than your
230
+ web browser dominate your workflow.
226
231
 
227
232
 
228
233
  ## WikiLink autocompletion
@@ -323,7 +328,7 @@ command. Use `:vimgrep` directly if you want to do anything more
323
328
  specific.
324
329
 
325
330
  Tip: You can flag important notes in your wiki content by typing flags
326
- like TODO or IMPORTANT on the same line, and then use `:SWSearch` and
331
+ like TODO or IMPORTANT! on the same line, and then use `:SWSearch` and
327
332
  `:cl` to see all instances of them across your entire wiki.
328
333
 
329
334
  ## Revision history and distributed workflows
data/lib/soywiki/html.rb CHANGED
@@ -86,7 +86,7 @@ module Soywiki
86
86
  `rm -rf #{HTML_DIR}/*`
87
87
  namespaces = Dir["*"].select {|f|
88
88
  File.directory?(f) && f != HTML_DIR
89
- }.map {|namespace|
89
+ }.sort.map {|namespace|
90
90
  count = Dir["#{namespace}/*"].select {|f| wiki_page?(f)}.size
91
91
  [namespace, count]
92
92
  }
data/lib/soywiki.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  require 'string_ext'
2
2
 
3
3
  module Soywiki
4
- VERSION = '0.3.6'
4
+ VERSION = '0.3.7'
5
5
  WIKI_WORD = /\b([a-z][\w_]+\.)?[A-Z][a-z]+[A-Z]\w*\b/
6
6
  HYPERLINK = %r|\bhttps?://[^ >)\n\]]+|
7
7
 
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 0
7
7
  - 3
8
- - 6
9
- version: 0.3.6
8
+ - 7
9
+ version: 0.3.7
10
10
  platform: ruby
11
11
  authors:
12
12
  - Daniel Choi