rufus-dollar 1.0.1 → 1.0.2

data/CHANGELOG.txt

@@ -1,6 +1,10 @@
 
 = rufus-dollar CHANGELOG.txt
 
+== rufus-dollar - 1.0.2    released 2009/02/04
+
+- code cleanup
+
 
 == rufus-dollar - 1.0.1    released 2008/02/19
 

data/README.txt

@@ -6,7 +6,7 @@ A one-method library for substituting ${stuff} in text strings.
 
 == getting it
 
-    sudo gem install rufus-dollar
+  sudo gem install rufus-dollar
 
 or at
 
@@ -15,23 +15,23 @@ http://rubyforge.org/frs/?group_id=4812
 
 == usage
 
-    require 'rubygems'
-    require 'rufus/dollar'
-
-    h = {
-        "name" => "Fred Brooks",
-        "title" => "Silver Bullet",
-        "left" => "na",
-        "right" => "me",
-    }
-
-    puts Rufus::dsub "${name} wrote '${title}'", h
-        # => "Fred Brooks wrote 'Silver Bullet'"
-
-    # dollar notations are nestable
-
-    puts Rufus::dsub "${${left}${right}}", h
-        # => "${name}" => "Fred Brooks"
+  require 'rubygems'
+  require 'rufus/dollar'
+  
+  h = {
+    'name' => 'Fred Brooks',
+    'title' => 'Silver Bullet',
+    'left' => 'na',
+    'right' => 'me',
+  }
+  
+  puts Rufus::dsub "${name} wrote '${title}'", h
+    # => "Fred Brooks wrote 'Silver Bullet'"
+  
+  # dollar notations are nestable
+  
+  puts Rufus::dsub "${${left}${right}}", h
+    # => "${name}" => "Fred Brooks"
 
 
 == dependencies
@@ -43,7 +43,7 @@ None.
 
 On the rufus-ruby list[http://groups.google.com/group/rufus-ruby] :
 
-    http://groups.google.com/group/rufus-ruby
+  http://groups.google.com/group/rufus-ruby
 
 
 == issue tracker
@@ -53,9 +53,9 @@ http://rubyforge.org/tracker/?atid=18584&group_id=4812&func=browse
 
 == source
 
-http://rufus.rubyforge.org/svn/trunk/dollar
+http://github.com/jmettraux/rufus-dollar
 
-    svn checkout http://rufus.rubyforge.org/svn/trunk/dollar
+  git clone git://github.com/jmettraux/rufus-dollar.git
 
 
 == author
@@ -64,6 +64,11 @@ John Mettraux, jmettraux@gmail.com
 http://jmettraux.wordpress.com
 
 
+== the rest of Rufus
+
+http://rufus.rubyforge.org
+
+
 == license
 
 MIT

data/lib/rufus-dollar.rb

@@ -0,0 +1,3 @@
+
+require 'rufus/dollar'
+

data/lib/rufus/dollar.rb

@@ -1,6 +1,6 @@
 #
 #--
-# Copyright (c) 2006-2008, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2006-2009, John Mettraux, jmettraux@gmail.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -8,10 +8,10 @@
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be included in
 # all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -31,90 +31,65 @@
 
 module Rufus
 
-    #
-    # Performs 'dollar substitution' on a piece of text with a given 
-    # dictionary.
-    #
-    #     require 'rubygems'
-    #     require 'rufus/dollar'
-    #
-    #     h = {
-    #         "name" => "Fred Brooke",
-    #         "title" => "Silver Bullet"
-    #     }
-    #
-    #     puts Rufus::dsub "${name} wrote '${title}'", h
-    #         # => "Fred Brooke wrote 'Silver Bullet'"
-    #
-    def self.dsub (text, dict, offset=nil)
-
-        text = text.to_s
-
-        #puts "### text is  >#{text}<"
-        #puts "### dict is of class #{dict.class.name}"
-
-        j = text.index("}", offset || 0)
+  #
+  # Performs 'dollar substitution' on a piece of text with a given
+  # dictionary.
+  #
+  #   require 'rubygems'
+  #   require 'rufus/dollar'
+  #
+  #   h = {
+  #     "name" => "Fred Brooke",
+  #     "title" => "Silver Bullet"
+  #   }
+  #
+  #   puts Rufus::dsub "${name} wrote '${title}'", h
+  #     # => "Fred Brooke wrote 'Silver Bullet'"
+  #
+  def self.dsub (text, dict, offset=nil)
 
-        return text if not j
+    text = text.to_s
 
-        t = text[0, j]
+    j = text.index('}', offset || 0)
 
-        i = t.rindex("${")
-        ii = t.rindex("\\${")
+    return text unless j
 
-        iii = t.rindex("{")
-        iii = nil if offset
+    t = text[0, j]
 
-        #puts "i  is #{i}"
-        #puts "j  is #{j}"
-        #puts "ii is #{ii}"
-        #puts "iii is #{iii}"
+    i = t.rindex('${')
+    ii = t.rindex("\\${")
 
-        return text if (not i)
-        return dsub(text, dict, j+1) if (iii) and (iii-1 > i)
+    iii = t.rindex('{')
+    iii = nil if offset
 
-        return unescape(text) if (i) and (i != 0) and (ii == i-1)
-            #
-            # found "\${"
-        
-        key = text[i+2..j-1]
+    return text unless i
+    return dsub(text, dict, j+1) if (iii) and (iii-1 > i)
 
-        #puts "### key is '#{key}'"
+    return unescape(text) if (i) and (i != 0) and (ii == i-1)
+      #
+      # found "\${"
 
-        value = dict[key]
+    key = text[i+2..j-1]
 
-        #puts "### value 0 is '#{value}'"
+    value = dict[key]
 
-        value = if value
-            value.to_s 
-        else
-            if dict.has_key?(key)
-                "false"
-            else
-                ""
-            end
-        end
-
-        #puts "### value 1 is '#{value}'"
-
-        #puts "### pre is  >#{text[0..i-1]}<"
-        #puts "### post is >#{text[j+1..-1]}<"
+    value = if value
+      value.to_s
+    else
+      dict.has_key?(key) ? 'false' : ''
+    end
 
-        pre = if i > 0 
-            text[0..i-1]
-        else
-            ""
-        end
+    pre = (i > 0) ? text[0..i-1] : ''
 
-        dsub "#{pre}#{value}#{text[j+1..-1]}", dict
-    end
+    dsub("#{pre}#{value}#{text[j+1..-1]}", dict)
+  end
 
-    private
+  private
 
-        def Rufus.unescape (text)
+  def self.unescape (text)
 
-            text.gsub("\\\\\\$\\{", "\\${")
-        end
+    text.gsub("\\\\\\$\\{", "\\${")
+  end
 
 end
 

data/test/dollar_test.rb

@@ -8,77 +8,73 @@
 #
 
 require 'test/unit'
-require 'rufus/dollar'
-require 'test_base'
+require File.dirname(__FILE__) + '/test_base'
 
-#
-# testing the 'dollar notation'
-#
 
 class DollarTest < Test::Unit::TestCase
-    include TestBase
+  include TestBase
 
-    #def setup
-    #end
+  #def setup
+  #end
 
-    #def teardown
-    #end
+  #def teardown
+  #end
 
-    def test_0
+  def test_0
 
-        dict = {}
+    dict = {}
 
-        dict['renard'] = 'goupil'
-        dict['cane'] = 'oie'
-        dict['oie blanche'] = 'poule'
+    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 "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 "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} et la ${cane}", dict, "le goupil et la oie"
+      #
+      # excuse my french...
 
