RubyGems - ltdtemplate - Versions diffs - 0.2.1 → 0.2.2 - Mend

ltdtemplate 0.2.1 → 0.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

data/.yardopts +1 -1
data/{HISTORY.txt → CHANGELOG} +10 -0
data/{RESOURCES.txt → RESOURCES} +4 -0
data/TEMPLATE_MANUAL.html +89 -3
data/lib/ltdtemplate.rb +2 -0
data/lib/ltdtemplate/value/string.rb +86 -1
data/lib/test.rb +10 -0
data/ltdtemplate.gemspec +3 -3
metadata +6 -5

data/.yardopts CHANGED Viewed

@@ -1,4 +1,4 @@
 --tag copyright:Copyright
 --tag license:License
 -
-HISTORY.txt RESOURCES.txt TEMPLATE_MANUAL.html
+CHANGELOG RESOURCES TEMPLATE_MANUAL.html

data/{HISTORY.txt → CHANGELOG} RENAMED Viewed

@@ -1,3 +1,13 @@
+2013-07-29 Version 0.2.2
+	Added string methods capcase, downcase, join, regexp,
+	rep/replace, rep1/replace1, split, and upcase.
+	Added regexp special object and methods ci/ignorecase,
+	ext/extended, and multi/multiline.
+	Renamed HISTORY.txt to CHANGELOG to conform to best practices;
+	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

data/{RESOURCES.txt → RESOURCES} RENAMED Viewed

@@ -15,6 +15,10 @@ calls
 iterations
     The total number of loop iterations
+regexp (limit)
+    A string may only be converted to a regexp if limit regexp
+    is set to false before rendering
 string_length
     The combined total length of strings created

data/TEMPLATE_MANUAL.html CHANGED Viewed

@@ -11,7 +11,7 @@ td:first-child, th:first-child { padding-left: 0.3em }
 </head>
 <body>
 <h1 id='top'>LtdTemplate Manual<br>
-<span style='font-size: smaller'>Version 0.1.3; July 13, 2013</span></h1>
+<span style='font-size: smaller'>Version 0.2.2; July 29, 2013</span></h1>
 <h2>Author(s)</h2>
@@ -404,6 +404,7 @@ $.*(1, 2, 3).list /* => 1, 2, 3 */</code></blockquote>
 <li><a href='#nil_value'>Nil</a></li>
 <li><a href='#number_values'>Numbers</a></li>
 <li><a href='#string_values'>Strings</a></li>
+<li><a href='#regexp_values'>Regular Expressions</a></li>
 </ul>
 <h3 id='array_values'>Arrays</h3>
@@ -758,6 +759,13 @@ for the nil value as follows:</p>
 </table>
+<p><a href='#codeblock_syntax'>Code blocks</a> may be bound as methods for
+all numeric values as follows:</p>
+<blockquote><code>@Number?=(')
+@Number['</code><i>method_name</i><code>]=({</code>
+<i>code sequence</i> <code>})</code></blockquote>
 <p>[<a href='#contents'>Contents</a>] [<a href='#values_methods'>Values And Methods</a>]</p>
 <h3 id='string_values'>Strings</h3>
@@ -772,11 +780,18 @@ for the nil value as follows:</p>
 <tr><td><code>class</code></td><td>Returns the string "String"</td></tr>
+<tr><td><code>capcase</code></td>
+    <td>Returns the string with each space-separated word capitalized
+    (since 0.2.2)</td></tr>
+<tr><td><code>downcase</code></td>
+    <td>Returns the string entirely in lowercase (since 0.2.2)</td></tr>
 <tr><td><code>flt</code>, <code>float</code></td>
     <td>Returns the floating-point value of the string</td></tr>
 <tr><td><code>html</code></td>
-    <td>Returns the HTML encoding of the string</td></tr>
+    <td>Returns the HTML encoding of the string (since 0.1.4)</td></tr>
 <tr><td><code>idx(</code><i>target</i><code>,
     </code><i>offset</i><code>)</code>,
@@ -789,12 +804,38 @@ for the nil value as follows:</p>
 <tr><td><code>int</code></td>
     <td>Returns the integer value of the string</td></tr>
+<tr><td><code>join(</code><i>list</i><code>)</code></td>
+    <td>Equivalent to
+    <code>$.array(<i>list</i><code>).join(</code><i>string</i><code>)</code>
+    (since 0.2.2)</td></tr>
 <tr><td><code>len</code>, <code>length</code></td>
     <td>Returns the length of the string</td></tr>
 <tr><td><code>pcte</code></td>
     <td>Returns the "percent encoding" of the string
