shortcode 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e0988a6e1f0ecb12fe3fed784a3510ed7453844
-  data.tar.gz: 172791fe6e082acf4f886c0c579634f5512c3e35
+  metadata.gz: 314fc72e3ebd9b6705c95087c2c509123ffc239e
+  data.tar.gz: 705924df01ce2a39709ddf99fae925fadc23348f
 SHA512:
-  metadata.gz: 0920cdbdfa0c5dd301e7f4a9ee6120222a97a3ee0603407f2d6938b89934801ebc5070ea4e00035b1f214a0dcf3ae218af2d5c249687d90f012a932f8a87eb3e
-  data.tar.gz: 21c39fe3f962bbfe73e9a91c337dc2d52243711d9688b7e813c10ee92f1e8ab6a6c0a5d17d21aec65aed7a8ddffcd9eb02620e774f690e0486239b63f0245121
+  metadata.gz: 1dc80f9880a0ef8db9a4bc1fe978083ca8de474114cd6a28250f064f77f25e4ecb87750f4233ad3b38dd7160f6baac3f876f8b31fac1ccde2ea5e57b0368eb21
+  data.tar.gz: 52b2eeabbeb6fbf67583c6dedacf97617ea1c7afdab506fa90eae7ddb9687e545dd516d68405669495b06721cb67e8e0d2e08ffc0c0b64285c07581b89d797cb

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 
 rvm:
-  - 2.0.0-p598
-  - 2.1.6
-  - 2.2.2
+  - 2.0.0-p647
+  - 2.1.7
+  - 2.2.3
   - ruby-head
   - jruby-19mode
   - jruby-head
@@ -12,6 +12,9 @@ sudo: false
 
 script: bundle exec rspec
 
+before_install:
+  - gem install bundler -v 1.10.6
+
 matrix:
   allow_failures:
     - rvm: ruby-head

data/Appraisals

@@ -7,9 +7,9 @@ appraise "rails-4.0" do
 end
 
 appraise "rails-4.1" do
-  gem "rails", "~> 4.1.10"
+  gem "rails", "~> 4.1.13"
 end
 
 appraise "rails-4.2" do
-  gem "rails", "4.2.1"
+  gem "rails", "4.2.4"
 end

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 1.1.1 (September 14, 2015)
+
+Features:
+
+  - Updated to parslet 1.7.1
+  - Updated to rspec 3.3
+
+Fixes:
+
+  - The order registered tags are defined no longer causes parsing to work incorrectly
+
+Misc:
+
+  - Testing against the latest versions of Rails 4.1 & 4.2
+
 ## 1.1.0 (May 15, 2015)
 
 Features:

data/Gemfile

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

data/Gemfile.lock

@@ -1,25 +1,18 @@
 PATH
   remote: .
   specs:
-    shortcode (1.1.0)
-      parslet (= 1.7.0)
+    shortcode (1.1.1)
+      parslet (= 1.7.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.1)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    appraisal (2.0.1)
-      activesupport (>= 3.2.21)
+    appraisal (2.1.0)
       bundler
       rake
       thor (>= 0.14.0)
     blankslate (3.1.3)
-    coveralls (0.8.1)
+    coveralls (0.8.2)
       json (~> 1.8)
       rest-client (>= 1.6.8, < 2)
       simplecov (~> 0.10.0)
@@ -29,52 +22,47 @@ GEM
     docile (1.1.5)
     domain_name (0.5.24)
       unf (>= 0.0.5, < 1.0.0)
-    haml (4.0.6)
+    haml (4.0.7)
       tilt
     http-cookie (1.0.2)
       domain_name (~> 0.5)
-    i18n (0.7.0)
-    json (1.8.2)
-    mime-types (2.5)
-    minitest (5.6.1)
+    json (1.8.3)
+    mime-types (2.6.2)
     netrc (0.10.3)
-    parslet (1.7.0)
+    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.2.0)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.3)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.1)
+    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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.1)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.2)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
     simplecov (0.10.0)
       docile (~> 1.1.0)
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    slim (3.0.3)
+    slim (3.0.6)
       temple (~> 0.7.3)
       tilt (>= 1.3.3, < 2.1)