-        dotest "le \\${renard} encore", dict, "le \\${renard} encore"
+    dotest "le \\${renard} encore", dict, "le \\${renard} encore"
 
-        dotest "", dict, ""
+    dotest "", dict, ""
 
-        dotest("""
+    dotest("""
 """, dict, """
 """)
-        dotest(""" 
+    dotest(""" 
 """, dict, """ 
 """)
-    end
+  end
 
-    def test_1
+  def test_1
 
-        dict = {}
-        dict['x'] = 'y'
+    dict = {}
+    dict['x'] = 'y'
 
-        dotest "${x}", dict, "y"
-        dotest "\\${x}", dict, "\\${x}"
-    end
+    dotest "${x}", dict, "y"
+    dotest "\\${x}", dict, "\\${x}"
+  end
 
-    def test_2
+  def test_2
 
-        dict = {}
-        dict['A'] = 'a'
-        dict['B'] = 'b'
-        dict['ab'] = 'ok'
+    dict = {}
+    dict['A'] = 'a'
+    dict['B'] = 'b'
+    dict['ab'] = 'ok'
 
-        dotest "${${A}${B}}", dict, "ok"
-    end
+    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 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

@@ -7,25 +7,24 @@
 # Mon Feb 18 23:32:12 JST 2008
 #
 
-require 'test/unit'
-require 'rufus/dollar'
-require 'test_base'
+require File.dirname(__FILE__) + '/test_base'
+
 
 class NestedTest < Test::Unit::TestCase
-    include TestBase
+  include TestBase
 
-    #def setup
-    #end
+  #def setup
+  #end
 
-    #def teardown
-    #end
+  #def teardown
+  #end
 
-    def test_0
+  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
+    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,4 +1,4 @@
 
-require 'test/dollar_test'
-require 'test/nested_test'
+require File.dirname(__FILE__) + '/dollar_test'
+require File.dirname(__FILE__) + '/nested_test'
 

data/test/test_base.rb

@@ -7,14 +7,21 @@
 # Mon Feb 18 23:30:37 JST 2008
 #
 
+$:.unshift File.dirname(__FILE__) + '/../lib/'
+
+require 'test/unit'
+require 'rufus/dollar'
+
+
 module TestBase
 
-    protected
+  protected
 
-        def dotest (text, dict, target)
+  def dotest (text, dict, target)
 
-            result = Rufus::dsub text, dict
+    result = Rufus.dsub(text, dict)
 
-            assert_equal target, result
-        end
+    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.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - John Mettraux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-19 00:00:00 +09:00
+date: 2009-02-04 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -26,6 +26,7 @@ extra_rdoc_files:
 files: 
 - lib/rufus
 - lib/rufus/dollar.rb
+- lib/rufus-dollar.rb
 - test/dollar_test.rb
 - test/nested_test.rb
 - test/test.rb
@@ -55,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 0.9.5
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: ${xxx} substitutions