shortcode 0.3.3 → 0.4.0

data/Gemfile.lock

@@ -1,8 +1,7 @@
 PATH
   remote: .
   specs:
-    shortcode (0.3.3)
-      haml (~> 4.0)
+    shortcode (0.4.0)
       parslet (= 1.6.0)
 
 GEM
@@ -19,7 +18,7 @@ GEM
       simplecov (>= 0.7)
       term-ansicolor
       thor
-    diff-lcs (1.2.4)
+    diff-lcs (1.2.5)
     docile (1.1.3)
     haml (4.0.5)
       tilt
@@ -30,14 +29,18 @@ GEM
     rake (10.1.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.4)
-    rspec-expectations (2.14.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.1)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.0)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json
@@ -60,7 +63,8 @@ DEPENDENCIES
   appraisal (= 1.0.0.beta3)
   bundler (~> 1.3)
   coveralls
+  haml (~> 4.0)
   rake
-  rspec
+  rspec (~> 3.0.0)
   shortcode!
   slim (~> 2.0)

data/README.md

@@ -46,10 +46,10 @@ Shortcode.process("[quote]Hello World[/quote]")
 Shortcode.setup do |config|
 
   # the template parser to use
-  config.template_parser = :haml # :erb, :haml, :slim supported, :haml is default
+  config.template_parser = :erb # :erb, :haml, :slim supported, :erb is default
 
    # location of the template files, default is "app/views/shortcode_templates"
-  config.template_path = "support/templates/haml"
+  config.template_path = "support/templates/erb"
 
    # a hash of templates passed as strings, if this is set it overrides the
    # above template_path option. The default is nil
@@ -68,19 +68,26 @@ end
 
 ### Templates
 
-Each shortcode tag needs a template in order to translate the shortcode into html (or other output). Templates can be written in HAML or erb and work in
+Each shortcode tag needs a template in order to translate the shortcode into html (or other output). Templates can be written in erb, haml or slim and work in
 a similar way to views in Rails. The main content of a tag is passed via the instance variable `@content`. Any attributes defined on a tag are passed in via an `@attributes` hash, shortcodes can have any number of attributes. For instance a quote shortcode might look like this:
 
     [quote author="Homer Simpson"]Doh![/quote]
 
