shortcode 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b80627fe9d3741eb1e8ad562aab6789697b83c98
-  data.tar.gz: f495da02fb8c29dfb02e4244dce8724b301c7b10
+  metadata.gz: 9e0988a6e1f0ecb12fe3fed784a3510ed7453844
+  data.tar.gz: 172791fe6e082acf4f886c0c579634f5512c3e35
 SHA512:
-  metadata.gz: 99d81eba4857e42a19de407c9930304e34413e21ac60f97f72b9a0d9e31bad8f802bbb1c77e50b710f680be770b553922d159d603cd4617f525bf90e78a7ca58
-  data.tar.gz: 6dc1697bb5106c5e37450a82117937393e3e0e1223c57afea3102d02e963413fad9d85316c5909e9b96aae1aa00f21d69d13a258eb3d95b6a587aed3018530ca
+  metadata.gz: 0920cdbdfa0c5dd301e7f4a9ee6120222a97a3ee0603407f2d6938b89934801ebc5070ea4e00035b1f214a0dcf3ae218af2d5c249687d90f012a932f8a87eb3e
+  data.tar.gz: 21c39fe3f962bbfe73e9a91c337dc2d52243711d9688b7e813c10ee92f1e8ab6a6c0a5d17d21aec65aed7a8ddffcd9eb02620e774f690e0486239b63f0245121

data/.travis.yml

@@ -1,10 +1,9 @@
 language: ruby
 
 rvm:
-  - 1.9.3-p551
   - 2.0.0-p598
-  - 2.1.5
-  - 2.2.0
+  - 2.1.6
+  - 2.2.2
   - ruby-head
   - jruby-19mode
   - jruby-head
@@ -19,7 +18,6 @@ matrix:
     - rvm: jruby-head
 
 gemfile:
-  - gemfiles/rails_3.1.gemfile
   - gemfiles/rails_3.2.gemfile
   - gemfiles/rails_4.0.gemfile
   - gemfiles/rails_4.1.gemfile

data/Appraisals

@@ -1,7 +1,3 @@
-appraise "rails-3.1" do
-  gem "rails", "~> 3.1.12"
-end
-
 appraise "rails-3.2" do
   gem "rails", "~> 3.2.21"
 end
@@ -11,9 +7,9 @@ appraise "rails-4.0" do
 end
 
 appraise "rails-4.1" do
-  gem "rails", "~> 4.1.9"
+  gem "rails", "~> 4.1.10"
 end
 
 appraise "rails-4.2" do
-  gem "rails", "4.2.0"
+  gem "rails", "4.2.1"
 end

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.1.0 (May 15, 2015)
+
+Features:
+
+  - Support for registering multiple presenters with a single call
+
 ## 1.0.2 (March 4, 2015)
 
 Fixes:

data/Gemfile

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

data/Gemfile.lock

@@ -1,72 +1,93 @@
 PATH
   remote: .
   specs:
-    shortcode (1.0.2)
-      parslet (= 1.6.2)
+    shortcode (1.1.0)
+      parslet (= 1.7.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    appraisal (1.0.2)
+    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)
       bundler
       rake
       thor (>= 0.14.0)
     blankslate (3.1.3)
-    coveralls (0.7.3)
-      multi_json (~> 1.10)
-      rest-client (~> 1.7)
-      simplecov (~> 0.9.1)
+    coveralls (0.8.1)
+      json (~> 1.8)
+      rest-client (>= 1.6.8, < 2)
+      simplecov (~> 0.10.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
     diff-lcs (1.2.5)
     docile (1.1.5)
+    domain_name (0.5.24)
+      unf (>= 0.0.5, < 1.0.0)
     haml (4.0.6)
       tilt
-    mime-types (2.4.3)
-    multi_json (1.10.1)
-    netrc (0.10.2)
-    parslet (1.6.2)
+    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)
+    netrc (0.10.3)
+    parslet (1.7.0)
       blankslate (>= 2.0, <= 4.0)
     rake (10.4.2)
-    rest-client (1.7.2)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
+    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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    simplecov (0.9.1)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
+    simplecov (0.10.0)
       docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    slim (3.0.1)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    slim (3.0.3)
       temple (~> 0.7.3)
       tilt (>= 1.3.3, < 2.1)
     temple (0.7.5)
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     thor (0.19.1)
+    thread_safe (0.3.5)
     tilt (2.0.1)
-    tins (1.3.3)
+    tins (1.5.1)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  appraisal (= 1.0.2)
+  appraisal (= 2.0.1)
   bundler (~> 1.3)
-  coveralls
+  coveralls (~> 0)
   haml (~> 4.0)