-    (for URI components)</td></tr>
+    (for URI components; since 0.1.4)</td></tr>
+<tr><td><code>regexp</code></td>
+    <td>Returns a "<a href='#regexp_values'>regular expression</a>"
+    version of the string (only if enabled by the calling program;
+    since 0.2.2)</td></tr>
+<tr><td><code>rep(</code><i>pattern</i><code>,</code>
+    <i>replacement</i><code>)</code>,
+    <code>replace(</code><i>pattern</i><code>,</code>
+    <i>replacement</i><code>)</code></td>
+    <td>Returns a copy of the string with all occurrences of <i>pattern</i>
+    replaced with <i>replacement</i>; the <i>pattern</i> may be a
+    <a href='#regexp_values'>regular expression</a> (since 0.2.2)</td></tr>
+<tr><td><code>rep1, replace1</code></td>
+    <td>Like <code>rep</code>/<code>replace</code>, but with only the
+    first occurrence replaced (since 0.2.2)</td></tr>
+<tr><td><code>split(</code><i>pattern</i>, <i>limit</i><code>)</code></td>
+    <td>Returns an array of up to <i>limit</i> (default unlimited)
+    substrings split at <i>pattern</i> (since 0.2.2)</td></tr>
 <tr><td><code>ridx(</code><i>string</i><code>,
     </code><i>offset</i><code>)</code>,
@@ -826,6 +867,9 @@ for the nil value as follows:</p>
 <tr><td><code>type</code></td><td>Returns the string "string"</td></tr>
+<tr><td><code>upcase</code></td>
+    <td>Returns the string entirely in uppercase</td></tr>
 <tr><td><code>+(</code><i>list</i><code>)</code></td>
     <td>Returns the concatenation of the string and the items in
     <i>list</i></td></tr>
@@ -846,6 +890,48 @@ for the nil value as follows:</p>
 </table>