-And the haml template to render the shortcode
-
-```haml
-%blockquote
-  %p.quotation= @content
-  -if @attributes[:author]
-    %p.citation
-      %span.author= @attributes[:author]
+And the erb template to render the shortcode
+
+```erb
+<blockquote>
+  <p class='quotation'>
+    <%= @content %>
+  </p>
+  <% if @attributes[:author] %>
+    <p class='citation'>
+      <span class='author'>
+        <%= @attributes[:author] %>
+      </span>
+    </p>
+  <% end %>
+</blockquote>
 ```
 
 If using the gem within a Rails project you can use the Rails helper methods within templates.
@@ -101,7 +108,7 @@ block as strings.
 
 #### Templates loaded from the file system
 
-Simply create files with the extension or .haml or .erb with a filename the same as the shortcode tag, e.g. gallery.haml would render a [gallery] shortcode tag. The default
+Simply create files with the extension or .erb, .haml, or .slim with a filename the same as the shortcode tag, e.g. gallery.html.erb would render a [gallery] shortcode tag. The default
 location for template files is `app/views/shortcode_templates`, if you want to load tempaltes from a different location use the `template_path` config option.
 
 #### Templates set as configuration options

data/lib/shortcode.rb

@@ -1,11 +1,13 @@
 require 'parslet'
-require 'haml'
+require 'erb'
 
 begin
-  require 'slim'
+  require 'haml'
 rescue LoadError; end
 
-require 'erb'
+begin
+  require 'slim'
+rescue LoadError; end
 
 module Shortcode
 

data/lib/shortcode/configuration.rb

@@ -1,20 +1,7 @@
 class Shortcode::Configuration
-  # This stores if the parser has been set in a configuration block so that deprication
-  # warnings can be issued
-  attr_accessor :parser_set
-
-  def haml_deprecation_warning
-    "[DEPRECATION] HAML will no longer be the default template parser in version 0.4 of Shortcode. A HAML template has been used without explicitly specifying HAML as the template parser in a setup block. Please set config.template_parser = :haml to suppress this warning"
-  end
-
   # Sets the template parser to use, supports :erb, :haml, and :slim, default is :haml
   attr_accessor :template_parser
 
-  def template_parser=(parser)
-    @parser_set = true
-    @template_parser = parser
-  end
-
   # Sets the path to search for template files
   attr_accessor :template_path
 
@@ -31,12 +18,11 @@ class Shortcode::Configuration
   attr_accessor :quotes
 
   def initialize
-    @template_parser    = :haml
+    @template_parser    = :erb
     @template_path      = "app/views/shortcode_templates"
     @templates          = nil
     @block_tags         = []
     @self_closing_tags  = []
     @quotes             = '"'
-    @parser_set         = false
   end
 end

data/lib/shortcode/tag.rb

@@ -29,13 +29,12 @@ class Shortcode::Tag
 
     def render_template
       case Shortcode.configuration.template_parser
-      when :slim
-        Slim::Template.new { markup }.render(self)
-      when :haml
-        warn Shortcode.configuration.haml_deprecation_warning unless Shortcode.configuration.parser_set
-        Haml::Engine.new(markup, ugly: true).render(binding)
       when :erb
         ERB.new(markup).result(binding)
+      when :haml
+        Haml::Engine.new(markup, ugly: true).render(binding)
+      when :slim
+        Slim::Template.new { markup }.render(self)
       else
         raise Shortcode::TemplateParserNotSupported, Shortcode.configuration.template_parser
       end

data/lib/shortcode/version.rb

@@ -1,3 +1,3 @@
 module Shortcode
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end

data/shortcode.gemspec

@@ -19,11 +19,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "parslet", "1.6.0"
-  spec.add_dependency "haml", "~> 4.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", "~> 3.0.0"
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "slim", "~> 2.0"
+  spec.add_development_dependency "haml", "~> 4.0"
 end

data/spec/parser_spec.rb

@@ -21,7 +21,7 @@ describe Shortcode::Parser do
 
   it "parses quote shortcodes" do
     quotes.each do |string|
-      parser.should parse(string)
+      expect(parser).to parse(string)
     end
   end
 
@@ -32,7 +32,7 @@ describe Shortcode::Parser do
 
     quotes.each do |string|
       # Change double quotes to single quotes in the fixture
-      parser.should parse(string.gsub '"', "'")
+      expect(parser).to parse(string.gsub '"', "'")
     end
 
     # Reset configuration to default
@@ -43,18 +43,18 @@ describe Shortcode::Parser do
 
   it "parses list shortcodes" do
     collapsible_lists.each do |string|
-      parser.should parse(string)
+      expect(parser).to parse(string)
     end
   end
 
   it "parses timeline shortcodes" do
     timelines.each do |string|
-      parser.should parse(string)
+      expect(parser).to parse(string)
     end
   end
 
   it "parses complex nested shortcodes" do
-    parser.should parse(complex_snippet)
+    expect(parser).to parse(complex_snippet)
   end
 
   describe "parsed strings" do
@@ -64,7 +64,7 @@ describe Shortcode::Parser do
       let(:parsed_object) { parser.parse(simple_quote) }
 
       it "created the expected object" do
-        parsed_object[:body].should == [{ open: "quote", options: [], inner: [{ text: "hello" }], close: "quote" }]
+        expect(parsed_object[:body]).to eq([{ open: "quote", options: [], inner: [{ text: "hello" }], close: "quote" }])
       end
 
     end
@@ -74,7 +74,7 @@ describe Shortcode::Parser do
       let(:parsed_object) { parser.parse(full_quote) }
 
       it "created the expected object" do
-        parsed_object[:body].should == [{
+        expect(parsed_object[:body]).to eq([{
           open: "quote",
           options: [
             { key: "author", value: "Jamie Dyer" },
@@ -82,7 +82,7 @@ describe Shortcode::Parser do
           ],
           inner: [{ text: "A quote" }],
           close: "quote"
-        }]
+        }])
       end
 
     end
@@ -92,7 +92,7 @@ describe Shortcode::Parser do
       let(:parsed_object) { parser.parse(quote_with_extras) }
 
       it "created the expected object" do
-        parsed_object[:body].should == [
+        expect(parsed_object[:body]).to eq([
           { text: "Blah blah " },
           {
             open: "quote",
@@ -103,7 +103,7 @@ describe Shortcode::Parser do
             close: "quote"
           },
           { text: "<br> blah blah\n" }
-        ]
+        ])
       end
 
     end
@@ -113,7 +113,7 @@ describe Shortcode::Parser do
       let(:parsed_object) { parser.parse(simple_list) }
 
       it "created the expected object" do
-        parsed_object[:body].should == [{
+        expect(parsed_object[:body]).to eq([{
           open: "collapsible_list",
           options: [],
           inner: [{
@@ -135,7 +135,7 @@ describe Shortcode::Parser do
             close: "item"
           }],
           close: "collapsible_list"
-        }]
+        }])
       end
 
     end
@@ -145,14 +145,14 @@ describe Shortcode::Parser do
       let(:parsed_object) { parser.parse(timeline_event) }
 
       it "created the expected object" do
-        parsed_object[:body].should == [{
+        expect(parsed_object[:body]).to eq([{
           open_close: "timeline_event",
           options: [
             { key: "date", value: "March 2013" },
             { key: "title", value: "a title" },
             { key: "link", value: "http://blah.com" }
           ]
-        }]
+        }])
       end
 
     end
@@ -162,13 +162,13 @@ describe Shortcode::Parser do
       let(:parsed_object) { parser.parse(timeline_info) }
 
       it "created the expected object" do
-        parsed_object[:body].should == [{
+        expect(parsed_object[:body]).to eq([{
           open_close: "timeline_info",
           options: [
             { key: "date", value: "Feb 2013" },
             { key: "title", value: "Something amazing" }
           ]
-        }]
+        }])
       end
 
     end
@@ -178,7 +178,7 @@ describe Shortcode::Parser do
       let(:parsed_object) { parser.parse(timeline_person) }
 
       it "created the expected object" do
-        parsed_object[:body].should == [{
+        expect(parsed_object[:body]).to eq([{
           open: "timeline_person",
           options: [
             { key: "date", value: "Jan 2012" },
@@ -190,7 +190,7 @@ describe Shortcode::Parser do
           ],
           inner: [{ text: "A bit of body copy\nwith a newline\n" }],
           close: "timeline_person"
-        }]
+        }])
       end
 
     end
@@ -200,7 +200,7 @@ describe Shortcode::Parser do
       let(:parsed_object) { parser.parse(complex_snippet) }
 
       it "created the expected object" do
-        parsed_object[:body].should == [{
+        expect(parsed_object[:body]).to eq([{
           text: "<h3>A page title</h3>\n<p>Some text</p>\n"},
           {
             open: "collapsible_list",
@@ -244,7 +244,7 @@ describe Shortcode::Parser do
             close: "collapsible_list"
           },
           { text: "<p>Some more text</p>\n" }
-        ]
+        ])
       end
     end
   end

data/spec/presenter_spec.rb

@@ -36,11 +36,11 @@ describe Shortcode::Presenter do
     end
 
     it "uses the custom attributes" do
-      Shortcode.process(simple_quote).gsub("\n",'').should == presenter_output.gsub("\n",'')
+      expect(Shortcode.process(simple_quote).gsub("\n",'')).to eq(presenter_output)
     end
 
     it "passes through additional attributes" do
-      Shortcode.process(simple_quote, { title: 'Additional attribute title' }).gsub("\n",'').should == attributes_output.gsub("\n",'')
+      expect(Shortcode.process(simple_quote, { title: 'Additional attribute title' }).gsub("\n",'')).to eq(attributes_output)
     end
 
   end

data/spec/rails_helpers_spec.rb

@@ -10,23 +10,23 @@ describe "rails helpers" do
 
   describe "erb" do
 
-    before(:each) do
-      Shortcode.setup do |config|
-        config.template_parser = :erb
-        config.template_path = File.join File.dirname(__FILE__), "support/templates/erb"
-      end
-    end
-
     it "are accessible within erb templates" do
-      Shortcode.process(template).gsub("\n",'').should == erb_output.gsub("\n",'')
+      expect(Shortcode.process(template).gsub("\n",'')).to eq(erb_output)
     end
 
   end
 
   describe "haml" do
 
+    before(:each) do
+      Shortcode.setup do |config|
+        config.template_parser = :haml
+        config.template_path = File.join File.dirname(__FILE__), "support/templates/haml"
+      end
+    end
+
     it "are accessible within haml templates" do
-      Shortcode.process(template).gsub("\n",'').should == haml_output.gsub("\n",'')
+      expect(Shortcode.process(template).gsub("\n",'')).to eq(haml_output)
     end
 
   end
@@ -41,7 +41,7 @@ describe "rails helpers" do
     end
 
     it "are accessible within slim templates" do
-      Shortcode.process(template).gsub("\n",'').should == slim_output.gsub("\n",'')
+      expect(Shortcode.process(template).gsub("\n",'')).to eq(slim_output)
     end
 
   end

data/spec/shortcode_spec.rb

@@ -10,22 +10,15 @@ describe Shortcode do
   context "simple_quote" do
 
     it "converts into html" do
-      Shortcode.process(simple_quote).should == simple_quote_output
+      expect(Shortcode.process(simple_quote).gsub("\n",'')).to eq(simple_quote_output)
     end
 
   end
 
   context "erb templates" do
 
-    before(:each) do
-      Shortcode.setup do |config|
-        config.template_parser = :erb
-        config.template_path = File.join File.dirname(__FILE__), "support/templates/erb"
-      end
-    end
-
     it "converts into html" do
-      Shortcode.process(simple_quote).gsub("\n",'').should == simple_quote_output.gsub("\n",'')
+      expect(Shortcode.process(simple_quote).gsub("\n",'')).to eq(simple_quote_output)
     end
   end
 

data/spec/spec_helper.rb

@@ -1,14 +1,15 @@
 $LOAD_PATH.unshift File.dirname(__FILE__)
 
-require 'coveralls'
-Coveralls.wear!
+if ENV["CI"]
+  require 'coveralls'
+  Coveralls.wear!
+end
 
 require 'rspec'
 require 'rails'
 require 'action_view'
 require 'shortcode'
 require 'support/fixtures'
-require 'support/custom_expectations/write_expectation'
 
 # Set slim's attribute quotes to use single quotes so it's the same as haml
 Slim::Engine.set_default_options attr_quote: "'"
@@ -19,9 +20,8 @@ RSpec.configure do |config|
   config.before(:each) do
     Shortcode.presenters = {}
     Shortcode.setup do |config|
-      config.template_parser = :haml
-      config.parser_set = false
-      config.template_path = File.join File.dirname(__FILE__), "support/templates/haml"
+      config.template_parser = :erb
+      config.template_path = File.join File.dirname(__FILE__), "support/templates/erb"
       config.templates = nil
       config.block_tags = [:quote, :collapsible_list, :item, :timeline_person, :rails_helper]
       config.self_closing_tags = [:timeline_event, :timeline_info]

data/spec/support/fixtures.rb

@@ -1,7 +1,9 @@
 RSpec.configure do |config|
 
   def load_fixture(name, type='txt')
-    File.read File.join(File.dirname(__FILE__), 'fixtures', "#{name}.#{type}")
+    type = type.to_s
+    string = File.read(File.join(File.dirname(__FILE__), 'fixtures', "#{name}.#{type}"))
+    type == 'txt' ? string : string.gsub("\n",'')
   end
 
 end

data/spec/support/templates/erb/collapsible_list.html.erb

@@ -0,0 +1,3 @@
+<div class='collapsible'>
+<%= @content %>
+</div>

data/spec/support/templates/erb/item.html.erb

@@ -0,0 +1,4 @@
+<section>
+<h5><%= @attributes[:title] %></h5>
+<div><%= @content %></div>
+</section>

data/spec/support/templates/erb/quote.html.erb

@@ -5,7 +5,8 @@
 <% if @attributes[:author] %>
 <span class='author'><%= @attributes[:author] %></span>
 <% end %>
-<% if @attributes[:title] <% end %><span class='position'><%= @attributes[:title] %></span>
+<% if @attributes[:title] %>
+<span class='position'><%= @attributes[:title] %></span>
 <% end %>
 </p>
 <% end %>

data/spec/support/templates/erb/timeline_event.html.erb

@@ -0,0 +1,17 @@
+<div class='timeline'>
+<table>
+<tbody>
+<tr>
+<th scope='row'>
+<%= @attributes[:date] %>
+</th>
+<td class='event'>
+<span class='description'><%= @attributes[:title] %></span>
+<% if @attributes[:link] %>
+<a class='read_more' href='<%= @attributes[:link] %>'>Read More</a>
+<% end %>
+</td>
+</tr>
+</tbody>
+</table>
+</div>

data/spec/support/templates/erb/timeline_info.html.erb

@@ -0,0 +1,15 @@
+<div class='timeline'>
+<table>
+<tbody>
+<tr>
+<th scope='row'>
+<%= @attributes[:date] %>
+</th>
+<td class='information'>
+<p><%= @attributes[:title] %></p>
+</td>
+</tr>
+</tbody>
+</table>
+</div>
+

data/spec/support/templates/erb/timeline_person.html.erb

@@ -0,0 +1,23 @@
+<div class='timeline'>
+<table>
+<tbody>
+<tr>
+<th scope='row'>
+<%= @attributes[:date] %>
+</th>
+<td class='team_news'>
+<img src='<%= @attributes[:image] %>'>
+<h4><%= @attributes[:title] %></h4>
+<span class='name'><%= @attributes[:name] %></span>
+<span class='position'><%= @attributes[:position] %></span>
+<% if @attributes[:link] %>
+<a class='read_more' href='<%= @attributes[:link] %>'>View Profile</a>
+<% end %>
+<div class='description'>
+<p><%= @content %></p>
+</div>
+</td>
+</tr>
+</tbody>
+</table>
+</div>

data/spec/tag_spec.rb

@@ -34,7 +34,6 @@ describe Shortcode::Tag do
 
     before(:each) do
       Shortcode.setup do |config|
-        config.template_parser = :erb
         config.templates = {
           from_string: '<p><%= @attributes[:string] %></p>'
         }
@@ -42,7 +41,7 @@ describe Shortcode::Tag do
     end
 
     it "renders a template from a string" do
-      tag.render.should == '<p>batman</p>'
+      expect(tag.render).to eq('<p>batman</p>')
     end
 
   end
@@ -53,7 +52,6 @@ describe Shortcode::Tag do
 
     before(:each) do
       Shortcode.setup do |config|
-        config.template_parser = :erb
         config.templates = {
           from_string: '<p><%= @attributes[:string] %></p>'
         }

data/spec/template_parsers_spec.rb

@@ -7,46 +7,23 @@ describe "template parsers" do
 
   context "erb" do
 
-    # TODO remove this before block as erb will eb the default at version 0.4
-    before(:each) do
-      Shortcode.setup do |config|
-        config.template_parser = :erb
-        config.template_path = File.join File.dirname(__FILE__), "support/templates/erb"
-      end
-    end
-
     it "can render a template" do
-      Shortcode.process(simple_quote).gsub("\n",'').should == simple_quote_output.gsub("\n",'')
+      expect(Shortcode.process(simple_quote).gsub("\n",'')).to eq(simple_quote_output)
     end
 
   end
 
   context "haml" do
 
-    it "can render a template" do
-      Shortcode.process(simple_quote).gsub("\n",'').should == simple_quote_output.gsub("\n",'')
-    end
-
-    context "when specified in the config" do
-
-      before(:each) do
-        Shortcode.setup do |config|
-          config.template_parser = :haml
-        end
-      end
-
-      it "does not show a deprecation warning" do
-        expect { Shortcode.process(simple_quote) }.not_to write(Shortcode.configuration.haml_deprecation_warning).to(:error)
+    before(:each) do
+      Shortcode.setup do |config|
+        config.template_parser = :haml
+        config.template_path = File.join File.dirname(__FILE__), "support/templates/haml"
       end
-
     end
 
-    context "when not specifed in the config" do
-
-      it "shows a deprecation warning" do
-        expect { Shortcode.process(simple_quote) }.to write(Shortcode.configuration.haml_deprecation_warning).to(:error)
-      end
-
+    it "can render a template" do
+      expect(Shortcode.process(simple_quote).gsub("\n",'')).to eq(simple_quote_output)
     end
 
   end
@@ -61,7 +38,7 @@ describe "template parsers" do
     end
 
     it "can render a template" do
-      Shortcode.process(simple_quote).gsub("\n",'').should == simple_quote_output.gsub("\n",'')
+      expect(Shortcode.process(simple_quote).gsub("\n",'')).to eq(simple_quote_output)
     end
 
   end

data/spec/transformer_spec.rb

@@ -34,7 +34,7 @@ describe Shortcode do
     it "converts into html" do
       obj = parser.parse(simple_quote)
       html = transformer.apply obj, additional_attributes: nil
-      html.should == simple_quote_output
+      expect(html.gsub("\n", '')).to eq(simple_quote_output)
     end
 
   end
@@ -43,7 +43,7 @@ describe Shortcode do
 
     it "converts into html" do
       html = transformer.apply(parser.parse(full_quote), additional_attributes: nil)
-      html.should == full_quote_output
+      expect(html.gsub("\n", '')).to eq(full_quote_output)
     end
 
   end
@@ -52,7 +52,7 @@ describe Shortcode do
 
     it "converts into html" do
       html = transformer.apply(parser.parse(quote_with_extras), additional_attributes: nil)
-      html.should == quote_with_extras_output
+      expect(html.gsub("\n", '')).to eq(quote_with_extras_output)
     end
 
   end
@@ -61,7 +61,7 @@ describe Shortcode do
 
     it "converts into html" do
       html = transformer.apply(parser.parse(simple_list), additional_attributes: nil)
-      html.should == simple_list_output
+      expect(html.gsub("\n", '')).to eq(simple_list_output)
     end
 
   end
@@ -70,7 +70,7 @@ describe Shortcode do
 
     it "converts into html" do
       html = transformer.apply(parser.parse(timeline_event), additional_attributes: nil)
-      html.should == timeline_event_output
+      expect(html.gsub("\n", '')).to eq(timeline_event_output)
     end
 
   end
@@ -79,7 +79,7 @@ describe Shortcode do
 
     it "converts into html" do
       html = transformer.apply(parser.parse(timeline_info), additional_attributes: nil)
-      html.should == timeline_info_output
+      expect(html.gsub("\n", '')).to eq(timeline_info_output)
     end
 
   end
@@ -88,7 +88,7 @@ describe Shortcode do
 
     it "converts into html" do
       html = transformer.apply(parser.parse(timeline_person), additional_attributes: nil)
-      html.should == timeline_person_output
+      expect(html.gsub("\n", '')).to eq(timeline_person_output)
     end
 
   end
@@ -97,22 +97,15 @@ describe Shortcode do
 
     it "converts into html" do
       html = transformer.apply(parser.parse(complex_snippet), additional_attributes: nil)
-      html.should == complex_snippet_output
+      expect(html.gsub("\n", '')).to eq(complex_snippet_output)
     end
   end
 
   context "erb templates" do
 
-    before(:each) do
-      Shortcode.setup do |config|
-        config.template_parser = :erb
-        config.template_path = File.join File.dirname(__FILE__), "support/templates/erb"
-      end
-    end
-
     it "converts into html" do
       html = transformer.apply(parser.parse(simple_quote), additional_attributes: nil)
-      html.gsub("\n",'').should == simple_quote_output.gsub("\n",'')
+      expect(html.gsub("\n",'')).to eq(simple_quote_output)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shortcode
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -27,22 +27,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.6.0
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -80,17 +64,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +107,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
 description: Gem for parsing wordpress style shortcodes
 email:
 - jamie@kernowsoul.com
@@ -161,7 +161,6 @@ files:
 - spec/rails_helpers_spec.rb
 - spec/shortcode_spec.rb
 - spec/spec_helper.rb
-- spec/support/custom_expectations/write_expectation.rb
 - spec/support/fixtures.rb
 - spec/support/fixtures/complex_snippet.txt
 - spec/support/fixtures/complex_snippet_output.html
@@ -186,15 +185,15 @@ files:
 - spec/support/fixtures/timeline_info_output.html
 - spec/support/fixtures/timeline_person.txt
 - spec/support/fixtures/timeline_person_output.html
+- spec/support/templates/erb/collapsible_list.html.erb
+- spec/support/templates/erb/item.html.erb
 - spec/support/templates/erb/quote.html.erb
 - spec/support/templates/erb/rails_helper.html.erb
-- spec/support/templates/haml/collapsible_list.html.haml
-- spec/support/templates/haml/item.html.haml
+- spec/support/templates/erb/timeline_event.html.erb
+- spec/support/templates/erb/timeline_info.html.erb
+- spec/support/templates/erb/timeline_person.html.erb
 - spec/support/templates/haml/quote.html.haml
 - spec/support/templates/haml/rails_helper.html.haml
-- spec/support/templates/haml/timeline_event.html.haml
-- spec/support/templates/haml/timeline_info.html.haml
-- spec/support/templates/haml/timeline_person.html.haml
 - spec/support/templates/slim/quote.html.slim
 - spec/support/templates/slim/rails_helper.html.slim
 - spec/tag_spec.rb
@@ -232,7 +231,6 @@ test_files:
 - spec/rails_helpers_spec.rb
 - spec/shortcode_spec.rb
 - spec/spec_helper.rb
-- spec/support/custom_expectations/write_expectation.rb
 - spec/support/fixtures.rb
 - spec/support/fixtures/complex_snippet.txt
 - spec/support/fixtures/complex_snippet_output.html
@@ -257,15 +255,15 @@ test_files:
 - spec/support/fixtures/timeline_info_output.html
 - spec/support/fixtures/timeline_person.txt
 - spec/support/fixtures/timeline_person_output.html
+- spec/support/templates/erb/collapsible_list.html.erb
+- spec/support/templates/erb/item.html.erb
 - spec/support/templates/erb/quote.html.erb
 - spec/support/templates/erb/rails_helper.html.erb
-- spec/support/templates/haml/collapsible_list.html.haml
-- spec/support/templates/haml/item.html.haml
+- spec/support/templates/erb/timeline_event.html.erb
+- spec/support/templates/erb/timeline_info.html.erb
+- spec/support/templates/erb/timeline_person.html.erb
 - spec/support/templates/haml/quote.html.haml
 - spec/support/templates/haml/rails_helper.html.haml
-- spec/support/templates/haml/timeline_event.html.haml
-- spec/support/templates/haml/timeline_info.html.haml
-- spec/support/templates/haml/timeline_person.html.haml
 - spec/support/templates/slim/quote.html.slim
 - spec/support/templates/slim/rails_helper.html.slim
 - spec/tag_spec.rb

data/spec/support/custom_expectations/write_expectation.rb

@@ -1,62 +0,0 @@
-RSpec::Matchers.define :write do |message|
-
-  chain(:to) do |io|
-    @io = io
-  end
-
-  match do |block|
-    output =
-      case io
-      when :output then fake_stdout(&block)
-      when :error  then fake_stderr(&block)
-      else raise("Allowed values for `to` are :output and :error, got `#{io.inspect}`")
-      end
-    output.include? message
-  end
-
-  description do
-    "write \"#{message}\" #{io_name}"
-  end
-
-  failure_message_for_should do
-    "expected to #{description}"
-  end
-
-  failure_message_for_should_not do
-    "expected to not #{description}"
-  end
-
-  def supports_block_expectations?
-    true
-  end
-
-  # Fake STDERR and return a string written to it.
-  def fake_stderr
-    original_stderr = $stderr
-    $stderr = StringIO.new
-    yield
-    $stderr.string
-  ensure
-    $stderr = original_stderr
-  end
-
-  # Fake STDOUT and return a string written to it.
-  def fake_stdout
-    original_stdout = $stdout
-    $stdout = StringIO.new
-    yield
-    $stdout.string
-  ensure
-    $stdout = original_stdout
-  end
-
-  # default IO is standard output
-  def io
-    @io ||= :output
-  end
-
-  # IO name is used for description message
-  def io_name
-    { output: "standard output", error: "standard error" }[io]
-  end
-end

data/spec/support/templates/haml/collapsible_list.html.haml

@@ -1,2 +0,0 @@
-.collapsible
-  = @content

data/spec/support/templates/haml/item.html.haml

@@ -1,3 +0,0 @@
-%section
-  %h5= @attributes[:title]
-  %div= @content

data/spec/support/templates/haml/timeline_event.html.haml

@@ -1,10 +0,0 @@
-.timeline
-  %table
-    %tbody
-      %tr
-        %th{scope: :row}
-          = @attributes[:date]
-        %td.event
-          %span.description= @attributes[:title]
-          -if @attributes[:link]
-            %a.read_more{href: @attributes[:link]} Read More

data/spec/support/templates/haml/timeline_info.html.haml

@@ -1,8 +0,0 @@
-.timeline
-  %table
-    %tbody
-      %tr
-        %th{scope: :row}
-          = @attributes[:date]
-        %td.information
-          %p= @attributes[:title]

data/spec/support/templates/haml/timeline_person.html.haml

@@ -1,15 +0,0 @@
-.timeline
-  %table
-    %tbody
-      %tr
-        %th{scope: :row}
-          = @attributes[:date]
-        %td.team_news
-          %img{src: @attributes[:image]}
-          %h4= @attributes[:title]
-          %span.name= @attributes[:name]
-          %span.position= @attributes[:position]
-          -if @attributes[:link]
-            %a.read_more{href: @attributes[:link]} View Profile
-          .description
-            %p= @content