radius 0.5.1 → 0.6.1

data/CHANGELOG

@@ -1,4 +1,12 @@
 = Change Log
+=== 0.6.1
+* Fixed a problem with non-tags that have no prefix or tagname (see test_parse_chirpy_bird)
+
+=== 0.6.0
+* Split radius.rb into multiple files.
+* Port the really hairy regexes from Radius::Parser to a single Ragel machine.
+* Added and refactored tests.
+* Refactored Rakefile and other administrativia.
 
 === 0.5.1
 * Fixed a problem with parsing quotes where a single tag preceding a double tag would consume the start

data/Manifest.txt

@@ -0,0 +1,21 @@
+CHANGELOG
+Manifest.txt
+QUICKSTART.rdoc
+README.rdoc
+Rakefile
+lib/radius.rb
+lib/radius/context.rb
+lib/radius/delegating_open_struct.rb
+lib/radius/error.rb
+lib/radius/parse_tag.rb
+lib/radius/parser.rb
+lib/radius/parser/scan.rb
+lib/radius/parser/scan.rl
+lib/radius/tag_binding.rb
+lib/radius/tag_definitions.rb
+lib/radius/utility.rb
+lib/radius/version.rb
+tasks/scan.rake
+test/context_test.rb
+test/parser_test.rb
+test/test_helper.rb

data/{QUICKSTART → QUICKSTART.rdoc}

@@ -8,7 +8,7 @@ the tags that will be used in the template. This is actually quite simple:
 
   require 'radius'
   
-  context = Context.new
+  context = Radius::Context.new
   context.define_tag "hello" do |tag|
     "Hello #{tag.attr['name'] || 'World'}!"
   end
@@ -53,7 +53,7 @@ With the code above your parser can easily handle Textile:
 
 This code will output:
 
-  <h1>Hello <strong>World</strong>!</h1>
+  <h1>Hello <b>World</b>!</h1>
 
 
 == Nested Tags
@@ -61,7 +61,7 @@ This code will output:
 But wait!--it gets better. Because container tags can manipulate the content they contain
 you can use them to iterate over collections:
 
-  context = Context.new
+  context = Radius::Context.new
   
   context.define_tag "stooge" do |tag|
     content = ''
@@ -72,7 +72,7 @@ you can use them to iterate over collections:
     content
   end
   
-  context.define_tag "stooge:name" do
+  context.define_tag "stooge:name" do |tag|
     tag.locals.name
   end
   
@@ -126,7 +126,7 @@ So far this doesn't save you a whole lot of typing, but suppose you want to expo
 methods that are on that object? You could do this:
 
   context.define_tag "user", :for => user, :expose => [ :name, :age, :email ]
-  
+
 This will add a total of four tags to the context. One for the <tt>user</tt> variable, and
 one for each of the three methods listed in the +expose+ clause. You could now get the user's
 name inside your template like this:
@@ -206,6 +206,7 @@ accessible to all tags:
   context.define_tag "inc" do |tag|
     tag.globals.count ||= 0
     tag.globals.count += 1
+    ""
   end
   
   context.define_tag "count" do |tag|
@@ -215,20 +216,18 @@ accessible to all tags:
 TagBinding#locals mirrors the variables that are in TagBinding#globals, but allows child
 tags to redefine variables. This is valuable when defining context sensitive tags:
 
-  require 'radius'
-
   class Person
     attr_accessor :name, :friend
     def initialize(name)
       @name = name
     end
   end
-
+  
   jack = Person.new('Jack')
   jill = Person.new('Jill')
   jack.friend = jill
   jill.friend = jack
-
+  
   context = Radius::Context.new do |c|
     c.define_tag "jack" do |tag|
       tag.locals.person = jack
@@ -252,9 +251,9 @@ tags to redefine variables. This is valuable when defining context sensitive tag
   parser.parse('<r:jack:name />') #=> "Jack"
   parser.parse('<r:jill:name />') #=> "Jill"
   parser.parse('<r:jill:friend:name />') #=> "Jack"
-  parser.parse('<r:jill:friend:friend:name />') #=> "Jack"
+  parser.parse('<r:jack:friend:friend:name />') #=> "Jack"
   parser.parse('<r:jill><r:friend:name /> and <r:name /></r:jill>') #=> "Jack and Jill"
