rufus-dollar 1.0 → 1.0.1

data/CHANGELOG.txt

@@ -2,5 +2,10 @@
 = rufus-dollar CHANGELOG.txt
 
 
+== rufus-dollar - 1.0.1    released 2008/02/19
+
+- bug   #18161 : problem with nested simple {} (not ${}). Fixed - s179
+
+
 == rufus-dollar - 1.0    released 2008/01/24
 

data/README.txt

@@ -1,7 +1,7 @@
 
 = rufus-dollar
 
-A one-method library for substituting ${stuff} in text strings
+A one-method library for substituting ${stuff} in text strings.
 
 
 == getting it
@@ -19,12 +19,19 @@ http://rubyforge.org/frs/?group_id=4812
     require 'rufus/dollar'
 
     h = {
-        "name" => "Fred Brooke",
-        "title" => "Silver Bullet"
+        "name" => "Fred Brooks",
+        "title" => "Silver Bullet",
+        "left" => "na",
+        "right" => "me",
     }
 
     puts Rufus::dsub "${name} wrote '${title}'", h
-        # => "Fred Brooke wrote 'Silver Bullet'"
+        # => "Fred Brooks wrote 'Silver Bullet'"
+
+    # dollar notations are nestable
+
+    puts Rufus::dsub "${${left}${right}}", h
+        # => "${name}" => "Fred Brooks"
 
 
 == dependencies

data/lib/rufus/dollar.rb

@@ -28,6 +28,7 @@
 # John Mettraux at openwfe.org
 #
 
+
 module Rufus
 
     #
@@ -45,16 +46,14 @@ module Rufus
     #     puts Rufus::dsub "${name} wrote '${title}'", h
     #         # => "Fred Brooke wrote 'Silver Bullet'"
     #
-    def Rufus.dsub (text, dict)
+    def self.dsub (text, dict, offset=nil)
 
         text = text.to_s
 
-        #puts "### text is >#{text}<"
+        #puts "### text is  >#{text}<"
         #puts "### dict is of class #{dict.class.name}"
 
-        #return nil unless text
-
-        j = text.index("}")
+        j = text.index("}", offset || 0)
 
         return text if not j
 
@@ -63,15 +62,21 @@ module Rufus
         i = t.rindex("${")
         ii = t.rindex("\\${")
 
+        iii = t.rindex("{")
+        iii = nil if offset
+
         #puts "i  is #{i}"
+        #puts "j  is #{j}"
         #puts "ii is #{ii}"
+        #puts "iii is #{iii}"
 
-        return text if not i
+        return text if (not i)
+        return dsub(text, dict, j+1) if (iii) and (iii-1 > i)
 
         return unescape(text) if (i) and (i != 0) and (ii == i-1)
             #
             # found "\${"
-
+        
         key = text[i+2..j-1]
 
         #puts "### key is '#{key}'"
@@ -92,8 +97,8 @@ module Rufus
 
         #puts "### value 1 is '#{value}'"
 
-        #puts "pre is  >#{text[0..i-1]}<"
-        #puts "post is >#{text[j+1..-1]}<"
+        #puts "### pre is  >#{text[0..i-1]}<"
+        #puts "### post is >#{text[j+1..-1]}<"
 
         pre = if i > 0 
             text[0..i-1]
@@ -101,7 +106,7 @@ module Rufus
             ""
         end
 
-        dsub("#{pre}#{value}#{text[j+1..-1]}", dict)
+        dsub "#{pre}#{value}#{text[j+1..-1]}", dict
     end
 
     private

data/test/dollar_test.rb

@@ -0,0 +1,84 @@
+
+#
+# Testing rufus-dollar
+#
+# John Mettraux at openwfe.org
+#
+# Mon Oct  9 22:19:44 JST 2006
+#
+
+require 'test/unit'
+require 'rufus/dollar'
+require 'test_base'
+
+#
+# testing the 'dollar notation'
+#
+
+class DollarTest < Test::Unit::TestCase
+    include TestBase
+
+    #def setup
+    #end
+
+    #def teardown
+    #end
+
+    def test_0
+
+        dict = {}
+
+        dict['renard'] = 'goupil'
+        dict['cane'] = 'oie'
+        dict['oie blanche'] = 'poule'
+
+        dotest "le petit renard", dict, "le petit renard"
+        dotest "le petit {renard}", dict, "le petit {renard}"
+        dotest "le petit ${renard}", dict, "le petit goupil"
+        dotest "le petit ${renard} noir", dict, "le petit goupil noir"
+
+        dotest "la grande ${${cane} blanche}", dict, "la grande poule"
+
+        dotest "le ${renard} et la ${cane}", dict, "le goupil et la oie"
+            #
+            # excuse my french...
+
+        dotest "le \\${renard} encore", dict, "le \\${renard} encore"
+
+        dotest "", dict, ""
+
+        dotest("""
+""", dict, """
+""")
+        dotest(""" 
+""", dict, """ 
+""")
+    end
+
+    def test_1
+
+        dict = {}
+        dict['x'] = 'y'
+
+        dotest "${x}", dict, "y"
+        dotest "\\${x}", dict, "\\${x}"
+    end
+
+    def test_2
+
+        dict = {}
+        dict['A'] = 'a'
+        dict['B'] = 'b'
+        dict['ab'] = 'ok'
+
+        dotest "${${A}${B}}", dict, "ok"
+    end
+
+    #def test_3
+    #    assert_equal OpenWFE.unescape("toto and ${toto}"), "toto and ${toto}"
+    #    assert_equal OpenWFE.unescape("toto & \${toto}"), "toto & ${toto}"
+    #    assert_equal "toto & \\${toto}", "toto & ${toto}"
+    #    #assert_equal OpenWFE.unescape('toto & \${toto}'), "toto & ${toto}"
+    #end
+
+end