+<p><a href='#codeblock_syntax'>Code blocks</a> may be bound as methods for
+all string values as follows:</p>
+<blockquote><code>@String?=(')
+@String['</code><i>method_name</i><code>]=({</code>
+<i>code sequence</i> <code>})</code></blockquote>
+<p>[<a href='#contents'>Contents</a>] [<a href='#values_methods'>Values And Methods</a>]</p>
+<h3 id='regexp_values'>Regular Expressions</h3>
+<p>"<a href='http://en.wikipedia.org/wiki/Regular_expression'>Regular
+expressions</a>" ("regex" or "regexp" for short) in LtdTemplate are
+specially enhanced, "magic strings". They behave like regular strings
+unless used in a method call that is able to use them as a regular
+expression.</p>
+<p>Regular expressions must be enabled by the calling program. See
+the gem documentation for details.</p>
+<p>Regexp-specific methods:</p>
+<table>
+<tr><th>Method</th><th>Description</th></tr>
+<tr><td><code>ci, ignorecase</code></td>
+    <td>Make pattern case-insensitive</td></tr>
+<tr><td><code>ext, extended</code></td>
+     <td>Allow white space and comments in the pattern</td></tr>
+<tr><td><code>multi, multiline</code></td>
+    <td>Makes <code>.</code> match newlines too</td></tr>
+<tr><td><code>type</code></td><td>Returns the string "regexp"</td></tr>
+</table>
+<blockquote><code>"Example".replace("[aeiou]".regexp.ci,'_)
+/* => _x_mpl_ */</code></blockquote>
 <p>[<a href='#contents'>Contents</a>] [<a href='#values_methods'>Values And Methods</a>]</p>
 <h2 id='examples'>(Some More) Examples</h2>

data/lib/ltdtemplate.rb CHANGED Viewed

@@ -8,6 +8,8 @@
 class LtdTemplate
+    VERSION = '0.2.2'
     TOKEN_MAP = {
 	?. => :dot,		# method separator
 	'..' => :dotdot,	# begin named values

data/lib/ltdtemplate/value/string.rb CHANGED Viewed

@@ -21,21 +21,28 @@ class LtdTemplate::Value::String < LtdTemplate::Code
     def get_value (opts = {})
 	case opts[:method]
 	when nil, 'call', 'str', 'string' then self
+	when 'capcase' then @template.factory :string, @value.capitalize
 	when 'class' then @template.factory :string, 'String'
+	when 'downcase' then @template.factory :string, @value.downcase
 	when 'flt', 'float' then @template.factory :number, @value.to_f
 	when 'html'
 	    require 'htmlentities'
 	    @template.factory :string, HTMLEntities.new(:html4).
 	      encode(@value, :basic, :named, :decimal)
+	when 'idx', 'index', 'ridx', 'rindex' then do_index opts
 	when 'int' then @template.factory :number, @value.to_i
+	when 'join' then do_join opts
 	when 'len', 'length' then @template.factory :number, @value.length
 	when 'pcte' then @template.factory(:string,
 	  @value.gsub(/[^a-z0-9]/i) { |c| sprintf "%%%2x", c.ord })
+	when 'regexp' then do_regexp opts
+	when 'rep', 'rep1', 'replace', 'replace1' then do_replace opts
 	when 'rng', 'range', 'slc', 'slice' then do_range_slice opts
+	when 'split' then do_split opts
 	when 'type' then @template.factory :string, 'string'
+	when 'upcase' then @template.factory :string, @value.upcase
 	when '+' then do_add opts
 	when '*' then do_multiply opts
-	when 'idx', 'index', 'ridx', 'rindex' then do_index opts
 	when '<', '<=', '==', '!=', '>=', '>' then do_compare opts
 	else do_method opts, 'String'
 	end
@@ -108,6 +115,18 @@ class LtdTemplate::Value::String < LtdTemplate::Code
 	end
     end
+    # String join
+    # str.join(list)
+    def do_join (opts)
+	params = params.positional if params = opts[:parameters]
+    	if params and params.size > 0
+	    @template.factory(:string, params.map do |val|
+	      val.get_value.to_text end.join(@value))
+	else
+	    @template.factory :string, ''
+	end
+    end
     # Range and slice:
     # str.range([begin[, end]])
     # str.slice([begin[, length]])
@@ -124,4 +143,70 @@ class LtdTemplate::Value::String < LtdTemplate::Code
 	@template.factory :string, (str || '')
     end
+    # Convert to regexp string
+    def do_regexp (opts)
+	(@template.limits[:regexp] != false) ? self :
+	(LtdTemplate::Value::Regexp.new @template, @value)
+    end
+    # Replace and replace one
+    # str.replace(pattern, replacement)
+    # str.replace1(pattern, replacement)
+    def do_replace (opts)
+	params = params.positional if params = opts[:parameters]
+	if params.size > 1
+	    pat = params[0].get_value
+	    pat = pat.respond_to?(:to_regexp) ? pat.to_regexp : pat.to_native
+	    repl = params[1].get_value.to_native
+	    if opts[:method][-1] == '1'
+		# replace one
+		@template.factory :string, @value.sub(pat, repl)
+	    else
+		# replace all
+		@template.factory :string, @value.gsub(pat, repl)
+	    end
+	else
+	    self
+	end
+    end
+    # Split
+    # str.split(pattern[, limit])
+    def do_split (opts)
+	split_opts = []
+	params = params.positional if params = opts[:parameters]
+	if params.size > 0
+	    pattern = params[0].get_value
+	    split_opts << ((pattern.respond_to? :to_regexp) ?
+	      pattern.to_regexp : pattern.to_native)
+	    split_opts << params[1].get_value.to_native if params.size > 1
+	end
+	@template.factory(:array).set_from_array @value.split(*split_opts)
+    end
+end
+class LtdTemplate::Value::Regexp < LtdTemplate::Value::String
+    def initialize (template, value)
+	super template, value
+	@options = 0
+    end
+    def to_regexp
+	@regexp ||= Regexp.new @value, @options
+    end
+    def get_value (opts = {})
+	case opts[:method]
+	when 'ci', 'ignorecase' then @options |= Regexp::IGNORECASE; self
+	when 'ext', 'extended' then @options |= Regexp::EXTENDED; self
+	when 'multi', 'multiline' then @options |= Regexp::MULTILINE; self
+	when 'type' then @template.factory :string, 'regexp'
+	else super
+	end
+    end
 end
+# END

data/lib/test.rb ADDED Viewed

@@ -0,0 +1,10 @@
+require 'ltdtemplate'
+t = LtdTemplate.new
+t.parse '<<"".regexp.type>>'
+print t.render, "\n"
+t.limits[:regexp] = false
+print t.render, "\n"
+#t.parse '<<"+".join(1,2,"three")>>'
+#t.parse '<<"Now IS the time".split("[^a-z]".regexp.ci).join("/")>>'

data/ltdtemplate.gemspec CHANGED Viewed

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name         = "ltdtemplate"
-  s.version      = "0.2.1"
-  s.date         = "2013-07-28"
+  s.version      = "0.2.2"
+  s.date         = "2013-07-29"
   s.authors      = ["Brian Katzung"]
   s.email        = ["briank@kappacs.com"]
   s.homepage     = "http://rubygems.org/gems/ltdtemplate"
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.license      = "MIT"
   s.files        = Dir.glob("lib/**/*") +
-      %w{ltdtemplate.gemspec Gemfile .yardopts HISTORY.txt RESOURCES.txt
+      %w{ltdtemplate.gemspec Gemfile .yardopts CHANGELOG RESOURCES
       TEMPLATE_MANUAL.html}
   s.test_files   = Dir.glob("test/**/[0-9]*.rb")
   s.require_path = 'lib'

metadata CHANGED Viewed

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments:
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors:
 - Brian Katzung
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-07-28 00:00:00 -05:00
+date: 2013-07-29 00:00:00 -05:00
 default_executable:
 dependencies: []
@@ -28,6 +28,7 @@ extensions: []
 extra_rdoc_files: []
 files:
+- lib/test.rb
 - lib/ltdtemplate/value/code_block.rb
 - lib/ltdtemplate/value/array.rb
 - lib/ltdtemplate/value/nil.rb
@@ -45,8 +46,8 @@ files:
 - ltdtemplate.gemspec
 - Gemfile
 - .yardopts
-- HISTORY.txt
-- RESOURCES.txt
+- CHANGELOG
+- RESOURCES
 - TEMPLATE_MANUAL.html
 - test/00class.rb
 - test/04number.rb