shortcode 0.3.1 → 0.3.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shortcode (0.3.1)
+    shortcode (0.3.2)
       haml (~> 4.0)
       parslet (= 1.6.0)
 
@@ -43,6 +43,10 @@ GEM
       multi_json
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
+    slim (2.0.2)
+      temple (~> 0.6.6)
+      tilt (>= 1.3.3, < 2.1)
+    temple (0.6.7)
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     thor (0.18.1)
@@ -59,3 +63,4 @@ DEPENDENCIES
   rake
   rspec
   shortcode!
+  slim (~> 2.0)

data/README.md

@@ -46,7 +46,7 @@ Shortcode.process("[quote]Hello World[/quote]")
 Shortcode.setup do |config|
 
   # the template parser to use
-  config.template_parser = :haml # :erb or :haml supported, :haml is default
+  config.template_parser = :haml # :erb, :haml, :slim supported, :haml is default
 
    # location of the template files, default is "app/views/shortcode_templates"
   config.template_path = "support/templates/haml"

data/lib/shortcode.rb

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

data/lib/shortcode/configuration.rb

@@ -1,8 +1,8 @@
 class Shortcode::Configuration
-  # Sets the template parser to use, supports :erb and :haml, default is :haml
+  # Sets the template parser to use, supports :erb, :haml, and :slim, default is :haml
   attr_accessor :template_parser
 
-  # Sets the template parser to use, supports :erb and :haml, default is :haml
+  # Sets the path to search for template files
   attr_accessor :template_path
 
   # Allows templates to be set from strings rather than read from the filesystem

data/lib/shortcode/tag.rb

@@ -29,6 +29,8 @@ class Shortcode::Tag
 
     def render_template
       case Shortcode.configuration.template_parser
+      when :slim
+        Slim::Template.new { markup }.render(self)
       when :haml
         Haml::Engine.new(markup, ugly: true).render(binding)
       when :erb

data/lib/shortcode/version.rb

@@ -1,3 +1,3 @@
 module Shortcode
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/shortcode.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "slim", "~> 2.0"
 end

data/spec/rails_helpers_spec.rb

@@ -3,9 +3,25 @@ require 'spec_helper'
 describe "rails helpers" do
 
   let(:template)    { load_fixture :rails_helper }
+  let(:slim_output) { load_fixture :rails_helper_output_slim, :html }
   let(:haml_output) { load_fixture :rails_helper_output_haml, :html }
   let(:erb_output)  { load_fixture :rails_helper_output_erb, :html }
 
+  describe "slim" do
+
+    before(:each) do
+      Shortcode.setup do |config|
+        config.template_parser = :slim
+        config.template_path = File.join File.dirname(__FILE__), "support/templates/slim"
+      end
+    end
+
+    it "are accessible within slim templates" do
+      Shortcode.process(template).gsub("\n",'').should == slim_output.gsub("\n",'')
+    end
+
+  end
+
   describe "haml" do
 
     it "are accessible within haml templates" do

data/spec/support/fixtures/rails_helper_output_slim.html

@@ -0,0 +1 @@
+<i>blah</i>

data/spec/support/templates/slim/rails_helper.html.slim

@@ -0,0 +1 @@
+= content_tag :i, @content

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shortcode
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -107,6 +107,22 @@ dependencies:
     - - ! '>='
       - !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'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: Gem for parsing wordpress style shortcodes
 email:
 - jamie@kernowsoul.com
@@ -156,6 +172,7 @@ files:
 - spec/support/fixtures/rails_helper.txt
 - spec/support/fixtures/rails_helper_output_erb.html
 - spec/support/fixtures/rails_helper_output_haml.html
+- spec/support/fixtures/rails_helper_output_slim.html
 - spec/support/fixtures/simple_list.txt
 - spec/support/fixtures/simple_list_output.html
 - spec/support/fixtures/simple_quote.txt
@@ -177,6 +194,7 @@ files:
 - 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/rails_helper.html.slim
 - spec/tag_spec.rb
 - spec/transformer_spec.rb
 homepage: https://github.com/kernow/shortcode
@@ -222,6 +240,7 @@ test_files:
 - spec/support/fixtures/rails_helper.txt
 - spec/support/fixtures/rails_helper_output_erb.html
 - spec/support/fixtures/rails_helper_output_haml.html
+- spec/support/fixtures/rails_helper_output_slim.html
 - spec/support/fixtures/simple_list.txt
 - spec/support/fixtures/simple_list_output.html
 - spec/support/fixtures/simple_quote.txt
@@ -243,5 +262,6 @@ test_files:
 - 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/rails_helper.html.slim
 - spec/tag_spec.rb
 - spec/transformer_spec.rb