-  parser.parse('<r:name />') # raises an UndefinedTagError exception
+  parser.parse('<r:name />') # raises a Radius::UndefinedTagError exception
 
 Notice how TagBinding#locals enables intelligent nesting. "<r:jill:name />" evaluates to
 "Jill", but "<r:jill:friend:name />" evaluates to "Jack". Locals loose scope as soon as
@@ -264,7 +263,7 @@ The final line in the example above demonstrates that calling "<r:name />" raise
 TagMissing error. This is because of the way the name tag was defined:
 
   tag.locals.person.name rescue tag.missing!
-  
+
 If person is not defined on locals it will return nil. Calling #name on nil would normally
 raise a NoMethodError exception, but because of the 'rescue' clause the TagBinding#missing!
 method is called which fires off Context#tag_missing. By default Context#tag_missing raises

data/{pkg/radius-0.5.0/README → README.rdoc}

@@ -5,13 +5,13 @@ used in MovableType[http://www.movabletype.org] and TextPattern[http://www.textp
 It uses tags similar to XML, but can be used to generate any form of plain text (HTML, e-mail,
 etc...).
 
-== Example
+== Usage
 
 With Radius, it is extremely easy to create custom tags and parse them. Here's a small
 example:
 
   require 'radius'
-
+  
   # Define tags on a context that will be available to a template:
   context = Radius::Context.new do |c|
     c.define_tag 'hello' do
@@ -30,7 +30,7 @@ example:
   
   # Parse tags and output the result
   puts parser.parse(%{A small example:\n<r:repeat times="3">* <r:hello />!\n</r:repeat>})
-  
+
 Output:
 
   A small example:
@@ -39,16 +39,19 @@ Output:
   * Hello world!
 
 
-= Quick Start
+== Quick Start
 
-Read the QUICKSTART[link:files/QUICKSTART.html] to get up and running fast with Radius.
+Read the QUICKSTART file to get up and running with Radius.
 
 
-== Download
-
-The latest version of Radius can be found on RubyForge:
-
-http://rubyforge.org/projects/radius/
+= Requirements
+ 
+Radius does not have any external requirements for using the library in your
+own programs.
+ 
+Ragel is required to create the ruby parser from the Ragel specification,
+and both Ragel and Graphviz are required to draw the state graph for the
+parser.
 
 
 == Installation
@@ -64,7 +67,7 @@ You can also install Radius by copying lib/radius.rb into the Ruby load path.
 
 Radius is free software and may be redistributed under the terms of the MIT-LICENSE:
 
-Copyright (c) 2006, John W. Long
+Copyright (c) 2006-2009, John W. Long
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this
 software and associated documentation files (the "Software"), to deal in the Software
@@ -83,15 +86,33 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 DEALINGS IN THE SOFTWARE.
 
 
-== The Future
+== Roadmap
+
+This is a prioritized roadmap for future releases:
+
+1. Clean up the current code base. [Done]
+
+2. Add support for multi-level contexts: tags should be able to be
+   defined to only be valid within other sets of tags. [Done]
+
+3. Create a simple DSL for defining contexts. [Done]
+
+4. Optimize for speed, modify scan.rl to emit C.
+
+
+== Development
+
+The latest version of Radius can be found on RubyForge:
+
+http://rubyforge.org/projects/radius
 
-Radius is nearing completion, but is still very much in the development stages. Take a look
-at the ROADMAP[link:files/ROADMAP.html] to see where we want to go.
+Experimental and development versions of Radius can be found on Github:
+ 
+http://github.com/jlong/radius
 
-If you are interested in helping with the development of Radiant, contact me and we'll talk.
+If you are interested in helping with the development of Radiant, feel free to
+fork the project on GitHub and send me a pull request.
 
-Enjoy!
 
---
 John Long ::
 http://wiseheartdesign.com

data/Rakefile

@@ -1,86 +1,31 @@
-require 'rubygems'
-require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rake/gempackagetask'
-
-PKG_NAME = 'radius'
-PKG_VERSION = '0.5.1'
-PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
-RUBY_FORGE_PROJECT = PKG_NAME
-RUBY_FORGE_USER = 'jlong'
-
-RELEASE_NAME  = PKG_VERSION
-RUBY_FORGE_GROUPID = '1262'
-RUBY_FORGE_PACKAGEID = '1538'
-
-RDOC_TITLE = "Radius -- Powerful Tag-Based Templates"
-RDOC_EXTRAS = ["README", "QUICKSTART", "ROADMAP", "CHANGELOG"]
-
-task :default => :test
-
-Rake::TestTask.new do |t| 
-  t.pattern = 'test/**/*_test.rb'
-end
-
-Rake::RDocTask.new do |rd|
-  rd.title = 'Radius -- Powerful Tag-Based Templates'
-  rd.main = "README"
-  rd.rdoc_files.include("lib/**/*.rb")
-  rd.rdoc_files.include(RDOC_EXTRAS)
-  rd.rdoc_dir = 'doc'
-end
-
-spec = Gem::Specification.new do |s|
-  s.name = PKG_NAME
-  s.version = PKG_VERSION
-  s.summary = 'Powerful tag-based template system.'
-  s.description = "Radius is a small, but powerful tag-based template language for Ruby\nsimilar to the ones used in MovableType and TextPattern. It has tags\nsimilar to HTML or XML, but can be used to generate any form of plain\ntext (not just HTML)."
-  s.homepage = 'http://radius.rubyforge.org'
-  s.rubyforge_project = RUBY_FORGE_PROJECT
-  s.platform = Gem::Platform::RUBY
-  s.requirements << 'none'
-  s.require_path = 'lib'
-  s.autorequire = 'radius'
-  s.has_rdoc = true
-  s.rdoc_options << '--title' << RDOC_TITLE << '--line-numbers' << '--main' << 'README'
-  s.extra_rdoc_files = RDOC_EXTRAS
-  files = FileList['**/*']
-  files.exclude 'doc'
-  files.exclude '**/._*'
-  s.files = files.to_a
-end
-
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.need_zip = true
-  pkg.need_tar = true
-end
-
-desc "Uninstall Gem"
-task :uninstall_gem do
-  sh "gem uninstall radius" rescue nil
-end
-
-desc "Build and install Gem from source"
-task :install_gem => [:package, :uninstall_gem] do
-  dir = File.join(File.dirname(__FILE__), 'pkg')
-  chdir(dir) do
-    latest = Dir['radius-*.gem'].last
-    sh "gem install #{latest}"
-  end
-end
-
-# --- Ruby forge release manager by florian gross -------------------------------------------------
-#
-# task found in Tobias Luetke's library 'liquid'
-#
-
-desc "Publish the release files to RubyForge."
-task :release => [:gem, :package] do
-  files = ["gem", "tgz", "zip"].map { |ext| "pkg/#{PKG_FILE_NAME}.#{ext}" }
-
-  system("rubyforge login --username #{RUBY_FORGE_USER}")
-  
-  files.each do |file|
-    system("rubyforge add_release #{RUBY_FORGE_GROUPID} #{RUBY_FORGE_PACKAGEID} \"#{RELEASE_NAME}\" #{file}")
-  end
-end
+%w(rubygems rake rake/clean fileutils newgem rubigen hoe).each { |f| require f }
+
+require 'lib/radius/version'
+
+# Generate all the Rake tasks
+# Run 'rake -T' to see list of generated tasks (from gem root directory)
+Hoe.spec 'radius' do |p|
+  p.version = Radius::Version.to_s
+  p.url = "http://radius.rubyforge.org"
+  p.developer('John W. Long', 'me@johnwlong.com')
+  p.author = [
+    "John W. Long (me@johnwlong.com)",
+    "David Chelimsky (dchelimsky@gmail.com)",
+    "Bryce Kerley (bkerley@brycekerley.net)"
+  ]
+  p.changes              = p.paragraphs_of("CHANGELOG", 1..2).join("\n\n")
+  p.rubyforge_name       = p.name
+  p.extra_dev_deps = [
+    ['newgem', ">= #{::Newgem::VERSION}"]
+  ]
+  p.readme_file = 'README.rdoc'
+  p.extra_rdoc_files |= %w(README.rdoc QUICKSTART.rdoc)
+  p.clean_globs |= %w(**/.DS_Store tmp *.log) # Remove these files on "rake clean"
+  path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
+  p.remote_rdoc_dir = File.join(path.gsub(/^#{p.rubyforge_name}\/?/,''), 'rdoc')
+  p.rsync_args = '-av --delete --ignore-errors'
+  p.test_globs = "test/**/*_test.rb"
+end
+
+require 'newgem/tasks' # load /tasks/*.rake
+Dir['tasks/**/*.rake'].each { |t| load t }

data/lib/radius.rb

@@ -1,497 +1,10 @@
-#--
-# Copyright (c) 2006, John W. Long
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy of this
-# software and associated documentation files (the "Software"), to deal in the Software
-# without restriction, including without limitation the rights to use, copy, modify,
-# merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to the following
-# conditions:
-#
-# The above copyright notice and this permission notice shall be included in all copies
-# or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-# INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-# PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-# CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
-# OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#++
-module Radius
-  # Abstract base class for all parsing errors.
-  class ParseError < StandardError
-  end
-  
-  # Occurs when Parser cannot find an end tag for a given tag in a template or when
-  # tags are miss-matched in a template.
-  class MissingEndTagError < ParseError
-    # Create a new MissingEndTagError object for +tag_name+. 
-    def initialize(tag_name)
-      super("end tag not found for start tag `#{tag_name}'")
-    end
-  end
-  
-  # Occurs when Context#render_tag cannot find the specified tag on a Context.
-  class UndefinedTagError < ParseError
-    # Create a new UndefinedTagError object for +tag_name+. 
-    def initialize(tag_name)
-      super("undefined tag `#{tag_name}'")
-    end
-  end
-  
-  module TagDefinitions # :nodoc:
-    class TagFactory # :nodoc:
-      def initialize(context)
-        @context = context
-      end
-      
-      def define_tag(name, options, &block)
-        options = prepare_options(name, options)
-        validate_params(name, options, &block)
-        construct_tag_set(name, options, &block)
-        expose_methods_as_tags(name, options)
-      end
-      
-      protected
-
-        # Adds the tag definition to the context. Override in subclasses to add additional tags
-        # (child tags) when the tag is created.
-        def construct_tag_set(name, options, &block)
-          if block
-            @context.definitions[name.to_s] = block
-          else
-            lp = last_part(name)
-            @context.define_tag(name) do |tag|
-              if tag.single?
-                options[:for]
-              else
-                tag.locals.send("#{ lp }=", options[:for]) unless options[:for].nil?
-                tag.expand
-              end
-            end
-          end
-        end
-
-        # Normalizes options pased to tag definition. Override in decendants to preform
-        # additional normalization.
-        def prepare_options(name, options)
-          options = Util.symbolize_keys(options)
-          options[:expose] = expand_array_option(options[:expose])
-          object = options[:for]
-          options[:attributes] = object.respond_to?(:attributes) unless options.has_key? :attributes
-          options[:expose] += object.attributes.keys if options[:attributes]
-          options
-        end
-        
-        # Validates parameters passed to tag definition. Override in decendants to add custom
-        # validations.
-        def validate_params(name, options, &block)
-          unless options.has_key? :for
-            raise ArgumentError.new("tag definition must contain a :for option or a block") unless block
-            raise ArgumentError.new("tag definition must contain a :for option when used with the :expose option") unless options[:expose].empty?
-          end
-        end
-        
-        # Exposes the methods of an object as child tags.
-        def expose_methods_as_tags(name, options)
-          options[:expose].each do |method|
-            tag_name = "#{name}:#{method}"
-            lp = last_part(name)
-            @context.define_tag(tag_name) do |tag|
-              object = tag.locals.send(lp)
-              object.send(method)
-            end
-          end
-        end
-        
-      protected
-      
-        def expand_array_option(value)
-          [*value].compact.map { |m| m.to_s.intern }
-        end
-        
-        def last_part(name)
-          name.split(':').last
-        end
-    end
-  end
-    
-  class DelegatingOpenStruct # :nodoc:
-    attr_accessor :object
-    
-    def initialize(object = nil)
-      @object = object
-      @hash = {}
-    end
-    
-    def method_missing(method, *args, &block)
-      symbol = (method.to_s =~ /^(.*?)=$/) ? $1.intern : method
-      if (0..1).include?(args.size)
-        if args.size == 1
-          @hash[symbol] = args.first
-        else
-          if @hash.has_key?(symbol)
-            @hash[symbol]
-          else
-            unless object.nil?
-              @object.send(method, *args, &block)
-            else
-              nil
-            end
-          end
-        end
-      else
-        super
-      end
-    end
-  end
-  
-  #
-  # A tag binding is passed into each tag definition and contains helper methods for working
-  # with tags. Use it to gain access to the attributes that were passed to the tag, to
-  # render the tag contents, and to do other tasks.
-  #
-  class TagBinding
-    # The Context that the TagBinding is associated with. Used internally. Try not to use
-    # this object directly.
-    attr_reader :context
-    
-    # The locals object for the current tag.
-    attr_reader :locals
-    
-    # The name of the tag (as used in a template string).
-    attr_reader :name
-    
-    # The attributes of the tag. Also aliased as TagBinding#attr.
-    attr_reader :attributes
-    alias :attr :attributes
-    
-    # The render block. When called expands the contents of the tag. Use TagBinding#expand
-    # instead.
-    attr_reader :block
-    
-    # Creates a new TagBinding object.
-    def initialize(context, locals, name, attributes, block)
-      @context, @locals, @name, @attributes, @block = context, locals, name, attributes, block
-    end
-    
-    # Evaluates the current tag and returns the rendered contents.
-    def expand
-      double? ? block.call : ''
-    end
-
-    # Returns true if the current tag is a single tag.
-    def single?
-      block.nil?
-    end
-
-    # Returns true if the current tag is a container tag.
-    def double?
-      not single?
-    end
-    
-    # The globals object from which all locals objects ultimately inherit their values.
-    def globals
-      @context.globals
-    end
-    
-    # Returns a list of the way tags are nested around the current tag as a string.
-    def nesting
-      @context.current_nesting
-    end
-    
-    # Fires off Context#tag_missing for the current tag.
-    def missing!
-      @context.tag_missing(name, attributes, &block)
-    end
-    
-    # Renders the tag using the current context .
-    def render(tag, attributes = {}, &block)
-      @context.render_tag(tag, attributes, &block)
-    end
-  end
-  
-  #
-  # A context contains the tag definitions which are available for use in a template.
-  # See the QUICKSTART[link:files/QUICKSTART.html] for a detailed explaination its
-  # usage.
-  #
-  class Context
-    # A hash of tag definition blocks that define tags accessible on a Context.
-    attr_accessor :definitions # :nodoc:
-    attr_accessor :globals # :nodoc:
-    
-    # Creates a new Context object.
-    def initialize(&block)
-      @definitions = {}
-      @tag_binding_stack = []
-      @globals = DelegatingOpenStruct.new
-      with(&block) if block_given?
-    end
-    
-    # Yeild an instance of self for tag definitions:
-    #
-    #   context.with do |c|
-    #     c.define_tag 'test' do
-    #       'test'
-    #     end
-    #   end
-    #
-    def with
-      yield self
-      self
-    end
-    
-    # Creates a tag definition on a context. Several options are available to you
-    # when creating a tag:
-    # 
-    # +for+::             Specifies an object that the tag is in reference to. This is
-    #                     applicable when a block is not passed to the tag, or when the
-    #                     +expose+ option is also used.
-    #
-    # +expose+::          Specifies that child tags should be set for each of the methods
-    #                     contained in this option. May be either a single symbol/string or
-    #                     an array of symbols/strings.
-    #
-    # +attributes+::      Specifies whether or not attributes should be exposed
-    #                     automatically. Useful for ActiveRecord objects. Boolean. Defaults
-    #                     to +true+.
-    #
-    def define_tag(name, options = {}, &block)
-      type = Util.impartial_hash_delete(options, :type).to_s
-      klass = Util.constantize('Radius::TagDefinitions::' + Util.camelize(type) + 'TagFactory') rescue raise(ArgumentError.new("Undefined type `#{type}' in options hash"))
-      klass.new(self).define_tag(name, options, &block)
-    end
-
-    # Returns the value of a rendered tag. Used internally by Parser#parse.
-    def render_tag(name, attributes = {}, &block)
-      if name =~ /^(.+?):(.+)$/
-        render_tag($1) { render_tag($2, attributes, &block) }
-      else
-        tag_definition_block = @definitions[qualified_tag_name(name.to_s)]
-        if tag_definition_block
-          stack(name, attributes, block) do |tag|
-            tag_definition_block.call(tag).to_s
-          end
-        else
-          tag_missing(name, attributes, &block)
-        end
-      end
-    end
-
-    # Like method_missing for objects, but fired when a tag is undefined.
-    # Override in your own Context to change what happens when a tag is
-    # undefined. By default this method raises an UndefinedTagError.
-    def tag_missing(name, attributes, &block)
-      raise UndefinedTagError.new(name)
-    end
-
-    # Returns the state of the current render stack. Useful from inside
-    # a tag definition. Normally just use TagBinding#nesting.
-    def current_nesting
-      @tag_binding_stack.collect { |tag| tag.name }.join(':')
-    end
-
-    private
-
-      # A convienence method for managing the various parts of the
-      # tag binding stack.
-      def stack(name, attributes, block)
-        previous = @tag_binding_stack.last
-        previous_locals = previous.nil? ? @globals : previous.locals
-        locals = DelegatingOpenStruct.new(previous_locals)
-        binding = TagBinding.new(self, locals, name, attributes, block)
-        @tag_binding_stack.push(binding)
-        result = yield(binding)
-        @tag_binding_stack.pop
-        result
-      end
-
-      # Returns a fully qualified tag name based on state of the
-      # tag binding stack.
-      def qualified_tag_name(name)
-        nesting_parts = @tag_binding_stack.collect { |tag| tag.name }
-        nesting_parts << name unless nesting_parts.last == name
-        specific_name = nesting_parts.join(':') # specific_name always has the highest specificity
-        unless @definitions.has_key? specific_name
-          possible_matches = @definitions.keys.grep(/(^|:)#{name}$/)
-          specificity = possible_matches.inject({}) { |hash, tag| hash[numeric_specificity(tag, nesting_parts)] = tag; hash }
-          max = specificity.keys.max
-          if max != 0
-            specificity[max]
-          else
-            name
-          end
-        else
-          specific_name
-        end
-      end
-      
-      # Returns the specificity for +tag_name+ at nesting defined
-      # by +nesting_parts+ as a number.
-      def numeric_specificity(tag_name, nesting_parts)
-        nesting_parts = nesting_parts.dup
-        name_parts = tag_name.split(':')
-        specificity = 0
-        value = 1
-        if nesting_parts.last == name_parts.last
-          while nesting_parts.size > 0
-            if nesting_parts.last == name_parts.last
-              specificity += value
-              name_parts.pop
-            end
-            nesting_parts.pop
-            value *= 0.1
-          end
-          specificity = 0 if (name_parts.size > 0)
-        end
-        specificity
-      end
-  end
-
-  class ParseTag # :nodoc:
-    def initialize(&b)
-      @block = b
-    end
-
-    def on_parse(&b)
-      @block = b
-    end
-
-    def to_s
-      @block.call(self)
-    end
-  end
-
-  class ParseContainerTag < ParseTag # :nodoc:
-    attr_accessor :name, :attributes, :contents
-    
-    def initialize(name = "", attributes = {}, contents = [], &b)
-      @name, @attributes, @contents = name, attributes, contents
-      super(&b)
-    end
-  end
-
-  #
-  # The Radius parser. Initialize a parser with a Context object that
-  # defines how tags should be expanded. See the QUICKSTART[link:files/QUICKSTART.html]
-  # for a detailed explaination of its usage.
-  #
-  class Parser
-    # The Context object used to expand template tags.
-    attr_accessor :context
-    
-    # The string that prefixes all tags that are expanded by a parser
-    # (the part in the tag name before the first colon).
-    attr_accessor :tag_prefix
-    
-    # Creates a new parser object initialized with a Context.
-    def initialize(context = Context.new, options = {})
-      if context.kind_of?(Hash) and options.empty?
-        options = context
-        context = options[:context] || options['context'] || Context.new
-      end
-      options = Util.symbolize_keys(options)
-      @context = context
-      @tag_prefix = options[:tag_prefix]
-    end
-
-    # Parses string for tags, expands them, and returns the result.
-    def parse(string)
-      @stack = [ParseContainerTag.new { |t| t.contents.to_s }]
-      pre_parse(string)
-      @stack.last.to_s
-    end
-
-    protected
-
-      def pre_parse(text) # :nodoc:
-        re = %r{<#{@tag_prefix}:([\w:]+?)(\s+(?:\w+\s*=\s*(?:"[^"]*?"|'[^']*?')\s*)*|)>|</#{@tag_prefix}:([\w:]+?)\s*>}
-        if md = re.match(text)
-          start_tag, attr, end_tag = $1, $2, $3
-          @stack.last.contents << ParseTag.new { parse_individual(md.pre_match) }
-          remaining = md.post_match
-          if start_tag
-            parse_start_tag(start_tag, attr, remaining)
-          else
-            parse_end_tag(end_tag, remaining)
-          end
-        else
-          if @stack.length == 1
-            @stack.last.contents << ParseTag.new { parse_individual(text) }
-          else
-            raise MissingEndTagError.new(@stack.last.name)
-          end
-        end
-      end
-
-      def parse_start_tag(start_tag, attr, remaining) # :nodoc:
-        @stack.push(ParseContainerTag.new(start_tag, parse_attributes(attr)))
-        pre_parse(remaining)
-      end
-
-      def parse_end_tag(end_tag, remaining) # :nodoc:
-        popped = @stack.pop
-        if popped.name == end_tag
-          popped.on_parse { |t| @context.render_tag(popped.name, popped.attributes) { t.contents.to_s } }
-          tag = @stack.last
-          tag.contents << popped
-          pre_parse(remaining)
-        else
-          raise MissingEndTagError.new(popped.name)
-        end
-      end
-
-      def parse_individual(text) # :nodoc:
-        re = %r{<#{@tag_prefix}:([\w:]+?)(\s+(?:\w+\s*=\s*(?:"[^"]*?"|'[^']*?')\s*)*|)/>}
-        if md = re.match(text)
-          attr = parse_attributes($2)
-          replace = @context.render_tag($1, attr)
-          md.pre_match + replace + parse_individual(md.post_match)
-        else
-          text || ''
-        end
-      end
-
-      def parse_attributes(text) # :nodoc:
-        attr = {}
-        re = /(\w+?)\s*=\s*('|")(.*?)\2/
-        while md = re.match(text)
-          attr[$1] = $3
-          text = md.post_match
-        end
-        attr
-      end
-  end
-
-  module Util # :nodoc:
-    def self.symbolize_keys(hash)
-      new_hash = {}
-      hash.keys.each do |k|
-        new_hash[k.to_s.intern] = hash[k]
-      end
-      new_hash
-    end
-    
-    def self.impartial_hash_delete(hash, key)
-      string = key.to_s
-      symbol = string.intern
-      value1 = hash.delete(symbol)
-      value2 = hash.delete(string)
-      value1 || value2
-    end
-    
-    def self.constantize(camelized_string)
-      raise "invalid constant name `#{camelized_string}'" unless camelized_string.split('::').all? { |part| part =~ /^[A-Za-z]+$/ }
-      Object.module_eval(camelized_string)
-    end
-    
-    def self.camelize(underscored_string)
-      string = ''
-      underscored_string.split('_').each { |part| string << part.capitalize }
-      string
-    end
-  end
-  
-end
+require 'radius/version'
+require 'radius/error'
+require 'radius/tag_definitions'
+require 'radius/delegating_open_struct'
+require 'radius/tag_binding'
+require 'radius/context'
+require 'radius/parse_tag'
+require 'radius/parser/scan'
+require 'radius/parser'
+require 'radius/utility'