shortcode 1.2.1 → 2.0.0.pre

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shortcode
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.0.pre
 platform: ruby
 authors:
 - Jamie Dyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-22 00:00:00.000000000 Z
+date: 2017-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -38,6 +38,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.15'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.1.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.1.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -58,64 +100,69 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.51'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.51'
 - !ruby/object:Gem::Dependency
-  name: slim
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.19'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.19'
 - !ruby/object:Gem::Dependency
-  name: haml
+  name: slim
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '3.0'
 description: Gem for parsing wordpress style shortcodes
 email:
 - jamie@kernowsoul.com
-executables: []
+executables:
+- appraisal
+- rspec
+- rubocop
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop"
+- ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
 - Appraisals
@@ -125,7 +172,9 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/rails_4.1.gemfile
+- bin/appraisal
+- bin/rspec
+- bin/rubocop
 - gemfiles/rails_4.2.gemfile
 - gemfiles/rails_5.0.gemfile
 - gemfiles/rails_5.1.gemfile
@@ -141,10 +190,12 @@ files:
 - lib/shortcode/transformer.rb
 - lib/shortcode/version.rb
 - shortcode.gemspec
-- spec/parser_spec.rb
+- spec/.rubocop.yml
 - spec/performance_spec.rb
-- spec/presenter_spec.rb
 - spec/rails_helpers_spec.rb
+- spec/shortcode/parser_spec.rb
+- spec/shortcode/presenter_spec.rb
+- spec/shortcode/tag_spec.rb
 - spec/shortcode_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixtures.rb
@@ -198,7 +249,6 @@ files:
 - spec/support/templates/haml/rails_helper.html.haml
 - spec/support/templates/slim/quote.html.slim
 - spec/support/templates/slim/rails_helper.html.slim
-- spec/tag_spec.rb
 - spec/template_parsers_spec.rb
 - spec/transformer_spec.rb
 homepage: https://github.com/kernow/shortcode
@@ -216,20 +266,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Gem for parsing wordpress style shortcodes in ruby projects
 test_files:
-- spec/parser_spec.rb
+- spec/.rubocop.yml
 - spec/performance_spec.rb
-- spec/presenter_spec.rb
 - spec/rails_helpers_spec.rb
+- spec/shortcode/parser_spec.rb
+- spec/shortcode/presenter_spec.rb
+- spec/shortcode/tag_spec.rb
 - spec/shortcode_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixtures.rb
@@ -283,6 +335,5 @@ test_files:
 - spec/support/templates/haml/rails_helper.html.haml
 - spec/support/templates/slim/quote.html.slim
 - spec/support/templates/slim/rails_helper.html.slim
-- spec/tag_spec.rb
 - spec/template_parsers_spec.rb
 - spec/transformer_spec.rb

data/gemfiles/rails_4.1.gemfile

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

data/spec/parser_spec.rb

