shortcode 0.0.2 → 0.0.3

data/lib/shortcode.rb

@@ -1,47 +1,35 @@
 require 'parslet'
 require 'haml'
 require 'erb'
-require 'facets/module/mattr'
 
 module Shortcode
+  extend self
 
-  # Sets the template parser to use, supports :erb and :haml, default is :haml
-  mattr_accessor :template_parser
-  @@template_parser = :haml
+  attr_accessor :configuration
 
-  # Sets the template parser to use, supports :erb and :haml, default is :haml
-  mattr_accessor :template_path
-  @@template_path = "app/views/shortcode_templates"
-
-  # Set the supported block_tags
-  mattr_accessor :block_tags
-  @@block_tags = [:quote]
-
-  # Set the supported self_closing_tags
-  mattr_accessor :self_closing_tags
-  @@self_closing_tags = [:youtube]
-
-  def self.setup
-    yield self
+  def setup
+    self.configuration ||= Configuration.new
+    yield configuration
   end
 
-  def self.process(code)
+  def process(code)
     transformer.apply(parser.parse(code))
   end
 
   private
 
-    def self.parser
+    def parser
       @@parser ||= Shortcode::Parser.new
     end
 
-    def self.transformer
+    def transformer
       @@transformer ||= Shortcode::Transformer.new
     end
 
 end
 
 require 'shortcode/version'
+require 'shortcode/configuration'
 require 'shortcode/parser'
 require 'shortcode/transformer'
 require 'shortcode/tag'

data/lib/shortcode/configuration.rb

@@ -0,0 +1,17 @@
+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]
+end

data/lib/shortcode/parser.rb

@@ -1,7 +1,7 @@
 class Shortcode::Parser < Parslet::Parser
 
-  rule(:block_tag)        { match_any_of Shortcode.block_tags }
-  rule(:self_closing_tag) { match_any_of Shortcode.self_closing_tags }
+  rule(:block_tag)        { match_any_of Shortcode.configuration.block_tags }
+  rule(:self_closing_tag) { match_any_of Shortcode.configuration.self_closing_tags }
 
   rule(:quotes) { str('"') }
 

data/lib/shortcode/tag.rb

@@ -26,23 +26,23 @@ class Shortcode::Tag
   private
 
     def render_template
-      case Shortcode.template_parser
+      case Shortcode.configuration.template_parser
       when :haml
         Haml::Engine.new(markup, ugly: true).render(binding)
       when :erb
         ERB.new(markup).result(binding)
       else
-        raise Shortcode::TemplateParserNotSupported, Shortcode.template_parser
+        raise Shortcode::TemplateParserNotSupported, Shortcode.configuration.template_parser
       end
     end
 
     def template_files
       template_paths.map do |filename|
-        File.join Shortcode.template_path, filename
+        File.join Shortcode.configuration.template_path, filename
       end
     end
 
     def template_paths
-      [ "#{@name}.html.#{Shortcode.template_parser.to_s}", "#{@name}.#{Shortcode.template_parser.to_s}" ]
+      [ "#{@name}.html.#{Shortcode.configuration.template_parser.to_s}", "#{@name}.#{Shortcode.configuration.template_parser.to_s}" ]
     end
 end

data/lib/shortcode/version.rb

@@ -1,3 +1,3 @@
 module Shortcode
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/shortcode.gemspec

@@ -19,8 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "parslet", "1.5.0"
-  spec.add_dependency "haml", "4.0.0"
-  spec.add_dependency "facets", "2.9.3"
+  spec.add_dependency "haml", "~> 4.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shortcode
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -32,33 +32,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-- !ruby/object:Gem::Dependency
-  name: facets
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.3
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.3
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -121,6 +105,7 @@ files:
 - README.md
 - Rakefile
 - lib/shortcode.rb
+- lib/shortcode/configuration.rb
 - lib/shortcode/exceptions.rb
 - lib/shortcode/parser.rb
 - lib/shortcode/tag.rb