radius 0.6.1 → 0.7.0.prerelease

data/lib/radius/parser/squiggle_scanner.rl

@@ -0,0 +1,126 @@
+%%{
+	machine parser;
+	
+	
+#	action _prefix { mark_pfx = p }
+#	action prefix {
+#	  if data[mark_pfx..p-1] != @prefix
+#      @nodes.last << data[mark_pfx-1..p]
+#	    fbreak;
+#    end
+#	}
+	action _starttag { mark_stg = p }
+	action starttag { @starttag = data[mark_stg..p-1] }
+	action _attr { mark_attr = p }
+	action attr {
+	  @attrs[@nat] = @vat 
+	}
+	
+	action prematch {
+	  @prematch_end = p
+	  @prematch = data[0..p] if p > 0
+	}
+	
+	action _nameattr { mark_nat = p }
+	action nameattr { @nat = data[mark_nat..p-1] }
+	action _valattr { mark_vat = p }
+	action valattr { @vat = data[mark_vat..p-1] }
+	
+	action opentag  { @flavor = :open }
+	action selftag  { @flavor = :self }
+	action closetag { @flavor = :close }
+	
+	action stopparse {
+	  @cursor = p;
+	  fbreak;
+	}
+	
+	
+	Closeout := empty;
+	
+	# words
+#	PrefixChar = [\-A-Za-z0-9._?] ;
+	NameChar = [\-A-Za-z0-9._:?] ;
+	TagName = NameChar+ >_starttag %starttag;
+#	Prefix = PrefixChar+ >_prefix %prefix;
+	
+#	Name = Prefix ":" TagName;
+	
+	NameAttr = NameChar+ >_nameattr %nameattr;
+  Q1Char = ( "\\\'" | [^'] ) ;
+  Q1Attr = Q1Char* >_valattr %valattr;
+  Q2Char = ( "\\\"" | [^"] ) ;
+  Q2Attr = Q2Char* >_valattr %valattr;
+ 
+  Attr =  NameAttr space* "=" space* ('"' Q2Attr '"' | "'" Q1Attr "'") space* >_attr %attr;
+  Attrs = (space+ Attr* | empty);
+  
+  CloseTrailer = "/}" %selftag;
+  OpenTrailer = "}" %opentag;
+  
+  Trailer = (OpenTrailer | CloseTrailer);
+  
+#	OpenOrSelfTag = Name Attrs? Trailer;
+	OpenOrSelfTag = TagName Attrs? Trailer;
+#	CloseTag = "/" Name space* "}" %closetag;
+	CloseTag = "/" TagName space* "}" %closetag;
+	
+	SomeTag = '{' space* (OpenOrSelfTag | CloseTag);
+	
+	main := |*
+	  SomeTag => {
+	    tag = {:prefix=>@prefix, :name=>@starttag, :flavor => @flavor, :attrs => @attrs}
+	    @prefix = nil
+	    @name = nil
+	    @flavor = :tasteless
+	    @attrs = {}
+	    @nodes << tag << ''
+      fbreak;
+	  };
+	  any => {
+	    @nodes.last << data[p]
+	    @tagstart = p
+	  };
+	*|;
+}%%
+
+module Radius
+  class SquiggleScanner
+    def operate(prefix, data)
+      data = Radius::OrdString.new data
+      buf = ""
+      csel = ""
+      @prematch = ''
+      @starttag = nil
+      @attrs = {}
+      @flavor = :tasteless
+      @cursor = 0
+      @tagstart = 0
+      @nodes = ['']
+      remainder = data.dup
+
+      until remainder.length == 0
+        p = perform_parse(prefix, remainder)
+        remainder = remainder[p..-1]
+      end
+
+      return @nodes
+    end
+    
+    private
+    def perform_parse(prefix, data)
+      stack = []
+      p = 0
+      ts = 0
+      te = 0
+      act = 0
+      eof = data.length
+      
+      @prefix = prefix
+      %% write data;
+      %% write init;
+      %% write exec;
+      return p
+    end
+  end
+end

data/lib/radius/utility.rb

@@ -26,5 +26,15 @@ module Radius
       underscored_string.split('_').each { |part| string << part.capitalize }
       string
     end
+
+    if RUBY_VERSION[0,3] == '1.8'
+      def self.array_to_s(c)
+        c.to_s
+      end
+    else
+      def self.array_to_s(c)
+        c.map{|x| x.is_a?(Array) ? array_to_s(x) : x.to_s }.join
+      end
+    end
   end
 end

data/lib/radius/version.rb

@@ -1,14 +1,8 @@
-module Radius
-  module Version
-    Major = '0'
-    Minor = '6'
-    Tiny  = '1'
-    
-    class << self
-      def to_s
-        [Major, Minor, Tiny].join('.')
-      end
-      alias :to_str :to_s
+module Radius #:nodoc:
+  def self.version
+    @version ||= begin
+      filename = File.join(File.dirname(__FILE__), '..', '..', 'VERSION')
+      IO.read(filename).strip
     end
   end
-end
+end

data/tasks/jeweler.rake

@@ -0,0 +1,22 @@
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "radius"
+    gem.summary = "A tag-based templating language for Ruby."
+    gem.description = "Radius is a powerful tag-based template language for Ruby inspired by the template languages used in MovableType and TextPattern. It uses tags similar to XML, but can be used to generate any form of plain text (HTML, e-mail, etc...)."
+    gem.email = "me@johnwlong.com"
+    gem.homepage = "http://github.com/jlong/radius"
+    gem.authors = [
+      "John W. Long (me@johnwlong.com)",
+      "David Chelimsky (dchelimsky@gmail.com)",
+      "Bryce Kerley (bkerley@brycekerley.net)"
+    ]
+    gem.files = FileList["[A-Z]*", "{bin,lib,tasks,test}/**/*"].exclude("tmp",'*.rbc','*.dot')
+    gem.extra_rdoc_files = ['README.rdoc', 'QUICKSTART.rdoc', 'LICENSE', 'CHANGELOG']
+    gem.add_development_dependency('RedCloth')
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+  end
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+end

data/tasks/rdoc.rake

@@ -0,0 +1,13 @@
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+  
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "Radius #{version}"
+  rdoc.main = "README.rdoc"
+  rdoc.rdoc_files.include('*.rdoc')
+  rdoc.rdoc_files.include('LICENSE')
+  rdoc.rdoc_files.include('CHANGELOG')
+  rdoc.rdoc_files.include('QUICKSTART.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/tasks/rubinius.rake

@@ -0,0 +1,4 @@
+desc "remove Rubinius rbc files"
+task "rubinius:clean" do
+  (Dir['**/*.rbc']).each { |f| rm f }
+end

data/tasks/scan.rake

@@ -1,27 +1,79 @@
 namespace :scan do
-  desc 'Generate the parser'
-  task 'build' => ['lib/radius/parser/scan.rb']
+  desc 'Generate the parsers'
+  task 'build' => [
+    'lib/radius/parser/scanner.rb',
+    'lib/radius/parser/squiggle_scanner.rb',
+    'lib/radius/parser/java_scanner.jar'
+  ]
   
-  desc 'Generate a PDF state graph from the parser'
-  task 'graph' => ['doc/scan.pdf']
+  desc 'Generate a PDF state graph from the parsers'
+  task 'graph' => ['doc/scanner.pdf', 'doc/squiggle_scanner.pdf']
   
-  desc 'turn the scan.rl file into a ruby file'
-  file 'lib/radius/parser/scan.rb' => ['lib/radius/parser/scan.rl'] do |t|
+  desc 'turn the scanner.rl file into a ruby file'
+  file 'lib/radius/parser/scanner.rb' => 'lib/radius/parser/scanner.rl' do |t|
     cd 'lib/radius/parser' do
-      sh "ragel -R scan.rl"
+      sh "ragel -R -F1 scanner.rl"
+    end
+  end
+  
+  desc 'turn the squiggle_scanner.rl file into a ruby file'
+  file 'lib/radius/parser/squiggle_scanner.rb' =>
+    ['lib/radius/parser/squiggle_scanner.rl'] \
+  do |t|
+    cd 'lib/radius/parser' do
+      sh "ragel -R -F1 squiggle_scanner.rl"
+    end
+  end
+
+  desc 'package JavaScanner into a jar file'
+  file 'lib/radius/parser/java_scanner.jar' => 'lib/radius/parser/JavaScanner.class' do
+    cd 'lib' do
+      sh "jar -cf radius/parser/java_scanner.jar radius/parser/*.class"
+    end
+  end
+
+  desc 'turn the JavaScanner.java file into a java class file'
+  file 'lib/radius/parser/JavaScanner.class' => 'lib/radius/parser/JavaScanner.java' do |t|
+    cd 'lib' do
+      jruby_path = ENV['JRUBY_HOME'] || '/usr/local/jruby/current'
+      sh "javac -cp #{jruby_path}/lib/jruby.jar radius/parser/JavaScanner.java"
+    end
+  end
+
+  desc 'turn the JavaScanner.rl file into a java source file'
+  file 'lib/radius/parser/JavaScanner.java' => 'lib/radius/parser/JavaScanner.rl' do |t|
+    cd 'lib/radius/parser' do
+      sh "ragel -J -F1 JavaScanner.rl"
     end
   end
 
   desc 'pdf of the ragel scanner'
-  file 'doc/scan.pdf' => 'lib/radius/parser/scan.dot' do |t|
+  file 'doc/scanner.pdf' => 'lib/radius/parser/scanner.dot' do |t|
+    cd 'lib/radius/parser' do
+      sh "dot -Tpdf -o ../../../doc/scanner.pdf scanner.dot"
+    end
+  end
+
+  desc 'pdf of the ragel squiggle scanner'
+  file 'doc/squiggle_scanner.pdf' =>
+    ['lib/radius/parser/squiggle_scanner.dot'] \
+  do |t|
+    cd 'lib/radius/parser' do
+      sh "dot -Tpdf -o ../../../doc/squiggle_scanner.pdf squiggle_scanner.dot"
+    end
+  end
+
+  file 'lib/radius/parser/scanner.dot' => 'lib/radius/parser/scanner.rl' do |t|
     cd 'lib/radius/parser' do
-      sh "dot -Tpdf -o ../../../doc/scan.pdf scan.dot"
+      sh "ragel -Vp scanner.rl > scanner.dot"
     end
   end
 
-  file 'lib/radius/parser/scan.dot' => ['lib/radius/parser/scan.rl'] do |t|
+  file 'lib/radius/parser/squiggle_scanner.dot' =>
+    ['lib/radius/parser/squiggle_scanner.rl'] \
+  do |t|
     cd 'lib/radius/parser' do
-      sh "ragel -Vp scan.rl > scan.dot"
+      sh "ragel -Vp squiggle_scanner.rl > squiggle_scanner.dot"
     end
   end
-end
+end

data/tasks/test.rake

@@ -0,0 +1,7 @@
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << "lib" << "test"
+  t.test_files = FileList['test/*_test.rb']
+  t.verbose = true
+end

data/test/benchmarks.rb

@@ -0,0 +1,35 @@
+$: << File.join(File.dirname(__FILE__), '..', 'lib')
+require 'radius'
+
+if RUBY_PLATFORM == 'java'
+  require 'java'
+  require 'radius/parser/jscanner'
+end
+
+require 'benchmark'
+
+document = <<EOF
+Before it all
+<r:foo>
+  Middle Top
+  <r:bar />
+  Middle Bottom
+</r:foo>
+After it all
+EOF
+
+amount = 1000
+
+Benchmark.bmbm do |bm|
+  bm.report('vanilla') do
+    scanner = Radius::Scanner.new(:scanner => Radius::Scanner)
+    amount.times { scanner.operate('r', document) }
+  end
+
+  if RUBY_PLATFORM == 'java'
+    bm.report('JavaScanner') do
+      scanner = Radius::JavaScanner.new(JRuby.runtime)
+      amount.times { scanner.operate('r', document) }
+    end
+  end
+end

data/test/context_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'test_helper')
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
 class RadiusContextTest < Test::Unit::TestCase
   include RadiusTestHelper
@@ -27,7 +27,7 @@ class RadiusContextTest < Test::Unit::TestCase
   end
   
   def test_render_tag
-    define_tag "hello" do |tag|
+    define_global_tag "hello" do |tag|
       "Hello #{tag.attr['name'] || 'World'}!"
     end
     assert_render_tag_output 'Hello World!', 'hello'

data/test/multithreaded_test.rb

@@ -0,0 +1,63 @@
+require 'thread'
+require 'test/unit'
+require 'radius'
+
+class MultithreadTest < Test::Unit::TestCase
+
+  def setup
+    Thread.abort_on_exception
+    @context = Radius::Context.new do |c|
+      c.define_tag('thread') do |tag|
+        "#{tag.locals.thread_id} / #{tag.globals.object_id}"
+      end
+    end
+  end
+
+  if RUBY_PLATFORM == 'java'
+    require 'java'
+    # call once before the thread to keep from using hidden require in a thread
+    Radius::Parser.new
+    def test_runs_multithreaded
+      lock = java.lang.String.new("lock")
+      threads = []
+      1000.times do |t|
+        thread = Thread.new do
+                   parser = Radius::Parser.new(@context, :tag_prefix => 'r')
+                   parser.context.globals.thread_id = Thread.current.object_id
+                   expected = "#{Thread.current.object_id} / "+
+                              "#{parser.context.globals.object_id}"
+                   actual = parser.parse('<r:thread />')
+                   assert_equal expected, actual
+                 end
+        lock.synchronized do
+          threads << thread
+        end
+      end
+      lock.synchronized do
+        threads.each{|t| t.join }
+      end
+    end
+  else
+    def test_runs_multithreaded
+      threads = []
+      mute = Mutex.new
+      1000.times do |t|
+        thread = Thread.new do
+                   parser = Radius::Parser.new(@context, :tag_prefix => 'r')
+                   parser.context.globals.thread_id = Thread.current.object_id
+                   expected = "#{Thread.current.object_id} / "+
+                              "#{parser.context.globals.object_id}"
+                   actual = parser.parse('<r:thread />')
+                   assert_equal expected, actual
+                 end
+        mute.synchronize do
+          threads << thread
+        end
+      end
+      mute.synchronize do
+        threads.each{|t| t.join }
+      end
+    end
+  end
+
+end

data/test/ord_string_test.rb

@@ -0,0 +1,18 @@
+require 'test/unit'
+require 'radius'
+
+class RadiusOrdStringTest < Test::Unit::TestCase
+
+  def test_string_slice_integer
+    str = Radius::OrdString.new "abc"
+    assert_equal str[0], 97
+    assert_equal str[1], 98
+    assert_equal str[2], 99
+  end
+
+  def test_string_slice_range
+    str = Radius::OrdString.new "abc"
+    assert_equal str[0..-1], "abc"
+  end
+
+end

data/test/parser_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'test_helper')
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
 class RadiusParserTest < Test::Unit::TestCase
   include RadiusTestHelper
@@ -238,16 +238,33 @@ class RadiusParserTest < Test::Unit::TestCase
   end
   
   def test_parse_with_default_tag_prefix
-    define_tag("hello") { |tag| "Hello world!" }
     @parser = Radius::Parser.new(@context)
+    define_tag("hello") { |tag| "Hello world!" }
     assert_equal "<p>Hello world!</p>", @parser.parse('<p><radius:hello /></p>')
   end
   
   def test_parse_with_other_radius_like_tags
-    define_tag('hello') { "hello" }
     @parser = Radius::Parser.new(@context, :tag_prefix => "ralph")
+    define_tag('hello') { "hello" }
     assert_equal "<r:ralph:hello />", @parser.parse("<r:ralph:hello />")
   end
+
+  def test_copyin_global_values
+    @context.globals.foo = 'bar'
+    assert_equal 'bar', Radius::Parser.new(@context).context.globals.foo
+  end
+
+  def test_does_not_pollute_copied_globals
+    @context.globals.foo = 'bar'
+    parser = Radius::Parser.new(@context)
+    parser.context.globals.foo = '[baz]'
+    assert_equal 'bar', @context.globals.foo
+  end
+
+  def test_parse_with_other_namespaces
+    @parser = Radius::Parser.new(@context, :tag_prefix => 'r')
+    assert_equal "<fb:test>hello world</fb:test>", @parser.parse("<fb:test>hello world</fb:test>")
+  end
   
   protected
   
@@ -287,4 +304,4 @@ class RadiusParserTest < Test::Unit::TestCase
       UserWithAttributes.new('John', 25, 'test@johnwlong.com')
     end
   
-end
+end