-    temple (0.7.5)
-    term-ansicolor (1.3.0)
+    temple (0.7.6)
+    term-ansicolor (1.3.2)
       tins (~> 1.0)
     thor (0.19.1)
-    thread_safe (0.3.5)
     tilt (2.0.1)
-    tins (1.5.1)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
+    tins (1.6.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.1)
@@ -83,11 +71,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  appraisal (= 2.0.1)
-  bundler (~> 1.3)
+  appraisal (= 2.1.0)
+  bundler (~> 1.10)
   coveralls (~> 0)
   haml (~> 4.0)
   rake (~> 10.4)
-  rspec (~> 3.1)
+  rspec (~> 3.3)
   shortcode!
   slim (~> 3.0)
+
+BUNDLED WITH
+   1.10.6

data/README.md

@@ -40,9 +40,23 @@ Shortcode is very simple to use, simply call the `process` method and pass it a
 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.
+
+```ruby
+module PagesHelper
+  def content(c)
+    Shortcode.process(c)
+  end
+
+  def content_html(c)
+    raw content(c)
+  end
+end
+```
+
 ### 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:
+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|

data/gemfiles/rails_3.2.gemfile

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

data/gemfiles/rails_4.0.gemfile

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

data/gemfiles/rails_4.1.gemfile

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

data/gemfiles/rails_4.2.gemfile

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

data/lib/shortcode/configuration.rb

@@ -12,10 +12,16 @@ class Shortcode::Configuration
   attr_accessor :helpers
 
   # Set the supported block_tags
-  attr_accessor :block_tags
+  attr_reader :block_tags
+  def block_tags=(block_tags)
+    @block_tags = block_tags.sort_by(&:length).reverse
+  end
 
   # Set the supported self_closing_tags
-  attr_accessor :self_closing_tags
+  attr_reader :self_closing_tags
+  def self_closing_tags=(self_closing_tags)
+    @self_closing_tags = self_closing_tags.sort_by(&:length).reverse
+  end
 
   # Set the quotation sign used for attribute values. Defaults to double quote (")
   attr_accessor :attribute_quote_type

data/lib/shortcode/version.rb

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

data/shortcode.gemspec

@@ -18,11 +18,11 @@ 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.0"
+  spec.add_dependency "parslet", "1.7.1"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.4"
-  spec.add_development_dependency "rspec", "~> 3.1"
+  spec.add_development_dependency "rspec", "~> 3.3"
   spec.add_development_dependency "coveralls", "~> 0"
   spec.add_development_dependency "slim", "~> 3.0"
   spec.add_development_dependency "haml", "~> 4.0"

data/spec/parser_spec.rb

@@ -26,6 +26,46 @@ describe Shortcode::Parser do
     end
   end
 
+  describe "matching similar tags" do
+
+    context "with the smaller tag listed first" do
+
+      before do
+        Shortcode.setup do |config|
+          config.block_tags = [:xx, :xxx]
+        end
+      end
+
+      it "parses xx" do
+        expect(parser.open).to parse("[xx]")
+      end
+
+      it "parses xxx" do
+        expect(parser.open).to parse("[xxx]")
+      end
+
+    end
+
+    context "with the smaller tag listed last" do
+
+      before do
+        Shortcode.setup do |config|
+          config.block_tags = [:xxx, :xx]
+        end
+      end
+
+      it "parses xx" do
+        expect(parser.open).to parse("[xx]")
+      end
+
+      it "parses xxx" do
+        expect(parser.open).to parse("[xxx]")
+      end
+
+    end
+
+  end
+
   context "attribute_quote_type configuration" do
 
     before do

data/spec/spec_helper.rb

@@ -12,7 +12,7 @@ require 'shortcode'
 require 'support/fixtures'
 
 # Set slim's attribute quotes to use single quotes so it's the same as haml
-Slim::Engine.set_default_options attr_quote: "'"
+Slim::Engine.set_options attr_quote: "'"
 
 RSpec.configure do |config|
   config.order = "random"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shortcode
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Jamie Dyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-15 00:00:00.000000000 Z
+date: 2015-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.7.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Gem for parsing wordpress style shortcodes in ruby projects