mastalk 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e2063c03e65f608a762f45f94e1bcfa4e4f3370
-  data.tar.gz: d113627da0b8674984686b0c0d796518af1a68fb
+  metadata.gz: 136987e072f7dbb42f90aa743569ebb46ccb04cd
+  data.tar.gz: 4796f36466e0e694f928f276fcdbfce9480beda1
 SHA512:
-  metadata.gz: b9e54c8a0e561b110ba704d680d4d6b9ec1f0cf7bb1712b1f1197494bc191e64dde730a69a4fa8ba6552d7ec6f4704dd7b6dc62d59ed1ecee07d7d3628dd5bf3
-  data.tar.gz: c8c1a02e4c9a5a6280b07cda883c1ecc4fc2dae956e03de946777f211e4bd02b76f40ace9bf49ac29dc63a3434407cf8bfc4eaa6d60c692f0e2c2768846e09d0
+  metadata.gz: 3ba14294c02fca4805c2d22c8bb50b06e85de901166007a9a43890658b6f6c990ecde65b1f0be982f374a63abcef9c1d3fda2f0f7fc086452ef8ff9dc53738ec
+  data.tar.gz: 3704b1aa7c8d3e53d5679a69d1fe9c452ec3fcf30305af350e589e14a3e9a40f0f85944788f941c8991df11604a352aef775e2d22735b71095f257b53182bdc0

data/.rspec

@@ -0,0 +1 @@
+--color

data/lib/mastalk/extensions.rb

@@ -12,10 +12,10 @@ module Mastalk
     SNIPPETS_FOLDER=File.join(File.dirname(__FILE__), 'snippets')
     @@extensions = []
 
-    def extension(start, stop = nil, new_line = false, &block)
+    def extension(start, stop = nil, &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)
+      re_stop = Regexp.escape(stop || start)
+      regex = Regexp.new("#{re_start}(.*?)(#{re_stop}+)", Regexp::MULTILINE)
       @@extensions << [regex, block]
     end
 
@@ -25,8 +25,8 @@ module Mastalk
       Dir.foreach(SNIPPETS_FOLDER) do |file|
         next if file == '.' || file == '..'
         content = File.read(File.join(SNIPPETS_FOLDER, file))
-        start, stop, new_line = args(content)
-        extension(start, stop, new_line == 'false') do |body|
+        start, stop = args(content)
+        extension(start, stop) do |body|
           ERB.new(remove_syntax_from(content)).result(binding)
         end
       end

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

@@ -1,3 +1,3 @@
-# [n], $, false
+# [n], [/n]
 
-<li class='no'><%= body.strip.gsub("\n", '') %></li>
+<li class='no'><%= Kramdown::Document.new(body.strip).to_html.gsub(/<p>|<\/p>|\n/, '') %></li>

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

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

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

@@ -1,3 +1,3 @@
-# [y], $, false
+# [y], [/y]
 
-<li class='yes'><%= body.strip.gsub("\n", '') %></li>
+<li class='yes'><%= Kramdown::Document.new(body.strip).to_html.gsub(/<p>|<\/p>|\n/, '') %></li>

data/lib/mastalk.rb

@@ -1,4 +1,5 @@
 require 'kramdown'
+require 'htmlentities'
 require_relative 'mastalk/extensions'
 
 module Mastalk
@@ -14,7 +15,7 @@ module Mastalk
     end
 
     def to_html
-      kramdown.to_html
+      ::HTMLEntities.new.decode( kramdown.to_html )
     end
 
     private
@@ -26,7 +27,7 @@ module Mastalk
     def preprocess(source)
       extensions.map do |regex, block|
         if source.match(regex)
-          source.sub!(regex, block.call(Regexp.last_match.captures.first))
+          source.sub!(regex, block.call(Regexp.last_match.captures.first).strip)
         end
       end
       preprocess(source) if extensions.any? {|regex, _| source.match(regex)}

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.2.1'
-  s.date        = '2014-11-17'
+  s.version     = '0.3.0'
+  s.date        = '2014-11-24'
   s.summary     = 'mastalk'
   s.description = 'Mastalk markdown extension language'
   s.authors     = ['Douglas Roper']
@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
   s.license       = 'MIT'
 
   s.add_runtime_dependency 'kramdown', '~> 1.5.0', '>= 1.5.0'
+  s.add_runtime_dependency 'htmlentities', '~> 4.3.2', '>= 4.3.2'
   s.add_development_dependency 'rspec', '~> 3.1.0', '>= 3.1.0'
   s.add_development_dependency 'rake', '~> 10.3.2', '>= 10.3.2'
 end

data/spec/mastalk_spec.rb

@@ -70,10 +70,10 @@ describe Mastalk::Document do
   end
 
   context 'with newline as end' do
-    let(:source) { "$yes-no\n [y] yes \n [n] no \n $end $why\n###header\nbody\n$why" }
+    let(:source) { "$yes-no\n [y] yes [/y] \n [n] no [/n] \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\"><li class=\"yes\">yes</li><li class=\"no\">no</li></ul>\n<div class=\"why\">
   <h3 id=\"header\">header</h3>\n<p>body</p>\n\n</div>\n"
     end
 
@@ -83,14 +83,14 @@ describe Mastalk::Document do
   end
 
   context 'two matches after each other' do
-    let(:source) { "$yes-no\n [y] yes \n $end $yes-no\ [n] no \n $end" }
+    let(:source) { "$yes-no\n [y] **yes** [/y] \n $end $yes-no\ [n] **no** [/n] \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"
+      "<ul class=\"yes-no\"><li class=\"yes\"><strong>yes</strong></li></ul><ul class=\"yes-no\"><li class=\"no\"><strong>no</strong></li></ul>"
     end
 
     it 'pre-processes correctly' do
-      expect(subject.to_html).to eq(expected)
+      expect(subject.to_html.gsub("\n", '')).to eq(expected)
     end
   end
 
@@ -105,4 +105,16 @@ describe Mastalk::Document do
       expect(subject.to_html).to eq(expected)
     end
   end
+
+  context 'ticks inside table' do
+    let(:source) { "|table|header|\n|$yes-no [y] yes [/y] $end|here|" }
+
+    let(:expected) do
+      "<table>\n  <tbody>\n    <tr>\n      <td>table</td>\n      <td>header</td>\n    </tr>\n    <tr>\n      <td><ul class='yes-no'><li class=\"yes\">yes</li></ul></td>\n      <td>here</td>\n    </tr>\n  </tbody>\n</table>\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.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Douglas Roper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -30,6 +30,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: htmlentities
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.3.2
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.3.2
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.3.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -77,6 +97,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - Gemfile
 - README.md
@@ -123,4 +144,3 @@ signing_key:
 specification_version: 4
 summary: mastalk
 test_files: []
-has_rdoc: