ltdtemplate 0.2.2 → 0.2.3

data/CHANGELOG

@@ -1,4 +1,21 @@
+2013-08-04 Version 0.2.3
+
+	Documented LtdTemplate constructor options, including the new
+	:missing_method option to supply a callback for missing method
+	calls (an alternative to subclassing LtdTemplate::Value classes).
+	Fixed implementation of class and instance set_classes methods
+	(which can now also accept a loaded class constant as an
+	alternative to a class name string).
+
+	LtdTemplate value classes now have a "type" method that returns
+	an associated symbol (e.g., :nil, :number, :string) for use by
+	the :missing_method callback.
+
+	Added test cases for $.use, the :missing_method callback, and
+	class and instance set_classes methods.
+
 2013-07-29 Version 0.2.2
+
 	Added string methods capcase, downcase, join, regexp,
 	rep/replace, rep1/replace1, split, and upcase.
 
@@ -9,6 +26,7 @@
 	also renamed RESOURCES.txt to RESOURCES.
 
 2013-07-28 Version 0.2.1
+
 	Added array.{each,each_rnd,each_seq} methods (executing the code
 	block supplied as the first parameter with parameters key and
 	value).
@@ -20,23 +38,29 @@
 	an array, hash, or Sarah as required for the data.
 
 2013-07-24 Version 0.1.5
+
 	Added RESOURCES.txt to .yardopts. OOPS!
 
 2013-07-24 Version 0.1.4
+
 	Added String.html (HTML encoding) and String.pcte (percent encoding)
 	methods. Added RESOURCES.txt describing resource usage/limits.
 
 2013-07-13 Version 0.1.3
+
 	Fix broken links and otherwise add some polish to TEMPLATE_MANUAL.html.
 
 2013-07-13 Version 0.1.2
+
 	Added .yardopts to gemspec. Still trying to get the hang of Ruby
 	packaging.
 
 2013-07-12 Version 0.1.1
+
 	Added Gemfile
 
 2013-07-12 Version 0.1.0
+
 	Fixed class names in unit tests.
 	String.* now handles multipliers <= 0.
 	Added number.abs (absolute value) method.
@@ -50,4 +74,5 @@
 	Added the template manual (TEMPLATE_MANUAL.html).
 
 2013-07-08 Version 0.0.1
+
 	First release

data/lib/ltdtemplate.rb

@@ -8,7 +8,7 @@
 
 class LtdTemplate
 
