@@ -1 +1,3 @@ doc +.DS_Store +**/.DS_Store .gitignore @@ -136,7 +136,8 @@ class RRDB # the values your application prefers. # def self.field_name(name) - name.to_s.delete("^a-zA-Z0-9_")[0..18] + name.to_s.tr( "-~!@\#$%^&*+=|<>./?", + "mtbahdpcnmveplgddq" ).delete("^a-zA-Z0-9_")[0..18] end # lib/rrdb.rb @@ -48,10 +48,22 @@ class TestUpdate < Test::Unit::TestCase end def test_unsupported_characters_are_removed_from_names - @db.update(Time.now, "a'b=" => 4) + @db.update(Time.now, "a'b)" => 4) assert(@db.fields.include?("ab"), "Trimmed field name not found.") end + def test_common_symbols_are_translated + @db.update(Time.now, '~ z ! @#$%^&*-+=|<>./?' => 4) + assert( @db.fields.include?("tzbahdpcnmmveplgddq"), + "Common symbols were not translated." ) + end + + def test_fields_that_differ_only_by_symbol + @db.update(Time.now, "Swap Used" => 1, "% Swap Used" => 2) + assert(@db.fields.include?("SwapUsed"), "Non-symbol field was not found.") + assert(@db.fields.include?("pSwapUsed"), "Symbol field was not found.") + end + def test_long_field_names_are_shortened_on_entry @db.update(Time.now, ("a".."z").to_a.join => 5) assert( @db.fields.include?(("a".."z").to_a.join[0..18]), @@ -63,7 +75,7 @@ class TestUpdate < Test::Unit::TestCase @db.update(Time.now, String.new => 6) end assert_raise(RRDB::FieldNameConflictError) do - @db.update(Time.now, "!@\#$%^&*" => 7) + @db.update(Time.now, "`(){}[]'" => 7) end end test/tc_update.rb fae1f147c1e92ef1f8a1379f2d28b28eb221c88e James Edward Gray II james@graysoftinc.com http://github.com/JEG2/rrdb/commit/aea997aff6465e9579200a2e53a109d71fc1fdf0 aea997aff6465e9579200a2e53a109d71fc1fdf0 2008-07-21T07:06:09-07:00 2008-07-21T07:06:09-07:00 Adding support for symbols in fields. 1bad1929339578bea3ed6e8e654c3d3486375202 James Edward Gray II james@graysoftinc.com