mastalk 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53bd3ebc0b27533aa4bae0ecc7d05b0cf77b3e9d
-  data.tar.gz: a0090eef7e49d3a51e25e663f06ad3b52ae78bb0
+  metadata.gz: e34ab5804d40bf3035fb0443125facc8de97eeb2
+  data.tar.gz: 70d8d346885296ce978fb0bd9fb077bf05fceb2f
 SHA512:
-  metadata.gz: 9b09169c148db98a2e339e84506db19c5ef72dcbd7a981662374fe05c5175b0e8d619fda45ef98ecea61787bf0180a4c3ef99d7fcdc94474ff871610d4d01a64
-  data.tar.gz: e186402c449c09b7d120c4d0a4069a09a1c1b3c8c9dea2fdb5bf0d4ec5df8ff2e32b5c6a13e7b646db2c0f90276d27e46c1d044672d503f01775e7c27a5ad9d4
+  metadata.gz: f648183d1ace8ec21c2ee075333a66b3d6973cb1e42aa8044fff9e07188057e616464e67978be5c08f36ce05c1b5caa1cdde6385056ef9fe968c89428a070e20
+  data.tar.gz: 823191b5e008407f96708d67b8ed426fba47137ac3770feed5b9ce507a3a24c776f1e135fbbdfc890a3efe7c03ebefff3c7db55dad1ba7dbe8473ef5af68cda6

data/.ruby-gemset

@@ -0,0 +1 @@
+mastalk

data/.ruby-version

@@ -0,0 +1 @@
+2.1.2

data/README.md

@@ -213,3 +213,38 @@ Outputs:
 ```
 <br />
 ```
+
+### Block
+
+Creates a simple two column layout with content `$bl_c` on one side and `$bl_m` opposite.
+
+* `$bl_c` is intended to contain content of any type.
+* `$bl_m` is intended to contain images, i.e. `![Alt text](img.gif)`, or video, i.e. `({5n1nixLSrQI})` or `(@3739688349001@)`.
+
+
+```
+$bl
+
+$bl_c
+
+$bl_c
+
+$bl_m
+
+$bl_m
+
+bl$
+```
+
+Outputs:
+
+```
+<div class="l-block">
+  <div class="l-block__content">
+    <div class="panel panel--block"></div>
+  </div>
+  <div class="l-block__media"></div>
+</div>
+```
+
+`$bl_c` `$bl_m` positioning can be swapped around to switch element positions.

data/lib/mastalk/extensions.rb

@@ -9,7 +9,7 @@ module Mastalk
   #
   # <p>replacement html <%= body %></p>
   module Extensions
-    SNIPPETS_FOLDER=File.join(File.dirname(__FILE__), 'snippets')
+    SNIPPETS_FOLDER = File.join(File.dirname(__FILE__), 'snippets')
     @@extensions = []
 
     def extension(start, stop = nil, &block)

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

@@ -0,0 +1,5 @@
+# $bl, bl$
+
+<div class="l-block">
+  <%= Mastalk::Document.new(body.strip).to_html.gsub(/<p>|<\/p>|\n/, '') %>
+</div>

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

@@ -0,0 +1,7 @@
+# $bl_c, bl_c$
+
+<div class="l-block__content">
+  <div class="panel panel--block">
+    <%= Mastalk::Document.new(body.strip).to_html.gsub(/<p>|<\/p>|\n/, '') %>
+  </div>
+</div>

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

@@ -0,0 +1,5 @@
+# $bl_m, bl_m$
+
+<div class="l-block__media">
+  <%= Mastalk::Document.new(body.strip).to_html.gsub(/<p>|<\/p>|\n/, '') %>
+</div>

data/mastalk.gemspec

@@ -3,11 +3,11 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = 'mastalk'
-  s.version     = '0.3.4'
-  s.date        = '2015-02-24'
+  s.version     = '0.3.5'
+  s.date        = '2015-03-02'
   s.summary     = 'mastalk'
   s.description = 'Mastalk markdown extension language'