data/test/nested_test.rb

@@ -0,0 +1,31 @@
+
+#
+# Testing rufus-dollar
+#
+# John Mettraux at openwfe.org
+#
+# Mon Feb 18 23:32:12 JST 2008
+#
+
+require 'test/unit'
+require 'rufus/dollar'
+require 'test_base'
+
+class NestedTest < Test::Unit::TestCase
+    include TestBase
+
+    #def setup
+    #end
+
+    #def teardown
+    #end
+
+    def test_0
+
+        dotest " ${a${b}e} ", {}, "  "
+        dotest " ${a{b}e} ", {}, "  "
+        dotest "${a{b}e}", {}, ""
+        dotest " \\${a{b}e} ", {}, " \\${a{b}e} "
+        dotest "{a${b}c}", { "b" => 2 }, "{a2c}"
+    end
+end

data/test/test.rb

@@ -1,91 +1,4 @@
 
-#
-# Testing rufus-dollar
-#
-# John Mettraux at openwfe.org
-#
-# Mon Oct  9 22:19:44 JST 2006
-#
+require 'test/dollar_test'
+require 'test/nested_test'
 
-require 'test/unit'
-require 'rufus/dollar'
-
-#
-# testing the 'dollar notation'
-#
-
-class DollarTest < Test::Unit::TestCase
-
-    #def setup
-    #end
-
-    #def teardown
-    #end
-
-    def test_0
-
-        dict = {}
-
-        dict['renard'] = 'goupil'
-        dict['cane'] = 'oie'
-        dict['oie blanche'] = 'poule'
-
-        dotest("le petit renard", dict, "le petit renard")
-        dotest("le petit {renard}", dict, "le petit {renard}")
-        dotest("le petit ${renard}", dict, "le petit goupil")
-        dotest("le petit ${renard} noir", dict, "le petit goupil noir")
-
-        dotest("la grande ${${cane} blanche}", dict, "la grande poule")
-
-        dotest("le ${renard} et la ${cane}", dict, "le goupil et la oie")
-            #
-            # excuse my french...
-
-        dotest("le \\${renard} encore", dict, "le \\${renard} encore")
-
-        dotest("", dict, "")
-
-        dotest("""
-""", dict, """
-""")
-        dotest(""" 
-""", dict, """ 
-""")
-    end
-
-    def test_1
-
-        dict = {}
-        dict['x'] = 'y'
-
-        dotest("${x}", dict, "y")
-        dotest("\\${x}", dict, "\\${x}")
-    end
-
-    def test_2
-
-        dict = {}
-        dict['A'] = 'a'
-        dict['B'] = 'b'
-        dict['ab'] = 'ok'
-
-        dotest("${${A}${B}}", dict, "ok")
-    end
-
-    #def test_3
-    #    assert_equal OpenWFE.unescape("toto and ${toto}"), "toto and ${toto}"
-    #    assert_equal OpenWFE.unescape("toto & \${toto}"), "toto & ${toto}"
-    #    assert_equal "toto & \\${toto}", "toto & ${toto}"
-    #    #assert_equal OpenWFE.unescape('toto & \${toto}'), "toto & ${toto}"
-    #end
-
-    def dotest (text, dict, target)
-
-        result = Rufus::dsub(text, dict)
-        #puts "..>#{text}<"
-        #puts "...->"
-        #puts "..>#{result}<"
-        #puts
-        assert_equal result, target
-    end
-end

data/test/test_base.rb

@@ -0,0 +1,20 @@
+
+#
+# Testing rufus-dollar
+#
+# John Mettraux at openwfe.org
+#
+# Mon Feb 18 23:30:37 JST 2008
+#
+
+module TestBase
+
+    protected
+
+        def dotest (text, dict, target)
+
+            result = Rufus::dsub text, dict
+
+            assert_equal target, result
+        end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rufus-dollar
 version: !ruby/object:Gem::Version 
-  version: "1.0"
+  version: 1.0.1
 platform: ruby
 authors: 
 - John Mettraux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-24 00:00:00 +09:00
+date: 2008-02-19 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -26,7 +26,10 @@ extra_rdoc_files:
 files: 
 - lib/rufus
 - lib/rufus/dollar.rb
+- test/dollar_test.rb
+- test/nested_test.rb
 - test/test.rb
+- test/test_base.rb
 - README.txt
 - CHANGELOG.txt
 - LICENSE.txt