shortcode 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 314fc72e3ebd9b6705c95087c2c509123ffc239e
-  data.tar.gz: 705924df01ce2a39709ddf99fae925fadc23348f
+  metadata.gz: b6e16afa9cbced683fa57993d25230c1ccbbc17d
+  data.tar.gz: 3085a76be15d7c3522219ff2efa39b2e5db9bf1a
 SHA512:
-  metadata.gz: 1dc80f9880a0ef8db9a4bc1fe978083ca8de474114cd6a28250f064f77f25e4ecb87750f4233ad3b38dd7160f6baac3f876f8b31fac1ccde2ea5e57b0368eb21
-  data.tar.gz: 52b2eeabbeb6fbf67583c6dedacf97617ea1c7afdab506fa90eae7ddb9687e545dd516d68405669495b06721cb67e8e0d2e08ffc0c0b64285c07581b89d797cb
+  metadata.gz: dc17a4b44ad1e685609b44a735395ed8802a834810b9d36cb403ab671a05b34056ea2329cb63bcc4002e4107774f0747bbd66968ce66b1f8b3a62d104c14130e
+  data.tar.gz: 1e816940f82d9cede5b8741cb02591dc1fbe5a5b8d060f1cacd3cec152f6650d78b4c619b8134bcf7d075307d4d2b676428dc045b7a32aa23e09ce84685987e8

data/.ruby-version

@@ -1 +1 @@
-2.1.3
+2.3.3

data/.travis.yml

@@ -1,27 +1,25 @@
 language: ruby
 
 rvm:
-  - 2.0.0-p647
-  - 2.1.7
-  - 2.2.3
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
   - ruby-head
-  - jruby-19mode
-  - jruby-head
+  - jruby-9.1.9.0
 
 sudo: false
 
 script: bundle exec rspec
 
 before_install:
-  - gem install bundler -v 1.10.6
+  - gem install bundler -v 1.15.0
 
 matrix:
   allow_failures:
     - rvm: ruby-head
-    - rvm: jruby-head
 
 gemfile:
-  - 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

data/Appraisals

@@ -1,15 +1,15 @@
-appraise "rails-3.2" do
-  gem "rails", "~> 3.2.21"
+appraise "rails-4.1" do
+  gem "rails", "~> 4.1.16"
 end
 
-appraise "rails-4.0" do
-  gem "rails", "~> 4.0.13"
+appraise "rails-4.2" do
+  gem "rails", "4.2.8"
 end
 
-appraise "rails-4.1" do
-  gem "rails", "~> 4.1.13"
+appraise "rails-5.0" do
+  gem "rails", "5.0.3"
 end
 
-appraise "rails-4.2" do
-  gem "rails", "4.2.4"
+appraise "rails-5.1" do
+  gem "rails", "5.1.1"
 end

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 1.2.0 (June 1, 2017)
+
+Features:
+
+  - Shortcode converted from module to a class (@toddnestor)
+  - Separate instances of Shortcode have separate configurations (@toddnestor)
+  - Updated to parslet 1.8.0
+  - Updated to rspec 3.6
+  - Template loading can be from configuration or file (@toddnestor)
+
+Misc:
+
+  - Testing against the latest versions of Rails 5.0 & 5.1
+
 ## 1.1.1 (September 14, 2015)
 
 Features:

data/Gemfile

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

data/Gemfile.lock

@@ -2,83 +2,69 @@ PATH
   remote: .
   specs:
     shortcode (1.1.1)
-      parslet (= 1.7.1)
+      parslet (= 1.8.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    appraisal (2.1.0)
+    appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
-    blankslate (3.1.3)
-    coveralls (0.8.2)
-      json (~> 1.8)
-      rest-client (>= 1.6.8, < 2)
-      simplecov (~> 0.10.0)
+    coveralls (0.8.21)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.14.1)
       term-ansicolor (~> 1.3)
-      thor (~> 0.19.1)
-    diff-lcs (1.2.5)
+      thor (~> 0.19.4)
+      tins (~> 1.6)
+    diff-lcs (1.3)
     docile (1.1.5)
