radius-ts 1.1.0 → 1.3.0

data/lib/radius/parser/scanner.rl

@@ -5,7 +5,8 @@
 	action _prefix { mark_pfx = p }
 	action prefix {
 	  if data[mark_pfx..p-1] != @prefix
-      @nodes.last << data[mark_pfx-1..p]
+	    closing = data[mark_pfx-1,1] == '/'
+	    @nodes.last << data[mark_pfx-(closing ? 2 : 1)..p]
 	    fbreak;
     end
 	}

data/lib/radius/parser/squiggle_scanner.rl

@@ -0,0 +1,125 @@
+%%{
+	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)
+      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 = '1'
-    Minor = '1'
-    Tiny  = '0'
-    
-    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

data/tasks/jeweler.rake

@@ -0,0 +1,23 @@
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "radius-ts"
+    gem.summary = "A tag-based templating language for Ruby. (JRuby Extensions)"
+    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...).  This is likely the last release before merging back upstream to jlong/radius."
+    gem.email = "todd@rubidine.com"
+    gem.homepage = "http://github.com/xtoddx/radius-ts"
+    gem.authors = [
+      "John W. Long (me@johnwlong.com)",
+      "David Chelimsky (dchelimsky@gmail.com)",
+      "Bryce Kerley (bkerley@brycekerley.net)",
+      "Todd Willey <todd@rubidine.com>"
+    ]
+    gem.files = FileList["[A-Z]*", "{bin,lib,tasks,test}/**/*"].exclude("tmp")
+    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

@@ -2,11 +2,12 @@ namespace :scan do
   desc 'Generate the parsers'
   task 'build' => [
     'lib/radius/parser/scanner.rb',
-    'lib/radius/parser/squiggle_scanner.rb'
+    'lib/radius/parser/squiggle_scanner.rb',
+    'lib/radius/parser/java_scanner.jar'
   ]
   
   desc 'Generate a PDF state graph from the parsers'
-  task 'graph' => ['doc/scanner.pdf', 'doc/squiggle_scanner.rb']
+  task 'graph' => ['doc/scanner.pdf', 'doc/squiggle_scanner.pdf']
   
   desc 'turn the scanner.rl file into a ruby file'
   file 'lib/radius/parser/scanner.rb' => 'lib/radius/parser/scanner.rl' do |t|
@@ -24,6 +25,28 @@ namespace :scan do
     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/scanner.pdf' => 'lib/radius/parser/scanner.dot' do |t|
     cd 'lib/radius/parser' do

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

data/test/multithreaded_test.rb

@@ -12,18 +12,49 @@ class MultithreadTest < Test::Unit::TestCase
     end
   end
 
-  def test_runs_multithreaded
-    threads = []
-    1000.times do |t|
-      threads << 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
+  if RUBY_PLATFORM == 'java'
+    require 'java'
+    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
-    threads.each{|t| t.join }
   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
@@ -261,6 +261,11 @@ class RadiusParserTest < Test::Unit::TestCase
     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
   
     def assert_parse_output(output, input, message = nil)

data/test/quickstart_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'test_helper')
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
 class QuickstartTest < Test::Unit::TestCase
 
@@ -20,7 +20,7 @@ class QuickstartTest < Test::Unit::TestCase
       RedCloth.new(contents).to_html
     end
     parser = Radius::Parser.new(context)
-    assert_equal "<h1>Hello <b>World</b>!</h1>", parser.parse('<radius:textile>h1. Hello **World**!</radius:textile>')
+    assert_equal "<p>Hello <b>World</b>!</p>", parser.parse('<radius:textile>Hello **World**!</radius:textile>')
   end
   
   def test_nested_example

data/test/squiggle_test.rb

@@ -10,7 +10,7 @@ class RadiusSquiggleTest < Test::Unit::TestCase
   end
 
   def test_sane_scanner_default
-    assert_kind_of Radius::Scanner, Radius::Parser.new.scanner
+    assert !Radius::Parser.new.scanner.is_a?(Radius::SquiggleScanner)
   end
 
   def test_initialize_with_params
@@ -235,6 +235,11 @@ class RadiusSquiggleTest < Test::Unit::TestCase
     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
   
     def assert_parse_output(output, input, message = nil)

data/test/test_helper.rb

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'timeout'
 
 unless defined? RADIUS_LIB
@@ -15,9 +16,12 @@ unless defined? RADIUS_LIB
       Radius::Context.new do |c|
         c.define_tag("reverse"   ) { |tag| tag.expand.reverse }
         c.define_tag("capitalize") { |tag| tag.expand.upcase  }
-        c.define_tag("attr"      ) { |tag| tag.attr.inspect   }
         c.define_tag("echo"      ) { |tag| tag.attr['value']  }
         c.define_tag("wrap"      ) { |tag| "[#{tag.expand}]"  }
+        c.define_tag("attr") do |tag|
+          kv = tag.attr.keys.sort.collect{|k| "#{k.inspect}=>#{tag[k].inspect}"}
+          "{#{kv.join(', ')}}"
+        end
       end
     end