-  s.authors     = ['Douglas Roper']
+  s.authors     = ['Douglas Roper', 'Justin Perry']
   s.email       = 'dougdroper@gmail.com'
   s.files       = `git ls-files`.split($/)
   s.homepage    = 'https://github.com/moneyadviceservice/mastalk'

data/spec/mastalk_spec.rb

@@ -113,7 +113,7 @@ describe Mastalk::Document 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
+    it 'outputs ticks inside a table' do
       expect(subject.to_html).to eq(expected)
     end
   end
@@ -125,7 +125,7 @@ describe Mastalk::Document do
       "<table>\n  <tbody>\n    <tr>\n      <td>table</td>\n      <td>header</td>\n    </tr>\n    <tr>\n      <td><ul><li>yes</li></ul></td>\n      <td>here</td>\n    </tr>\n  </tbody>\n</table>\n"
     end
 
-    it 'pre-processes correctly' do
+    it 'outputs a bullet list inside a table' do
       expect(subject.to_html).to eq(expected)
     end
   end
@@ -137,7 +137,7 @@ describe Mastalk::Document do
       "<p><br /> <br /></p>\n"
     end
 
-    it 'pre-processes correctly' do
+    it 'outputs a line break' do
       expect(subject.to_html).to eq(expected)
     end
   end
@@ -153,8 +153,45 @@ describe Mastalk::Document do
   context 'when youtube video' do
     let(:source) { '({oZ0_U108aZw})' }
 
-    it 'includes youtube embed video' do
+    it 'outputs the youtube embed video' do
       expect(subject.to_html).to include('https://www.youtube.com/embed/oZ0_U108aZw')
     end
   end
+
+  context 'block with media and content' do
+    let(:source) { '$bl $bl_c Content bl_c$ $bl_m bl_m$ bl$' }
+
+    let(:expected) do
+      %(<div class="l-block">\n  <div class="l-block__content">  <div class="panel panel--block">    Content  </div></div><div class="l-block__media">  </div>\n</div>\n)
+    end
+
+    it 'outputs a block layout with media and content container blocks' do
+      expect(subject.to_html).to eq(expected)
+    end
+  end
+
+  context 'collapsable section' do
+    let(:source) { '$- -$' }
+
+    let(:expected) do
+      %(<div class="collapsible-section">\n  \n\n</div>\n)
+    end
+
+    it 'outputs a collapsible section block' do
+      expect(subject.to_html).to eq(expected)
+    end
+  end
+
+  context 'collapsable header' do
+    let(:source) { '$= Content =$' }
+
+    let(:expected) do
+      %(<div class="collapsible">\n  <button class="unstyled-button">\n    <span class="icon icon--toggle"></span>\n    <span class=\"visually-hidden js-collapsable-hidden\"></span>\n     Content \n  </button>\n</div>\n)
+    end
+
+    it 'outputs a collapsible header' do
+      expect(subject.to_html).to eq(expected)
+    end
+  end
+
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: mastalk
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Douglas Roper
+- Justin Perry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -98,6 +99,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - README.md
@@ -106,12 +109,14 @@ files:
 - lib/mastalk/extensions.rb
 - lib/mastalk/snippets/action_item.html.erb
 - lib/mastalk/snippets/add_action.html.erb
+- lib/mastalk/snippets/block.html.erb
+- lib/mastalk/snippets/block_content.html.erb
+- lib/mastalk/snippets/block_media.html.erb
 - lib/mastalk/snippets/break.html.erb
 - lib/mastalk/snippets/bright_video.html.erb
 - lib/mastalk/snippets/bullet_points.html.erb
 - lib/mastalk/snippets/callout.html.erb
 - lib/mastalk/snippets/collabsible_section.html.erb
-- lib/mastalk/snippets/collapsable.html.erb
 - lib/mastalk/snippets/collapsible_header.html.erb
 - lib/mastalk/snippets/how.html.erb
 - lib/mastalk/snippets/no.html.erb
@@ -148,4 +153,3 @@ signing_key:
 specification_version: 4
 summary: mastalk
 test_files: []
-has_rdoc: 

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

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