mastalk 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 220cf96953a354bbaf66f95e548280ea2f50608b
-  data.tar.gz: bedca3b3cbdaa206841548a6f419dc92ce54cc38
+  metadata.gz: 20d1aaef80c7e2a2b51c613eee6e0df5ab6fbe9c
+  data.tar.gz: 1c3ea4b6799681f990a1ae55bd1f2440e982057c
 SHA512:
-  metadata.gz: bc5650ba5306081a15c26257ac9b9c6c717e9580f3977414220a61766b56dfed9ad6fa549faae5ef5f95220d738881f49d80c09d914a64e5d1a40eb989f64c8c
-  data.tar.gz: e268d79c98be558d3f0aa2f5da4f75a9bc67d08bb3f918a688904a552b8171d7e5addddf5ecab6f0b290fe9f819148ff6c845b2adc38bce39a11352d745605ec
+  metadata.gz: 2413d958bdfbfb7d8420c06b62496ca2b0b381ab9b1f0fc185bf88c3786310b50c1fbe7d792689d5ed20ceee303fa2fc63048b9d6559b222fc346f0747cb248d
+  data.tar.gz: 29371f00356396cf9d4ac9d02241460ce3274cbd519d7ce4c68880abd644b9661a35bea0129c010fc8390286672d5279970a03e6c8cf27c14c3d9dc451d9f00c

data/README.md

@@ -35,11 +35,11 @@ Outputs:
 `.callout`
 
 ```
-$=callout
+$~callout
 # Budgeting tips
 In 1985, average first-time buyers needed a deposit of 5% to buy a home - in 2012, this had increased to 20%
 *Source: HMS Treasury*
-=$
+~$
 ```
 
 Outputs:

data/lib/mastalk/extensions.rb

@@ -15,7 +15,7 @@ module Mastalk
     def extension(start, stop = nil, new_line = false, &block)
       re_start = Regexp.escape(start)
       re_stop = stop == '$' ? stop : Regexp.escape(stop || start)
-      regex = Regexp.new("#{re_start}(.*)(#{re_stop})", new_line ? 0 : Regexp::MULTILINE)
+      regex = Regexp.new("#{re_start}(.*?)(#{re_stop}+)", new_line ? 0 : Regexp::MULTILINE)
       @@extensions << [regex, block]
     end
 

data/lib/mastalk/snippets/action_item.html.erb

@@ -1,5 +1,5 @@
 # $action, $item
 
 <div class='action-item'>
-  <%= Mastalk::Document.new(body.strip).to_html %>
+  <%= body %>
 </div>

data/lib/mastalk/snippets/add_action.html.erb

@@ -1,5 +1,5 @@
 # ^
 
 <div class='add-action'>
- <%= Mastalk::Document.new(body.strip).to_html %>
+ <%= Mastalk::Document.new(body.strip).to_html.gsub(/<p>|<\/p>/, '') %>
 </div>

data/lib/mastalk/snippets/callout.html.erb

@@ -1,4 +1,4 @@
-# $=callout, =$
+# $~callout, ~$
 
 <div class='callout'>
   <%= Mastalk::Document.new(body.strip).to_html %>

data/lib/mastalk/snippets/collapsable.html.erb

@@ -1,5 +1,5 @@
 # $collapsable
 
 <div class='collapsable'>
-  <%= Mastalk::Document.new(body.strip).to_html %>
+  <%= body.strip %>
 </div>

data/lib/mastalk/snippets/collapsible_header.html.erb

@@ -4,6 +4,6 @@
   <button class="unstyled-button">
     <span class="icon icon--toggle"></span>
     <span class="visually-hidden js-collapsable-hidden"></span>
-    <%= Mastalk::Document.new(body).to_html %>
+    <%= body %>
   </button>
 </div>

data/lib/mastalk/snippets/ticks.html.erb

@@ -1,5 +1,5 @@
 # $yes-no, $end
 
 <ul class='yes-no'>
-  <%= Mastalk::Document.new(body).to_html %>
+  <%= body %>
 </ul>

data/lib/mastalk.rb

@@ -26,9 +26,10 @@ module Mastalk
     def preprocess(source)
       extensions.map do |regex, block|
         if source.match(regex)
-          source.gsub!(regex, block.call(Regexp.last_match.captures.first))
+          source.sub!(regex, block.call(Regexp.last_match.captures.first))
         end
       end
+      preprocess(source) if extensions.any? {|regex, _| source.match(regex)}
       source
     end
   end

data/mastalk.gemspec

@@ -3,8 +3,8 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = 'mastalk'
-  s.version     = '0.1.2'
-  s.date        = '2014-10-31'
+  s.version     = '0.2.0'
+  s.date        = '2014-11-11'
   s.summary     = 'mastalk'
   s.description = 'Mastalk markdown extension language'
   s.authors     = ['Douglas Roper']

data/spec/mastalk_spec.rb

@@ -73,7 +73,7 @@ describe Mastalk::Document do
     let(:source) { "$yes-no\n [y] yes \n [n] no \n $end $why\n###header\nbody\n$why" }
 
     let(:expected) do
-      "<ul class=\"yes-no\">\n  \n<li class=\"yes\">yes</li>\n\n<li class=\"no\">no</li>\n\n\n</ul>\n<div class=\"why\">
+      "<ul class=\"yes-no\">\n  \n <li class=\"yes\">yes</li>\n\n <li class=\"no\">no</li>\n\n \n</ul>\n<div class=\"why\">
   <h3 id=\"header\">header</h3>\n<p>body</p>\n\n</div>\n"
     end
 
@@ -81,4 +81,28 @@ describe Mastalk::Document do
       expect(subject.to_html).to eq(expected)
     end
   end
+
+  context 'two matches after each other' do
+    let(:source) { "$yes-no\n [y] yes \n $end $yes-no\ [n] no \n $end" }
+
+    let(:expected) do
+      "<ul class=\"yes-no\">\n  \n <li class=\"yes\">yes</li>\n\n \n</ul>\n<ul class=\"yes-no\">\n   <li class=\"no\">no</li>\n\n \n</ul>\n"
+    end
+
+    it 'pre-processes correctly' do
+      expect(subject.to_html).to eq(expected)
+    end
+  end
+
+  context 'two callouts after each other' do
+    let(:source) { "$~callout\n ##yes ~$ $~callout\n ##yes ~$" }
+
+    let(:expected) do
+      "<div class=\"callout\">\n  <h2 id=\"yes\">yes</h2>\n\n</div>\n<div class=\"callout\">\n  <h2 id=\"yes\">yes</h2>\n\n</div>\n"
+    end
+
+    it 'pre-processes correctly' do
+      expect(subject.to_html).to eq(expected)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mastalk
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Douglas Roper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown