shortcode 1.0.0 → 1.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b80627fe9d3741eb1e8ad562aab6789697b83c98
+  data.tar.gz: f495da02fb8c29dfb02e4244dce8724b301c7b10
+SHA512:
+  metadata.gz: 99d81eba4857e42a19de407c9930304e34413e21ac60f97f72b9a0d9e31bad8f802bbb1c77e50b710f680be770b553922d159d603cd4617f525bf90e78a7ca58
+  data.tar.gz: 6dc1697bb5106c5e37450a82117937393e3e0e1223c57afea3102d02e963413fad9d85316c5909e9b96aae1aa00f21d69d13a258eb3d95b6a587aed3018530ca

data/.ruby-version

@@ -0,0 +1 @@
+2.1.3

data/.travis.yml

@@ -1,27 +1,26 @@
 language: ruby
+
 rvm:
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
+  - 1.9.3-p551
+  - 2.0.0-p598
+  - 2.1.5
+  - 2.2.0
   - ruby-head
   - jruby-19mode
   - jruby-head
+
+sudo: false
+
 script: bundle exec rspec
 
 matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
-  exclude:
-    - rvm: 1.9.2
-      gemfile: gemfiles/rails_4.0.gemfile
-    - rvm: 1.9.2
-      gemfile: gemfiles/rails_4.1.gemfile
 
 gemfile:
-  - gemfiles/rails_3.0.gemfile
   - gemfiles/rails_3.1.gemfile
   - gemfiles/rails_3.2.gemfile
   - gemfiles/rails_4.0.gemfile
   - gemfiles/rails_4.1.gemfile
+  - gemfiles/rails_4.2.gemfile

data/Appraisals

@@ -1,19 +1,19 @@
-appraise "rails-3.0" do
-  gem "rails", "~> 3.0.20"
-end
-
 appraise "rails-3.1" do
   gem "rails", "~> 3.1.12"
 end
 
 appraise "rails-3.2" do
-  gem "rails", "~> 3.2.19"
+  gem "rails", "~> 3.2.21"
 end
 
 appraise "rails-4.0" do
-  gem "rails", "~> 4.0.8"
+  gem "rails", "~> 4.0.13"
 end
 
 appraise "rails-4.1" do
-  gem "rails", "~> 4.1.4"
+  gem "rails", "~> 4.1.9"
+end
+
+appraise "rails-4.2" do
+  gem "rails", "4.2.0"
 end

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+## 1.0.2 (March 4, 2015)
+
+Fixes:
+
+  - Whitespace after tags is now preserved
+
+## 1.0.1 (January 21, 2015)
+
+Features:
+
+  - Implemented a TemplateBinding class as the binding to templates to provide a clean interface
+  - Updated to parslet 1.6.2
+  - Updated to rspec 3.1
+
+Misc:
+
+  - Testing against the latest versions of Rails 3.1, 3.2, 4.0, 4.1 & 4.2
+  - Testing against the latest versions of Ruby 1.9.3-p551, 2.0.0-p598, 2.1.5 & 2.2.0
+  - Dropped test support for Rails 3.0
+  - Dropped test support for run 1.9.2
+  - README improvements
+
 ## 1.0.0 (July 29, 2014)
 
 Features:

data/Gemfile

@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in shortcode.gemspec
 gemspec
 
-gem 'appraisal', '1.0.0.beta3'
+gem 'appraisal', '1.0.2'

data/Gemfile.lock

@@ -1,70 +1,72 @@
 PATH
   remote: .
   specs:
-    shortcode (1.0.0)
-      parslet (= 1.6.0)
+    shortcode (1.0.2)
+      parslet (= 1.6.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    appraisal (1.0.0.beta3)
+    appraisal (1.0.2)
       bundler
       rake
       thor (>= 0.14.0)
-    blankslate (2.1.2.4)
-    coveralls (0.7.0)
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      term-ansicolor
-      thor
+    blankslate (3.1.3)
+    coveralls (0.7.3)
+      multi_json (~> 1.10)
+      rest-client (~> 1.7)
+      simplecov (~> 0.9.1)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.1)
     diff-lcs (1.2.5)
-    docile (1.1.3)
-    haml (4.0.5)
+    docile (1.1.5)
+    haml (4.0.6)
       tilt
-    mime-types (2.2)
+    mime-types (2.4.3)
     multi_json (1.10.1)
-    parslet (1.6.0)
-      blankslate (~> 2.0)
-    rake (10.1.0)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    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)
+    netrc (0.10.2)
+    parslet (1.6.2)
+      blankslate (>= 2.0, <= 4.0)
+    rake (10.4.2)
+    rest-client (1.7.2)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
       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)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    simplecov (0.9.1)
       docile (~> 1.1.0)
-      multi_json
+      multi_json (~> 1.0)
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    slim (2.0.2)
-      temple (~> 0.6.6)
+    slim (3.0.1)
+      temple (~> 0.7.3)
       tilt (>= 1.3.3, < 2.1)
-    temple (0.6.7)
+    temple (0.7.5)
     term-ansicolor (1.3.0)
       tins (~> 1.0)
-    thor (0.18.1)
+    thor (0.19.1)
     tilt (2.0.1)
-    tins (1.3.0)
+    tins (1.3.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  appraisal (= 1.0.0.beta3)
+  appraisal (= 1.0.2)
   bundler (~> 1.3)
   coveralls
   haml (~> 4.0)
   rake
-  rspec (~> 3.0.0)
+  rspec (~> 3.1.0)
   shortcode!
-  slim (~> 2.0)
+  slim (~> 3.0)

data/README.md

@@ -27,8 +27,8 @@ Or install it yourself as:
 $ gem install shortcode
 ```
 
-Shortcode is tested against ruby version 1.9.2 and greater as well as jruby, it will not work with ruby 1.8. Shortcode rails integration is tested against
-Rails versions 3.0, 3.1, 3.2, 4.0, and 4.1.
+Shortcode is tested against ruby version 1.9.3, 2.0, 2.1, and 2.2 as well as jruby, it will not work with ruby 1.8. Shortcode rails integration is tested against
+Rails versions 3.1, 3.2, 4.0, 4.1 and 4.2.
 
 ## Usage
 
@@ -40,6 +40,17 @@ Shortcode is very simple to use, simply call the `process` method and pass it a
 Shortcode.process("[quote]Hello World[/quote]")
 ```
 
+### Tags
+
+Any tags you wish to use with Shortcode need to be configured in the setup block, there are 2 types of tag, `block_tags` and `self_closing_tags`. Block tags have a matching open and close tag such as `[quote]A quote[/quote]`, self closing tags have no close tag, for example `[gallery]`. To define the tags Shortcode should parse do so in the configuration as follows:
+
+```ruby
+Shortcode.setup do |config|
+  config.block_tags = [:quote, :list]
+  config.self_closing_tags = [:gallery, :widget]
+end
+```
+
 ### Templates
 
 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
@@ -83,11 +94,13 @@ block as strings.
 #### Templates loaded from the file system
 
 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.
+location for template files is `app/views/shortcode_templates`, if you want to load templates from a different location use the `template_path` config option.
+
+Note: only 1 template parser is supported at a time, if using haml for instance all templates must be haml.
 
 #### Templates set as configuration options
 
-The alternative way to define tempaltes is to set them using the `templates` config option, this option can take a hash with keys of the same name as the shortcode tags and
+The alternative way to define templates is to set them using the `templates` config option, this option can take a hash with keys of the same name as the shortcode tags and
 values containing a template string. For instance:
 
 ```ruby
@@ -99,9 +112,11 @@ end
 If the `templates` config option is set all templates will be loaded from this hash, if a shortcode is encountered without a matching key in the `templates` config option
 an exception will be raised.
 
+Note: it's NOT possible to load templates from a config option AND from the file system, you must either load all templates from the file system or define all templates in a config option.
+
 ### Custom Helpers
 
-If you wish to use custom helper modules in templates you can do so by specifying the helpers in a setup block which should be an array. Methods in the helper modules will then become available within all tempaltes.
+If you wish to use custom helper modules in templates you can do so by specifying the helpers in a setup block which should be an array. Methods in the helper modules will then become available within all templates.
 
 ```ruby
 Shortcode.setup do |config|
@@ -204,7 +219,7 @@ Shortcode.setup do |config|
   # above template_path option. The default is nil
   config.templates = { gallery: 'template code' }
 
-  # an array of helper modules to make available within tempaltes
+  # an array of helper modules to make available within templates
   config.helpers = [CustomerHelper]
 
   # a list of block tags to support e.g. [quote]Hello World[/quote]
@@ -216,7 +231,8 @@ Shortcode.setup do |config|
   # the type of quotes to use for attribute values, default is double quotes (")
   config.attribute_quote_type = '"'
 
-  # Allows quotes around attributes to be omitted. Defaults to true (quotes must be present around the value).
+  # Allows quotes around attributes to be omitted
+  # Defaults to true, quotes must be present around attribute values
   config.use_attribute_quotes = true
 end
 ```

data/gemfiles/rails_3.1.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "appraisal", "1.0.0.beta3"
+gem "appraisal", "1.0.2"
 gem "rails", "~> 3.1.12"
 
-gemspec :path=>".././"
+gemspec :path => "../"

data/gemfiles/rails_3.2.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "appraisal", "1.0.0.beta3"
-gem "rails", "~> 3.2.19"
+gem "appraisal", "1.0.2"
+gem "rails", "~> 3.2.21"
 
-gemspec :path=>".././"
+gemspec :path => "../"

data/gemfiles/rails_4.0.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "appraisal", "1.0.0.beta3"
-gem "rails", "~> 4.0.8"
+gem "appraisal", "1.0.2"
+gem "rails", "~> 4.0.13"
 
-gemspec :path=>".././"
+gemspec :path => "../"

data/gemfiles/rails_4.1.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "appraisal", "1.0.0.beta3"
-gem "rails", "~> 4.1.4"
+gem "appraisal", "1.0.2"
+gem "rails", "~> 4.1.9"
 
-gemspec :path=>".././"
+gemspec :path => "../"

data/gemfiles/rails_4.2.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", "1.0.2"
+gem "rails", "4.2.0"
+
+gemspec :path => "../"

data/lib/shortcode.rb

@@ -40,6 +40,7 @@ require 'shortcode/configuration'
 require 'shortcode/parser'
 require 'shortcode/presenter'
 require 'shortcode/processor'
+require 'shortcode/template_binding'
 require 'shortcode/transformer'
 require 'shortcode/tag'
 require 'shortcode/exceptions'

data/lib/shortcode/parser.rb

@@ -8,8 +8,8 @@ class Shortcode::Parser < Parslet::Parser
   rule(:space)        { str(' ').repeat(1) }
   rule(:space?)       { space.maybe }
   rule(:newline)      { (str("\r\n") | str("\n")) >> space? }
+  rule(:newline?)     { newline.maybe }
   rule(:whitespace)   { (space | newline).repeat(1) }
-  rule(:whitespace?)  { whitespace.maybe }
 
   rule(:key) { match('[a-zA-Z0-9\-_]').repeat(1) }
 
@@ -21,9 +21,9 @@ class Shortcode::Parser < Parslet::Parser
   rule(:options)  { (str(' ') >> option).repeat(1) }
   rule(:options?) { options.repeat(0, 1) }
 
-  rule(:open)       { str('[') >> block_tag.as(:open) >> options?.as(:options) >> str(']') >> whitespace? }
-  rule(:close)      { str('[/') >> block_tag.as(:close) >> str(']') >> whitespace?  }
-  rule(:open_close) { str('[') >> self_closing_tag.as(:open_close) >> options?.as(:options) >> str(']') >> whitespace? }
+  rule(:open)       { str('[') >> block_tag.as(:open) >> options?.as(:options) >> str(']') >> newline? }
+  rule(:close)      { str('[/') >> block_tag.as(:close) >> str(']') >> newline? }
+  rule(:open_close) { str('[') >> self_closing_tag.as(:open_close) >> options?.as(:options) >> str(']') >> newline? }
 
   rule(:text)   { ((close | block | open_close).absent? >> any).repeat(1).as(:text) }
   rule(:block)  { (open >> (block | text | open_close).repeat.as(:inner) >> close) }

data/lib/shortcode/railtie.rb

@@ -1,3 +1,3 @@
-class Shortcode::Tag
+class Shortcode::TemplateBinding
   include ActionView::Helpers
 end

data/lib/shortcode/tag.rb

@@ -1,17 +1,8 @@
 class Shortcode::Tag
 
   def initialize(name, attributes=[], content='', additional_attributes=nil)
-    include_helper_modules
-    @name       = name.downcase
-    presenter   = Shortcode::Presenter.new name, set_attributes(attributes), content, additional_attributes
-    @attributes = presenter.attributes
-    @content    = presenter.content
-  end
-
-  def set_attributes(attributes)
-    hash = {}
-    attributes.each { |o| hash[o[:key].to_sym] = o[:value] }
-    hash
+    @name = name.downcase
+    @binding = Shortcode::TemplateBinding.new(@name, attributes, content, additional_attributes)
   end
 
   def markup
@@ -28,23 +19,14 @@ class Shortcode::Tag
 
   private
 
-    def include_helper_modules
-      return unless Shortcode.configuration.helpers.any?
-      class << self
-        Shortcode.configuration.helpers.each do |helper|
-          include helper
-        end
-      end
-    end
-
     def render_template
       case Shortcode.configuration.template_parser
       when :erb
-        ERB.new(markup).result(binding)
+        ERB.new(markup).result(@binding.get_binding)
       when :haml
-        Haml::Engine.new(markup, ugly: true).render(binding)
+        Haml::Engine.new(markup, ugly: true).render(@binding)
       when :slim
-        Slim::Template.new { markup }.render(self)
+        Slim::Template.new { markup }.render(@binding)
       else
         raise Shortcode::TemplateParserNotSupported, Shortcode.configuration.template_parser
       end

data/lib/shortcode/template_binding.rb

@@ -0,0 +1,33 @@
+class Shortcode::TemplateBinding
+
+  def initialize(name, attributes=[], content='', additional_attributes=nil)
+    include_helper_modules
+    presenter   = Shortcode::Presenter.new name, set_attributes(attributes), content, additional_attributes
+    @name       = name
+    @attributes = presenter.attributes
+    @content    = presenter.content
+  end
+
+  # Expose private binding() method for use with erb templates
+  def get_binding
+    binding
+  end
+
+  private
+
+    def set_attributes(attributes)
+      hash = {}
+      attributes.each { |o| hash[o[:key].to_sym] = o[:value] }
+      hash
+    end
+
+    def include_helper_modules
+      return unless Shortcode.configuration.helpers.any?
+      class << self
+        Shortcode.configuration.helpers.each do |helper|
+          include helper
+        end
+      end
+    end
+
+end

data/lib/shortcode/version.rb

@@ -1,3 +1,3 @@
 module Shortcode
-  VERSION = "1.0.0"
+  VERSION = "1.0.2"
 end

data/shortcode.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Jamie Dyer"]
   spec.email         = ["jamie@kernowsoul.com"]
   spec.description   = "Gem for parsing wordpress style shortcodes"
-  spec.summary       = "Gem for parsing wordpress style shortcodes"
+  spec.summary       = "Gem for parsing wordpress style shortcodes in ruby projects"
   spec.homepage      = "https://github.com/kernow/shortcode"
   spec.license       = "MIT"
 
@@ -18,12 +18,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "parslet", "1.6.0"
+  spec.add_dependency "parslet", "1.6.2"
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 3.0.0"
-  spec.add_development_dependency "coveralls"
-  spec.add_development_dependency "slim", "~> 2.0"
+  spec.add_development_dependency "rake", "~> 0"
+  spec.add_development_dependency "rspec", "~> 3.1"
+  spec.add_development_dependency "coveralls", "~> 0"
+  spec.add_development_dependency "slim", "~> 3.0"
   spec.add_development_dependency "haml", "~> 4.0"
 end

data/spec/parser_spec.rb

@@ -118,7 +118,7 @@ describe Shortcode::Parser do
             inner: [{ text: "A quote" }],
             close: "quote"
           },
-          { text: "<br> blah blah\n" }
+          { text: " <br> blah blah\n" }
         ])
       end
 
@@ -259,7 +259,7 @@ describe Shortcode::Parser do
             }],
             close: "collapsible_list"
           },
-          { text: "<p>Some more text</p>\n" }
+          { text: "\n<p>Some more text</p>\n" }
         ])
       end
     end

data/spec/support/fixtures/block_with_whitespace.txt

@@ -0,0 +1,2 @@
+[rails_helper]this is bold[/rails_helper] and this is not bold.
+[rails_helper]this is italic[/rails_helper]without a space.

data/spec/support/fixtures/block_with_whitespace_output.html

@@ -0,0 +1,2 @@
+<b>this is bold</b> and this is not bold.
+<b>this is italic</b>without a space.

data/spec/support/fixtures/quote_with_extras_output.html

@@ -4,4 +4,4 @@ Blah blah <blockquote>
 <span class='author'>Jamie Dyer</span>
 </p>
 </blockquote>
-<br> blah blah
+ <br> blah blah

data/spec/transformer_spec.rb

@@ -7,27 +7,29 @@ describe Shortcode do
   let(:parser)      { Shortcode::Parser.new }
   let(:transformer) { Shortcode::Transformer.new }
 
-  let(:simple_quote)      { load_fixture :simple_quote }
-  let(:full_quote)        { load_fixture :full_quote }
-  let(:quote_with_extras) { load_fixture :quote_with_extras }
-  let(:simple_list)       { load_fixture :simple_list }
-  let(:timeline_event)    { load_fixture :timeline_event }
-  let(:timeline_info)     { load_fixture :timeline_info }
-  let(:timeline_person)   { load_fixture :timeline_person }
-  let(:complex_snippet)   { load_fixture :complex_snippet }
+  let(:simple_quote)          { load_fixture :simple_quote }
+  let(:full_quote)            { load_fixture :full_quote }
+  let(:quote_with_extras)     { load_fixture :quote_with_extras }
+  let(:simple_list)           { load_fixture :simple_list }
+  let(:timeline_event)        { load_fixture :timeline_event }
+  let(:timeline_info)         { load_fixture :timeline_info }
+  let(:timeline_person)       { load_fixture :timeline_person }
+  let(:complex_snippet)       { load_fixture :complex_snippet }
+  let(:block_with_whitespace) { load_fixture :block_with_whitespace }
 
   let(:quotes)            { [simple_quote, full_quote, quote_with_extras] }
   let(:collapsible_lists) { [simple_list] }
   let(:timelines)         { [timeline_event, timeline_info, timeline_person] }
 
-  let(:simple_quote_output)      { load_fixture :simple_quote_output, :html }
-  let(:full_quote_output)        { load_fixture :full_quote_output, :html }
-  let(:quote_with_extras_output) { load_fixture :quote_with_extras_output, :html }
-  let(:simple_list_output)       { load_fixture :simple_list_output, :html }
-  let(:timeline_event_output)    { load_fixture :timeline_event_output, :html }
-  let(:timeline_info_output)     { load_fixture :timeline_info_output, :html }
-  let(:timeline_person_output)   { load_fixture :timeline_person_output, :html }
-  let(:complex_snippet_output)   { load_fixture :complex_snippet_output, :html }
+  let(:simple_quote_output)          { load_fixture :simple_quote_output, :html }
+  let(:full_quote_output)            { load_fixture :full_quote_output, :html }
+  let(:quote_with_extras_output)     { load_fixture :quote_with_extras_output, :html }
+  let(:simple_list_output)           { load_fixture :simple_list_output, :html }
+  let(:timeline_event_output)        { load_fixture :timeline_event_output, :html }
+  let(:timeline_info_output)         { load_fixture :timeline_info_output, :html }
+  let(:timeline_person_output)       { load_fixture :timeline_person_output, :html }
+  let(:complex_snippet_output)       { load_fixture :complex_snippet_output, :html }
+  let(:block_with_whitespace_output) { load_fixture :block_with_whitespace_output, :html }
 
   context "simple_quote" do
 
@@ -108,4 +110,13 @@ describe Shortcode do
       expect(html.gsub("\n",'')).to eq(simple_quote_output)
     end
   end
+
+  context 'whitespace' do
+
+    it 'is preserved after a block tag' do
+      html = transformer.apply(parser.parse(block_with_whitespace), additional_attributes: nil)
+      expect(html.gsub("\n",'')).to eq(block_with_whitespace_output)
+    end
+
+  end
 end

metadata

@@ -1,126 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: shortcode
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.0.2
 platform: ruby
 authors:
 - Jamie Dyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.6.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.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
@@ -130,9 +115,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rbenv-version
-- .travis.yml
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -140,11 +125,11 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/rails_3.0.gemfile
 - gemfiles/rails_3.1.gemfile
 - gemfiles/rails_3.2.gemfile
 - gemfiles/rails_4.0.gemfile
 - gemfiles/rails_4.1.gemfile
+- gemfiles/rails_4.2.gemfile
 - lib/shortcode.rb
 - lib/shortcode/configuration.rb
 - lib/shortcode/exceptions.rb
@@ -153,6 +138,7 @@ files:
 - lib/shortcode/processor.rb
 - lib/shortcode/railtie.rb
 - lib/shortcode/tag.rb
+- lib/shortcode/template_binding.rb
 - lib/shortcode/transformer.rb
 - lib/shortcode/version.rb
 - shortcode.gemspec
@@ -163,6 +149,8 @@ files:
 - spec/shortcode_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixtures.rb
+- spec/support/fixtures/block_with_whitespace.txt
+- spec/support/fixtures/block_with_whitespace_output.html
 - spec/support/fixtures/complex_snippet.txt
 - spec/support/fixtures/complex_snippet_output.html
 - spec/support/fixtures/custom_helper.txt
@@ -216,28 +204,27 @@ files:
 homepage: https://github.com/kernow/shortcode
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
-summary: Gem for parsing wordpress style shortcodes
+specification_version: 4
+summary: Gem for parsing wordpress style shortcodes in ruby projects
 test_files:
 - spec/parser_spec.rb
 - spec/performance_spec.rb
@@ -246,6 +233,8 @@ test_files:
 - spec/shortcode_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixtures.rb
+- spec/support/fixtures/block_with_whitespace.txt
+- spec/support/fixtures/block_with_whitespace_output.html
 - spec/support/fixtures/complex_snippet.txt
 - spec/support/fixtures/complex_snippet_output.html
 - spec/support/fixtures/custom_helper.txt

data/.rbenv-version

@@ -1 +0,0 @@
-1.9.3-p392

data/gemfiles/rails_3.0.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal", "1.0.0.beta3"
-gem "rails", "~> 3.0.20"
-
-gemspec :path=>".././"