radius 0.6.1 → 0.7.0.prerelease

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
@@ -68,15 +68,14 @@ class QuickstartTest < Test::Unit::TestCase
     attr_accessor :name, :age, :email
   end
   def test_exposing_objects_example
-    context = Radius::Context.new
-    parser = Radius::Parser.new(context)
+    parser = Radius::Parser.new
     
-    context.define_tag "count", :for => 1
+    parser.context.define_tag "count", :for => 1
     assert_equal "1", parser.parse("<radius:count />")
     
     user = User.new
     user.name, user.age, user.email = "John", 29, "john@example.com"
-    context.define_tag "user", :for => user, :expose => [ :name, :age, :email ]
+    parser.context.define_tag "user", :for => user, :expose => [ :name, :age, :email ]
     assert_equal "John", parser.parse("<radius:user><radius:name /></radius:user>")
     
     assert_equal "John", parser.parse("<radius:user:name />")
@@ -94,16 +93,15 @@ class QuickstartTest < Test::Unit::TestCase
   end
   
   def test_tag_globals_example
-    context = Radius::Context.new
-    parser = Radius::Parser.new(context)
+    parser = Radius::Parser.new
     
-    context.define_tag "inc" do |tag|
+    parser.context.define_tag "inc" do |tag|
       tag.globals.count ||= 0
       tag.globals.count += 1
       ""
     end
     
-    context.define_tag "count" do |tag|
+    parser.context.define_tag "count" do |tag|
       tag.globals.count || 0
     end
     
@@ -150,4 +148,4 @@ class QuickstartTest < Test::Unit::TestCase
     assert_raises(Radius::UndefinedTagError) { parser.parse('<r:name />') } # raises a Radius::UndefinedTagError exception
   end
   
-end
+end

data/test/squiggle_test.rb

