md_inc 0.2.7 → 0.2.8

data/lib/md_inc/md_inc_commands.rb

@@ -1,7 +1,5 @@
 module MdInc
   module Commands
-    public :instance_eval
-
     class << self
       def root(path)
         @root = path
@@ -11,13 +9,25 @@ module MdInc
         @root ? File.join(@root, path) : path
       end
 
+      def process(content)
+        output = process_lines(content.split("\n"))
+        output.flatten.join("\n")
+      end
+
+      def process_lines(lines)
+        lines.map do |line|
+          (line[0] == '.') ? instance_eval(line[1..-1]) : line
+        end
+      end        
+
       def x(*args)
         []
       end
 
-      def inc(path)
+      def inc(path, recursive=true)
         lines = File.readlines(full_path(path))
-        lines.map &:rstrip!
+        lines.map! &:rstrip
+        recursive ? process_lines(lines) : lines
       end
 
       def code_inc(path, language=nil, re1=nil, re2=nil)
@@ -29,10 +39,10 @@ module MdInc
       end
 
       def code(language, lines)
-        unless language.nil?
-          ["```#{language}"] + lines + ["```"]
-        else
+        if language.nil?
           lines.map {|l| l.rstrip.prepend('    ')}
+        else
+          ["```#{language}"] + lines + ["```"]          
         end
       end
 

data/lib/md_inc/version.rb

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

data/lib/md_inc.rb

@@ -3,30 +3,20 @@ require 'md_inc/md_inc_commands'
 
 module MdInc
   class TextProcessor
-    def process_stream(s)
-      process(s.read)
+    def root(path)
+      Commands.root(path)
     end
 
-    def process_file(path)
-      process(File.read(path))
+    def process(string)
+      Commands.process(string)
     end
 
-    def process(content)
-      output = []
-      content.split("\n").each do |line|
-        if /^\./ =~ line
-          output << process_command(line)
-        else
-          output << line
-        end
-      end
-      out = output.flatten.join("\n")
-      out
+    def process_stream(stream)
+      Commands.process(stream.read)
     end
 
-    def process_command(command_line)
-      cmd = command_line[1..-1]
-      Commands.instance_eval(cmd)
+    def process_file(path)
+      Commands.process(File.read(path))
     end
   end
 end

data/spec/md_inc_spec.rb

@@ -1,6 +1,70 @@
 require 'md_inc'
 require 'fileutils'
 
+describe MdInc::Commands do
+  context '#code' do
+    it 'uses git style tagging if a language is supplied' do
+      output = MdInc::Commands.code("java", %w{foo})
+      output.should == [ "```java", "foo", "```"]
+    end
+
+    it 'uses traditional code indenting if a language is not supplied' do
+      output = MdInc::Commands.code(nil, %w{foo})
+      output.should == [ "    foo"]
+    end
+  end
+
+  context '#skip' do
+    let(:lines) { %w{foo skip1 skip2 bar skip3 baz skip4 skip5} }
+
+    it 'skips the lines that match the regular expression' do
+      output = MdInc::Commands.skip(/skip/, lines)
+      output.should == %w{foo bar baz}
+    end
+
+    it 'doesnt skip the lines that down match the regular expression' do
+      output = MdInc::Commands.skip(/no match/, lines)
+      output.should == lines
+    end
+  end
+
+  context '#between' do
+    let(:lines) { %w{aaa bbb ccc ddd eee} }
+
+    it 'returns the lines between the patterns, exclusive' do
+      output = MdInc::Commands.between(/aaa/, /ddd/, lines)
+      output.should == %w{bbb ccc}
+    end
+
+    it 'will skip the whole output if first re doesnt match' do
+      output = MdInc::Commands.between(/no match/, /ccc/, lines)
+      output.should == []
+    end
+  end
+
+  context '#normalize_indent' do
+    it 'does nothing to non-indented lines' do
+      lines = %w{aaa, bbb, ccc}
+      output = MdInc::Commands.normalize_indent(lines)
+      output.should == lines
+    end
+
+    it 'does nothing to lines with at least one non-indented line' do
+      lines = ['  aaa', 'bbb', '         ccc']
+      output = MdInc::Commands.normalize_indent(lines)
+      output.should == lines
+    end
+
+    it 'unindents so that the least indented line has no indent' do
+      lines = [' aaa', '  bbb', '   ccc']
+      output = MdInc::Commands.normalize_indent(lines)
+      output.should == ['aaa', ' bbb', '  ccc']
+    end
+
+  end
+
+end
+
 describe MdInc::TextProcessor do
   let(:mdi) { MdInc::TextProcessor.new }
 
@@ -28,11 +92,18 @@ describe MdInc::TextProcessor do
       File.open("temp2",'w') do |f|
         1.upto(10) {|n| f.puts "line #{n}" }
       end
+
+      File.open("temp3",'w') do |f|
+        f.puts "temp3 line1"
+        f.puts ".inc 'temp1'"
+        f.puts "temp3 line3"
+      end
     end
 
     after :each do
       FileUtils.rm_f("temp1")
       FileUtils.rm_f("temp2")
+      FileUtils.rm_f("temp3")
     end
 
     it 'can pull in the contents of another file with inc' do
@@ -61,5 +132,11 @@ describe MdInc::TextProcessor do
       output = mdi.process(text)
       output.should == "first\nAAA\nBBB\nlast"
     end
+
+    it 'can do recursive inclusion' do
+      text = "first\n.inc 'temp3'\nlast"
+      output = mdi.process(text)
+      output.should == "first\ntemp3 line1\naaa\nbbb\ntemp3 line3\nlast"      
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: md_inc
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-13 00:00:00.000000000 Z
+date: 2013-02-14 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.