shortcode 1.2.1 → 2.0.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11f134f87bfa70439f00a60c1b424648357cbbe4
-  data.tar.gz: 99a050c747acb9dfedc1f3f9e035d4eb9b496dc4
+  metadata.gz: 67c526cf7e4b188fc7d99cf8b41617e9276b4152
+  data.tar.gz: de1db6a4b8749558967a4bfa59db55f6520af4c4
 SHA512:
-  metadata.gz: a021bdbe0979e2266972703969c0c01030a45138de2e1e99e36ba77845020b7f787056d3a13afd6337fdaef3c1b39e3b1004f4727d454a0d648d86f64953891b
-  data.tar.gz: 44ddde6b96b26707107ee0ba028de4404d965ed5453d9e1be587c09040f54d9c258d0d3b411162311ccdd57d3b7b2b5940109a40fe8af4a6f43952f0730e6d3a
+  metadata.gz: 8c2cbbf8f3d9bb15e080ee37d658a58efcdeb63b0c3e583133c1352e1ac50d9f7e01bdbfd546b85560551b03b55e919e8ec8334a1d0db9468dd9a66d9afaa765
+  data.tar.gz: cc71f73c661b952f3dea16a1a7b28c691d315f2a301ff0db4b3bfc9dc5ef05339f39c962e86e92f5de72453c69ef1ca768e603adf36d250dd6462386c831e9bb

data/.rubocop

@@ -0,0 +1 @@
+-D

data/.rubocop.yml

@@ -0,0 +1,72 @@
+###########################
+# Configuration for rubocop
+# in .rubocop.yml
+# Most of these are disabling existing cops, primarily
+# due to a smattering of different styles and loose
+# guidlines for contributions.
+#
+# Any of these may be changed.
+
+require: rubocop-rspec
+
+AllCops:
+  Exclude:
+    - 'bin/*'
+
+Style/Documentation:
+  Enabled: false
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+# START Ruby 2.4 editions (these are disabled for the upgrade, reenable after
+#       if you wish)
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/SafeNavigation:
+  Enabled: false
+
+Style/NumericPredicate:
+  Enabled: false
+
+Performance/RegexpMatch:
+  Enabled: false
+# END Ruby 2.4 editions
+
+Layout/SpaceAroundEqualsInParameterDefault:
+  EnforcedStyle: no_space
+
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+
+EmptyLinesAroundClassBody:
+  EnforcedStyle: empty_lines
+
+Layout/EmptyLinesAroundModuleBody:
+  EnforcedStyle: empty_lines
+
+Style/Lambda:
+  EnforcedStyle: literal
+  # SupportedStyles:
+  #   - line_count_dependent
+  #   - lambda
+  #   - literal
+
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+Performance/Casecmp:
+  Enabled: false
+
+Style/Alias:
+  Enabled: false
+
+Style/BlockDelimiters:
+  Enabled: false
+
+LineLength:
+  Max: 110
+
+Metrics/MethodLength:
+  Max: 14

data/.travis.yml

@@ -1,25 +1,26 @@
 language: ruby
 
 rvm:
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
+  - 2.2.8
+  - 2.3.5
+  - 2.4.2
   - ruby-head
   - jruby-9.1.9.0
 
 sudo: false
 
-script: bundle exec rspec
+script:
+  - bin/rspec
+  - bin/rubocop
 
 before_install:
-  - gem install bundler -v 1.15.0
+  - gem install bundler -v 1.16.0
 
 matrix:
   allow_failures:
     - rvm: ruby-head
 
 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,11 @@
-appraise "rails-4.1" do
-  gem "rails", "~> 4.1.16"
-end
-
 appraise "rails-4.2" do
-  gem "rails", "4.2.8"
+  gem "rails", "4.2.10"
 end
 
 appraise "rails-5.0" do
-  gem "rails", "5.0.3"
+  gem "rails", "5.0.6"
 end
 
 appraise "rails-5.1" do
-  gem "rails", "5.1.1"
+  gem "rails", "5.1.4"
 end

data/Gemfile

@@ -1,6 +1,6 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in shortcode.gemspec
 gemspec
 
-gem 'appraisal', '2.2.0'
+gem "appraisal", "2.2.0"

data/Gemfile.lock

@@ -7,51 +7,166 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    actioncable (5.1.4)
+      actionpack (= 5.1.4)
+      nio4r (~> 2.0)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.1.4)
+      actionpack (= 5.1.4)
+      actionview (= 5.1.4)
+      activejob (= 5.1.4)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.1.4)
+      actionview (= 5.1.4)
+      activesupport (= 5.1.4)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.1.4)
+      activesupport (= 5.1.4)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.1.4)
+      activesupport (= 5.1.4)
+      globalid (>= 0.3.6)
+    activemodel (5.1.4)
+      activesupport (= 5.1.4)
+    activerecord (5.1.4)
+      activemodel (= 5.1.4)
+      activesupport (= 5.1.4)
+      arel (~> 8.0)
+    activesupport (5.1.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
     appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
+    arel (8.0.0)
+    ast (2.3.0)
+    builder (3.2.3)
+    concurrent-ruby (1.0.5)
     coveralls (0.8.21)
       json (>= 1.8, < 3)
       simplecov (~> 0.14.1)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.4)
       tins (~> 1.6)
+    crass (1.0.2)
     diff-lcs (1.3)
     docile (1.1.5)
-    haml (5.0.1)
+    erubi (1.6.1)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    haml (5.0.4)
       temple (>= 0.8.0)
       tilt
+    i18n (0.9.0)
+      concurrent-ruby (~> 1.0)
     json (2.1.0)
