shortcode 0.1.1 → 0.1.2

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 .DS_Store
+gemfiles/*.lock

data/.travis.yml

@@ -0,0 +1,24 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - ruby-head
+  - jruby-19mode
+  - jruby-head
+script: bundle exec rspec
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
+  exclude:
+    - rvm: 1.9.2
+      gemfile: gemfiles/rails_4.0.gemfile
+
+gemfile:
+  - gemfiles/rails_3.0.gemfile
+  - gemfiles/rails_3.1.gemfile
+  - gemfiles/rails_3.2.gemfile
+  - gemfiles/rails_4.0.gemfile

data/Appraisals

@@ -0,0 +1,15 @@
+appraise "rails-3.0" do
+  gem "rails", "~> 3.0.20"
+end
+
+appraise "rails-3.1" do
+  gem "rails", "~> 3.1.12"
+end
+
+appraise "rails-3.2" do
+  gem "rails", "~> 3.2.17"
+end
+
+appraise "rails-4.0" do
+  gem "rails", "~> 4.0.3"
+end

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in shortcode.gemspec
 gemspec
+
+gem "appraisal", "1.0.0.beta3"

data/README.md

@@ -1,5 +1,7 @@
 # Shortcode
 
+[![Build Status](https://travis-ci.org/kernow/shortcode.png?branch=master)](https://travis-ci.org/kernow/shortcode)
+
 A ruby gem for parsing Wordpress style shortcodes. The gem uses a [PEG](http://en.wikipedia.org/wiki/Parsing_expression_grammar) (Parsing Expression Grammar) parser rather than using regular expressions so its easier to understand, test and extend.
 
 ## Installation
@@ -99,7 +101,7 @@ Sometimes the data passed to the template from the shortcode it not enough. Lets
 In a rails app you could return image records to the template using something like this:
 
 ```ruby
-class CustomPrsenter
+class CustomPresenter
 
   def self.for
     :quote
@@ -121,7 +123,7 @@ class CustomPrsenter
   private
 
     def images
-      @attributes.ids.split(',').collect { |n| Image.find(n) }
+      Image.where("id IN (?)", @attributes[:ids])
     end
 end
 ```
@@ -131,7 +133,7 @@ end
 To register a presenter simply call `Shortcode.register_presenter` passing the presenter class e.g.
 
 ```ruby
-Shortcode.register_presenter(CustomPrsenter)
+Shortcode.register_presenter(CustomPresenter)
 ```
 
 ## Contributing

data/Rakefile

@@ -1 +1,3 @@
+require "rubygems"
+require "bundler/setup"
 require "bundler/gem_tasks"

data/gemfiles/rails_3.0.gemfile

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

data/gemfiles/rails_3.1.gemfile

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

data/gemfiles/rails_3.2.gemfile

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

data/gemfiles/rails_4.0.gemfile

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

data/lib/shortcode.rb

@@ -6,8 +6,7 @@ module Shortcode
   extend self
 
   attr_accessor :configuration, :presenters
-  @@presenters = {}
-
+  self.presenters = {}
 
   def setup
     self.configuration ||= Configuration.new
@@ -41,4 +40,6 @@ require 'shortcode/presenter'
 require 'shortcode/transformer'
 require 'shortcode/tag'
 require 'shortcode/exceptions'
-require 'shortcode/railtie' if defined?(Rails)
+require 'shortcode/railtie' if defined?(Rails) && Rails::VERSION::MAJOR >= 3
+
+Shortcode.setup {}

data/lib/shortcode/configuration.rb

@@ -1,17 +1,20 @@
 class Shortcode::Configuration
   # Sets the template parser to use, supports :erb and :haml, default is :haml
   attr_accessor :template_parser
-  @template_parser = :haml
 
   # Sets the template parser to use, supports :erb and :haml, default is :haml
   attr_accessor :template_path
-  @template_path = "app/views/shortcode_templates"
 
   # Set the supported block_tags
   attr_accessor :block_tags
-  @block_tags = [:quote]
 
   # Set the supported self_closing_tags
   attr_accessor :self_closing_tags
-  @self_closing_tags = [:youtube]
+
+  def initialize
+    @template_parser    = :haml
+    @template_path      = "app/views/shortcode_templates"
+    @block_tags         = []
+    @self_closing_tags  = []
+  end
 end

data/lib/shortcode/version.rb

@@ -1,3 +1,3 @@
 module Shortcode
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/shortcode.gemspec

@@ -24,5 +24,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "rails", "~> 4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shortcode
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-23 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -91,22 +91,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4'
 description: Gem for parsing wordpress style shortcodes
 email:
 - jamie@kernowsoul.com
@@ -116,10 +100,16 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rbenv-version
+- .travis.yml
+- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/rails_3.0.gemfile
+- gemfiles/rails_3.1.gemfile
+- gemfiles/rails_3.2.gemfile
+- gemfiles/rails_4.0.gemfile
 - lib/shortcode.rb
 - lib/shortcode/configuration.rb
 - lib/shortcode/exceptions.rb