-    VERSION = '0.2.2'
+    VERSION = '0.2.3'
 
     TOKEN_MAP = {
 	?. => :dot,		# method separator
@@ -95,14 +95,16 @@ class LtdTemplate
 	@@classes.merge! classes
     end
 
+    # Constructor
+    #
+    # @param options [Hash] Options hash
+    # @option options [Proc] :loader Callback for $.use method
+    # @option options [Proc] :missing_method Callback for missing methods
     def initialize (options = {})
-	@classes = @@classes
-	@code = nil
-	@factory_singletons = {}
-	@limits = {}
-	@namespace = nil
+	@classes, @factory_singletons = {}, {}
+	@code, @namespace = nil, nil
+	@limits, @usage = {}, {}
 	@options = options
-	@usage = {}
 	@used = {}
     end
 
@@ -143,7 +145,7 @@ class LtdTemplate
 	self
     end
 
-    # Change default factory classes for this template.
+    # Override default factory classes for this template instance.
     #
     # @param classes [Hash] A hash of factory symbols and corresponding
     #   classes to be instantiated.
@@ -161,12 +163,19 @@ class LtdTemplate
     # @return Returns the new code/value object.
     def factory (type, *args)
 	use :factory
-	type = @classes[type]
-	file = type.downcase.gsub '::', '/'
-	require file
-	eval(type).instance(self, *args)
+	type = @classes[type] || @@classes[type]
+	if type.is_a? String
+	    file = type.downcase.gsub '::', File::SEPARATOR
+	    require file
+	    eval(type).instance(self, *args)
+	else
+	    type.instance(self, *args)
+	end
     end
 
+    # Shortcut for frequently used template factory :nil
+    def nil; @factory_singletons[:nil] || factory(:nil); end
+
     # Render the template.
     #
     # The options hash may include :parameters, which may be an array or

data/lib/ltdtemplate/code.rb

@@ -1,11 +1,11 @@
-class LtdTemplate; end
-
 # LtdTemplate::Code - Base class for LtdTemplate code/value objects
 #
 # @author Brian Katzung <briank@kappacs.com>, Kappa Computer Solutions, LLC
 # @copyright 2013 Brian Katzung and Kappa Computer Solutions, LLC
 # @license MIT License
 
+class LtdTemplate; end
+
 class LtdTemplate::Code
 
     # @!attribute [r] tpl_methods
@@ -38,8 +38,7 @@ class LtdTemplate::Code
     # @param key [String] The (native) string for the method.
     # @return [LtdTemplate::Value::Code_Block]
     def get_item (key)
-	(@tpl_methods.has_key? key) ? @tpl_methods[key] :
-	  @template.factory(:nil)
+	(@tpl_methods.has_key? key) ? @tpl_methods[key] : @template.nil
     end
 
     # Set a non-array value's method code block.
@@ -72,7 +71,7 @@ class LtdTemplate::Code
 	if params = opts[:parameters]
 	    set_value(params.scalar? ? params.positional[0] : params)
 	end
-	@template.factory :nil
+	@template.nil
     end
 
     # Try to execute code-block methods bound to the object or object
@@ -91,8 +90,10 @@ class LtdTemplate::Code
 	if method
 	    opts[:target] = self
 	    method.get_value opts
+	elsif mmproc = @template.options[:missing_method]
+	    mmproc.call(@template, self, opts) || @template.nil
 	else
-	    @template.factory :nil
+	    @template.nil
 	end
     end
 

data/lib/ltdtemplate/code/code_block.rb

@@ -21,7 +21,7 @@ class LtdTemplate::Code::Code_Block < LtdTemplate::Code
     def get_value (opts = {})
 	values = @code.map { |part| part.get_value }.flatten
 	case values.size
-	when 0 then @template.factory :nil
+	when 0 then @template.nil
 	when 1 then values[0]
 	else @template.factory(:array).set_value(values)
 	end

data/lib/ltdtemplate/code/variable.rb

@@ -67,7 +67,7 @@ class LtdTemplate::Code::Variable < LtdTemplate::Code
 	case opts[:method]
 	when '=' then do_set opts	# see LtdTemplate::Code
 	when '?='
-	    if is_set? then @template.factory :nil
+	    if is_set? then @template.nil
 	    else do_set opts
 	    end
 	else target.get_value opts

data/lib/ltdtemplate/value/array.rb

@@ -37,7 +37,7 @@ class LtdTemplate::Value::Array < LtdTemplate::Code
     #
     def has_item? (key); @sarah.has_key? key; end
     def get_item (key)
-	@sarah.has_key?(key) ? @sarah[key] : @template.factory(:nil)
+	@sarah.has_key?(key) ? @sarah[key] : @template.nil
     end
     def set_item (key, value)
 	@sarah[key] = value
@@ -75,6 +75,9 @@ class LtdTemplate::Value::Array < LtdTemplate::Code
 	end
     end
 
+    # Type (for :missing_method callback)
+    def type; :array; end
+
     #
     # Scalar assignment is used instead of array assignment if the
     # parameter list contains exactly one positional parameter and
@@ -175,21 +178,21 @@ class LtdTemplate::Value::Array < LtdTemplate::Code
     end
 
     def do_pop (opts)
-	@sarah.pop || @template.factory(:nil)
+	@sarah.pop || @template.nil
     end
 
     def do_push (opts)
 	if params = opts[:parameters] then @sarah.append! params.sarah end
-	@template.factory :nil
+	@template.nil
     end
 
     def do_shift (opts)
-	@sarah.shift || @template.factory(:nil)
+	@sarah.shift || @template.nil
     end
 
     def do_unshift (opts)
 	if params = opts[:parameters] then @sarah.insert! params.sarah end
-	@template.factory :nil
+	@template.nil
     end
 
     protected
@@ -201,7 +204,7 @@ class LtdTemplate::Value::Array < LtdTemplate::Code
 	  value.is_a? Array
 	return @template.factory(:array).set_from_hash value if
 	  value.is_a? Hash
-	@template.factory :nil
+	@template.nil
     end
 
 end

data/lib/ltdtemplate/value/boolean.rb

@@ -37,6 +37,9 @@ class LtdTemplate::Value::Boolean < LtdTemplate::Code
 	end
     end
 
+    # Type (for :missing_method callback)
+    def type; :boolean; end
+
     # Implement +/| (or):
     # bool|(bool1, ..., boolN)
     # True if ANY boolean is true. Evaluates {} blocks until true.

data/lib/ltdtemplate/value/code_block.rb

@@ -37,4 +37,7 @@ class LtdTemplate::Value::Code_Block < LtdTemplate::Code
 	end
     end
 
+    # Type (for :missing_method callback)
+    def type; :code_block; end
+
 end

data/lib/ltdtemplate/value/namespace.rb

@@ -72,8 +72,8 @@ class LtdTemplate::Value::Namespace < LtdTemplate::Value::Array
 	when 'if' then do_if opts
 	when 'loop' then do_loop opts
 	when 'method' then method_string
-	when 'nil' then @template.factory :nil
-	when 'target' then @target || @template.factory(:nil)
+	when 'nil' then @template.nil
+	when 'target' then @target || @template.nil
 	when 'true' then @template.factory :boolean, true
 	when 'use' then do_use opts
 	when 'var' then do_add_names opts
@@ -81,18 +81,21 @@ class LtdTemplate::Value::Namespace < LtdTemplate::Value::Array
 	end
     end
 
+    # Type (for :missing_method callback)
+    def type; :namespace; end
+
     # Add new namespace names with nil or specific values
     #
     def do_add_names (opts)
 	params = opts[:parameters]
 	if params.positional.size
-	    tnil = @template.factory :nil
+	    tnil = @template.nil
 	    params.positional.each { |item| set_item(item.to_native, tnil) }
 	end
 	if params.named.size
 	    params.named.each { |item, val| set_item(item, val) }
 	end
-	@template.factory :nil
+	@template.nil
     end
 
     # Implement conditionals
@@ -111,7 +114,7 @@ class LtdTemplate::Value::Namespace < LtdTemplate::Value::Array
 		return e2.get_value(:method => 'call') if e1.to_boolean
 	    end
 	end
-	@template.factory :nil
+	@template.nil
     end
 
     def do_loop (opts)
@@ -141,7 +144,7 @@ class LtdTemplate::Value::Namespace < LtdTemplate::Value::Array
 		  result.kind_of? String
 	    end
 	end
-	tpl.factory :nil
+	tpl.nil
     end
 
 end

data/lib/ltdtemplate/value/nil.rb

@@ -20,6 +20,9 @@ class LtdTemplate::Value::Nil < LtdTemplate::Code
 	end
     end
 
+    # Type (for :missing_method callback)
+    def type; :nil; end
+
     def to_boolean; false; end
     def to_native; ''; end
     def to_text; ''; end

data/lib/ltdtemplate/value/number.rb

@@ -45,6 +45,9 @@ class LtdTemplate::Value::Number < LtdTemplate::Code
 	end
     end
 
+    # Type (for :missing_method callback)
+    def type; :number; end
+
     # Implement sequential operations (+, *, /, %, &, |, ^)
     def do_sequential (opts = {}, &block)
 	if params = opts[:parameters]

data/lib/ltdtemplate/value/string.rb

@@ -48,6 +48,9 @@ class LtdTemplate::Value::String < LtdTemplate::Code
 	end
     end
 
+    # Type (for :missing_method callback)
+    def type; :string; end
+
     def do_add (opts)
 	combined = @value
 	if params = opts[:parameters]

data/ltdtemplate.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name         = "ltdtemplate"
-  s.version      = "0.2.2"
-  s.date         = "2013-07-29"
+  s.version      = "0.2.3"
+  s.date         = "2013-08-04"
   s.authors      = ["Brian Katzung"]
   s.email        = ["briank@kappacs.com"]
   s.homepage     = "http://rubygems.org/gems/ltdtemplate"

data/test/09use.rb

@@ -0,0 +1,15 @@
+require 'minitest/autorun'
+require 'ltdtemplate'
+
+class TestLtdTemplate_09 < MiniTest::Unit::TestCase
+
+    def test_use1
+	loader = Proc.new { |tpl, name| "@#{name}=(0+(@#{name},1))" }
+	tpl = LtdTemplate.new :loader => loader
+	tpl.parse "<<$.use('ab)$.use('cd)$.use('ab)\",\".join(@ab,@cd)>>"
+	assert_equal "1,1", tpl.render, "use ab, cd, ab counts => 1, 1"
+    end
+
+end
+
+# END

data/test/10missing_meth.rb

@@ -0,0 +1,18 @@
+require 'minitest/autorun'
+require 'ltdtemplate'
+
+class TestLtdTemplate_10 < MiniTest::Unit::TestCase
+
+    def test_missing_meth1
+	miss_meth = Proc.new do |tpl, obj, opt|
+	    tpl.factory :string, "#{obj.type}.#{opt[:method]};"
+	end
+	tpl = LtdTemplate.new :missing_method => miss_meth
+	tpl.parse "<<$.*.abc 1.def '.ghi>>"
+	assert_equal "array.abc;number.def;string.ghi;", tpl.render,
+	  "missing method ary.abc, num.def, str.def"
+    end
+
+end
+
+# END

data/test/11classes.rb

@@ -0,0 +1,47 @@
+require 'minitest/autorun'
+require 'ltdtemplate'
+require 'ltdtemplate/value/nil'
+
+class TestLtdTemplate_11 < MiniTest::Unit::TestCase
+
+    def test_classes1
+	LtdTemplate.set_classes :nil => Nil1
+	tpl = LtdTemplate.new
+	tpl.parse '<<$.nil.type>>'
+	assert_equal 'nil1', tpl.render, 'nil type after class class change'
+
+	tpl = LtdTemplate.new
+	tpl.set_classes :nil => Nil2
+	tpl.parse '<<$.nil.type>>'
+	assert_equal 'nil2', tpl.render, 'nil type after instance class change'
+
+	tpl = LtdTemplate.new
+	tpl.parse '<<$.nil.type>>'
+	assert_equal 'nil1', tpl.render, 'recheck nil type after class change'
+    end
+
+end
+
+class Nil1 < LtdTemplate::Value::Nil
+
+    def get_value (opts = {})
+	case opts[:method]
+	when 'type' then @template.factory :string, 'nil1'
+	else super
+	end
+    end
+
+end
+
+class Nil2 < LtdTemplate::Value::Nil
+
+    def get_value (opts = {})
+	case opts[:method]
+	when 'type' then @template.factory :string, 'nil2'
+	else super
+	end
+    end
+
+end
+
+# END

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Brian Katzung
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-29 00:00:00 -05:00
+date: 2013-08-04 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -49,6 +49,7 @@ files:
 - CHANGELOG
 - RESOURCES
 - TEMPLATE_MANUAL.html
+- test/10missing_meth.rb
 - test/00class.rb
 - test/04number.rb
 - test/05string.rb
@@ -58,6 +59,8 @@ files:
 - test/08interpolate.rb
 - test/01instance.rb
 - test/02tpl_literal.rb
+- test/09use.rb
+- test/11classes.rb
 has_rdoc: true
 homepage: http://rubygems.org/gems/ltdtemplate
 licenses: 
@@ -91,6 +94,7 @@ signing_key:
 specification_version: 3
 summary: A resource-limitable, textual templating system
 test_files: 
+- test/10missing_meth.rb
 - test/00class.rb
 - test/04number.rb
 - test/05string.rb
@@ -100,3 +104,5 @@ test_files:
 - test/08interpolate.rb
 - test/01instance.rb
 - test/02tpl_literal.rb
+- test/09use.rb
+- test/11classes.rb