-    domain_name (0.5.24)
-      unf (>= 0.0.5, < 1.0.0)
-    haml (4.0.7)
+    haml (5.0.1)
+      temple (>= 0.8.0)
       tilt
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
-    json (1.8.3)
-    mime-types (2.6.2)
-    netrc (0.10.3)
-    parslet (1.7.1)
-      blankslate (>= 2.0, <= 4.0)
-    rake (10.4.2)
-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+    json (2.1.0)
+    parslet (1.8.0)
+    rake (12.0.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.2)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
-    simplecov (0.10.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    simplecov (0.14.1)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    slim (3.0.6)
-      temple (~> 0.7.3)
+    simplecov-html (0.10.1)
+    slim (3.0.8)
+      temple (>= 0.7.6, < 0.9)
       tilt (>= 1.3.3, < 2.1)
-    temple (0.7.6)
-    term-ansicolor (1.3.2)
+    temple (0.8.0)
+    term-ansicolor (1.6.0)
       tins (~> 1.0)
-    thor (0.19.1)
-    tilt (2.0.1)
-    tins (1.6.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.1)
+    thor (0.19.4)
+    tilt (2.0.7)
+    tins (1.14.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  appraisal (= 2.1.0)
-  bundler (~> 1.10)
-  coveralls (~> 0)
-  haml (~> 4.0)
-  rake (~> 10.4)
-  rspec (~> 3.3)
+  appraisal (= 2.2.0)
+  bundler (~> 1.15)
+  coveralls (~> 0.8)
+  haml (~> 5.0)
+  rake (~> 12.0)
+  rspec (~> 3.6)
   shortcode!
   slim (~> 3.0)
 
 BUNDLED WITH
-   1.10.6
+   1.15.0

data/README.md

@@ -27,8 +27,8 @@ Or install it yourself as:
 $ gem install shortcode
 ```
 
-Shortcode is tested against ruby version 2.0, 2.1, and 2.2 as well as jruby, it will not work with ruby 1.8 and is no longer tested against ruby 1.9. Shortcode rails integration is tested against
-Rails versions 3.2, 4.0, 4.1 and 4.2.
+Shortcode is tested against ruby version 2.2, 2.3, and 2.4 as well as jruby (2.x compatible), it will not work with ruby 1.8 and is no longer tested against ruby 1.9. Shortcode rails integration is tested against
+Rails versions 4.1, 4.2, 5.0 and 5.1.
 
 ## Usage
 
@@ -36,8 +36,11 @@ Rails versions 3.2, 4.0, 4.1 and 4.2.
 
 Shortcode is very simple to use, simply call the `process` method and pass it a string containing shortcode markup.
 
+You can create multiple instances of `Shortcode` with separate configurations for each.
+
 ```ruby
-Shortcode.process("[quote]Hello World[/quote]")
+shortcode = Shortcode.new
+shortcode.process("[quote]Hello World[/quote]")
 ```
 
 In a Rails app, you can create helper methods to handle your shortcoded content and use them in your views with something similar to `<%= content_html @page.content %>`. Those two helper method can be used if your content contains html to be escaped or not.
@@ -59,12 +62,23 @@ end
 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 (in a Rails initializer for example) as follows:
 
 ```ruby
-Shortcode.setup do |config|
+shortcode = Shortcode.new
+shortcode.setup do |config|
   config.block_tags = [:quote, :list]
   config.self_closing_tags = [:gallery, :widget]
 end
 ```
 
+Note that you can call the setup block multiple times if need be and add to it.
+
+For example:
+
+```ruby
+shortcode.setup do |config|
+  config.block_tags << :other_tag
+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
@@ -118,22 +132,23 @@ The alternative way to define templates is to set them using the `templates` con
 values containing a template string. For instance:
 
 ```ruby
-Shortcode.setup do |config|
+shortcode = Shortcode.new
+
+shortcode.setup do |config|
   config.templates = { gallery: 'template code' }
 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.
+Note: Templates can be loaded from either the file system or the configuration templates.  If `check_config_templates_first` is set to true (the default value) on the configuration then it will check configuration templates first, and file system templates if it doesn't find one.  If `check_config_templates_first` is set to false on the configuration it will check for a file system template first, and then configuration templates if it doesn't find one.  If it doesn't find a template in either spot then it will raise an error.
 
 ### 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 templates.
 
 ```ruby
-Shortcode.setup do |config|
+shortcode = Shortcode.new
+
+shortcode.setup do |config|
   config.helpers = [CustomHelper, AnotherCustomHelper]
 end
 ```
@@ -167,15 +182,15 @@ class GalleryPresenter
 
   private
 
-    def images
-      Image.where("id IN (?)", @attributes[:ids])
-    end
+  def images
+    Image.where("id IN (?)", @attributes[:ids])
+  end
 end
 ```
 
 #### Using additional attributes
 
-At times you may want to pass through additional attributes to a presenter, for instance if you have a [gallery] shortcode tag and you want to pull out all images for a post, this can be achived using additional attributes with a presenter.
+At times you may want to pass through additional attributes to a presenter, for instance if you have a [gallery] shortcode tag and you want to pull out all images for a post, this can be achieved using additional attributes with a presenter.
 
 ```ruby
 class GalleryPresenter
@@ -199,34 +214,39 @@ class GalleryPresenter
 
   private
 
-    def images
-      @additional_attributes[:images].map &:url
-    end
+  def images
+    @additional_attributes[:images].map &:url
+  end
 end
+```
 
-# The hash containing the images attribute is passed through to the presenter
-# as the additional_attributes argument
-Shortcode.process('[gallery]', { images: @post.images })
+The hash containing the images attribute is passed through to the presenter as the additional_attributes argument to the `process` method.
 
+```ruby
+shortcode = Shortcode.new
+shortcode.process('[gallery]', { images: @post.images })
 ```
 
 #### Registering presenters
 
-To register a presenter simply call `Shortcode.register_presenter` passing the presenter class e.g.
+To register a presenter simply call `register_presenter` passing the presenter class e.g.
 
 ```ruby
+shortcode = Shortcode.new
+
 # A single presenter
-Shortcode.register_presenter(CustomPresenter)
+shortcode.register_presenter(CustomPresenter)
 
 # Or multiple presenters in one call
-Shortcode.register_presenter(CustomPresenter, AnotherPresenter)
-
+shortcode.register_presenter(CustomPresenter, AnotherPresenter)
 ```
 
 ### Configuration
 
 ```ruby
-Shortcode.setup do |config|
+shortcode = Shortcode.new
+
+shortcode.setup do |config|
 
   # the template parser to use
   config.template_parser = :erb # :erb, :haml, :slim supported, :erb is default
@@ -234,10 +254,12 @@ Shortcode.setup do |config|
   # location of the template files, default is "app/views/shortcode_templates"
   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
+  # a hash of templates passed as strings.
   config.templates = { gallery: 'template code' }
 
+  # a boolean option to set whether configuration templates are checked first or file system templates
+  config.check_config_templates_first = true
+
   # an array of helper modules to make available within templates
   config.helpers = [CustomerHelper]
 
@@ -256,6 +278,23 @@ Shortcode.setup do |config|
 end
 ```
 
+### Singleton
+
+You can optionally use Shortcode as a singleton instance with the same configuration throughout.
+
+To do this, you call methods directly on the `Shortcode` class.
+
+For example:
+
+```ruby
+Shortcode.setup do |config|
+  config.block_tags = [:quote]
+end
+
+Shortcode.register_presenter(QuotePresenterClass)
+
+Shortcode.process('[quote]Some quote[/quote]')
+```
 
 ## Contributing
 

data/gemfiles/rails_4.1.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "appraisal", "2.1.0"
-gem "rails", "~> 4.1.13"
+gem "appraisal", "2.2.0"
+gem "rails", "~> 4.1.16"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_4.2.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "appraisal", "2.1.0"
-gem "rails", "4.2.4"
+gem "appraisal", "2.2.0"
+gem "rails", "4.2.8"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_5.0.gemfile

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

data/gemfiles/rails_5.1.gemfile

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