shortcode 1.1.1 → 1.2.0

data/lib/shortcode/version.rb

@@ -1,3 +1,3 @@
-module Shortcode
-  VERSION = "1.1.1"
+class Shortcode
+  VERSION = "1.2.0"
 end

data/shortcode.gemspec

@@ -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.7.1"
+  spec.add_dependency "parslet", "1.8.0"
 
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.4"
-  spec.add_development_dependency "rspec", "~> 3.3"
-  spec.add_development_dependency "coveralls", "~> 0"
+  spec.add_development_dependency "bundler", "~> 1.15"
+  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "rspec", "~> 3.6"
+  spec.add_development_dependency "coveralls", "~> 0.8"
   spec.add_development_dependency "slim", "~> 3.0"
-  spec.add_development_dependency "haml", "~> 4.0"
+  spec.add_development_dependency "haml", "~> 5.0"
 end

data/spec/parser_spec.rb

@@ -3,8 +3,8 @@ require 'parslet/rig/rspec'
 require 'pp'
 
 describe Shortcode::Parser do
-
-  let(:parser) { Shortcode::Parser.new }
+  configuration = Shortcode.singleton.send(:configuration)
+  let(:parser) { Shortcode::Parser.new(configuration) }
 
   let(:simple_quote)      { load_fixture :simple_quote }
   let(:full_quote)        { load_fixture :full_quote }

data/spec/presenter_spec.rb

@@ -12,6 +12,7 @@ require 'support/presenters/missing_attributes_presenter'
 
 describe Shortcode::Presenter do
 
+  let(:configuration) { Shortcode.singleton.send(:configuration) }
   let(:simple_quote)  { load_fixture :simple_quote }
   let(:item)          { load_fixture :item }
 
@@ -35,7 +36,6 @@ describe Shortcode::Presenter do
   end
 
   describe "using a single presenter for multiple shortcodes" do
-
     let(:quote_presenter_output)  { load_fixture :simple_quote_presenter_output, :html }
     let(:item_presenter_output)   { load_fixture :item_presenter_output,         :html }
 
@@ -67,7 +67,7 @@ describe Shortcode::Presenter do
       end
 
       it "adds the presenter to the list" do
-        expect(Shortcode::Presenter.presenters).to include(MyPresenter.for)
+        expect(configuration.presenters).to include(MyPresenter.for)
       end
 
     end
@@ -79,8 +79,8 @@ describe Shortcode::Presenter do
       end
 
       it "adds the presenter to the list" do
-        expect(Shortcode::Presenter.presenters).to include(MyPresenter.for)
-        expect(Shortcode::Presenter.presenters).to include(OtherPresenter.for)
+        expect(configuration.presenters).to include(MyPresenter.for)
+        expect(configuration.presenters).to include(OtherPresenter.for)
       end
 
     end

data/spec/shortcode_spec.rb

@@ -54,4 +54,29 @@ describe Shortcode do
 
   end
 
+  context "multiple instances" do
+    let(:shortcode1) { Shortcode.new }
+    let(:shortcode2) { Shortcode.new }
+
+    it "allows having multiple Shortcode instances that have independent configurations" do
+      expect(shortcode1.send(:configuration)).to_not be(shortcode2.send(:configuration))
+    end
+
+    it "uses the shortcode instance's configuration to process shortcodes" do
+      shortcode1.setup do |config|
+        config.self_closing_tags << :quote
+        config.templates = { quote: 'i am from shortcode 1' }
+      end
+
+      shortcode2.setup do |config|
+        config.self_closing_tags << :quote
+        config.templates = { quote: 'i am from shortcode 2' }
+      end
+
+      expect(shortcode1.process('[quote]')).to eq('i am from shortcode 1')
+      expect(shortcode2.process('[quote]')).to eq('i am from shortcode 2')
+    end
+
+  end
+
 end

data/spec/spec_helper.rb

@@ -16,17 +16,19 @@ Slim::Engine.set_options attr_quote: "'"
 
 RSpec.configure do |config|
   config.order = "random"
+  config.color = true
 
   config.before(:each) do
-    Shortcode::Presenter.presenters = {}
     Shortcode.setup do |config|
       config.template_parser = :erb
       config.template_path = File.join File.dirname(__FILE__), "support/templates/erb"
-      config.templates = nil
+      config.templates = {}
+      config.check_config_templates_first = true
       config.block_tags = [:quote, :collapsible_list, :item, :timeline_person, :rails_helper, :custom_helper]
       config.self_closing_tags = [:timeline_event, :timeline_info]
       config.attribute_quote_type = '"'
       config.use_attribute_quotes = true
