Merge pull request #25 from neocotic/wip-2.1.1

2.1.1 WIP
neocotic · May 6, 2013 · 21f9c31 · 21f9c31
2 parents 26c95f0 + 3093f54
commit 21f9c31
Show file tree

Hide file tree

Showing 22 changed files with 309 additions and 213 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 node_modules/
 npm-debug.log
+tmp/
 
 .DS_Store?
 ehthumbs.db

diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,7 @@
+2013.05.06, Version 2.1.1
+
+* [#24](https://github.com/neocotic/html.md/issues/24): Add `base` option to specify the base URL used to resolve relative URLs
+
 2013.05.03, Version 2.1.0
 
 * [#18](https://github.com/neocotic/html.md/issues/18): Add support for [bower][] installations

diff --git a/Gruntfile.coffee b/Gruntfile.coffee
@@ -1,7 +1,7 @@
 module.exports = (grunt) ->
 
-  # Configure
-  # ---------
+  # Configuration
+  # -------------
 
   grunt.initConfig
 
@@ -11,6 +11,7 @@ module.exports = (grunt) ->
       docs: ['docs/*']
       lib:  ['lib/*']
       dist: ['dist/*']
+      test: ['tmp']
 
     coffee:
       all:
@@ -46,4 +47,4 @@ module.exports = (grunt) ->
 
   grunt.registerTask 'build',   ['clean', 'coffee', 'docco', 'uglify']
   grunt.registerTask 'default', ['build', 'test']
-  grunt.registerTask 'test',    ['nodeunit']
+  grunt.registerTask 'test',    ['clean:test', 'nodeunit']
diff --git a/README.md b/README.md
@@ -92,7 +92,8 @@ $ md -l .
 
       -h, --help          output usage information
       -V, --version       output the version number
-      -a, --absolute      always use absolute URLs for links
+      -a, --absolute      always use absolute URLs for links and images
+      -b, --base <url>    set base URL to resolve relative URLs from
       -d, --debug         print additional debug information
       -e, --eval          pass a string from the command line as input
       -i, --inline        generate inline style links
@@ -122,7 +123,11 @@ The following options are recognised by this method (all of which are optional);
   </tr>
   <tr>
     <td>absolute</td>
-    <td>All links are parsed with absolute URLs</td>
+    <td>All links and images are parsed with absolute URLs</td>
+  </tr>
+  <tr>
+    <td>base</td>
+    <td>All relative links and images are resolved from this URL</td>g
   </tr>
   <tr>
     <td>debug</td>
@@ -134,6 +139,8 @@ The following options are recognised by this method (all of which are optional);
   </tr>
 </table>
 
+**Note:** The `base` option *only* works in the [node.js][] environment.
+
 ### Miscellaneous
 
 #### `noConflict()`
@@ -157,7 +164,7 @@ This is really just intended for use within a browser.
 The current version of `md`.
 
 ``` javascript
-console.log(md.version); // "2.1.0"
+console.log(md.version); // "2.1.1"
 ```
 
 ## Windows

diff --git a/component.json b/component.json
@@ -1,5 +1,5 @@
 {
   "name": "html-md",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "main": "dist/md.min.js"
 }
diff --git a/dist/md.min.js b/dist/md.min.js
diff --git a/docs/command.html b/docs/command.html
diff --git a/docs/md.html b/docs/md.html
diff --git a/lib/command.js b/lib/command.js
diff --git a/lib/md.js b/lib/md.js
diff --git a/man/md.1 b/man/md.1
@@ -15,6 +15,10 @@
 .I output_dir
 ]
 [
+.B \-b
+.I base_url
+]
+[
 .I paths
 ]
 .br
@@ -40,7 +44,15 @@ systems to provide a complete command line utility.
 
 .TP 15
 .B \-a/\-\-absolute
-Always use absolute URLs for converted links.
+Always use absolute URLs for converted links and
+images.
+
+.HP
+.B \-b/\-\-base
+.I url
+.br
+Specifies the base URL to resolve relative URLs
+from.
 
 .TP
 .B \-d/\-\-debug