@@ -0,0 +1,281 @@
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+require 'radius/parser/squiggle_scanner'
+
+class RadiusSquiggleTest < Test::Unit::TestCase
+  include RadiusTestHelper
+  
+  def setup
+    @context = new_context
+    @parser = Radius::Parser.new(@context, :scanner => Radius::SquiggleScanner.new)
+  end
+
+  def test_sane_scanner_default
+    assert !Radius::Parser.new.scanner.is_a?(Radius::SquiggleScanner)
+  end
+
+  def test_initialize_with_params
+    @parser = Radius::Parser.new(:scanner => Radius::SquiggleScanner.new)
+    assert_kind_of Radius::SquiggleScanner, @parser.scanner
+  end
+  
+  def test_parse_individual_tags_and_parameters
+    define_tag "add" do |tag|
+      tag.attr["param1"].to_i + tag.attr["param2"].to_i
+    end
+    assert_parse_output "{3}", %[{{ add param1="1" param2='2'/}}]
+  end
+  
+  def test_parse_attributes
+    attributes = %[{"a"=>"1", "b"=>"2", "c"=>"3", "d"=>"'"}]
+    assert_parse_output attributes, %[{attr a="1" b='2'c="3"d="'" /}]
+    assert_parse_output attributes, %[{attr a="1" b='2'c="3"d="'"}{/attr}]
+  end
+  
+  def test_parse_attributes_with_slashes_or_angle_brackets
+    slash = %[{"slash"=>"/"}]
+    angle = %[{"angle"=>">"}]
+    assert_parse_output slash, %[{attr slash="/"}{/attr}]
+    assert_parse_output slash, %[{attr slash="/"}{attr /}{/attr}]
+    assert_parse_output angle, %[{attr angle=">"}{/attr}]
+  end
+  
+  def test_parse_quotes
+    assert_parse_output "test []", %[{echo value="test" /} {wrap attr="test"}{/wrap}]
+  end
+  
+  def test_things_that_should_be_left_alone
+    [
+      %[ test="2"="4" ],
+      %[="2" ] 
+    ].each do |middle|
+      assert_parsed_is_unchanged "{attr#{middle}/}"
+      assert_parsed_is_unchanged "{attr#{middle}}"
+    end
+  end
+  
+  def test_tags_inside_html_tags
+    assert_parse_output %[<div class="xzibit">tags in yo tags</div>],
+      %[<div class="{reverse}tibizx{/reverse}">tags in yo tags</div>]
+  end
+    
+  def test_parse_result_is_always_a_string
+    define_tag("twelve") { 12 }
+    assert_parse_output "12", "{ twelve /}"
+  end
+  
+  def test_parse_double_tags
+    assert_parse_output "test".reverse, "{reverse}test{/reverse}"
+    assert_parse_output "tset TEST", "{reverse}test{/reverse} {capitalize}test{/capitalize}"
+  end
+  
+  def test_parse_tag_nesting
+    define_tag("parent", :for => '')
+    define_tag("parent:child", :for => '')
+    define_tag("extra", :for => '')
+    define_tag("nesting") { |tag| tag.nesting }
+    define_tag("extra:nesting") { |tag| tag.nesting.gsub(':', ' > ') }
+    define_tag("parent:child:nesting") { |tag| tag.nesting.gsub(':', ' * ') }
+    assert_parse_output "nesting", "{nesting /}"
+    assert_parse_output "parent:nesting", "{parent:nesting /}"
+    assert_parse_output "extra > nesting", "{extra:nesting /}"
+    assert_parse_output "parent * child * nesting", "{parent:child:nesting /}"
+    assert_parse_output "parent > extra > nesting", "{parent:extra:nesting /}"
+    assert_parse_output "parent > child > extra > nesting", "{parent:child:extra:nesting /}"
+    assert_parse_output "parent * extra * child * nesting", "{parent:extra:child:nesting /}"
+    assert_parse_output "parent > extra > child > extra > nesting", "{parent:extra:child:extra:nesting /}"
+    assert_parse_output "parent > extra > child > extra > nesting", "{parent}{extra}{child}{extra}{nesting /}{/extra}{/child}{/extra}{/parent}"
+    assert_parse_output "extra * parent * child * nesting", "{extra:parent:child:nesting /}"
+    assert_parse_output "extra > parent > nesting", "{extra}{parent:nesting /}{/extra}"
+    assert_parse_output "extra * parent * child * nesting", "{extra:parent}{child:nesting /}{/extra:parent}"
+    assert_raises(Radius::UndefinedTagError) { @parser.parse("{child /}") }
+  end
+  def test_parse_tag_nesting_2
+    define_tag("parent", :for => '')
+    define_tag("parent:child", :for => '')
+    define_tag("content") { |tag| tag.nesting }
+    assert_parse_output 'parent:child:content', '{parent}{child:content /}{/parent}'
+  end
+  
+  def test_parse_tag__binding_do_missing
+    define_tag 'test' do |tag|
+      tag.missing!
+    end
+    e = assert_raises(Radius::UndefinedTagError) { @parser.parse("{test /}") }
+    assert_equal "undefined tag `test'", e.message
+  end
+
+  def test_parse_chirpy_bird
+    # :> chirp chirp
+    assert_parse_output "<:", "<:"
+  end
+
+  def test_parse_tag__binding_render_tag
+    define_tag('test') { |tag| "Hello #{tag.attr['name']}!" }
+    define_tag('hello') { |tag| tag.render('test', tag.attr) }
+    assert_parse_output 'Hello John!', '{hello name="John" /}'
+  end
+  
+  def test_accessing_tag_attributes_through_tag_indexer
+    define_tag('test') { |tag| "Hello #{tag['name']}!" }
+    assert_parse_output 'Hello John!', '{test name="John" /}'
+  end
+  
+  def test_parse_tag__binding_render_tag_with_block
+    define_tag('test') { |tag| "Hello #{tag.expand}!" }
+    define_tag('hello') { |tag| tag.render('test') { tag.expand } }
+    assert_parse_output 'Hello John!', '{hello}John{/hello}'
+  end
+  
+  def test_tag_locals
+    define_tag "outer" do |tag|
+      tag.locals.var = 'outer'
+      tag.expand
+    end
+    define_tag "outer:inner" do |tag|
+      tag.locals.var = 'inner'
+      tag.expand
+    end
+    define_tag "outer:var" do |tag|
+      tag.locals.var
+    end
+    assert_parse_output 'outer', "{outer}{var /}{/outer}"
+    assert_parse_output 'outer:inner:outer', "{outer}{var /}:{inner}{var /}{/inner}:{var /}{/outer}"
+    assert_parse_output 'outer:inner:outer:inner:outer', "{outer}{var /}:{inner}{var /}:{outer}{var /}{/outer}:{var /}{/inner}:{var /}{/outer}"
+    assert_parse_output 'outer', "{outer:var /}"
+  end
+  
+  def test_tag_globals
+    define_tag "set" do |tag|
+      tag.globals.var = tag.attr['value']
+      ''
+    end
+    define_tag "var" do |tag|
+      tag.globals.var
+    end
+    assert_parse_output "  true  false", %[{var /} {set value="true" /} {var /} {set value="false" /} {var /}]
+  end
+  
+  def test_parse_loops
+    @item = nil
+    define_tag "each" do |tag|
+      result = []
+      ["Larry", "Moe", "Curly"].each do |item|
+        tag.locals.item = item
+        result << tag.expand
+      end
+      result.join(tag.attr["between"] || "")
+    end
+    define_tag "each:item" do |tag|
+      tag.locals.item
+    end
+    assert_parse_output %[Three Stooges: "Larry", "Moe", "Curly"], %[Three Stooges: {each between=", "}"{item /}"{/each}]
+  end
+  
+  def test_parse_speed
+    define_tag "set" do |tag|
+      tag.globals.var = tag.attr['value']
+      ''
+    end
+    define_tag "var" do |tag|
+      tag.globals.var
+    end
+    parts = %w{decima nobis augue at facer processus commodo legentis odio lectorum dolore nulla esse lius qui nonummy ullamcorper erat ii notare}
+    multiplier = parts.map{|p| "#{p}=\"#{rand}\""}.join(' ')
+    assert_nothing_raised do
+      Timeout.timeout(10) do
+        assert_parse_output " false", %[{set value="false" #{multiplier} /} {var /}]
+      end
+    end
+  end
+  
+  def test_tag_option_for
+    define_tag 'fun', :for => 'just for kicks'
+    assert_parse_output 'just for kicks', '{fun /}'
+  end
+  
+  def test_tag_expose_option
+    define_tag 'user', :for => users.first, :expose => ['name', :age]
+    assert_parse_output 'John', '{user:name /}'
+    assert_parse_output '25', '{user}{age /}{/user}'
+    e = assert_raises(Radius::UndefinedTagError) { @parser.parse "{user:email /}" }
+    assert_equal "undefined tag `email'", e.message
+  end
+  
+  def test_tag_expose_attributes_option_on_by_default
+    define_tag 'user', :for => user_with_attributes
+    assert_parse_output 'John', '{user:name /}'
+  end
+  def test_tag_expose_attributes_set_to_false
+    define_tag 'user_without_attributes', :for => user_with_attributes, :attributes => false
+    assert_raises(Radius::UndefinedTagError) { @parser.parse "{user_without_attributes:name /}" }
+  end
+  
+  def test_tag_options_must_contain_a_for_option_if_methods_are_exposed
+    e = assert_raises(ArgumentError) { define_tag('fun', :expose => :today) { 'test' } }
+    assert_equal "tag definition must contain a :for option when used with the :expose option", e.message
+  end
+  
+  def test_parse_fail_on_missing_end_tag
+    assert_raises(Radius::MissingEndTagError) { @parser.parse("{reverse}") }
+  end
+  
+  def test_parse_fail_on_wrong_end_tag
+    assert_raises(Radius::WrongEndTagError) { @parser.parse("{reverse}{capitalize}{/reverse}") }
+  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
+  
+    def assert_parse_output(output, input, message = nil)
+      r = @parser.parse(input)
+      assert_equal(output, r, message)
+    end
+    
+    def assert_parsed_is_unchanged(something)
+      assert_parse_output something, something
+    end
+    
+    class User
+      attr_accessor :name, :age, :email, :friend
+      def initialize(name, age, email)
+        @name, @age, @email = name, age, email
+      end
+      def <=>(other)
+        name <=> other.name
+      end
+    end
+    
+    class UserWithAttributes < User
+      def attributes
+        { :name => name, :age => age, :email => email }
+      end
+    end
+    
+    def users
+      [
+        User.new('John', 25, 'test@johnwlong.com'),
+        User.new('James', 27, 'test@jameslong.com')
+      ]
+    end
+    
+    def user_with_attributes
+      UserWithAttributes.new('John', 25, 'test@johnwlong.com')
+    end
+  
+end

data/test/test_helper.rb

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'timeout'
 
 unless defined? RADIUS_LIB
@@ -15,14 +16,21 @@ 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
     
     def define_tag(name, options = {}, &block)
+      @parser.context.define_tag name, options, &block
+    end
+    
+    def define_global_tag(name, options = {}, &block)
       @context.define_tag name, options, &block
     end
   end
-end
+end

data/test/utility_test.rb

@@ -0,0 +1,30 @@
+require 'test/unit'
+require 'radius'
+
+class RadiusUtilityTest < Test::Unit::TestCase
+  
+  def test_symbolize_keys
+    h = Radius::Utility.symbolize_keys({ 'a' => 1, :b => 2 })
+    assert_equal h[:a], 1
+    assert_equal h[:b], 2
+  end
+  
+  def test_impartial_hash_delete
+    h = { 'a' => 1, :b => 2 }
+    assert_equal Radius::Utility.impartial_hash_delete(h, :a), 1
+    assert_equal Radius::Utility.impartial_hash_delete(h, 'b'), 2
+    assert_equal h.empty?, true
+  end
+  
+  def test_constantize
+    assert_equal Radius::Utility.constantize('String'), String
+  end
+  
+  def test_camelize
+    assert_equal Radius::Utility.camelize('ab_cd_ef'), 'AbCdEf'
+  end
+
+  def test_array_to_s
+    assert_equal Radius::Utility.array_to_s(['a', 1, [:c]]), 'a1c'
+  end
+end

metadata

@@ -1,7 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: radius
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  hash: 1092611506
+  prerelease: 6
+  segments: 
+  - 0
+  - 7
+  - 0
+  - prerelease
+  version: 0.7.0.prerelease
 platform: ruby
 authors: 
 - John W. Long (me@johnwlong.com)
@@ -9,115 +16,111 @@ authors:
 - Bryce Kerley (bkerley@brycekerley.net)
 autorequire: 
 bindir: bin
-cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDLjCCAhagAwIBAgIBADANBgkqhkiG9w0BAQUFADA9MQswCQYDVQQDDAJtZTEZ
-  MBcGCgmSJomT8ixkARkWCWpvaG53bG9uZzETMBEGCgmSJomT8ixkARkWA2NvbTAe
-  Fw0wNzA5MjUwNTA3MDNaFw0wODA5MjQwNTA3MDNaMD0xCzAJBgNVBAMMAm1lMRkw
-  FwYKCZImiZPyLGQBGRYJam9obndsb25nMRMwEQYKCZImiZPyLGQBGRYDY29tMIIB
-  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8MjmSgpGWiy+PyyumoFLnA/w
-  gOymrqEIoHwlNRV8Z2RcZkrUHuKnFcH8ShqRww+/1BBnDJlx2rGrQ8d2W75f+xKj
-  hxVwA+eFbLtpMMe1E0qfD69F2sQk5/+dB7WwtF4kI0vt/rHne4hYj7dN/OeJ248q
-  dfZbxohWzSlPg0zopxlQ7WuFjZKclkUNx9Euv7K04imu4i7Q5ThCldV3VVrBFqCq
-  VhI8lAeg7Yln1t6SaPLQ3AqQlq2hk8MA7APy4LdWaN03cunfKwkHVVwPaSD8ualr
-  wrBQsmIrc4f3h9hJq0Ri1u/k4B2CTxaRLA34mb7MrpwZo5RqFd3x512MJaqfhQID
-  AQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU2eSXhP+B
-  7zF3qc5Rrb75aLF7BXowDQYJKoZIhvcNAQEFBQADggEBAFdj2/TsGJSaeFXoMixS
-  ojVHMctKErQkA2pRM7URVyeLljJweAies3qlfpPSuUTcWFLpJf7+So1CNrU7OzXa
-  UNAIhlWzz+knSeMahQWyMQvNGW3nt07PEkaosVdsi/Y6hO+YKNiZicBFuKw7fFUl
-  1FQHJMmy4+bTXxWl6RUymFiDhIjagLHbr09igGHaIOptys1k7Fxpx3xBDNr/IC0H
-  c5GbUePwwNafnjsl9cQo3Xka285/d0IOT4grVUmAeLAh601oR/YGtsHDC7B0jWqq
-  S4yE0yydTjVFpgazHI/CP2fneTHKbaf+H6jwNRzKN9HtcDpP2yO0tYhtmMotuZUd
-  qXI=
-  -----END CERTIFICATE-----
+cert_chain: []
 
-date: 2009-09-16 00:00:00 -04:00
-default_executable: 
+date: 2011-06-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: newgem
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: RedCloth
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.3.3
-    version: 
-description: ""
-email: 
-- me@johnwlong.com
+  version_requirements: *id001
+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...).
+email: me@johnwlong.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- Manifest.txt
-- README.rdoc
+- CHANGELOG
+- LICENSE
 - QUICKSTART.rdoc
+- README.rdoc
 files: 
 - CHANGELOG
-- Manifest.txt
+- LICENSE
 - QUICKSTART.rdoc
 - README.rdoc
 - Rakefile
+- VERSION
 - lib/radius.rb
 - lib/radius/context.rb
 - lib/radius/delegating_open_struct.rb
 - lib/radius/error.rb
+- lib/radius/ord_string.rb
 - lib/radius/parse_tag.rb
 - lib/radius/parser.rb
-- lib/radius/parser/scan.rb
-- lib/radius/parser/scan.rl
+- lib/radius/parser/JavaScanner$Flavor.class
+- lib/radius/parser/JavaScanner$Tag.class
+- lib/radius/parser/JavaScanner.class
+- lib/radius/parser/JavaScanner.java
+- lib/radius/parser/JavaScanner.rl
+- lib/radius/parser/java_scanner.jar
+- lib/radius/parser/scanner.rb
+- lib/radius/parser/scanner.rl
+- lib/radius/parser/squiggle_scanner.rb
+- lib/radius/parser/squiggle_scanner.rl
 - lib/radius/tag_binding.rb
 - lib/radius/tag_definitions.rb
 - lib/radius/utility.rb
 - lib/radius/version.rb
+- tasks/jeweler.rake
+- tasks/rdoc.rake
+- tasks/rubinius.rake
 - tasks/scan.rake
+- tasks/test.rake
+- test/benchmarks.rb
 - test/context_test.rb
+- test/multithreaded_test.rb
+- test/ord_string_test.rb
 - test/parser_test.rb
+- test/quickstart_test.rb
+- test/squiggle_test.rb
 - test/test_helper.rb
-has_rdoc: true
-homepage: http://radius.rubyforge.org
+- test/utility_test.rb
+homepage: http://github.com/jlong/radius
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --main
-- README.rdoc
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
-rubyforge_project: radius
-rubygems_version: 1.3.4
+rubyforge_project: 
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
-summary: ""
-test_files: 
-- test/context_test.rb
-- test/parser_test.rb
-- test/quickstart_test.rb
+summary: A tag-based templating language for Ruby.
+test_files: []
+