+      config.presenters = {}
     end
   end
 end

data/spec/tag_spec.rb

@@ -1,10 +1,11 @@
 require 'spec_helper'
 
 describe Shortcode::Tag do
+  let(:configuration) { Shortcode.singleton.send(:configuration) }
 
   context "when the template file is missing" do
 
-    let(:tag) { Shortcode::Tag.new('doesnt_exist') }
+    let(:tag) { Shortcode::Tag.new('doesnt_exist', configuration) }
 
     it "raises a TemplateNotFound error when the file doesn't exists" do
       expect { tag.render }.to raise_error(Shortcode::TemplateNotFound)
@@ -14,7 +15,7 @@ describe Shortcode::Tag do
 
   context "when an unsupported template parser is specified" do
 
-    let(:tag) { Shortcode::Tag.new('quote') }
+    let(:tag) { Shortcode::Tag.new('quote', configuration) }
 
     before(:each) do
       Shortcode.setup do |config|
@@ -30,7 +31,7 @@ describe Shortcode::Tag do
 
   context "templates from strings" do
 
-    let(:tag) { Shortcode::Tag.new('from_string', [{ key: 'string', value: 'batman' }]) }
+    let(:tag) { Shortcode::Tag.new('from_string', configuration, [{ key: 'string', value: 'batman' }]) }
 
     before(:each) do
       Shortcode.setup do |config|
@@ -48,7 +49,7 @@ describe Shortcode::Tag do
 
   context "when the template is missing from the config" do
 
-    let(:tag) { Shortcode::Tag.new('missing', [{ key: 'string', value: 'batman' }]) }
+    let(:tag) { Shortcode::Tag.new('missing', configuration, [{ key: 'string', value: 'batman' }]) }
 
     before(:each) do
       Shortcode.setup do |config|
@@ -64,4 +65,22 @@ describe Shortcode::Tag do
 
   end
 
+  context "when templates exist both in configuration and file system" do
+    let(:tag) { Shortcode::Tag.new('quote', configuration ) }
+
+    before(:each) do
+      configuration.templates[:quote] = '<p><%= @content %></p>'
+    end
+
+    it 'uses the configuration template when check_config_templates_first is true' do
+      expect(tag.markup).to eq('<p><%= @content %></p>')
+    end
+
+    it 'uses the file system template when check_config_templates_first is false' do
+      configuration.check_config_templates_first = false
+
+      expect(tag.markup).to eq(File.open('spec/support/templates/erb/quote.html.erb').read)
+    end
+  end
+
 end

data/spec/template_parsers_spec.rb

@@ -23,7 +23,7 @@ describe "template parsers" do
     end
 
     it "can render a template" do
-      expect(Shortcode.process(simple_quote).gsub("\n",'')).to eq(simple_quote_output)
+      expect(Shortcode.process(simple_quote).gsub("\n",'').gsub('>  <', '><')).to eq(simple_quote_output)
     end
 
   end

data/spec/transformer_spec.rb

@@ -3,9 +3,9 @@ require 'parslet/rig/rspec'
 require 'pp'
 
 describe Shortcode do
-
-  let(:parser)      { Shortcode::Parser.new }
-  let(:transformer) { Shortcode::Transformer.new }
+  configuration = Shortcode.singleton.send(:configuration)
+  let(:parser)      { Shortcode::Parser.new(configuration) }
+  let(:transformer) { Shortcode::Transformer.new(configuration) }
 
   let(:simple_quote)          { load_fixture :simple_quote }
   let(:full_quote)            { load_fixture :full_quote }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shortcode
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Jamie Dyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-14 00:00:00.000000000 Z
+date: 2017-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -16,70 +16,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 description: Gem for parsing wordpress style shortcodes
 email:
 - jamie@kernowsoul.com
@@ -125,10 +125,10 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/rails_3.2.gemfile
-- gemfiles/rails_4.0.gemfile
 - gemfiles/rails_4.1.gemfile
 - gemfiles/rails_4.2.gemfile
+- gemfiles/rails_5.0.gemfile
+- gemfiles/rails_5.1.gemfile
 - lib/shortcode.rb
 - lib/shortcode/configuration.rb
 - lib/shortcode/exceptions.rb
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Gem for parsing wordpress style shortcodes in ruby projects

data/gemfiles/rails_3.2.gemfile

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

data/gemfiles/rails_4.0.gemfile

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