poppins 0.0.1 → 0.0.2

data/README.md

@@ -22,17 +22,22 @@ Or install it yourself as:
 
 ## Usage
 
-Poppins: a Markdown cleaner and formatter
-Usage: poppins [options] <filename>
+    Poppins: a Markdown cleaner and formatter
+    Usage: poppins [options] <filename>
+    
+    Examples:
+      poppins ./README.md
+      poppins --output 'output.md' ./input.md
+    
+    Options:
+        -o, --output [FILE]              Write the clean, formatted Markdown to FILE.
+        -h, --help                       Show this message
+        -v, --version                    Show version
+
+## Roadmap
+
+Poppins is intended to be similar to [formd](http://www.drbunsen.org/formd-a-markdown-formatting-tool.html), but with easier integration with Ruby projects.  Also, I would like to add the ability to insert reference links they way Dr. Drang describes [here](http://www.leancrew.com/all-this/2012/08/markdown-reference-links-in-bbedit/) and [here](http://www.leancrew.com/all-this/2012/08/more-markdown-reference-links-in-bbedit/).
 
-Examples:
-  poppins ./README.md
-  poppins --output 'output.md' ./input.md
-
-Options:
-    -o, --output [FILE]              Write the clean, formatted Markdown to FILE.
-    -h, --help                       Show this message
-    -v, --version                    Show version
 
 ## Contributing
 

data/bin/poppins

@@ -34,11 +34,7 @@ op.parse!
 
 input = ARGV.shift.to_s.strip
 
-if input.empty?
-  puts op
-  exit 1
-end
-
 poppins = Poppins::Document.new input, @output
 
 poppins.clean_and_format
+

data/lib/poppins/document.rb

@@ -1,14 +1,21 @@
 module Poppins
   class Document
 
-    def initialize(input, output=nil)
-      @input = File.open(input, 'r').readlines.join
+    def initialize(input=nil, output=nil)
+      if input.empty?
+        # TODO: Probably need to raise an error if ARGF is nil...
+        @input = ARGF.readlines.join
+      else
+        @input = File.open(input, 'r').readlines.join
+      end
+
       @output = output
 
       # RegEx for matching reference links in the text.  (Avoid footnotes!)
       @links = /\[([^\]]+)\]\[([^^\]]+)\]/
       # RegEx for matching labels for reference links.  (Avoid footnotes!)
       @labels = /^\[([^^\]]+)\]:\s+(.+)$/
+      @labels_with_possible_newlines = /^\[([^^\]]+)\]:\s+(.+)(\n)?/
     end
 
     ##
@@ -57,7 +64,7 @@ module Poppins
     def clean_and_format
       # Remove old references (TOOD: Need to remove blank lines resulting from
       # this.)
-      result = @input.gsub(@labels, '')
+      result = @input.gsub(@labels_with_possible_newlines, '')
       #
       # Add new references
       ordinal_references.each do |r| 

data/lib/poppins/version.rb

@@ -1,3 +1,3 @@
 module Poppins
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: poppins
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-01 00:00:00.000000000 Z
+date: 2012-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -63,7 +63,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1494761217159726976
+      hash: 1824278332185590952
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1494761217159726976
+      hash: 1824278332185590952
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23