+    loofah (2.1.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
+    method_source (0.9.0)
+    mini_mime (0.1.4)
+    mini_portile2 (2.3.0)
+    minitest (5.10.3)
+    nio4r (2.1.0)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
+    parallel (1.12.0)
+    parser (2.4.0.0)
+      ast (~> 2.2)
     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)
+    powerpack (0.1.1)
+    rack (2.0.3)
+    rack-test (0.7.0)
+      rack (>= 1.0, < 3)
+    rails (5.1.4)
+      actioncable (= 5.1.4)
+      actionmailer (= 5.1.4)
+      actionpack (= 5.1.4)
+      actionview (= 5.1.4)
+      activejob (= 5.1.4)
+      activemodel (= 5.1.4)
+      activerecord (= 5.1.4)
+      activesupport (= 5.1.4)
+      bundler (>= 1.3.0)
+      railties (= 5.1.4)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (5.1.4)
+      actionpack (= 5.1.4)
+      activesupport (= 5.1.4)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rainbow (2.2.2)
+      rake
+    rake (12.2.1)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
+    rubocop (0.51.0)
+      parallel (~> 1.10)
+      parser (>= 2.3.3.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    rubocop-rspec (1.19.0)
+      rubocop (>= 0.51.0)
+    ruby-progressbar (1.9.0)
     simplecov (0.14.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.1)
+    simplecov-html (0.10.2)
     slim (3.0.8)
       temple (>= 0.7.6, < 0.9)
       tilt (>= 1.3.3, < 2.1)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     temple (0.8.0)
     term-ansicolor (1.6.0)
       tins (~> 1.0)
     thor (0.19.4)
-    tilt (2.0.7)
-    tins (1.14.0)
+    thread_safe (0.3.6)
+    tilt (2.0.8)
+    tins (1.15.0)
+    tzinfo (1.2.4)
+      thread_safe (~> 0.1)
+    unicode-display_width (1.3.0)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
 
 PLATFORMS
   ruby
@@ -61,10 +176,13 @@ DEPENDENCIES
   bundler (~> 1.15)
   coveralls (~> 0.8)
   haml (~> 5.0)
+  rails (= 5.1.4)
   rake (~> 12.0)
-  rspec (~> 3.6)
+  rspec (~> 3.7)
+  rubocop (~> 0.51)
+  rubocop-rspec (~> 1.19)
   shortcode!
   slim (~> 3.0)
 
 BUNDLED WITH
-   1.15.0
+   1.15.4

data/bin/appraisal

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'appraisal' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("appraisal", "appraisal")

data/bin/rspec

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

data/bin/rubocop

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'rubocop' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rubocop", "rubocop")

data/gemfiles/rails_4.2.gemfile

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "appraisal", "2.2.0"
-gem "rails", "4.2.8"
+gem "rails", "4.2.10"
 
 gemspec path: "../"

data/gemfiles/rails_5.0.gemfile

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "appraisal", "2.2.0"
-gem "rails", "5.0.3"
+gem "rails", "5.0.6"
 
 gemspec path: "../"

data/gemfiles/rails_5.1.gemfile

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "appraisal", "2.2.0"
-gem "rails", "5.1.1"
+gem "rails", "5.1.4"
 
 gemspec path: "../"

data/lib/shortcode.rb

@@ -1,37 +1,16 @@
-require 'parslet'
-require 'erb'
+require "parslet"
+require "erb"
 
+# rubocop:disable Lint/HandleExceptions
 begin
-  require 'haml'
+  require "haml"
 rescue LoadError; end
-
 begin
-  require 'slim'
+  require "slim"
 rescue LoadError; end
+# rubocop:enable Lint/HandleExceptions
 
 class Shortcode
-  # This is providedc for backwards compatibility
-  def self.process(string, additional_attributes=nil)
-    warn "[DEPRECATION] singleton `Shortcode.process` is deprecated and will be removed in version 2.0. Please create a new instance `Shortcode.new` and call `process` on the instance."
-    singleton.process(string, additional_attributes)
-  end
-
-  # This is provided for backwards compatibility
-  def self.singleton
-    @instance ||= new
-  end
-
-  # This is providedc for backwards compatibility
-  def self.setup(&prc)
-    warn "[DEPRECATION] singleton `Shortcode.setup` is deprecated and will be removed in version 2.0. Please create a new instance `Shortcode.new` and call `setup` on the instance."
-    singleton.setup(&prc)
-  end
-
-  # This is providedc for backwards compatibility
-  def self.register_presenter(*presenters)
-    warn "[DEPRECATION] singleton `Shortcode.register_presenter` is deprecated and will be removed in version 2.0. Please create a new instance `Shortcode.new` and call `register_presenter` on the instance."
-    singleton.register_presenter(*presenters)
-  end
 
   def process(string, additional_attributes=nil)
     Shortcode::Processor.new.process(string, configuration, additional_attributes)
@@ -47,22 +26,19 @@ class Shortcode
     end
   end
 
-  private
-
   def configuration
     @configuration ||= Configuration.new
   end
-end
 
-require 'shortcode/version'
-require 'shortcode/configuration'
-require 'shortcode/parser'
-require 'shortcode/presenter'
-require 'shortcode/processor'
-require 'shortcode/template_binding'
-require 'shortcode/transformer'
-require 'shortcode/tag'
-require 'shortcode/exceptions'
-require 'shortcode/railtie' if defined?(Rails) && Rails::VERSION::MAJOR >= 3
+end
 
-Shortcode.setup {}
+require "shortcode/version"
+require "shortcode/configuration"
+require "shortcode/parser"
+require "shortcode/presenter"
+require "shortcode/processor"
+require "shortcode/template_binding"
+require "shortcode/transformer"
+require "shortcode/tag"
+require "shortcode/exceptions"
+require "shortcode/railtie" if defined?(Rails) && Rails::VERSION::MAJOR >= 3