-  rake
-  rspec (~> 3.1.0)
+  rake (~> 10.4)
+  rspec (~> 3.1)
   shortcode!
   slim (~> 3.0)

data/README.md

@@ -27,8 +27,8 @@ Or install it yourself as:
 $ gem install shortcode
 ```
 
-Shortcode is tested against ruby version 1.9.3, 2.0, 2.1, and 2.2 as well as jruby, it will not work with ruby 1.8. Shortcode rails integration is tested against
-Rails versions 3.1, 3.2, 4.0, 4.1 and 4.2.
+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.
 
 ## Usage
 
@@ -201,7 +201,12 @@ Shortcode.process('[gallery]', { images: @post.images })
 To register a presenter simply call `Shortcode.register_presenter` passing the presenter class e.g.
 
 ```ruby
+# A single presenter
 Shortcode.register_presenter(CustomPresenter)
+
+# Or multiple presenters in one call
+Shortcode.register_presenter(CustomPresenter, AnotherPresenter)
+
 ```
 
 ### Configuration

data/gemfiles/rails_3.2.gemfile

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

data/gemfiles/rails_4.0.gemfile

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

data/gemfiles/rails_4.1.gemfile

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

data/gemfiles/rails_4.2.gemfile

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

data/lib/shortcode.rb

@@ -23,8 +23,10 @@ module Shortcode
     yield configuration
   end
 
-  def self.register_presenter(presenter)
-    Shortcode::Presenter.register presenter
+  def self.register_presenter(*presenters)
+    presenters.each do |presenter|
+      Shortcode::Presenter.register presenter
+    end
   end
 
   private

data/lib/shortcode/version.rb

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

data/shortcode.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "parslet", "1.6.2"
+  spec.add_dependency "parslet", "1.7.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake", "~> 0"
+  spec.add_development_dependency "rake", "~> 10.4"
   spec.add_development_dependency "rspec", "~> 3.1"
   spec.add_development_dependency "coveralls", "~> 0"
   spec.add_development_dependency "slim", "~> 3.0"

data/spec/presenter_spec.rb

@@ -3,6 +3,7 @@ require 'parslet/rig/rspec'
 require 'pp'
 
 require 'support/presenters/my_presenter'
+require 'support/presenters/other_presenter'
 require 'support/presenters/multiple_presenter'
 require 'support/presenters/missing_for_presenter'
 require 'support/presenters/missing_initialize_presenter'
@@ -57,6 +58,35 @@ describe Shortcode::Presenter do
 
   end
 
+  context "presenter registration" do
+
+    describe "registering a single presenter" do
+
+      before do
+        Shortcode.register_presenter MyPresenter
+      end
+
+      it "adds the presenter to the list" do
+        expect(Shortcode::Presenter.presenters).to include(MyPresenter.for)
+      end
+
+    end
+
+    describe "registering multiple presenters" do
+
+      before do
+        Shortcode.register_presenter(MyPresenter, OtherPresenter)
+      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)
+      end
+
+    end
+
+  end
+
   context "presenter validation" do
 
     describe "missing #for class method" do

data/spec/support/presenters/other_presenter.rb

@@ -0,0 +1,19 @@
+class OtherPresenter
+
+  def self.for
+    :other
+  end
+
+  def initialize(attributes, content, additional_attributes)
+    @content = content
+    @additional_attributes = additional_attributes
+  end
+
+  def content
+    @content
+  end
+
+  def attributes
+    @additional_attributes || { title: "my custom title" }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shortcode
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Jamie Dyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -125,7 +125,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/rails_3.1.gemfile
 - gemfiles/rails_3.2.gemfile
 - gemfiles/rails_4.0.gemfile
 - gemfiles/rails_4.1.gemfile
@@ -186,6 +185,7 @@ files:
 - spec/support/presenters/missing_initialize_presenter.rb
 - spec/support/presenters/multiple_presenter.rb
 - spec/support/presenters/my_presenter.rb
+- spec/support/presenters/other_presenter.rb
 - spec/support/templates/erb/collapsible_list.html.erb
 - spec/support/templates/erb/custom_helper.html.erb
 - spec/support/templates/erb/item.html.erb
@@ -270,6 +270,7 @@ test_files:
 - spec/support/presenters/missing_initialize_presenter.rb
 - spec/support/presenters/multiple_presenter.rb
 - spec/support/presenters/my_presenter.rb
+- spec/support/presenters/other_presenter.rb
 - spec/support/templates/erb/collapsible_list.html.erb
 - spec/support/templates/erb/custom_helper.html.erb
 - spec/support/templates/erb/item.html.erb

data/gemfiles/rails_3.1.gemfile

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