@@ -1,307 +0,0 @@
-require 'spec_helper'
-require 'parslet/rig/rspec'
-require 'pp'
-
-describe Shortcode::Parser do
-  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 }
-  let(:without_quotes)    { load_fixture :without_quotes }
-  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(:quotes)            { [simple_quote, full_quote, quote_with_extras] }
-  let(:collapsible_lists) { [simple_list] }
-  let(:timelines)         { [timeline_event, timeline_info, timeline_person] }
-
-  it "parses quote shortcodes" do
-    quotes.each do |string|
-      expect(parser).to parse(string)
-    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
-      Shortcode.setup do |config|
-        config.attribute_quote_type = "'"
-      end
-    end
-
-    it "parses quotes using custom quotations" do
-      quotes.each do |string|
-        # Change double quotes to single quotes in the fixture
-        expect(parser).to parse(string.gsub '"', "'")
-      end
-    end
-
-  end
-
-  context "use_attribute_quotes configuration" do
-
-    before do
-      Shortcode.setup do |config|
-        config.use_attribute_quotes = false
-      end
-    end
-
-    it "parses shortcodes with optional quotes" do
-      expect(parser).to parse(without_quotes)
-    end
-
-  end
-
-  it "parses list shortcodes" do
-    collapsible_lists.each do |string|
-      expect(parser).to parse(string)
-    end
-  end
-
-  it "parses timeline shortcodes" do
-    timelines.each do |string|
-      expect(parser).to parse(string)
-    end
-  end
-
-  it "parses complex nested shortcodes" do
-    expect(parser).to parse(complex_snippet)
-  end
-
-  describe "parsed strings" do
-
-    context "simple_quote" do
-
-      let(:parsed_object) { parser.parse(simple_quote) }
-
-      it "created the expected object" do
-        expect(parsed_object[:body]).to eq([{ open: "quote", options: [], inner: [{ text: "hello" }], close: "quote" }])
-      end
-
-    end
-
-    context "full_quote" do
-
-      let(:parsed_object) { parser.parse(full_quote) }
-
-      it "created the expected object" do
-        expect(parsed_object[:body]).to eq([{
-          open: "quote",
-          options: [
-            { key: "author", value: "Jamie Dyer" },
-            { key: "title", value: "King of England" }
-          ],
-          inner: [{ text: "A quote" }],
-          close: "quote"
-        }])
-      end
-
-    end
-
-    context "quote_with_extras" do
-
-      let(:parsed_object) { parser.parse(quote_with_extras) }
-
-      it "created the expected object" do
-        expect(parsed_object[:body]).to eq([
-          { text: "Blah blah " },
-          {
-            open: "quote",
-            options: [
-              { key: "author", value: "Jamie Dyer" }
-            ],
-            inner: [{ text: "A quote" }],
-            close: "quote"
-          },
-          { text: " <br> blah blah\n" }
-        ])
-      end
-
-    end
-
-    context "simple_list" do
-
-      let(:parsed_object) { parser.parse(simple_list) }
-
-      it "created the expected object" do
-        expect(parsed_object[:body]).to eq([{
-          open: "collapsible_list",
-          options: [],
-          inner: [{
-            open: "item",
-            options: [{ key: "title", value: "Example title 1" }],
-            inner: [{ text: "Example content 1" }],
-            close: "item"
-          },
-          {
-            open: "item",
-            options: [{ key: "title", value: "Example title 2" }],
-            inner: [{ text: "Example content 2" }],
-            close: "item"
-          },
-          {
-            open: "item",
-            options: [{ key: "title", value: "Example title 3" }],
-            inner: [{ text: "Example content 3" }],
-            close: "item"
-          }],
-          close: "collapsible_list"
-        }])
-      end
-
-    end
-
-    context "timeline_event" do
-
-      let(:parsed_object) { parser.parse(timeline_event) }
-
-      it "created the expected object" do
-        expect(parsed_object[:body]).to eq([{
-          open_close: "timeline_event",
-          options: [
-            { key: "date", value: "March 2013" },
-            { key: "title", value: "a title" },
-            { key: "link", value: "http://blah.com" }
-          ]
-        }])
-      end
-
-    end
-
-    context "timeline_info" do
-
-      let(:parsed_object) { parser.parse(timeline_info) }
-
-      it "created the expected object" do
-        expect(parsed_object[:body]).to eq([{
-          open_close: "timeline_info",
-          options: [
-            { key: "date", value: "Feb 2013" },
-            { key: "title", value: "Something amazing" }
-          ]
-        }])
-      end
-
-    end
-
-    context "timeline_person" do
-
-      let(:parsed_object) { parser.parse(timeline_person) }
-
-      it "created the expected object" do
-        expect(parsed_object[:body]).to eq([{
-          open: "timeline_person",
-          options: [
-            { key: "date", value: "Jan 2012" },
-            { key: "title", value: "A real title" },
-            { key: "image", value: "/images/person.jpg" },
-            { key: "name", value: "Sam Smith" },
-            { key: "position", value: "Presedent" },
-            { key: "link", value: "http://blah.com" }
-          ],
-          inner: [{ text: "A bit of body copy\nwith a newline\n" }],
-          close: "timeline_person"
-        }])
-      end
-
-    end
-
-    context "complex_snippet" do
-
-      let(:parsed_object) { parser.parse(complex_snippet) }
-
-      it "created the expected object" do
-        expect(parsed_object[:body]).to eq([{
-          text: "<h3>A page title</h3>\n<p>Some text</p>\n"},
-          {
-            open: "collapsible_list",
-            options: [],
-            inner:     [{
-              open: "item",
-              options: [{ key: "title", value: "Example title 1" }],
-              inner: [{
-                open: "quote",
-                options: [
-                  { key: "author", value: "Jamie Dyer" },
-                  { key: "title", value: "King of England" }
-                ],
-                inner: [{ text: "A quote" }],
-                close: "quote"
-              },
-              { text: "I'm inbetween 2 quotes!\n    " },
-              {
-                open: "quote",
-                options: [
-                  { key: "author", value: "Forrest Gump" },
-                  { key: "title", value: "Idiot" }
-                ],
-                inner: [{text: "Life is like..."}],
-                close: "quote"
-              }],
-            close: "item"
-            },
-            {
-              open: "item",
-              options: [{ key: "title", value: "Example title 2" }],
-              inner: [{ text: "Example content 2" }],
-              close: "item"
-            },
-            {
-              open: "item",
-              options: [{ key: "title", value: "Example title 3" }],
-              inner: [{ text: "Example content 3" }],
-              close: "item"
-            }],
-            close: "collapsible_list"
-          },
-          { text: "\n<p>Some more text</p>\n" }
-        ])
-      end
-    end
-  end
-end