md_inc 0.2.6 → 0.2.7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    md_inc (0.2.2)
+    md_inc (0.2.6)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -21,7 +21,7 @@ Or install it yourself as:
 MdInc is a simple text inclusion filter intended for use
 with markdown and similar text formatting utilities. 
 MdInc provides simple 'include this other file' kind
-of processing. Using MdInc is straight forwark: Just require
+of processing. Using MdInc is straightforward: Just require
 it in and use the process method:
 
     require 'md_inc'

data/bin/md_inc

@@ -19,15 +19,15 @@ op = OptionParser.new do |op|
     $: << dir
   end
 
-  op.on '-d dir', '--dir dir', "Set the default dir for pulling incldue files" do |dir|
+  op.on '-d dir', '--dir dir', "Set the default dir for pulling include files" do |dir|
     base_dir = dir
   end
 end
 
 op.parse!
 
+MdInc::Commands::root(base_dir) unless base_dir.nil?
 tp = MdInc::TextProcessor.new
-tp.base_dir = base_dir if base_dir
 
 if ARGV.empty?
   puts tp.process_stream(STDIN)

data/lib/md_inc/md_inc_commands.rb

@@ -20,16 +20,20 @@ module MdInc
         lines.map &:rstrip!
       end
 
-      def code_inc(path, language='', re1=nil, re2=nil)
+      def code_inc(path, language=nil, re1=nil, re2=nil)
         if re1
-          code(language, between(re1, re2, inc(path)))
+          code(language, normalize_indent(between(re1, re2, inc(path))))
         else
-          code(language, inc(path))
+          code(language, normalize_indent(inc(path)))
         end
       end
 
       def code(language, lines)
-        ["```#{language}"] + lines + ["```"]
+        unless language.nil?
+          ["```#{language}"] + lines + ["```"]
+        else
+          lines.map {|l| l.rstrip.prepend('    ')}
+        end
       end
 
       def between(re1, re2, lines)
@@ -55,6 +59,22 @@ module MdInc
         end
         output
       end
+
+      def normalize_indent(lines)
+        min_indent = min_indent(lines)
+        lines.map {|l| l[min_indent..-1]}
+      end
+
+      private
+
+      def min_indent(lines)
+        indents = lines.map {|l| indent_depth(l)}
+        indents.min
+      end
+
+      def indent_depth(s)
+        /^ */.match(s).end(0)
+      end
     end
   end
 end

data/lib/md_inc/version.rb

@@ -1,3 +1,3 @@
 module MdInc
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/spec/new_commands.rb

@@ -1,6 +1,6 @@
 # This is an example of what you need to do to
 # Add a new command to MdInc: Just add a new
-# module level method to the Vacuum::Commands
+# module level method to the MdInc::Commands
 # module and off you go.
 module MdInc
   module Commands

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: md_inc
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-12 00:00:00.000000000Z
+date: 2013-02-13 00:00:00.000000000 Z
 dependencies: []
 description: MdInc is a simple text inclusion utility (it sucks in files) intended
   for use with markdown and similar utilities.